From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 28 Sep 2021 21:51:57 +0000 (-0700)
Subject: bpo-45269: test wrong `markers` type to `c_make_encoder` (GH-28540) (GH-28610)
X-Git-Tag: v3.9.8~121
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6b5ceae3475d7782ed88f4e54bdb2232a8eb088;p=thirdparty%2FPython%2Fcpython.git

bpo-45269: test wrong `markers` type to `c_make_encoder` (GH-28540) (GH-28610)

(cherry picked from commit e046aabbe386fdf32bae6ffb7fae5ce479fd10c6)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
---

diff --git a/Lib/test/test_json/test_speedups.py b/Lib/test/test_json/test_speedups.py
index fbfee1a58209..682014cfd5b3 100644
--- a/Lib/test/test_json/test_speedups.py
+++ b/Lib/test/test_json/test_speedups.py
@@ -59,6 +59,15 @@ class TestEncode(CTest):
         with self.assertRaises(ZeroDivisionError):
             enc('spam', 4)
 
+    def test_bad_markers_argument_to_encoder(self):
+        # https://bugs.python.org/issue45269
+        with self.assertRaisesRegex(
+            TypeError,
+            r'make_encoder\(\) argument 1 must be dict or None, not int',
+        ):
+            self.json.encoder.c_make_encoder(1, None, None, None, ': ', ', ',
+                                             False, False, False)
+
     def test_bad_bool_args(self):
         def test(name):
             self.json.encoder.JSONEncoder(**{name: BadBool()}).encode({'a': 1})
diff --git a/Misc/NEWS.d/next/Tests/2021-09-24-10-41-49.bpo-45269.8jKEr8.rst b/Misc/NEWS.d/next/Tests/2021-09-24-10-41-49.bpo-45269.8jKEr8.rst
new file mode 100644
index 000000000000..72dd9471134f
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-09-24-10-41-49.bpo-45269.8jKEr8.rst
@@ -0,0 +1 @@
+Cover case when invalid ``markers`` type is supplied to ``c_make_encoder``.