Issue 3314. The sys module is used in an error case.

diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
index c92b5aad64c266425a83db1b77b840c6f379729e..dbb7c36bc1d276f0ae784d56e4baff1f951a3a1e 100644 (file)
--- a/Lib/test/test_urlparse.py
+++ b/Lib/test/test_urlparse.py
@@ -310,6 +310,10 @@ class UrlParseTestCase(unittest.TestCase):
         self.assertEqual(urllib.parse.urlparse("http://example.com?blahblah=/foo"),
                          ('http', 'example.com', '', '', 'blahblah=/foo', ''))
 
+    def test_usingsys(self):
+        # Issue 3314: sys module is used in the error
+        self.assertRaises(TypeError, urllib.parse.urlencode, "foo")
+
 def test_main():
     support.run_unittest(UrlParseTestCase)
 

diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index 8edc9635d3b66150e86d875ff9c88a9cb29e22be..fe02db5e000c143ec843ad4e61fed57dbf573885 100644 (file)
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -4,6 +4,8 @@ See RFC 1808: "Relative Uniform Resource Locators", by R. Fielding,
 UC Irvine, June 1995.
 """
 
+import sys
+
 __all__ = ["urlparse", "urlunparse", "urljoin", "urldefrag",
            "urlsplit", "urlunsplit"]
 
@@ -599,7 +601,6 @@ test_input = """
 """
 
 def test():
-    import sys
     base = ''
     if sys.argv[1:]:
         fn = sys.argv[1]