#14875: merge with 3.2.

2012-05-21 17:53:42 -06:00 · 2012-05-21 17:53:42 -06:00 · 4226543490
parent 945a3ada7f 898d51da4d
commit 4226543490
2 changed files with 3 additions and 2 deletions
--- 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):
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -42,6 +42,8 @@ Core and Builtins
 Library
 -------

+- Issue #14875: Use float('inf') instead of float('1e66666') in the json module.
+
 - Issue #13585: Added contextlib.ExitStack

 - PEP 3144, Issue #14814: Added the ipaddress module