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
........
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

View file

@ -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)