From 5b5d5ed4c011ef71258a2c34463c6fe3821dab40 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Mon, 31 Aug 2015 11:30:01 -0500 Subject: fix difference between py2 and py3 with base64.b64decode --- pyramid/tests/test_session.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3