From: Senthil Kumaran <orsenthil@gmail.com>
Date: Wed, 4 Aug 2010 17:49:13 +0000 (+0000)
Subject: Merged revisions 83729 via svnmerge from
X-Git-Tag: v3.1.3rc1~389
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe2f4ecc14aefd236d2f39546976bcebe1ef29e5;p=python

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

diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 4522466722..a26b763231 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.encode()).strip()
+            proxy_auth = base64.b64encode(proxy_passwd.encode()).decode('ascii')
         else:
             proxy_auth = None
 
         if user_passwd:
             import base64
-            auth = base64.b64encode(user_passwd.encode()).strip()
+            auth = base64.b64encode(user_passwd.encode()).decode('ascii')
         else:
             auth = None
         http_conn = connection_factory(host)