diff options
| author | Michael Merickel <michael@merickel.org> | 2018-11-12 23:19:06 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2018-11-12 23:19:06 -0600 |
| commit | 4cb6a965f7e8ce44ef609436f314b56119131f73 (patch) | |
| tree | 4413959a30c4367220d6e57608e06739d12d2f8b | |
| parent | b1a257bacc1c4ac2c1401ed02c51d9c6c03685d2 (diff) | |
| download | pyramid-4cb6a965f7e8ce44ef609436f314b56119131f73.tar.gz pyramid-4cb6a965f7e8ce44ef609436f314b56119131f73.tar.bz2 pyramid-4cb6a965f7e8ce44ef609436f314b56119131f73.zip | |
get rid of pickle alias
| -rw-r--r-- | src/pyramid/compat.py | 2 | ||||
| -rw-r--r-- | src/pyramid/session.py | 3 | ||||
| -rw-r--r-- | tests/test_session.py | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/pyramid/compat.py b/src/pyramid/compat.py index 47e842fbb..c2d7c7f3f 100644 --- a/src/pyramid/compat.py +++ b/src/pyramid/compat.py @@ -13,8 +13,6 @@ except BaseException: # pragma: no cover __pypy__ = None PYPY = False -import pickle - def text_(s, encoding='latin-1', errors='strict'): """ If ``s`` is an instance of ``bytes``, return diff --git a/src/pyramid/session.py b/src/pyramid/session.py index e9486ec6d..1b1bfb3e5 100644 --- a/src/pyramid/session.py +++ b/src/pyramid/session.py @@ -1,5 +1,6 @@ import binascii import os +import pickle import time from zope.deprecation import deprecated @@ -7,7 +8,7 @@ from zope.interface import implementer from webob.cookies import JSONSerializer, SignedSerializer -from pyramid.compat import pickle, text_, bytes_, native_ +from pyramid.compat import text_, bytes_, native_ from pyramid.csrf import check_csrf_origin, check_csrf_token from pyramid.interfaces import ISession diff --git a/tests/test_session.py b/tests/test_session.py index f7e7bab05..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): |