diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-01-08 12:34:47 -0800 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-01-08 12:34:47 -0800 |
commit | e6fc94d63e650debd759280565b9a7edea2818ff (patch) | |
tree | ce9f3b77415d535a395780d9cd5c82f0d8fefa90 | |
parent | 89ad8bd3c4683752b2c043cebb4e29d0d03cf856 (diff) | |
download | cryptography-e6fc94d63e650debd759280565b9a7edea2818ff.tar.gz cryptography-e6fc94d63e650debd759280565b9a7edea2818ff.tar.bz2 cryptography-e6fc94d63e650debd759280565b9a7edea2818ff.zip |
Fixed #1614 -- don't cause warnings with the latest setuptools
-rw-r--r-- | src/cryptography/hazmat/backends/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptography/hazmat/backends/__init__.py b/src/cryptography/hazmat/backends/__init__.py index 24c029f6..2098aeb2 100644 --- a/src/cryptography/hazmat/backends/__init__.py +++ b/src/cryptography/hazmat/backends/__init__.py @@ -17,8 +17,8 @@ def _available_backends(): if _available_backends_list is None: _available_backends_list = [ - backend.load(require=False) - for backend in pkg_resources.iter_entry_points( + ep.resolve() if hasattr(ep, "resolve") else ep.load(require=False) + for ep in pkg_resources.iter_entry_points( "cryptography.backends" ) ] |