summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2018-03-20 16:41:14 +0100
committerJeremy Lainé <jeremy.laine@m4x.org>2018-03-20 16:41:14 +0100
commitbb9a51bbbcb010bb3aac31a7031e7c5e75681d60 (patch)
tree6fad5fea6eb902776fd726b2213aa63540d97305
parentd5c8c68a8df0cb864d44a5ad00cb8f2ffc60bab8 (diff)
downloadurllib3-bb9a51bbbcb010bb3aac31a7031e7c5e75681d60.tar.gz
x509.UnsupportedExtension is gone in cryptography >= 2.1
-rw-r--r--urllib3/contrib/pyopenssl.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/urllib3/contrib/pyopenssl.py b/urllib3/contrib/pyopenssl.py
index 2762bca4..94b3c345 100644
--- a/urllib3/contrib/pyopenssl.py
+++ b/urllib3/contrib/pyopenssl.py
@@ -199,8 +199,7 @@ def get_subj_alt_name(peer_cert):
except x509.ExtensionNotFound:
# No such extension, return the empty list.
return []
- except (x509.DuplicateExtension, x509.UnsupportedExtension,
- x509.UnsupportedGeneralNameType, UnicodeError) as e:
+ except (x509.DuplicateExtension, x509.UnsupportedGeneralNameType, UnicodeError) as e:
# A problem has been found with the quality of the certificate. Assume
# no SAN field is present.
log.warning(