summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2015-11-04 07:55:19 -0500
committerMonty Taylor <mordred@inaugust.com>2015-11-04 10:11:32 -0500
commitd9eb7114dc483f587f2d67c7de6ceff7f13bae3e (patch)
tree104aeb801229464751e4b93f38e59658a450785e
parentdd66558b69e3f884326d65a105ac6ccb12c463a9 (diff)
Fix typos1.1.1
Notes
Notes (review): Code-Review+2: James E. Blair <corvus@inaugust.com> Workflow+1: James E. Blair <corvus@inaugust.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 04 Nov 2015 22:55:12 +0000 Reviewed-on: https://review.openstack.org/241430 Project: openstack-infra/requestsexceptions Branch: refs/heads/master
-rw-r--r--requestsexceptions/__init__.py4
-rw-r--r--test-requirements.txt1
2 files changed, 3 insertions, 2 deletions
diff --git a/requestsexceptions/__init__.py b/requestsexceptions/__init__.py
index f1c1e50..6cb585c 100644
--- a/requestsexceptions/__init__.py
+++ b/requestsexceptions/__init__.py
@@ -31,7 +31,7 @@ except ImportError:
31 InsecureRequestWarning = None 31 InsecureRequestWarning = None
32 32
33try: 33try:
34 from requests.packages.urllib3.exceptions import SubjectAltNameWarning 34 from requests.packages.urllib3.exceptions import SubjectAltNameWarning
35except ImportError: 35except ImportError:
36 try: 36 try:
37 from urllib3.exceptions import SubjectAltNameWarning 37 from urllib3.exceptions import SubjectAltNameWarning
@@ -44,5 +44,5 @@ def squelch_warnings(insecure_requests=True):
44 warnings.filterwarnings('ignore', category=SubjectAltNameWarning) 44 warnings.filterwarnings('ignore', category=SubjectAltNameWarning)
45 if InsecurePlatformWarning: 45 if InsecurePlatformWarning:
46 warnings.filterwarnings('ignore', category=InsecurePlatformWarning) 46 warnings.filterwarnings('ignore', category=InsecurePlatformWarning)
47 if insecure_requests and InsecureRequestWarning): 47 if insecure_requests and InsecureRequestWarning:
48 warnings.filterwarnings('ignore', category=InsecureRequestWarning) 48 warnings.filterwarnings('ignore', category=InsecureRequestWarning)
diff --git a/test-requirements.txt b/test-requirements.txt
index e69de29..b990d70 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -0,0 +1 @@
flake8>=2.2.4,<=2.4.1