aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/http/authentication.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-16 20:19:52 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-16 20:19:52 +0200
commite1659f3fcf83b5993b776a4ef3d2de70fbe27aa2 (patch)
treec0eba50b522d1d0183b057e9cae7bf7cc38c4fc3 /netlib/http/authentication.py
parent2f9c566e480c377566a0ae044d698a75b45cd54c (diff)
parent265f31e8782ee9da511ce4b63aa2da00221cbf66 (diff)
downloadmitmproxy-e1659f3fcf83b5993b776a4ef3d2de70fbe27aa2.tar.gz
mitmproxy-e1659f3fcf83b5993b776a4ef3d2de70fbe27aa2.tar.bz2
mitmproxy-e1659f3fcf83b5993b776a4ef3d2de70fbe27aa2.zip
Merge pull request #92 from mitmproxy/python3
Python3 & HTTP1 Refactor
Diffstat (limited to 'netlib/http/authentication.py')
-rw-r--r--netlib/http/authentication.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/netlib/http/authentication.py b/netlib/http/authentication.py
index fe1f0d14..2055f843 100644
--- a/netlib/http/authentication.py
+++ b/netlib/http/authentication.py
@@ -19,8 +19,8 @@ def parse_http_basic_auth(s):
def assemble_http_basic_auth(scheme, username, password):
- v = binascii.b2a_base64(username + ":" + password)
- return scheme + " " + v
+ v = binascii.b2a_base64(username + b":" + password)
+ return scheme + b" " + v
class NullProxyAuth(object):