summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-03-17 21:52:35 -0400
committerR David Murray <rdmurray@bitdance.com>2013-03-17 21:52:35 -0400
commit588722800dfb8893229bd4f78eb64fab59da3db0 (patch)
tree4ce6ad3f1de14bb14fa18256aabcf0cdbcfb2675
parenta03ae6226e56e16ca1630174d89ef295a25686c3 (diff)
downloadcpython-588722800dfb8893229bd4f78eb64fab59da3db0.tar.gz
#16057: Clarify why the base method default is called in custom encoders.
Original patch by Kushal Das.
-rw-r--r--Doc/library/json.rst2
-rw-r--r--Lib/json/encoder.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
index 7b69c24186..58eee18575 100644
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -83,6 +83,7 @@ Extending :class:`JSONEncoder`::
... def default(self, obj):
... if isinstance(obj, complex):
... return [obj.real, obj.imag]
+ ... # Let the base class default method raise the TypeError
... return json.JSONEncoder.default(self, obj)
...
>>> json.dumps(2 + 1j, cls=ComplexEncoder)
@@ -431,6 +432,7 @@ Encoders and Decoders
pass
else:
return list(iterable)
+ # Let the base class default method raise the TypeError
return json.JSONEncoder.default(self, o)
diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py
index e1ed21f6e7..1d8b20c095 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)
"""