#16057: Clarify why the base method default is called in custom encoders.

Original patch by Kushal Das.

diff --git a/Doc/library/json.rst b/Doc/library/json.rst
index 648ba3a78828e167a8c8f66a80b5a6afd3ce3e5f..a3c6bb0efbe6313380495663fd04c18f206a79b5 100644 (file)
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -84,6 +84,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)
     ...
     >>> dumps(2 + 1j, cls=ComplexEncoder)
@@ -452,6 +453,7 @@ Encoders and Decoders
                 pass
             else:
                 return list(iterable)
+            # Let the base class default method raise the TypeError
             return JSONEncoder.default(self, o)
 
 

diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py
index 4d1aaa8eedfd6173beea57ac09a0fa9dcda34593..f5eeed75f04c9d035a00b4d67c75b74326f0683f 100644 (file)
--- a/Lib/json/encoder.py
+++ b/Lib/json/encoder.py
@@ -177,6 +177,7 @@ class JSONEncoder(object):
                     pass
                 else:
                     return list(iterable)
+                # Let the base class default method raise the TypeError
                 return JSONEncoder.default(self, o)
 
         """