From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 10 Apr 2016 12:46:30 +0000 (+0300)
Subject: Issue #26623: TypeError message for JSON unserializible object now contains
X-Git-Tag: v3.6.0a1~241
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47c5474aa0cbe8dc3cf2c370b19769edd3f2e8d8;p=thirdparty%2FPython%2Fcpython.git

Issue #26623: TypeError message for JSON unserializible object now contains
object's type name, not object's representation.
Based on patch by Mahmoud Lababidi.
---

diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py
index d596489f42d3..0772bbc06b9e 100644
--- a/Lib/json/encoder.py
+++ b/Lib/json/encoder.py
@@ -176,7 +176,8 @@ class JSONEncoder(object):
                 return JSONEncoder.default(self, o)
 
         """
-        raise TypeError(repr(o) + " is not JSON serializable")
+        raise TypeError("Object of type '%s' is not JSON serializable" %
+                        o.__class__.__name__)
 
     def encode(self, o):
         """Return a JSON string representation of a Python data structure.