summaryrefslogtreecommitdiffstats
path: root/Lib/json
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-03-18 01:53:48 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-03-18 01:53:48 (GMT)
commitfbb1815491d6a4516629c6d6b8b9c2b08b326089 (patch)
tree9e72f4f5c863eacd2af0e6f35c3003d1a8a6038a /Lib/json
parent5a948a7eeee0090a10aaaf97c1b4093090acf184 (diff)
parent1f2a49cfc610bfd7cbc85fd263295549377e8094 (diff)
downloadcpython-fbb1815491d6a4516629c6d6b8b9c2b08b326089.zip
cpython-fbb1815491d6a4516629c6d6b8b9c2b08b326089.tar.gz
cpython-fbb1815491d6a4516629c6d6b8b9c2b08b326089.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 93b5ea7..39b550d 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)
"""