summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-08-15 10:57:05 +0200
committerClaude Paroz <claude@2xlibre.net>2012-08-15 10:58:26 +0200
commite0d67f3440b3b2c854da013fd1f9894477e26a77 (patch)
treedd859b35e432c62b1df02c46b3c01dd1065c2bff /django
parent64531df5df1fdb93af4eebaa7994716d6cd5b15f (diff)
[py3] Fixed test_client_regress tests
Diffstat (limited to 'django')
-rw-r--r--django/contrib/sessions/backends/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/sessions/backends/base.py b/django/contrib/sessions/backends/base.py
index c25f1babd4..2fb7991b49 100644
--- a/django/contrib/sessions/backends/base.py
+++ b/django/contrib/sessions/backends/base.py
@@ -81,7 +81,7 @@ class SessionBase(object):
"Returns the given session dictionary pickled and encoded as a string."
pickled = pickle.dumps(session_dict, pickle.HIGHEST_PROTOCOL)
hash = self._hash(pickled)
- return base64.b64encode(hash.encode() + b":" + pickled)
+ return base64.b64encode(hash.encode() + b":" + pickled).decode('ascii')
def decode(self, session_data):
encoded_data = base64.b64decode(smart_bytes(session_data))