merge from 3.1

diff --cc Lib/test/test_urllib.py
index 275b2eb81e90e3e003a4ae88cc8f5cda959f9833,4d3509ae7d2f1726910745f4a9a9f1a06ed39af8..7bb8a098c7e3baf7fe8bde1a19bc8a7b9ad5bad7
--- 1/Lib/test/test_urllib.py
--- 2/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 6d902bf475c0e77c8dd24d4ccdae41defc4f738f,8764b1131f314b9471f611bb7976dec6a67737bc..242ec2c33723f84af4d02c697c8e5a4faf744644
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -53,10 -51,10 +53,13 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #9233: Fix json to work properly even when _json is not available.
+ - Issue #11474: Fix the bug with url2pathname() handling of '/C|/' on Windows.
+   Patch by Santoso Wijaya.
+ 
 +- 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.