Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-08 08:22:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged revisions 83415 via svnmerge from

Browse source 
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
........
This commit is contained in:
Senthil Kumaran 2010-08-01 17:55:50 +00:00
parent f6df1ee171
commit afef78f832
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/test/test_urllib.py
View file

@ -191,6 +191,17 @@ def test_empty_socket(self):
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"""

4
Lib/urllib/request.py
View file

@ -1595,13 +1595,13 @@ def _open_generic_http(self, connection_factory, url, data):
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)