aboutsummaryrefslogtreecommitdiff
path: root/requests/packages/urllib3/__init__.py
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-10-14 19:05:05 +0200
committerDaniele Tricoli <eriol@mornie.org>2015-10-14 19:05:05 +0200
commitd01fda0eb2b8256cc36b77bb586ba6bc7c58c561 (patch)
tree9388f02824df07bcbe014f6fe801a0b1b23d6c07 /requests/packages/urllib3/__init__.py
parent4ded421c898253557a3bb0147a2bfc8c85583db8 (diff)
parent3d3afa49b9ca0e898ecb09c7271d28e0c737016b (diff)
downloadpython-requests-d01fda0eb2b8256cc36b77bb586ba6bc7c58c561.tar
python-requests-d01fda0eb2b8256cc36b77bb586ba6bc7c58c561.tar.gz
merge patched into master
Diffstat (limited to 'requests/packages/urllib3/__init__.py')
-rw-r--r--requests/packages/urllib3/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/requests/packages/urllib3/__init__.py b/requests/packages/urllib3/__init__.py
index f48ac4a..86bb71d 100644
--- a/requests/packages/urllib3/__init__.py
+++ b/requests/packages/urllib3/__init__.py
@@ -4,7 +4,7 @@ urllib3 - Thread-safe connection pooling and re-using.
__author__ = 'Andrey Petrov (andrey.petrov@shazow.net)'
__license__ = 'MIT'
-__version__ = '1.10.4'
+__version__ = '1.12'
from .connectionpool import (
@@ -58,6 +58,8 @@ del NullHandler
import warnings
# SecurityWarning's always go off by default.
warnings.simplefilter('always', exceptions.SecurityWarning, append=True)
+# SubjectAltNameWarning's should go off once per host
+warnings.simplefilter('default', exceptions.SubjectAltNameWarning)
# InsecurePlatformWarning's don't vary between requests, so we keep it default.
warnings.simplefilter('default', exceptions.InsecurePlatformWarning,
append=True)