From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 21 May 2012 23:53:42 +0000 (-0600)
Subject: #14875: merge with 3.2.
X-Git-Tag: v3.3.0a4~97
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=422654349045c3abdc4fa923aa6538fd6a4e04b6;p=thirdparty%2FPython%2Fcpython.git

#14875: merge with 3.2.
---

422654349045c3abdc4fa923aa6538fd6a4e04b6
diff --cc Misc/NEWS
index ae4f7aab809b,ec5cd9878e4f..eaa9014e96dd
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -42,10 -67,8 +42,12 @@@ Core and Builtin
  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
 +
  - Issue #14426: Correct the Date format in Expires attribute of Set-Cookie
    Header in Cookie.py.