merge from 3.2.

Fix closes Issue1147.

diff --cc Lib/test/test_urllib.py
Simple merge

diff --cc Misc/NEWS
index 098497e8801de44345e7fcca9288de9a4e6d4773,242ec2c33723f84af4d02c697c8e5a4faf744644..bf75d8b6dcd27ffa758741106e6e4de93fc0efff
--- 1/Misc/NEWS
--- 2/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.