From e222010029298bb3d9d88c35b77fb56efc582ea0 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Tue, 7 Jan 2014 15:16:35 -0800
Subject: Fixed #408 -- cleanup how is_available works

---
 cryptography/hazmat/bindings/openssl/binding.py |  7 +++---
 cryptography/hazmat/bindings/utils.py           |  8 -------
 tests/hazmat/bindings/test_bindings.py          | 32 -------------------------
 3 files changed, 3 insertions(+), 44 deletions(-)
 delete mode 100644 tests/hazmat/bindings/test_bindings.py

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
diff --git a/tests/hazmat/bindings/test_bindings.py b/tests/hazmat/bindings/test_bindings.py
deleted file mode 100644
index 7af1d581..00000000
--- a/tests/hazmat/bindings/test_bindings.py
+++ /dev/null
@@ -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
-- 
cgit v1.2.3


From 9a95dad8df43fdc9149fac3e0a6302a3f5b61b6e Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Tue, 7 Jan 2014 15:20:42 -0800
Subject: Explanatory comment

---
 cryptography/hazmat/bindings/openssl/binding.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cryptography/hazmat/bindings/openssl/binding.py b/cryptography/hazmat/bindings/openssl/binding.py
index 19d4d8a9..8a4e1dd3 100644
--- a/cryptography/hazmat/bindings/openssl/binding.py
+++ b/cryptography/hazmat/bindings/openssl/binding.py
@@ -83,4 +83,5 @@ class Binding(object):
 
     @classmethod
     def is_available(cls):
+        # OpenSSL is the only binding so for now it must always be available
         return True
-- 
cgit v1.2.3