diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-01-09 09:43:06 +0000 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-01-09 09:43:06 +0000 |
commit | d1bb77fe1ddc756b886b48b9542d1980962bb2aa (patch) | |
tree | d05e533c5489fa570d4ddad89b294717d92a444e /src | |
parent | 89ad8bd3c4683752b2c043cebb4e29d0d03cf856 (diff) | |
parent | f8da8e20f0d0265a4f4465eef1294ee59f3edb0e (diff) | |
download | cryptography-d1bb77fe1ddc756b886b48b9542d1980962bb2aa.tar.gz cryptography-d1bb77fe1ddc756b886b48b9542d1980962bb2aa.tar.bz2 cryptography-d1bb77fe1ddc756b886b48b9542d1980962bb2aa.zip |
Merge pull request #1615 from alex/setuptools-warnings
Fixed #1614 -- don't cause warnings with the latest setuptools
Diffstat (limited to 'src')
-rw-r--r-- | src/cryptography/hazmat/backends/__init__.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/cryptography/hazmat/backends/__init__.py b/src/cryptography/hazmat/backends/__init__.py index 24c029f6..256fee39 100644 --- a/src/cryptography/hazmat/backends/__init__.py +++ b/src/cryptography/hazmat/backends/__init__.py @@ -17,8 +17,13 @@ def _available_backends(): if _available_backends_list is None: _available_backends_list = [ - backend.load(require=False) - for backend in pkg_resources.iter_entry_points( + # 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) + for ep in pkg_resources.iter_entry_points( "cryptography.backends" ) ] |