summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2018-11-12 23:19:06 -0600
committerMichael Merickel <michael@merickel.org>2018-11-12 23:19:06 -0600
commit4cb6a965f7e8ce44ef609436f314b56119131f73 (patch)
tree4413959a30c4367220d6e57608e06739d12d2f8b /src
parentb1a257bacc1c4ac2c1401ed02c51d9c6c03685d2 (diff)
downloadpyramid-4cb6a965f7e8ce44ef609436f314b56119131f73.tar.gz
pyramid-4cb6a965f7e8ce44ef609436f314b56119131f73.tar.bz2
pyramid-4cb6a965f7e8ce44ef609436f314b56119131f73.zip
get rid of pickle alias
Diffstat (limited to 'src')
-rw-r--r--src/pyramid/compat.py2
-rw-r--r--src/pyramid/session.py3
2 files changed, 2 insertions, 3 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