From db34d7e3d9e6b13e549866324323e1df8a6e7777 Mon Sep 17 00:00:00 2001 From: Phoebe Queen Date: Wed, 12 Aug 2015 02:15:08 +0100 Subject: added get_extension_for_class #2255 --- src/cryptography/x509/base.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src') diff --git a/src/cryptography/x509/base.py b/src/cryptography/x509/base.py index 2b4eeb56..f58b5221 100644 --- a/src/cryptography/x509/base.py +++ b/src/cryptography/x509/base.py @@ -79,6 +79,13 @@ class Extensions(object): raise ExtensionNotFound("No {0} extension was found".format(oid), oid) + def get_extension_for_class(self, extclass): + for ext in self: + if type(ext.value) == extclass: + return ext + + raise ExtensionNotFound("No {0} extension was found".format(extclass), extclass) + def __iter__(self): return iter(self._extensions) -- cgit v1.2.3 From 754be60e2fb672950d97d1089df5ce2175e557b4 Mon Sep 17 00:00:00 2001 From: Phoebe Queen Date: Wed, 12 Aug 2015 03:11:35 +0100 Subject: Corrected class checking #2255 --- src/cryptography/x509/extensions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/cryptography/x509/extensions.py b/src/cryptography/x509/extensions.py index 74e271ed..938a98e9 100644 --- a/src/cryptography/x509/extensions.py +++ b/src/cryptography/x509/extensions.py @@ -82,7 +82,7 @@ class Extensions(object): def get_extension_for_class(self, extclass): for ext in self: - if type(ext.value) == extclass: + if isinstance(ext.value, extclass): return ext raise ExtensionNotFound("No {0} extension was found".format(extclass), extclass) -- cgit v1.2.3 From 2cc111a18b615ccf3ecec9fe8918836d498e4b67 Mon Sep 17 00:00:00 2001 From: Phoebe Queen Date: Wed, 12 Aug 2015 04:14:22 +0100 Subject: fixing pep8 errors #2255 --- src/cryptography/x509/extensions.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/cryptography/x509/extensions.py b/src/cryptography/x509/extensions.py index 938a98e9..09d76501 100644 --- a/src/cryptography/x509/extensions.py +++ b/src/cryptography/x509/extensions.py @@ -85,7 +85,9 @@ class Extensions(object): if isinstance(ext.value, extclass): return ext - raise ExtensionNotFound("No {0} extension was found".format(extclass), extclass) + raise ExtensionNotFound( + "No {0} extension was found".format(extclass), extclass + ) def __iter__(self): return iter(self._extensions) -- cgit v1.2.3 From ecae981f3a17236caee76bc95c5881db0b0d39b3 Mon Sep 17 00:00:00 2001 From: Phoebe Queen Date: Wed, 12 Aug 2015 05:00:32 +0100 Subject: added test to raise error --- src/cryptography/x509/extensions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/cryptography/x509/extensions.py b/src/cryptography/x509/extensions.py index 09d76501..0adf9e26 100644 --- a/src/cryptography/x509/extensions.py +++ b/src/cryptography/x509/extensions.py @@ -86,7 +86,7 @@ class Extensions(object): return ext raise ExtensionNotFound( - "No {0} extension was found".format(extclass), extclass + "No {0} extension was found".format(extclass), extclass.oid ) def __iter__(self): -- cgit v1.2.3