summaryrefslogtreecommitdiffstats
path: root/Lib/json
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-03-18 01:53:23 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-03-18 01:53:23 (GMT)
commit1f2a49cfc610bfd7cbc85fd263295549377e8094 (patch)
tree21c57e0ff4ae7c72814adba2949921485076888f /Lib/json
parent3e2fe05e62e061032d81becb2f9ef1a8def54f63 (diff)
parentdd246171e483afa21f12e2a961a461e0d5119ea3 (diff)
downloadcpython-1f2a49cfc610bfd7cbc85fd263295549377e8094.zip
cpython-1f2a49cfc610bfd7cbc85fd263295549377e8094.tar.gz
cpython-1f2a49cfc610bfd7cbc85fd263295549377e8094.tar.bz2
Merge #16057: Clarify why the base method default is called in custom encoders.
Original patch by Kushal Das.
Diffstat (limited to 'Lib/json')
-rw-r--r--Lib/json/encoder.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py
index e1ed21f..1d8b20c 100644
--- a/Lib/json/encoder.py
+++ b/Lib/json/encoder.py
@@ -166,6 +166,7 @@ class JSONEncoder(object):
pass
else:
return list(iterable)
+ # Let the base class default method raise the TypeError
return JSONEncoder.default(self, o)
"""