[Python-checkins] cpython (merge 3.2 -> default): #14875: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/f5f5db593d99
changeset:   77101:f5f5db593d99
parent:      77098:35c3946657ce
parent:      77100:06f21c6e0f2b
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon May 21 17:53:42 2012 -0600
summary:
  #14875: merge with 3.2.

files:
  Lib/json/encoder.py |  3 +--
  Misc/NEWS           |  2 ++
  2 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py
--- a/Lib/json/encoder.py
+++ b/Lib/json/encoder.py
@@ -27,8 +27,7 @@
     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):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -42,6 +42,8 @@
 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

-- 
Repository URL: http://hg.python.org/cpython