Commit 42265434 authored by Ezio Melotti's avatar Ezio Melotti

#14875: merge with 3.2.

parents 945a3ada 898d51da
......@@ -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):
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment