summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-05-21 23:53:42 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-05-21 23:53:42 (GMT)
commit422654349045c3abdc4fa923aa6538fd6a4e04b6 (patch)
tree18c676c1dc8bf9de0b47a0003032d9f918c72c4b /Misc
parent945a3ada7f5f57552214a47cbd0de828f19d0246 (diff)
parent898d51da4d2db44d71809ee84089877f5c08f3fd (diff)
downloadcpython-422654349045c3abdc4fa923aa6538fd6a4e04b6.zip
cpython-422654349045c3abdc4fa923aa6538fd6a4e04b6.tar.gz
cpython-422654349045c3abdc4fa923aa6538fd6a4e04b6.tar.bz2
#14875: merge with 3.2.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS2
1 files changed, 2 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index ae4f7aa..eaa9014 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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