Commit a0d1caa4 authored by Jérome Perrin's avatar Jérome Perrin

base64 WIP

parent 3cb4d3b8
...@@ -106,7 +106,7 @@ class BaseExtensibleTraversableMixin(ExtensibleTraversableMixin): ...@@ -106,7 +106,7 @@ class BaseExtensibleTraversableMixin(ExtensibleTraversableMixin):
# this logic is copied from identify() in # this logic is copied from identify() in
# AccessControl.User.BasicUserFolder. # AccessControl.User.BasicUserFolder.
if auth and auth.lower().startswith('basic '): if auth and auth.lower().startswith('basic '):
name = decodebytes(auth.split(' ')[-1]).split(':', 1)[0] name = decodebytes(auth.split(' ')[-1].encode()).decode().split(':', 1)[0]
if name is not None: if name is not None:
user = portal_membership._huntUser(name, self) user = portal_membership._huntUser(name, self)
else: else:
......
...@@ -193,7 +193,7 @@ def credentialsChanged(self, user, name, pw, request=None): ...@@ -193,7 +193,7 @@ def credentialsChanged(self, user, name, pw, request=None):
# <patch> # <patch>
# We don't want new lines, so use base64.standard_b64encode instead of # We don't want new lines, so use base64.standard_b64encode instead of
# base64.encodebytes # base64.encodebytes
ac = standard_b64encode('%s:%s' % (name, pw)).rstrip() ac = standard_b64encode(('%s:%s' % (name, pw)).encode()).rstrip().decode()
# </patch> # </patch>
method = self.getCookieMethod('setAuthCookie', method = self.getCookieMethod('setAuthCookie',
self.defaultSetAuthCookie) self.defaultSetAuthCookie)
......
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