From: Senthil Kumaran <senthil@uthcode.com>
Date: Thu, 11 Apr 2013 03:53:12 +0000 (-0700)
Subject: merge from 3.3
X-Git-Tag: v3.4.0a1~990
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b081b7ba1963c10b7c1a81241c6c7eee829b5b0;p=python

merge from 3.3

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

8b081b7ba1963c10b7c1a81241c6c7eee829b5b0
diff --cc Lib/test/test_urllib.py
index cbe4327046,140e5c8ab1..cf57047484
--- a/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."""