From c2d76a60720b57cf0e10466eed43934b2fc08500 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Sat, 17 Aug 2019 23:03:41 -0400 Subject: [PATCH] More python 3 fixes in the safe_sessions middleware. --- openedx/core/djangoapps/safe_sessions/middleware.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openedx/core/djangoapps/safe_sessions/middleware.py b/openedx/core/djangoapps/safe_sessions/middleware.py index 36aa883322..5443bae960 100644 --- a/openedx/core/djangoapps/safe_sessions/middleware.py +++ b/openedx/core/djangoapps/safe_sessions/middleware.py @@ -202,7 +202,7 @@ class SafeCookieData(object): hash_func = sha256() for data_item in [self.version, self.session_id, user_id]: hash_func.update(six.b(six.text_type(data_item))) - hash_func.update('|') + hash_func.update(b'|') return hash_func.hexdigest() @staticmethod @@ -475,7 +475,7 @@ def _delete_cookie(request, response): cookie_header = request.META.get('HTTP_COOKIE', '')[:4096] log.warning( u"Malformed Cookie Header? First 4K, in Base64: %s", - b64encode(cookie_header) + b64encode(six.b(cookie_header)) ) # Note, there is no request.user attribute at this point.