Merge pull request #3421 from mmerickel/drop-py2

remove py2 from the codebase

1 files changed, 2 insertions, 8 deletions

diff --git a/tests/test_session.py b/tests/test_session.py
index 5e2a1ff55..8e5e82bb2 100644
--- a/tests/test_session.py
+++ b/tests/test_session.py
@@ -1,8 +1,8 @@
 import base64
 import json
+import pickle
 import unittest
 from pyramid import testing
-from pyramid.compat import pickle
 
 
 class SharedCookieSessionTests(object):
@@ -607,13 +607,7 @@ class DummySerializer(object):
         return base64.b64encode(json.dumps(value).encode('utf-8'))
 
     def loads(self, value):
-        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
+        return json.loads(base64.b64decode(value).decode('utf-8'))
 
 
 class DummySessionFactory(dict):