Commit 1bf197eb authored by Vinay Sajip's avatar Vinay Sajip

Fixed #27251: corrected string/bytes handling in credentials.

parent 8bff8f69
...@@ -1156,8 +1156,8 @@ class HTTPHandler(logging.Handler): ...@@ -1156,8 +1156,8 @@ class HTTPHandler(logging.Handler):
h.putheader("Content-length", str(len(data))) h.putheader("Content-length", str(len(data)))
if self.credentials: if self.credentials:
import base64 import base64
s = ('u%s:%s' % self.credentials).encode('utf-8') s = ('%s:%s' % self.credentials).encode('utf-8')
s = 'Basic ' + base64.b64encode(s).strip() s = 'Basic ' + base64.b64encode(s).strip().decode('ascii')
h.putheader('Authorization', s) h.putheader('Authorization', s)
h.endheaders() h.endheaders()
if self.method == "POST": if self.method == "POST":
......
...@@ -1672,7 +1672,8 @@ class HTTPHandlerTest(BaseTest): ...@@ -1672,7 +1672,8 @@ class HTTPHandlerTest(BaseTest):
secure_client = secure and sslctx secure_client = secure and sslctx
self.h_hdlr = logging.handlers.HTTPHandler(host, '/frob', self.h_hdlr = logging.handlers.HTTPHandler(host, '/frob',
secure=secure_client, secure=secure_client,
context=context) context=context,
credentials=('foo', 'bar'))
self.log_data = None self.log_data = None
root_logger.addHandler(self.h_hdlr) root_logger.addHandler(self.h_hdlr)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment