Skip to content

bpo-27613: Fix json.dump() for collections with overridden __bool__(). #1257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
serhiy-storchaka wants to merge 1 commit into from
Closed

bpo-27613: Fix json.dump() for collections with overridden __bool__(). #1257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions Lib/json/encoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,15 +275,16 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
_indent = ' ' * _indent

def _iterencode_list(lst, _current_indent_level):
if not lst:
if not len(lst):
yield '[]'
return
if markers is not None:
markerid = id(lst)
if markerid in markers:
raise ValueError("Circular reference detected")
markers[markerid] = lst
buf = '['
yield '['
buf = ''
if _indent is not None:
_current_indent_level += 1
newline_indent = '\n' + _indent * _current_indent_level
Expand Down Expand Up @@ -331,7 +332,7 @@ def _iterencode_list(lst, _current_indent_level):
del markers[markerid]

def _iterencode_dict(dct, _current_indent_level):
if not dct:
if not len(dct):
yield '{}'
return
if markers is not None:
Expand Down
16 changes: 16 additions & 0 deletions Lib/test/test_json/test_dump.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,22 @@ def __lt__(self, o):
d[1337] = "true.dat"
self.assertEqual(self.dumps(d, sort_keys=True), '{"1337": "true.dat"}')

def test_encode_overridden_bool(self):
class L(list):
def __bool__(self):
return value

class D(dict):
def __bool__(self):
return value

value = True
self.assertEqual(self.dumps(L()), '[]')
self.assertEqual(self.dumps(D()), '{}')
value = False
self.assertEqual(self.dumps(L([1])), '[1]')
self.assertEqual(self.dumps(D({'a': 1})), '{"a": 1}')


class TestPyDump(TestDump, PyTest): pass

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ Extension Modules
Library
-------

- bpo-27613: Fixed json.dump() for collections with overridden __bool__().

- bpo-29960: Preserve generator state when _random.Random.setstate()
raises an exception. Patch by Bryan Olson.

Expand Down