simplejson 3.19.2__tar.gz → 3.20.1__tar.gz

{simplejson-3.19.2 → simplejson-3.20.1}/CHANGES.txt

@@ -1,3 +1,14 @@
+Version 3.20.1 released 2025-02-14
+
+* Do not memoize keys before they are coerced to string
+  https://github.com/simplejson/simplejson/pull/329
+
+Version 3.19.3 released 2024-08-14
+
+* Updated test & build matrix to include Python 3.13.
+  Dropped wheel support for Python 2.7 on macOS.
+  https://github.com/simplejson/simplejson/pull/326
+
 Version 3.19.2 released 2023-10-05
 
 * Updated test & build matrix to include Python 3.12 and use

{simplejson-3.19.2/simplejson.egg-info → simplejson-3.20.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: simplejson
-Version: 3.19.2
+Version: 3.20.1
 Summary: Simple, fast, extensible JSON encoder/decoder for Python
 Home-page: https://github.com/simplejson/simplejson
 Author: Bob Ippolito
@@ -27,11 +27,21 @@ Classifier: Programming Language :: Python :: 3.9
 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 :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=2.5, !=3.0.*, !=3.1.*, !=3.2.*
 License-File: LICENSE.txt
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: platform
+Dynamic: requires-python
+Dynamic: summary
 
 simplejson
 ----------

{simplejson-3.19.2 → simplejson-3.20.1}/conf.py

@@ -36,15 +36,15 @@ master_doc = 'index'
 
 # General substitutions.
 project = 'simplejson'
-copyright = '2023, Bob Ippolito'
+copyright = '2025, Bob Ippolito'
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '3.19'
+version = '3.20'
 # The full version, including alpha/beta/rc tags.
-release = '3.19.2'
+release = '3.20.1'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:

{simplejson-3.19.2 → simplejson-3.20.1}/index.rst

@@ -148,13 +148,6 @@ Serializing multiple objects to JSON lines (newline-delimited JSON)::
     >>> ''.join(dumps_lines([{'count': 1}, {'count': 2}, {'count': 3}]))
     '{"count":1}\n{"count":2}\n{"count":3}\n'
 
-.. note::
-
-   JSON is a subset of `YAML <http://yaml.org/>`_ 1.2. The JSON produced by
-   this module's default settings (in particular, the default *separators*
-   value) is also a subset of YAML 1.0 and 1.1. This module can thus also be
-   used as a YAML serializer.
-
 
 Basic Usage
 -----------

{simplejson-3.19.2 → simplejson-3.20.1}/setup.py

@@ -12,7 +12,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \
     DistutilsPlatformError
 
 IS_PYPY = hasattr(sys, 'pypy_translation_info')
-VERSION = '3.19.2'
+VERSION = '3.20.1'
 DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python"
 
 with open('README.rst', 'r') as f:
@@ -41,6 +41,7 @@ CLASSIFIERS = [
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: 3.13',
     'Programming Language :: Python :: Implementation :: CPython',
     'Programming Language :: Python :: Implementation :: PyPy',
     'Topic :: Software Development :: Libraries :: Python Modules',

{simplejson-3.19.2 → simplejson-3.20.1}/simplejson/__init__.py

@@ -118,7 +118,7 @@ Serializing multiple objects to JSON lines (newline-delimited JSON)::
 
 """
 from __future__ import absolute_import
-__version__ = '3.19.2'
+__version__ = '3.20.1'
 __all__ = [
     'dump', 'dumps', 'load', 'loads',
     'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',

{simplejson-3.19.2 → simplejson-3.20.1}/simplejson/_speedups.c

@@ -10,11 +10,13 @@
 #define JSON_UNICHR Py_UCS4
 #define JSON_InternFromString PyUnicode_InternFromString
 #define PyString_GET_SIZE PyUnicode_GET_LENGTH
+#define JSON_StringCheck PyUnicode_Check
 #define PY2_UNUSED
 #define PY3_UNUSED UNUSED
 #else /* PY_MAJOR_VERSION >= 3 */
 #define PY2_UNUSED UNUSED
 #define PY3_UNUSED
+#define JSON_StringCheck(obj) (PyString_Check(obj) || PyUnicode_Check(obj))
 #define PyBytes_Check PyString_Check
 #define PyUnicode_READY(obj) 0
 #define PyUnicode_KIND(obj) (sizeof(Py_UNICODE))
@@ -3034,25 +3036,29 @@ encoder_listencode_dict(PyEncoderObject *s, JSON_Accu *rval, PyObject *dct, Py_s
         if (value == NULL)
             goto bail;
 
-        encoded = PyDict_GetItem(s->key_memo, key);
-        if (encoded != NULL) {
-            Py_INCREF(encoded);
-        } else {
-            kstr = encoder_stringify_key(s, key);
-            if (kstr == NULL)
-                goto bail;
-            else if (kstr == Py_None) {
-                /* skipkeys */
-                Py_DECREF(item);
-                Py_DECREF(kstr);
-                continue;
-            }
+        kstr = encoder_stringify_key(s, key);
+        if (kstr == NULL)
+            goto bail;
+        else if (kstr == Py_None) {
+            /* skipkeys */
+            Py_DECREF(item);
+            Py_DECREF(kstr);
+            continue;
         }
         if (idx) {
             if (JSON_Accu_Accumulate(rval, s->item_separator))
                 goto bail;
         }
-        if (encoded == NULL) {
+        /*
+         * Only cache the encoding of string keys. False and True are
+         * indistinguishable from 0 and 1 in a dictionary lookup and there
+         * may be other quirks with user defined subclasses.
+         */
+        encoded = PyDict_GetItem(s->key_memo, kstr);
+        if (encoded != NULL) {
+            Py_INCREF(encoded);
+            Py_CLEAR(kstr);
+        } else {
             encoded = encoder_encode_string(s, kstr);
             Py_CLEAR(kstr);
             if (encoded == NULL)

{simplejson-3.19.2 → simplejson-3.20.1}/simplejson/tests/test_dump.py

@@ -72,6 +72,12 @@ class TestDump(TestCase):
         self.assertEqual(json.dumps(
                  {True: False, False: True}, sort_keys=True),
                  '{"false": true, "true": false}')
+        self.assertEqual(
+            # load first because the keys are not sorted
+            json.loads(json.dumps({'k1': {False: 5}, 'k2': {0: 5}})),
+            {'k1': {'false': 5}, 'k2': {'0': 5}},
+        )
+
         self.assertEqual(
             json.dumps(
                 {2: 3.0,

{simplejson-3.19.2 → simplejson-3.20.1/simplejson.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: simplejson
-Version: 3.19.2
+Version: 3.20.1
 Summary: Simple, fast, extensible JSON encoder/decoder for Python
 Home-page: https://github.com/simplejson/simplejson
 Author: Bob Ippolito
@@ -27,11 +27,21 @@ Classifier: Programming Language :: Python :: 3.9
 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 :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=2.5, !=3.0.*, !=3.1.*, !=3.2.*
 License-File: LICENSE.txt
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: platform
+Dynamic: requires-python
+Dynamic: summary
 
 simplejson
 ----------