diff options
| author | Michael Merickel <michael@merickel.org> | 2018-11-14 18:50:02 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2018-11-14 18:59:44 -0600 |
| commit | 5e7361044cbd18d5d9f72f603a9861c1e69a037b (patch) | |
| tree | 825c07f53cd6dc51e87a6195585174ce8230f41c | |
| parent | 9ead1d8e84edcb86ea9e07b4d2c31e7b74a098ed (diff) | |
| download | pyramid-5e7361044cbd18d5d9f72f603a9861c1e69a037b.tar.gz pyramid-5e7361044cbd18d5d9f72f603a9861c1e69a037b.tar.bz2 pyramid-5e7361044cbd18d5d9f72f603a9861c1e69a037b.zip | |
remove SimpleCookie and escape shims
| -rw-r--r-- | src/pyramid/compat.py | 4 | ||||
| -rw-r--r-- | tests/pkgs/permbugapp/__init__.py | 2 | ||||
| -rw-r--r-- | tests/test_authentication.py | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/pyramid/compat.py b/src/pyramid/compat.py index 12b4b7b00..2dde5eeee 100644 --- a/src/pyramid/compat.py +++ b/src/pyramid/compat.py @@ -76,10 +76,6 @@ def is_nonstr_iter(v): return hasattr(v, '__iter__') -from http.cookies import SimpleCookie - -from html import escape - # see PEP 3333 for why we encode WSGI PATH_INFO to latin-1 before # decoding it to utf-8 def decode_path_info(path): diff --git a/tests/pkgs/permbugapp/__init__.py b/tests/pkgs/permbugapp/__init__.py index aedd405f8..72b5d9c17 100644 --- a/tests/pkgs/permbugapp/__init__.py +++ b/tests/pkgs/permbugapp/__init__.py @@ -1,4 +1,4 @@ -from pyramid.compat import escape +from html import escape from pyramid.security import view_execution_permitted from pyramid.response import Response diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 87b7da5a8..a18ccaeb4 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -1,3 +1,4 @@ +from http.cookies import SimpleCookie import unittest import warnings from pyramid import testing @@ -706,8 +707,6 @@ class TestAuthTktCookieHelper(unittest.TestCase): return cookie def _parseCookie(self, cookie): - from pyramid.compat import SimpleCookie - cookies = SimpleCookie() cookies.load(cookie) return cookies.get('auth_tkt') |