Merge pull request #1347 from hobarrera/master

Issue #749: Add optional SNI support for python2.
psf · May 4, 2013 · 50e5922 · 50e5922
2 parents e585e49 + 18857a0
commit 50e5922
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -125,3 +125,4 @@ Patches and Suggestions
 - Dmitry Medvinsky <me@dmedvinsky.name>
 - Bryce Boe <bbzbryce@gmail.com> @bboe
 - Colin Dunklau <colin.dunklau@gmail.com> @cdunklau
+- Hugo Osvaldo Barrera <hugo@osvaldobarrera.com.ar> @hobarrera
diff --git a/requests/__init__.py b/requests/__init__.py
@@ -48,6 +48,12 @@
 __license__ = 'Apache 2.0'
 __copyright__ = 'Copyright 2013 Kenneth Reitz'
 
+# Attempt to enable urllib3's SNI support, if possible
+try:
+ from requests.packages.urllib3.contrib import pyopenssl
+ pyopenssl.inject_into_urllib3()
+except ImportError:
+ pass
 
 from . import utils
 from .models import Request, Response, PreparedRequest

diff --git a/setup.py b/setup.py
@@ -20,6 +20,7 @@
  'requests.packages.charade',
  'requests.packages.urllib3',
  'requests.packages.urllib3.packages',
+ 'requests.packages.urllib3.contrib',
  'requests.packages.urllib3.packages.ssl_match_hostname'
 ]