Issue #27934: Use float.__repr__ instead of plain repr when JSON-encoding an instance...

diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py
index f5eeed75f04c9d035a00b4d67c75b74326f0683f..97ffe8e8a2c5b208b52b8b1e0b59b12617eb9ecc 100644 (file)
--- a/Lib/json/encoder.py
+++ b/Lib/json/encoder.py
@@ -28,7 +28,7 @@ for i in range(0x20):
     #ESCAPE_DCT.setdefault(chr(i), '\\u%04x' % (i,))
 
 INFINITY = float('inf')
-FLOAT_REPR = repr
+FLOAT_REPR = float.__repr__
 
 def encode_basestring(s):
     """Return a JSON representation of a Python string

diff --git a/Lib/json/tests/test_float.py b/Lib/json/tests/test_float.py
index 049f9ae1832b0bcdedc81c5a57f9b8035f3d85b8..c10381da5a1fe9814809cbf07d2539bb80afacfd 100644 (file)
--- a/Lib/json/tests/test_float.py
+++ b/Lib/json/tests/test_float.py
@@ -32,6 +32,17 @@ class TestFloat(object):
                 self.assertNotEqual(res[0], res[0])
             self.assertRaises(ValueError, self.dumps, [val], allow_nan=False)
 
+    def test_float_subclasses_use_float_repr(self):
+        # Issue 27934.
+        class PeculiarFloat(float):
+            def __repr__(self):
+                return "I'm not valid JSON"
+            def __str__(self):
+                return "Neither am I"
+
+        val = PeculiarFloat(3.2)
+        self.assertEqual(self.loads(self.dumps(val)), val)
+
 
 class TestPyFloat(TestFloat, PyTest): pass
 class TestCFloat(TestFloat, CTest): pass

diff --git a/Misc/ACKS b/Misc/ACKS
index 07e5724fe4115f7cf51135e5cc84077276bfa936..7963a12a7559b5982857f873f61084131a9d9f56 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -636,6 +636,7 @@ Manuel Jacob
 David Jacobs
 Kevin Jacobs
 Kjetil Jacobsen
+Eddie James
 Bertrand Janin
 Geert Jansen
 Jack Jansen

diff --git a/Misc/NEWS b/Misc/NEWS
index aeccb5478f183314c9787769aabd9d5f365902c7..9f2a32250df13b30c428d79f69c52664bc0d6175 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -36,6 +36,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #27934: Use ``float.__repr__`` instead of plain ``repr`` when JSON-
+  encoding an instance of a float subclass. Thanks Eddie James.
+
 - Issue #27861: Fixed a crash in sqlite3.Connection.cursor() when a factory
   creates not a cursor.  Patch by Xiang Zhang.
 

diff --git a/Modules/_json.c b/Modules/_json.c
index c3015460578e5b66c52ba1c5c1fc18cf3824e3dd..2d660831867f81b2aee13ca42b6dedec43467c24 100644 (file)
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -1960,8 +1960,8 @@ encoder_encode_float(PyEncoderObject *s, PyObject *obj)
             return PyString_FromString("NaN");
         }
     }
-    /* Use a better float format here? */
-    return PyObject_Repr(obj);
+    /* Make sure to use the base float class repr method */
+    return PyFloat_Type.tp_repr(obj);
 }
 
 static PyObject *