diff options
| -rw-r--r-- | pyramid/tests/test_session.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pyramid/tests/test_session.py b/pyramid/tests/test_session.py index 2fd764e5e..eac6593d9 100644 --- a/pyramid/tests/test_session.py +++ b/pyramid/tests/test_session.py @@ -654,7 +654,13 @@ class DummySerializer(object): return base64.b64encode(json.dumps(value).encode('utf-8')) def loads(self, value): - return json.loads(base64.b64decode(value).decode('utf-8')) + try: + return json.loads(base64.b64decode(value).decode('utf-8')) + + # base64.b64decode raises a TypeError on py2 instead of a ValueError + # and a ValueError is required for the session to handle it properly + except TypeError: + raise ValueError class DummySessionFactory(dict): _dirty = False |