summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-05-21 23:49:06 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-05-21 23:49:06 (GMT)
commit898d51da4d2db44d71809ee84089877f5c08f3fd (patch)
treeb40cdc91af32b5f8961fbaf86518a62fad822a60
parentdfa465243c94b540099c413eb79b2774b40bb82e (diff)
downloadcpython-898d51da4d2db44d71809ee84089877f5c08f3fd.zip
cpython-898d51da4d2db44d71809ee84089877f5c08f3fd.tar.gz
cpython-898d51da4d2db44d71809ee84089877f5c08f3fd.tar.bz2
#14875: Use float('inf') instead of float('1e66666') in the json module.
-rw-r--r--Lib/json/encoder.py3
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 2 deletions
diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py
index 4b214eb..75b7f49 100644
--- a/Lib/json/encoder.py
+++ b/Lib/json/encoder.py
@@ -27,8 +27,7 @@ for i in range(0x20):
ESCAPE_DCT.setdefault(chr(i), '\\u{0:04x}'.format(i))
#ESCAPE_DCT.setdefault(chr(i), '\\u%04x' % (i,))
-# Assume this produces an infinity on all machines (probably not guaranteed)
-INFINITY = float('1e66666')
+INFINITY = float('inf')
FLOAT_REPR = repr
def encode_basestring(s):
diff --git a/Misc/NEWS b/Misc/NEWS
index 1540478..ec5cd98 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -67,6 +67,8 @@ Core and Builtins
Library
-------
+- Issue #14875: Use float('inf') instead of float('1e66666') in the json module.
+
- Issue #14426: Correct the Date format in Expires attribute of Set-Cookie
Header in Cookie.py.