From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Wed, 13 Apr 2011 04:18:24 +0000 (+0300)
Subject: Merge with 3.1.
X-Git-Tag: v3.2.1b1~135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04c6423fbab6f4a525d56cedc91600a52d74f062;p=python

Merge with 3.1.
---

04c6423fbab6f4a525d56cedc91600a52d74f062
diff --cc Misc/NEWS
index e16db92e4a,6a4da30c3f..6d902bf475
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -53,11 -51,11 +53,14 @@@ Core and Builtin
  Library
  -------
  
- - Issue #11830: Remove unnecessary introspection code in the decimal module.                                                                
 -- Issue #9233: Fix json to work properly even when _json is not available.
++- 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'.