python-rapidjson 1.22__tar.gz → 1.23__tar.gz

{python_rapidjson-1.22 → python_rapidjson-1.23}/CHANGES.rst

@@ -1,6 +1,15 @@
 Changes
 -------
 
+1.23 (2025-12-07)
+~~~~~~~~~~~~~~~~~
+
+* Fix serialization bug when using ``MM_COERCE_KEYS_TO_STRINGS`` together with
+  ``sort_keys=True`` (`issue #229`__)
+
+  __ https://github.com/python-rapidjson/python-rapidjson/issues/229
+
+
 1.22 (2025-10-21)
 ~~~~~~~~~~~~~~~~~
 

{python_rapidjson-1.22 → python_rapidjson-1.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-rapidjson
-Version: 1.22
+Version: 1.23
 Summary: Python wrapper around rapidjson
 Home-page: https://github.com/python-rapidjson/python-rapidjson
 Author: Ken Robbins
@@ -188,6 +188,15 @@ __ https://python-rapidjson.readthedocs.io/en/latest/quickstart.html#incompatibi
 Changes
 -------
 
+1.23 (2025-12-07)
+~~~~~~~~~~~~~~~~~
+
+* Fix serialization bug when using ``MM_COERCE_KEYS_TO_STRINGS`` together with
+  ``sort_keys=True`` (`issue #229`__)
+
+  __ https://github.com/python-rapidjson/python-rapidjson/issues/229
+
+
 1.22 (2025-10-21)
 ~~~~~~~~~~~~~~~~~
 

{python_rapidjson-1.22 → python_rapidjson-1.23}/docs/changes.rst

@@ -1,6 +1,15 @@
 Changes
 -------
 
+1.23 (2025-12-07)
+~~~~~~~~~~~~~~~~~
+
+* Fix serialization bug when using ``MM_COERCE_KEYS_TO_STRINGS`` together with
+  ``sort_keys=True`` (`issue #229`__)
+
+  __ https://github.com/python-rapidjson/python-rapidjson/issues/229
+
+
 1.22 (2025-10-21)
 ~~~~~~~~~~~~~~~~~
 

{python_rapidjson-1.22 → python_rapidjson-1.23}/python_rapidjson.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-rapidjson
-Version: 1.22
+Version: 1.23
 Summary: Python wrapper around rapidjson
 Home-page: https://github.com/python-rapidjson/python-rapidjson
 Author: Ken Robbins
@@ -188,6 +188,15 @@ __ https://python-rapidjson.readthedocs.io/en/latest/quickstart.html#incompatibi
 Changes
 -------
 
+1.23 (2025-12-07)
+~~~~~~~~~~~~~~~~~
+
+* Fix serialization bug when using ``MM_COERCE_KEYS_TO_STRINGS`` together with
+  ``sort_keys=True`` (`issue #229`__)
+
+  __ https://github.com/python-rapidjson/python-rapidjson/issues/229
+
+
 1.22 (2025-10-21)
 ~~~~~~~~~~~~~~~~~
 

{python_rapidjson-1.22 → python_rapidjson-1.23}/rapidjson.cpp

@@ -3,7 +3,7 @@
 // :Author:    Ken Robbins <ken@kenrobbins.com>
 // :License:   MIT License
 // :Copyright: © 2015 Ken Robbins
-// :Copyright: © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 Lele Gaifax
+// :Copyright: © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025 Lele Gaifax
 //
 
 #include <locale.h>
@@ -2297,23 +2297,17 @@ decoder_new(PyTypeObject* type, PyObject* args, PyObject* kwargs)
 
 
 struct DictItem {
-    const char* key_str;
-    Py_ssize_t key_size;
-    PyObject* item;
-
-    DictItem(const char* k,
-             Py_ssize_t s,
-             PyObject* i)
-        : key_str(k),
-          key_size(s),
-          item(i)
+    std::string key;
+    PyObject* value;
+
+    DictItem(std::string k,
+             PyObject* v)
+        : key(k),
+          value(v)
         {}
 
     bool operator<(const DictItem& other) const {
-        Py_ssize_t tks = this->key_size;
-        Py_ssize_t oks = other.key_size;
-        int cmp = strncmp(this->key_str, other.key_str, tks < oks ? tks : oks);
-        return (cmp == 0) ? (tks < oks) : (cmp < 0);
+        return key < other.key;
     }
 };
 
@@ -2613,7 +2607,7 @@ dumps_internal(
                         return false;
                     }
                     ASSERT_VALID_SIZE(l);
-                    items.push_back(DictItem(key_str, l, item));
+                    items.push_back(DictItem(std::string(key_str, l), item));
                 } else if (!(mappingMode & MM_SKIP_NON_STRING_KEYS)) {
                     PyErr_SetString(PyExc_TypeError, "keys must be strings");
                     assert(!coercedKey);
@@ -2625,10 +2619,10 @@ dumps_internal(
             std::sort(items.begin(), items.end());
 
             for (size_t i=0, s=items.size(); i < s; i++) {
-                writer->Key(items[i].key_str, (SizeType) items[i].key_size);
+                writer->Key(items[i].key.c_str(), (SizeType) items[i].key.length());
                 if (Py_EnterRecursiveCall(" while JSONifying dict object"))
                     return false;
-                bool r = RECURSE(items[i].item);
+                bool r = RECURSE(items[i].value);
                 Py_LeaveRecursiveCall();
                 if (!r)
                     return false;

{python_rapidjson-1.22 → python_rapidjson-1.23}/setup.py

@@ -44,7 +44,7 @@ else:
                            " want to report the issue.")
 
 # Automatically updated by bump-my-version at release time
-VERSION = '1.22'
+VERSION = '1.23'
 
 with open('README.rst', encoding='utf-8') as f:
     LONG_DESCRIPTION = f.read()

{python_rapidjson-1.22 → python_rapidjson-1.23}/tests/test_params.py

@@ -3,7 +3,7 @@
 # :Author:    Ken Robbins <ken@kenrobbins.com>
 # :License:   MIT License
 # :Copyright: © 2015 Ken Robbins
-# :Copyright: © 2015, 2016, 2017, 2018, 2019, 2020 Lele Gaifax
+# :Copyright: © 2015, 2016, 2017, 2018, 2019, 2020, 2025 Lele Gaifax
 #
 
 from calendar import timegm
@@ -217,6 +217,17 @@ def test_sort_keys(dumps):
     assert dumps(o, sort_keys=True) == '{"a":"a","a\\u0000b":"a\\u0000b","a0":"a0","a1":"a1"}'
 
 
+def test_sort_and_coerce_keys(dumps):
+    # Issue 229
+    o = {"a": 1, 3: 4.5, date(2025,10,10): 2, date(2025,11,11): 3}
+    expected = '{"2025-10-10":2,"2025-11-11":3,"3":4.5,"a":1}'
+    assert dumps(o, sort_keys=True, mapping_mode=rj.MM_COERCE_KEYS_TO_STRINGS) == expected
+
+    o = {"ab": 3, "a": 1, "a\x00b": 2}
+    expected = '{"a":1,"a\\u0000b":2,"ab":3}'
+    assert dumps(o, sort_keys=True, mapping_mode=rj.MM_COERCE_KEYS_TO_STRINGS) == expected
+
+
 def test_default():
     class Bar:
         pass