commit c84567b2b40d3fdb49776470b18b9cdf144aa6f3
author Alex Gaynor <alex.gaynor@gmail.com> Wed Mar 16 07:45:09 2016 -0400
committer Alex Gaynor <alex.gaynor@gmail.com> Wed Mar 16 07:45:09 2016 -0400
tree 371ed5745ab8d3ccd137d7e95af788794bd094c7
parent b6e39c8a92245c76fe093d03494e7763f01dba52

Remove code for pre-cryptography 1.2

src/OpenSSL/crypto.py

diff --git a/src/OpenSSL/crypto.py b/src/OpenSSL/crypto.py
index ce32f93..a5924c9 100644
--- a/src/OpenSSL/crypto.py
+++ b/src/OpenSSL/crypto.py
@@ -270,12 +270,7 @@
 
         :return: The type of the key.
         """
-        try:
-            # cryptography 1.2+
-            return _lib.Cryptography_EVP_PKEY_id(self._pkey)
-        except AttributeError:
-            # Older releases of cryptography.
-            return self._pkey.type
+        return _lib.Cryptography_EVP_PKEY_id(self._pkey)
 
     def bits(self):
         """