From: Senthil Kumaran <orsenthil@gmail.com>
Date: Thu, 14 Apr 2011 05:20:41 +0000 (+0800)
Subject: merge from 3.2.
X-Git-Tag: v3.3.0a1~2589
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99e97f92c6b4993275fc84b76018374281467e91;p=thirdparty%2FPython%2Fcpython.git

merge from 3.2.

Fix closes Issue1147.
---

99e97f92c6b4993275fc84b76018374281467e91
diff --cc Misc/NEWS
index 098497e8801d,242ec2c33723..bf75d8b6dcd2
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -103,10 -53,9 +103,13 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11474: Fix the bug with url2pathname() handling of '/C|/' on Windows.
+   Patch by Santoso Wijaya.
+ 
 +- Issue #11684: complete email.parser bytes API by adding BytesHeaderParser.
 +
 +- The bz2 module now handles 4GiB+ input buffers correctly.
 +
  - Issue #9233: Fix json.loads('{}') to return a dict (instead of a list), when
    _json is not available.