Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Remove URLLIB3_USE_PYOPENSSL env var.

  • Loading branch information...
commit 4efbf91c8401a882d2bb4a1b0b1e040bf3555055 1 parent df1d950
@kirkeby authored
Showing with 8 additions and 10 deletions.
  1. +8 −10 urllib3/util.py
View
18 urllib3/util.py
@@ -7,7 +7,6 @@
from base64 import b64encode
from collections import namedtuple
-import os
from socket import error as SocketError
try:
@@ -32,15 +31,14 @@
try:
OpenSSL = ServerSSLCertVerification = None
- if os.environ.get('URLLIB3_USE_PYOPENSSL') == 'true':
- import OpenSSL.SSL
- from ndg.httpsclient.ssl_peer_verification import ServerSSLCertVerification, SUBJ_ALT_NAME_SUPPORT
- from ndg.httpsclient.subj_alt_name import SubjectAltName
- from pyasn1.codec.der import decoder as der_decoder
- from socket import _fileobject
- # SNI only *really* works if we can read the subjectAltName of
- # certificates, so.
- HAS_SNI = SUBJ_ALT_NAME_SUPPORT
+ import OpenSSL.SSL
+ from ndg.httpsclient.ssl_peer_verification import ServerSSLCertVerification, SUBJ_ALT_NAME_SUPPORT
+ from ndg.httpsclient.subj_alt_name import SubjectAltName
+ from pyasn1.codec.der import decoder as der_decoder
+ from socket import _fileobject
+ # SNI only *really* works if we can read the subjectAltName of
+ # certificates, so.
+ HAS_SNI = SUBJ_ALT_NAME_SUPPORT
except ImportError:
pass
Please sign in to comment.
Something went wrong with that request. Please try again.