merge from 3.3

#5609 - test_urllib coverage for url2pathname and pathname2url. Patch
contribution by Thomas Fenzl & Maksim Kozyarchuk

diff --cc Lib/test/test_urllib.py
index cbe4327046df310530cbd5997bb3623d80ea77e7,140e5c8ab19966e18cb5fd0cff0ab95a8a423eaa..cf570474848397728ad37e6d0a36d19d3c6e73a5
--- 1/Lib/test/test_urllib.py
--- 2/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@@ -15,6 -16,6 +16,7 @@@ from nturl2path import url2pathname, pa
  from base64 import b64encode
  import collections
  
++
  def hexescape(char):
      """Escape char as RFC 2396 specifies"""
      hex_repr = hex(ord(char))[2:].upper()
@@@ -1363,6 -1291,6 +1367,7 @@@ class URLopener_Tests(unittest.TestCase
  #         self.assertEqual(ftp.ftp.sock.gettimeout(), 30)
  #         ftp.close()
  
++
  class RequestTests(unittest.TestCase):
      """Unit tests for urllib.request.Request."""