Merge "Update HTTPS certificate handling for pep-0476"

2015-02-19 17:58:58 +00:00
parent a3eaafefbd b96f613026
commit 72f0bc3579
2 changed files with 7 additions and 1 deletions
@@ -149,7 +149,11 @@ class VerifiedHTTPSConnection(HTTPSConnection):
        if six.PY3:
            excp_lst = (TypeError, FileNotFoundError, ssl.SSLError)
        else:
-            excp_lst = ()
+            # NOTE(jamespage)
+            # Accomodate changes in behaviour for pep-0467, introduced
+            # in python 2.7.9.
+            # https://github.com/python/peps/blob/master/pep-0476.txt
+            excp_lst = (TypeError, IOError, ssl.SSLError)
        try:
            HTTPSConnection.__init__(self, host, port,
                                     key_file=key_file,