Fixed #27251: merged fix from 3.5.

vsajip · vsajip · commit 24a72ca2391b · 2016-06-07T21:20:39.000+01:00
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
@@ -1165,8 +1165,8 @@ def emit(self, record):
                 h.putheader("Content-length", str(len(data)))
             if self.credentials:
                 import base64
-                s = ('u%s:%s' % self.credentials).encode('utf-8')
-                s = 'Basic ' + base64.b64encode(s).strip()
+                s = ('%s:%s' % self.credentials).encode('utf-8')
+                s = 'Basic ' + base64.b64encode(s).strip().decode('ascii')
                 h.putheader('Authorization', s)
             h.endheaders()
             if self.method == "POST":
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
@@ -1672,7 +1672,8 @@ def test_output(self):
             secure_client = secure and sslctx
             self.h_hdlr = logging.handlers.HTTPHandler(host, '/frob',
                                                        secure=secure_client,
-                                                       context=context)
+                                                       context=context,
+                                                       credentials=('foo', 'bar'))
             self.log_data = None
             root_logger.addHandler(self.h_hdlr)
 
