gh-148241: Fix json serialization for str subclasses by vstinner · Pull Request #148249 · python/cpython · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions Lib/test/test_json/test_dump.py
7 changes: 7 additions & 0 deletions Lib/test/test_json/test_encode_basestring_ascii.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
from test.support import bigaddrspacetest


# str subclass which returns a different string on str(obj)
class StrSubclass(str):
def __str__(self):
return "StrSubclass"

CASES = [
('/\\"\ucafe\ubabe\uab98\ufcde\ubcda\uef4a\x08\x0c\n\r\t`1~!@#$%^&*()_+-=[]{}|;:\',./<>?', '"/\\\\\\"\\ucafe\\ubabe\\uab98\\ufcde\\ubcda\\uef4a\\b\\f\\n\\r\\t`1~!@#$%^&*()_+-=[]{}|;:\',./<>?"'),
('\u0123\u4567\u89ab\ucdef\uabcd\uef4a', '"\\u0123\\u4567\\u89ab\\ucdef\\uabcd\\uef4a"'),
Expand All @@ -14,6 +19,8 @@
('\U0001d120', '"\\ud834\\udd20"'),
('\u03b1\u03a9', '"\\u03b1\\u03a9"'),
("`1~!@#$%^&*()_+-={':[,]}|;.</>?", '"`1~!@#$%^&*()_+-={\':[,]}|;.</>?"'),
# Don't call obj.__str__() on str subclasses
(StrSubclass('ascii'), '"ascii"'),
]

class TestEncodeBasestringAscii:
Expand Down
9 changes: 9 additions & 0 deletions Lib/test/test_json/test_enum.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ class WeirdNum(float, Enum):
neg_inf = NEG_INF
nan = NAN

class StringEnum(str, Enum):
COLOR = "color"

class TestEnum:

def test_floats(self):
Expand Down Expand Up @@ -116,5 +119,11 @@ def test_dict_values(self):
self.assertEqual(nd['j'], NEG_INF)
self.assertTrue(isnan(nd['n']))

def test_str_enum(self):
obj = StringEnum.COLOR
self.assertEqual(self.dumps(obj), '"color"')
self.assertEqual(self.dumps([obj]), '["color"]')
self.assertEqual(self.dumps({'key': obj}), '{"key": "color"}')

class TestPyEnum(TestEnum, PyTest): pass
class TestCEnum(TestEnum, CTest): pass
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:mod:`json`: Fix serialization: no longer call ``str(obj)`` on :class:`str`
subclasses. Patch by Victor Stinner.
9 changes: 7 additions & 2 deletions Modules/_json.c
Loading