mirror of
https://github.com/saymrwulf/cryptography.git
synced 2026-05-14 20:37:55 +00:00
Fixed #408 -- cleanup how is_available works
This commit is contained in:
parent
7ec30af9a5
commit
e222010029
3 changed files with 3 additions and 44 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
# implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from __future__ import absolute_import, division, print_function
|
||||
|
||||
import cffi
|
||||
|
||||
from cryptography.hazmat.bindings.utils import binding_available
|
||||
from cryptography.hazmat.bindings.openssl.binding import Binding
|
||||
|
||||
|
||||
def dummy_initializer():
|
||||
ffi = cffi.FFI()
|
||||
ffi.verify(source="#include <fake_header.h>")
|
||||
|
||||
|
||||
def test_binding_available():
|
||||
assert binding_available(Binding._ensure_ffi_initialized) is True
|
||||
|
||||
|
||||
def test_binding_unavailable():
|
||||
assert binding_available(dummy_initializer) is False
|
||||
Loading…
Reference in a new issue