mirror of
https://github.com/python/cpython.git
synced 2025-12-04 00:30:19 +00:00
#14875: merge with 3.2.
This commit is contained in:
commit
4226543490
2 changed files with 3 additions and 2 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue