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

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

@@ -1,6 +1,23 @@
 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)
+~~~~~~~~~~~~~~~~~
+
+* Generate wheels on PyPI using Python 3.14 final release, thanks to cibuildwheel `3.2.1`__
+
+  __ https://cibuildwheel.pypa.io/en/stable/changelog/#v321
+
+
 1.21 (2025-07-10)
 ~~~~~~~~~~~~~~~~~
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-rapidjson
-Version: 1.21
+Version: 1.23
 Summary: Python wrapper around rapidjson
 Home-page: https://github.com/python-rapidjson/python-rapidjson
 Author: Ken Robbins
@@ -8,7 +8,7 @@ Author-email: ken@kenrobbins.com
 Maintainer: Lele Gaifax
 Maintainer-email: lele@metapensiero.it
 License: MIT License
-Keywords: json rapidjson
+Keywords: json jsonc rapidjson
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: C++
@@ -19,6 +19,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python
 Requires-Python: >=3.6
 Description-Content-Type: text/x-rst
@@ -42,7 +43,7 @@ Dynamic: summary
 .. :Author:    Ken Robbins <ken@kenrobbins.com>
 .. :License:   MIT License
 .. :Copyright: © 2015 Ken Robbins
-.. :Copyright: © 2016, 2017, 2018, 2020, 2022, 2024 Lele Gaifax
+.. :Copyright: © 2016, 2017, 2018, 2020, 2022, 2024, 2025 Lele Gaifax
 ..
 
 ==================
@@ -114,6 +115,26 @@ Basic usage looks like this:
     Chunk: b'":"ba'
     Chunk: b'z"}'
 
+Most functionalities are exposed both as *functions* and as *classes*.
+
+The following uses a *relaxed syntax* ``Decoder`` instance, that handles JSONC__ and
+*trailing commas*:
+
+__ https://jsonc.org/
+
+.. code-block:: python
+
+    >>> from rapidjson import Decoder
+    >>> from rapidjson import PM_COMMENTS, PM_TRAILING_COMMAS
+    >>> decoder = Decoder(parse_mode=PM_COMMENTS | PM_TRAILING_COMMAS)
+    >>> decoder('''
+    ... {
+    ...     "bar": /* Block comment */ "baz",
+    ...     "foo":100, // Trailing comma and comment
+    ... }
+    ... ''')
+    {'bar': 'baz', 'foo': 100}
+
 
 Development
 -----------
@@ -167,6 +188,23 @@ __ 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)
+~~~~~~~~~~~~~~~~~
+
+* Generate wheels on PyPI using Python 3.14 final release, thanks to cibuildwheel `3.2.1`__
+
+  __ https://cibuildwheel.pypa.io/en/stable/changelog/#v321
+
+
 1.21 (2025-07-10)
 ~~~~~~~~~~~~~~~~~
 

{python_rapidjson-1.21 → python_rapidjson-1.23}/README.rst

@@ -3,7 +3,7 @@
 .. :Author:    Ken Robbins <ken@kenrobbins.com>
 .. :License:   MIT License
 .. :Copyright: © 2015 Ken Robbins
-.. :Copyright: © 2016, 2017, 2018, 2020, 2022, 2024 Lele Gaifax
+.. :Copyright: © 2016, 2017, 2018, 2020, 2022, 2024, 2025 Lele Gaifax
 ..
 
 ==================
@@ -75,6 +75,26 @@ Basic usage looks like this:
     Chunk: b'":"ba'
     Chunk: b'z"}'
 
+Most functionalities are exposed both as *functions* and as *classes*.
+
+The following uses a *relaxed syntax* ``Decoder`` instance, that handles JSONC__ and
+*trailing commas*:
+
+__ https://jsonc.org/
+
+.. code-block:: python
+
+    >>> from rapidjson import Decoder
+    >>> from rapidjson import PM_COMMENTS, PM_TRAILING_COMMAS
+    >>> decoder = Decoder(parse_mode=PM_COMMENTS | PM_TRAILING_COMMAS)
+    >>> decoder('''
+    ... {
+    ...     "bar": /* Block comment */ "baz",
+    ...     "foo":100, // Trailing comma and comment
+    ... }
+    ... ''')
+    {'bar': 'baz', 'foo': 100}
+
 
 Development
 -----------

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

@@ -1,6 +1,23 @@
 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)
+~~~~~~~~~~~~~~~~~
+
+* Generate wheels on PyPI using Python 3.14 final release, thanks to cibuildwheel `3.2.1`__
+
+  __ https://cibuildwheel.pypa.io/en/stable/changelog/#v321
+
+
 1.21 (2025-07-10)
 ~~~~~~~~~~~~~~~~~
 

{python_rapidjson-1.21 → python_rapidjson-1.23}/docs/quickstart.rst

@@ -2,7 +2,7 @@
 .. :Project:   python-rapidjson -- Quickstart examples
 .. :Author:    Lele Gaifax <lele@metapensiero.it>
 .. :License:   MIT License
-.. :Copyright: © 2016, 2017, 2018, 2020, 2021 Lele Gaifax
+.. :Copyright: © 2016, 2017, 2018, 2020, 2021, 2025 Lele Gaifax
 ..
 
 =============
@@ -158,6 +158,25 @@ The module exposes also a *stream* interface:
     >>> load(stream) == data
     True
 
+Almost all these functionalities are also available as *classes*. For example, the
+following uses a *relaxed syntax* :class:`~rapidjson.Decoder` instance, that handles
+JSONC__ and *trailing commas*:
+
+__ https://jsonc.org/
+
+.. code-block:: python
+
+    >>> from rapidjson import Decoder
+    >>> from rapidjson import PM_COMMENTS, PM_TRAILING_COMMAS
+    >>> decoder = Decoder(parse_mode=PM_COMMENTS | PM_TRAILING_COMMAS)
+    >>> decoder('''
+    ... {
+    ...     "bar": /* Block comment */ "baz",
+    ...     "foo":100, // Trailing comma and comment
+    ... }
+    ... ''')
+    {'bar': 'baz', 'foo': 100}
+
 
 Incompatibilities
 -----------------

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-rapidjson
-Version: 1.21
+Version: 1.23
 Summary: Python wrapper around rapidjson
 Home-page: https://github.com/python-rapidjson/python-rapidjson
 Author: Ken Robbins
@@ -8,7 +8,7 @@ Author-email: ken@kenrobbins.com
 Maintainer: Lele Gaifax
 Maintainer-email: lele@metapensiero.it
 License: MIT License
-Keywords: json rapidjson
+Keywords: json jsonc rapidjson
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: C++
@@ -19,6 +19,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python
 Requires-Python: >=3.6
 Description-Content-Type: text/x-rst
@@ -42,7 +43,7 @@ Dynamic: summary
 .. :Author:    Ken Robbins <ken@kenrobbins.com>
 .. :License:   MIT License
 .. :Copyright: © 2015 Ken Robbins
-.. :Copyright: © 2016, 2017, 2018, 2020, 2022, 2024 Lele Gaifax
+.. :Copyright: © 2016, 2017, 2018, 2020, 2022, 2024, 2025 Lele Gaifax
 ..
 
 ==================
@@ -114,6 +115,26 @@ Basic usage looks like this:
     Chunk: b'":"ba'
     Chunk: b'z"}'
 
+Most functionalities are exposed both as *functions* and as *classes*.
+
+The following uses a *relaxed syntax* ``Decoder`` instance, that handles JSONC__ and
+*trailing commas*:
+
+__ https://jsonc.org/
+
+.. code-block:: python
+
+    >>> from rapidjson import Decoder
+    >>> from rapidjson import PM_COMMENTS, PM_TRAILING_COMMAS
+    >>> decoder = Decoder(parse_mode=PM_COMMENTS | PM_TRAILING_COMMAS)
+    >>> decoder('''
+    ... {
+    ...     "bar": /* Block comment */ "baz",
+    ...     "foo":100, // Trailing comma and comment
+    ... }
+    ... ''')
+    {'bar': 'baz', 'foo': 100}
+
 
 Development
 -----------
@@ -167,6 +188,23 @@ __ 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)
+~~~~~~~~~~~~~~~~~
+
+* Generate wheels on PyPI using Python 3.14 final release, thanks to cibuildwheel `3.2.1`__
+
+  __ https://cibuildwheel.pypa.io/en/stable/changelog/#v321
+
+
 1.21 (2025-07-10)
 ~~~~~~~~~~~~~~~~~
 

{python_rapidjson-1.21 → 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.21 → 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.21'
+VERSION = '1.23'
 
 with open('README.rst', encoding='utf-8') as f:
     LONG_DESCRIPTION = f.read()
@@ -94,7 +94,7 @@ setup(
     long_description=LONG_DESCRIPTION + '\n\n' + CHANGES,
     long_description_content_type='text/x-rst',
     license='MIT License',
-    keywords='json rapidjson',
+    keywords='json jsonc rapidjson',
     author='Ken Robbins',
     author_email='ken@kenrobbins.com',
     maintainer='Lele Gaifax',
@@ -111,6 +111,7 @@ setup(
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
         'Programming Language :: Python :: 3.13',
+        'Programming Language :: Python :: 3.14',
         'Programming Language :: Python',
     ],
     ext_modules=[Extension('rapidjson', **extension_options)],

{python_rapidjson-1.21 → python_rapidjson-1.23}/tests/test_memory_leaks.py

@@ -3,7 +3,7 @@
 # :Created:   dom 10 feb 2019 13:47:32 CET
 # :Author:    Lele Gaifax <lele@metapensiero.it>
 # :License:   MIT License
-# :Copyright: © 2019 Lele Gaifax
+# :Copyright: © 2019, 2025 Lele Gaifax
 #
 
 import io
@@ -53,7 +53,8 @@ def test_object_hook_and_default():
     tracemalloc.stop()
 
     for stat in top_stats[:10]:
-        assert stat.count_diff < 3
+        # Uhm, with Py 3.14, on macOS,  the diff is 3...
+        assert stat.count_diff <= 3
 
 
 def test_load():
@@ -78,7 +79,8 @@ def test_load():
     tracemalloc.stop()
 
     for stat in top_stats[:10]:
-        assert stat.count_diff < 3
+        # Uhm, with Py 3.14, on macOS,  the diff is 3...
+        assert stat.count_diff <= 3
 
 
 def test_failed_validation():
@@ -121,4 +123,5 @@ def test_failed_validation():
     tracemalloc.stop()
 
     for stat in top_stats[:10]:
-        assert stat.count_diff < 3
+        # Uhm, with Py 3.14, on macOS,  the diff is 3...
+        assert stat.count_diff <= 3

{python_rapidjson-1.21 → 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

{python_rapidjson-1.21 → python_rapidjson-1.23}/tests/test_refs_count.py

@@ -2,7 +2,7 @@
 # :Project:   python-rapidjson -- Refs leaks tests
 # :Author:    Lele Gaifax <lele@metapensiero.it>
 # :License:   MIT License
-# :Copyright: © 2017, 2018, 2020, 2022 Lele Gaifax
+# :Copyright: © 2017, 2018, 2020, 2022, 2025 Lele Gaifax
 #
 
 # NB: this is a simplistic test that uses sys.gettotalrefcount(), available
@@ -211,10 +211,11 @@ def test_endarray_leak():
             return list(seq)
 
     j1 = rj.loads(value)
-    assert sys.getrefcount(j1['v']) == 3
+    # Uhm, with Py 3.14 the refcount is 2...
+    assert 2 <= sys.getrefcount(j1['v']) <= 3
 
     j2 = Decoder1()(value)
-    assert sys.getrefcount(j2['v']) == 3
+    assert 2 <= sys.getrefcount(j2['v']) <= 3
 
     j3 = Decoder2()(value)
-    assert sys.getrefcount(j3['v']) == 3
+    assert 2 <= sys.getrefcount(j3['v']) <= 3