From: Senthil Kumaran Date: Sun, 1 Aug 2010 17:55:50 +0000 (+0000) Subject: Merged revisions 83415 via svnmerge from X-Git-Tag: v3.1.3rc1~445 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=afef78f832d0f2eab287f4ce889baf4d68a4fc63;p=python Merged revisions 83415 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83415 | senthil.kumaran | 2010-08-01 23:23:37 +0530 (Sun, 01 Aug 2010) | 3 lines Fix Issue8123 - TypeError in urllib when trying to use HTTP authentication ........ --- diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py index acd5577824..c573f147f1 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -191,6 +191,17 @@ Content-Type: text/html; charset=iso-8859-1 finally: self.unfakehttp() + def test_userpass_inurl(self): + self.fakehttp(b"Hello!") + try: + fp = urlopen("http://user:pass@python.org/") + self.assertEqual(fp.readline(), b"Hello!") + self.assertEqual(fp.readline(), b"") + self.assertEqual(fp.geturl(), 'http://user:pass@python.org/') + self.assertEqual(fp.getcode(), 200) + finally: + self.unfakehttp() + class urlretrieve_FileTests(unittest.TestCase): """Test urllib.urlretrieve() on local files""" diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 14ea0aad5e..4522466722 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1595,13 +1595,13 @@ class URLopener: if proxy_passwd: import base64 - proxy_auth = base64.b64encode(proxy_passwd).strip() + proxy_auth = base64.b64encode(proxy_passwd.encode()).strip() else: proxy_auth = None if user_passwd: import base64 - auth = base64.b64encode(user_passwd).strip() + auth = base64.b64encode(user_passwd.encode()).strip() else: auth = None http_conn = connection_factory(host)