summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKenneth Reitz <me@kennethreitz.org>2017-05-26 22:48:58 -0400
committerKenneth Reitz <me@kennethreitz.org>2017-05-26 22:48:58 -0400
commit818daff12a8e2bfdabe620b08e0b252bd93d2c6a (patch)
tree532953fb729f6eaa4ee5bab42f2750d3f2a570eb /tests
parent0bb200515c0fa9d5e12d21ea563ed5e134912bec (diff)
downloadpython-requests-818daff12a8e2bfdabe620b08e0b252bd93d2c6a.tar.gz
more test removal of old imports
Diffstat (limited to 'tests')
-rw-r--r--tests/__init__.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/tests/__init__.py b/tests/__init__.py
index 1b7182a5..36874d06 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -4,17 +4,8 @@
import warnings
-try:
- import urllib3 as urllib3_package
-except ImportError:
- urllib3_package = False
-
-from requests.packages import urllib3 as urllib3_bundle
-
-if urllib3_package is urllib3_bundle:
- from urllib3.exceptions import SNIMissingWarning
-else:
- from requests.packages.urllib3.exceptions import SNIMissingWarning
+import urllib3 as urllib3_package
+from urllib3.exceptions import SNIMissingWarning
# urllib3 sets SNIMissingWarning to only go off once,
# while this test suite requires it to always fire