summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFacundo Batista <facundobatista@gmail.com>2008-07-07 18:24:11 (GMT)
committerFacundo Batista <facundobatista@gmail.com>2008-07-07 18:24:11 (GMT)
commit2ac5de2a56f74026d3f82e014e564b884d06c8f2 (patch)
tree26bb79f8cf89b2fe182c30297b8ed4117d781899
parent9f2f83338f54a769497fd122e86170aa58cf5603 (diff)
downloadcpython-2ac5de2a56f74026d3f82e014e564b884d06c8f2.zip
cpython-2ac5de2a56f74026d3f82e014e564b884d06c8f2.tar.gz
cpython-2ac5de2a56f74026d3f82e014e564b884d06c8f2.tar.bz2
Issue 3314. The sys module is used in an error case.
-rw-r--r--Lib/test/test_urlparse.py4
-rw-r--r--Lib/urllib/parse.py3
2 files changed, 6 insertions, 1 deletions
diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
index c92b5aa..dbb7c36 100644
--- 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 8edc963..fe02db5 100644
--- 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]