mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 16:43:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

#14875: merge with 3.2.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

3
Lib/json/encoder.py
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{0:04x}'.format(i))
#ESCAPE_DCT.setdefault(chr(i), '\\u%04x' % (i,)) #ESCAPE_DCT.setdefault(chr(i), '\\u%04x' % (i,))
# Assume this produces an infinity on all machines (probably not guaranteed) INFINITY = float('inf')
INFINITY = float('1e66666')
FLOAT_REPR = repr FLOAT_REPR = repr
def encode_basestring(s): def encode_basestring(s):

2
Misc/NEWS
View file

@ -42,6 +42,8 @@ Core and Builtins
Library Library
------- -------
- Issue #14875: Use float('inf') instead of float('1e66666') in the json module.
- Issue #13585: Added contextlib.ExitStack - Issue #13585: Added contextlib.ExitStack
- PEP 3144, Issue #14814: Added the ipaddress module - PEP 3144, Issue #14814: Added the ipaddress module