aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-08-03 16:12:18 +0100
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-08-03 16:12:18 +0100
commit7557bc0d61f218e20b3cfaa591ed410551331d49 (patch)
tree499cd3ad5a7c8bee6e216cf79311f8c73706e7fd
parent3133a6b6deac1196b6306bbd4fa1fec348ec5402 (diff)
downloadcryptography-7557bc0d61f218e20b3cfaa591ed410551331d49.tar.gz
cryptography-7557bc0d61f218e20b3cfaa591ed410551331d49.tar.bz2
cryptography-7557bc0d61f218e20b3cfaa591ed410551331d49.zip
pass in the imports to make it a bit clearer what's going on
-rw-r--r--src/cryptography/hazmat/bindings/openssl/binding.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/binding.py b/src/cryptography/hazmat/bindings/openssl/binding.py
index d7156523..be3d6382 100644
--- a/src/cryptography/hazmat/bindings/openssl/binding.py
+++ b/src/cryptography/hazmat/bindings/openssl/binding.py
@@ -25,12 +25,12 @@ def _osrandom_rand_status():
class _ConditionalLibrary(object):
- def __init__(self):
+ def __init__(self, lib, conditional_names):
for attr in dir(lib):
attrval = getattr(lib, attr)
setattr(self, attr, attrval)
- for condition, names in CONDITIONAL_NAMES.items():
+ for condition, names in conditional_names.items():
if not getattr(self, condition):
for name in names:
delattr(self, name)
@@ -87,7 +87,7 @@ class Binding(object):
def _ensure_ffi_initialized(cls):
with cls._init_lock:
if not cls._lib_loaded:
- cls.lib = _ConditionalLibrary()
+ cls.lib = _ConditionalLibrary(lib, CONDITIONAL_NAMES)
cls._lib_loaded = True
cls._register_osrandom_engine()