#14875: merge with 3.2.

This commit is contained in:
Ezio Melotti 2012-05-21 17:53:42 -06:00
commit 4226543490
2 changed files with 3 additions and 2 deletions

View File

@ -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):

View File

@ -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