Merge pull request #2685 from alex/setuptools-dep

Require a newer setuptools.

1 files changed, 1 insertions, 6 deletions

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"
             )