diff options
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | src/_cffi_src/commoncrypto/sectrust.py | 1 | ||||
| -rw-r--r-- | src/cryptography/hazmat/backends/__init__.py | 7 |
3 files changed, 2 insertions, 8 deletions
@@ -37,7 +37,7 @@ requirements = [ "idna>=2.0", "pyasn1>=0.1.8", "six>=1.4.1", - "setuptools>=1.0", + "setuptools>=11.3", ] setup_requirements = [] diff --git a/src/_cffi_src/commoncrypto/sectrust.py b/src/_cffi_src/commoncrypto/sectrust.py index 8962f4f2..842c36c7 100644 --- a/src/_cffi_src/commoncrypto/sectrust.py +++ b/src/_cffi_src/commoncrypto/sectrust.py @@ -15,7 +15,6 @@ typedef uint32_t SecTrustResultType; enum { kSecTrustResultInvalid, kSecTrustResultProceed, - kSecTrustResultConfirm, kSecTrustResultDeny, kSecTrustResultUnspecified, kSecTrustResultRecoverableTrustFailure, diff --git a/src/cryptography/hazmat/backends/__init__.py b/src/cryptography/hazmat/backends/__init__.py index 256fee39..96a431dc 100644 --- a/src/cryptography/hazmat/backends/__init__.py +++ b/src/cryptography/hazmat/backends/__init__.py @@ -17,12 +17,7 @@ def _available_backends(): if _available_backends_list is None: _available_backends_list = [ - # setuptools 11.3 deprecated support for the require parameter to - # load(), and introduced the new resolve() method instead. - # This can be removed if/when we can assume setuptools>=11.3. At - # some point we may wish to add a warning, to push people along, - # but at present this would result in too many warnings. - ep.resolve() if hasattr(ep, "resolve") else ep.load(require=False) + ep.resolve() for ep in pkg_resources.iter_entry_points( "cryptography.backends" ) |