Update simplejson-3.17.5

lib/simplejson/tests/__init__.py

@@ -7,6 +7,7 @@ import os
 class NoExtensionTestSuite(unittest.TestSuite):
     def run(self, result):
         import simplejson
+
         simplejson._toggle_speedups(False)
         result = unittest.TestSuite.run(self, result)
         simplejson._toggle_speedups(True)
@@ -15,16 +16,17 @@ class NoExtensionTestSuite(unittest.TestSuite):
 
 class TestMissingSpeedups(unittest.TestCase):
     def runTest(self):
-        if hasattr(sys, 'pypy_translation_info'):
+        if hasattr(sys, "pypy_translation_info"):
             "PyPy doesn't need speedups! :)"
-        elif hasattr(self, 'skipTest'):
-            self.skipTest('_speedups.so is missing!')
+        elif hasattr(self, "skipTest"):
+            self.skipTest("_speedups.so is missing!")
 
 
-def additional_tests(suite=None):
+def additional_tests(suite=None, project_dir=None):
     import simplejson
     import simplejson.encoder
     import simplejson.decoder
+
     if suite is None:
         suite = unittest.TestSuite()
     try:
@@ -36,39 +38,54 @@ def additional_tests(suite=None):
         raise
     for mod in (simplejson, simplejson.encoder, simplejson.decoder):
         suite.addTest(doctest.DocTestSuite(mod))
-    suite.addTest(doctest.DocFileSuite('../../index.rst'))
+    if project_dir is not None:
+        suite.addTest(
+            doctest.DocFileSuite(
+                os.path.join(project_dir, "index.rst"), module_relative=False
+            )
+        )
     return suite
 
 
-def all_tests_suite():
+def all_tests_suite(project_dir=None):
     def get_suite():
         suite_names = [
-            'simplejson.tests.%s' % (os.path.splitext(f)[0],)
+            "simplejson.tests.%s" % (os.path.splitext(f)[0],)
             for f in os.listdir(os.path.dirname(__file__))
-            if f.startswith('test_') and f.endswith('.py')
+            if f.startswith("test_") and f.endswith(".py")
         ]
         return additional_tests(
-            unittest.TestLoader().loadTestsFromNames(suite_names))
+            suite=unittest.TestLoader().loadTestsFromNames(suite_names),
+            project_dir=project_dir,
+        )
+
     suite = get_suite()
     import simplejson
+
     if simplejson._import_c_make_encoder() is None:
         suite.addTest(TestMissingSpeedups())
     else:
-        suite = unittest.TestSuite([
-            suite,
-            NoExtensionTestSuite([get_suite()]),
-        ])
+        suite = unittest.TestSuite(
+            [
+                suite,
+                NoExtensionTestSuite([get_suite()]),
+            ]
+        )
     return suite
 
 
-def main():
-    runner = unittest.TextTestRunner(verbosity=1 + sys.argv.count('-v'))
-    suite = all_tests_suite()
+def main(project_dir=None):
+    runner = unittest.TextTestRunner(verbosity=1 + sys.argv.count("-v"))
+    suite = all_tests_suite(project_dir=project_dir)
     raise SystemExit(not runner.run(suite).wasSuccessful())
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     import os
     import sys
-    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
-    main()
+
+    project_dir = os.path.dirname(
+        os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    )
+    sys.path.insert(0, project_dir)
+    main(project_dir=project_dir)

lib/simplejson/tests/_cibw_runner.py

@@ -0,0 +1,7 @@
+"""Internal module for running tests from cibuildwheel"""
+
+import sys
+import simplejson.tests
+
+if __name__ == '__main__':
+    simplejson.tests.main(project_dir=sys.argv[1])

lib/simplejson/tests/test_namedtuple.py

@@ -3,6 +3,11 @@ import unittest
 import simplejson as json
 from simplejson.compat import StringIO
 
+try:
+    from unittest import mock
+except ImportError:
+    mock = None
+
 try:
     from collections import namedtuple
 except ImportError:
@@ -120,3 +125,25 @@ class TestNamedTuple(unittest.TestCase):
             self.assertEqual(
                 json.dumps(f({})),
                 json.dumps(f(DeadDict()), namedtuple_as_object=True))
+
+    def test_asdict_does_not_return_dict(self):
+        if not mock:
+            if hasattr(unittest, "SkipTest"):
+                raise unittest.SkipTest("unittest.mock required")
+            else:
+                print("unittest.mock not available")
+                return
+        fake = mock.Mock()
+        self.assertTrue(hasattr(fake, '_asdict'))
+        self.assertTrue(callable(fake._asdict))
+        self.assertFalse(isinstance(fake._asdict(), dict))
+        # https://github.com/simplejson/simplejson/pull/284
+        # when running under a debug build of CPython (COPTS=-UNDEBUG)
+        # a C assertion could fire due to an unchecked error of an PyDict
+        # API call on a non-dict internally in _speedups.c.  Without a debug
+        # build of CPython this test likely passes either way despite the
+        # potential for internal data corruption.  Getting it to crash in
+        # a debug build is not always easy either as it requires an
+        # assert(!PyErr_Occurred()) that could fire later on.
+        with self.assertRaises(TypeError):
+            json.dumps({23: fake}, namedtuple_as_object=True, for_json=False)