Skip to content

Commit

Permalink
Merge pull request #803 from JordonPhillips/disable-pyopenssl
Browse files Browse the repository at this point in the history
Disable pyopenssl.
  • Loading branch information
JordonPhillips committed Feb 24, 2016
2 parents 9b743f5 + 3a9d983 commit 71a9d8c
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions botocore/endpoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@
DEFAULT_TIMEOUT = 60
filter_ssl_warnings()

try:
from botocore.vendored.requests.packages.urllib3.contrib import pyopenssl
pyopenssl.extract_from_urllib3()
except ImportError:
pass


def convert_to_response_dict(http_response, operation_model):
"""Convert an HTTP response object to a request dict.
Expand Down

0 comments on commit 71a9d8c

Please sign in to comment.