Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 83729 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83729 | senthil.kumaran | 2010-08-04 23:16:23 +0530 (Wed, 04 Aug 2010) | 3 lines

  Sending the auth info as string. Fix BytesWarning: str() on a bytes instance Exception on buildbot.
........
This commit is contained in:
Senthil Kumaran 2010-08-04 17:49:13 +00:00
parent 6aa8bc3442
commit fe2f4ecc14
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/urllib/request.py
View File

@ -1595,13 +1595,13 @@ class URLopener:
if proxy_passwd: if proxy_passwd:
import base64 import base64
proxy_auth = base64.b64encode(proxy_passwd.encode()).strip() proxy_auth = base64.b64encode(proxy_passwd.encode()).decode('ascii')
else: else:
proxy_auth = None proxy_auth = None
if user_passwd: if user_passwd:
import base64 import base64
auth = base64.b64encode(user_passwd.encode()).strip() auth = base64.b64encode(user_passwd.encode()).decode('ascii')
else: else:
auth = None auth = None
http_conn = connection_factory(host) http_conn = connection_factory(host)