summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-04-13 04:18:24 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-04-13 04:18:24 (GMT)
commit04c6423fbab6f4a525d56cedc91600a52d74f062 (patch)
treef6f0099cd34a142ddbc5f53569d46dadedc34cab /Misc
parent1a20c121ef3cfc53cf8ec754cbba8ef82933f175 (diff)
parentd210aa1ad9329661625ca5f0b6754f84ffc25021 (diff)
downloadcpython-04c6423fbab6f4a525d56cedc91600a52d74f062.zip
cpython-04c6423fbab6f4a525d56cedc91600a52d74f062.tar.gz
cpython-04c6423fbab6f4a525d56cedc91600a52d74f062.tar.bz2
Merge with 3.1.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS9
1 files changed, 6 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index e16db92..6d902bf 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -53,11 +53,14 @@ Core and Builtins
Library
-------
-- Issue #11830: Remove unnecessary introspection code in the decimal module.
+- Issue #9233: Fix json.loads('{}') to return a dict (instead of a list), when
+ _json is not available.
-- Issue #11703 - urllib2.geturl() does not return correct url when the original
+- Issue #11830: Remove unnecessary introspection code in the decimal module.
+
+- Issue #11703: urllib2.geturl() does not return correct url when the original
url contains #fragment.
-
+
- Issue #10019: Fixed regression in json module where an indent of 0 stopped
adding newlines and acted instead like 'None'.