From: Senthil Kumaran <orsenthil@gmail.com>
Date: Thu, 14 Apr 2011 05:18:55 +0000 (+0800)
Subject: merge from 3.1
X-Git-Tag: v3.2.1b1~128
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=56f1e2d875109c9f9bef2d3c065a5218d1a9485b;p=thirdparty%2FPython%2Fcpython.git

merge from 3.1
---

56f1e2d875109c9f9bef2d3c065a5218d1a9485b
diff --cc Lib/test/test_urllib.py
index 275b2eb81e90,4d3509ae7d2f..7bb8a098c7e3
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@@ -9,7 -9,9 +9,8 @@@ import i
  import unittest
  from test import support
  import os
+ import sys
  import tempfile
 -import warnings
  
  def hexescape(char):
      """Escape char as RFC 2396 specifies"""
diff --cc Misc/NEWS
index 6d902bf475c0,8764b1131f31..242ec2c33723
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -53,10 -51,10 +53,13 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11474: Fix the bug with url2pathname() handling of '/C|/' on Windows.
+   Patch by Santoso Wijaya.
+ 
 -- 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 #11830: Remove unnecessary introspection code in the decimal module.
  
  - Issue #11703: urllib2.geturl() does not return correct url when the original
    url contains #fragment.