diff options
| author | Christopher Baines <mail@cbaines.net> | 2015-12-22 14:21:02 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2015-12-22 14:21:02 +0000 |
| commit | 1a6fe6bde5ecdf37b0278033772274dc503ec230 (patch) | |
| tree | c892bdfefcf2d5ee85e21a94b52738352c825d0a /test/with_dummyserver/test_https.py | |
| parent | 327251264d6f5ba51abb1f90e29d4d153f825d2c (diff) | |
| parent | 01eb41ddb423818d06a60ab7e40aae9cb7dcb23e (diff) | |
| download | python-urllib3-1a6fe6bde5ecdf37b0278033772274dc503ec230.tar python-urllib3-1a6fe6bde5ecdf37b0278033772274dc503ec230.tar.gz | |
merge patched into master
Diffstat (limited to 'test/with_dummyserver/test_https.py')
| -rw-r--r-- | test/with_dummyserver/test_https.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/with_dummyserver/test_https.py b/test/with_dummyserver/test_https.py index 7319d7e..8c16d30 100644 --- a/test/with_dummyserver/test_https.py +++ b/test/with_dummyserver/test_https.py @@ -36,7 +36,7 @@ from urllib3.exceptions import ( SystemTimeWarning, InsecurePlatformWarning, ) -from urllib3.packages import six +import six from urllib3.util.timeout import Timeout from urllib3.util.ssl_ import HAS_SNI |