summaryrefslogtreecommitdiff
path: root/tests/test_authentication.py
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2020-01-03 23:14:53 -0600
committerMichael Merickel <michael@merickel.org>2020-01-03 23:14:53 -0600
commit828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39 (patch)
treebe692270de956199b4cfb1eda8a9fc24ceb8374e /tests/test_authentication.py
parent7820b922cc1b87147cc60288dff0bbdfd7b5bc8a (diff)
parent148cf5138638ce6b1b92b4e13fe1444df9451e34 (diff)
downloadpyramid-828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39.tar.gz
pyramid-828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39.tar.bz2
pyramid-828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39.zip
Merge branch 'master' into security-docs
Diffstat (limited to 'tests/test_authentication.py')
-rw-r--r--tests/test_authentication.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/test_authentication.py b/tests/test_authentication.py
index e0f5a7963..ec3aef4ef 100644
--- a/tests/test_authentication.py
+++ b/tests/test_authentication.py
@@ -1,8 +1,9 @@
from http.cookies import SimpleCookie
import unittest
import warnings
+
from pyramid import testing
-from pyramid.util import text_, bytes_
+from pyramid.util import bytes_, text_
class TestCallbackAuthenticationPolicyDebugging(unittest.TestCase):