This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 358ba529c0c24ff54c946870e22810a4182ba560 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 12 14:15:26 2018 +0100 x2gobroker/basicauth.py: Fix call of base64.decodestring on Python3. --- debian/changelog | 1 + x2gobroker/basicauth.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ab4ba30..c9ea885 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ x2gobroker (0.0.4.0-0x2go1) UNRELEASED; urgency=medium - Drop left-over debug print() call. - Makefile: Assure that setup.py is run under Python3. - Improve debugging messages during authentication phase. + - x2gobroker/basicauth.py: Fix call of base64.decodestring on Python3. * debian/{control,compat}: Bump to DH version level 9. * debian/{control,x2gobroker-common.install}: + Split out common files into non-Pythonian bin:pkg. diff --git a/x2gobroker/basicauth.py b/x2gobroker/basicauth.py index 9a79935..4ae0620 100644 --- a/x2gobroker/basicauth.py +++ b/x2gobroker/basicauth.py @@ -39,7 +39,7 @@ def require_basic_auth(realm, validate_callback): if auth_header is None or not auth_header.startswith('Basic '): create_auth_header() else: - auth_decoded = base64.decodestring(auth_header[6:]) + auth_decoded = base64.decodestring(auth_header[6:].encode()).decode() username, kwargs['basicauth_pass'] = [ s for s in auth_decoded.split(':', 2) ] kwargs['basicauth_user'], access = validate_callback(username, kwargs['basicauth_pass']) if access: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git