diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-07 15:16:35 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-07 15:16:35 -0800 |
| commit | e222010029298bb3d9d88c35b77fb56efc582ea0 (patch) | |
| tree | 12003e793e6abf848c405a8c375235ef0ce8db87 /cryptography | |
| parent | 7ec30af9a58647d1e38bb78b5381e64af67128a6 (diff) | |
| download | cryptography-e222010029298bb3d9d88c35b77fb56efc582ea0.tar.gz cryptography-e222010029298bb3d9d88c35b77fb56efc582ea0.tar.bz2 cryptography-e222010029298bb3d9d88c35b77fb56efc582ea0.zip | |
Fixed #408 -- cleanup how is_available works
Diffstat (limited to 'cryptography')
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/binding.py | 7 | ||||
| -rw-r--r-- | cryptography/hazmat/bindings/utils.py | 8 |
2 files changed, 3 insertions, 12 deletions
diff --git a/cryptography/hazmat/bindings/openssl/binding.py b/cryptography/hazmat/bindings/openssl/binding.py index 2a1e1184..19d4d8a9 100644 --- a/cryptography/hazmat/bindings/openssl/binding.py +++ b/cryptography/hazmat/bindings/openssl/binding.py @@ -13,9 +13,8 @@ from __future__ import absolute_import, division, print_function -from cryptography.hazmat.bindings.utils import ( - build_ffi, binding_available -) +from cryptography.hazmat.bindings.utils import build_ffi + _OSX_PRE_INCLUDE = """ #ifdef __APPLE__ @@ -84,4 +83,4 @@ class Binding(object): @classmethod def is_available(cls): - return binding_available(cls._ensure_ffi_initialized) + return True diff --git a/cryptography/hazmat/bindings/utils.py b/cryptography/hazmat/bindings/utils.py index 40fd07f8..69290eb3 100644 --- a/cryptography/hazmat/bindings/utils.py +++ b/cryptography/hazmat/bindings/utils.py @@ -87,11 +87,3 @@ def build_ffi(module_prefix, modules, pre_include, post_include, libraries): delattr(lib, name) return ffi, lib - - -def binding_available(initializer): - try: - initializer() - return True - except cffi.VerificationError: - return False |