Backport bug #1016563: Bug in urllib2 proxy auth

diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 3c777cdec7f0891c5924422ed3f530a4209538eb..f4c15ba0cb5196ac4fa59669bbc9d11c8a2b1de9 100644 (file)
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -582,7 +582,7 @@ class ProxyHandler(BaseHandler):
             if ':' in user_pass:
                 user, password = user_pass.split(':', 1)
                 user_pass = base64.encodestring('%s:%s' % (unquote(user),
-                                                           unquote(password)))
+                                                unquote(password))).strip()
                 req.add_header('Proxy-authorization', 'Basic ' + user_pass)
         host = unquote(host)
         req.set_proxy(host, type)