Skip to content

reverse py_to_json integer types to match json::parse() #12646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 11, 2024
Merged

reverse py_to_json integer types to match json::parse() #12646

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions third-party/rsutils/include/rsutils/py/json.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,24 @@ inline rsutils::json py_to_json( const py::handle & obj )

if( py::isinstance< py::int_ >( obj ) )
{
// NOTE: JSON RFC 8259 section 6 describes number formats, without 'signed' vs 'unsigned' distinctions:
// https://json.nlohmann.me/features/types/number_handling/
// When parsing text, Nlohmann's JSON chooses 'unsigned' by default! See lexer.hpp (scan_number()).
// So we match here (and diverge from the default pybind11_json handling!):
try
{
rsutils::json::number_integer_t s = obj.cast< rsutils::json::number_integer_t >();
if( py::int_( s ).equal( obj ) )
return s;
rsutils::json::number_unsigned_t u = obj.cast< rsutils::json::number_unsigned_t >();
if( py::int_( u ).equal( obj ) )
return u;
}
catch( ... ) {}
try
{
rsutils::json::number_unsigned_t u = obj.cast< rsutils::json::number_unsigned_t >();
if( py::int_( u ).equal( obj ) )
return u;
rsutils::json::number_integer_t s = obj.cast< rsutils::json::number_integer_t >();
if( py::int_( s ).equal( obj ) )
return s;
}
catch( ... ) { }
catch( ... ) {}
throw std::runtime_error( "py_to_json received out-of-range for both number_integer_t and number_unsigned_t: "
+ py::repr( obj ).cast< std::string >() );
}
Expand Down