diff options
| author | Michael Merickel <michael@merickel.org> | 2020-01-03 23:14:53 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2020-01-03 23:14:53 -0600 |
| commit | 828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39 (patch) | |
| tree | be692270de956199b4cfb1eda8a9fc24ceb8374e /tests/test_request.py | |
| parent | 7820b922cc1b87147cc60288dff0bbdfd7b5bc8a (diff) | |
| parent | 148cf5138638ce6b1b92b4e13fe1444df9451e34 (diff) | |
| download | pyramid-828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39.tar.gz pyramid-828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39.tar.bz2 pyramid-828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39.zip | |
Merge branch 'master' into security-docs
Diffstat (limited to 'tests/test_request.py')
| -rw-r--r-- | tests/test_request.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_request.py b/tests/test_request.py index 1a10a8509..bbf6aa47c 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -1,8 +1,8 @@ import unittest -from pyramid import testing -from pyramid.security import SecurityAPIMixin, AuthenticationAPIMixin -from pyramid.util import text_, bytes_ +from pyramid import testing +from pyramid.security import AuthenticationAPIMixin, SecurityAPIMixin +from pyramid.util import bytes_, text_ class TestRequest(unittest.TestCase): |