Fixes the find_library import and adds an 'initialized' variable to the Dyad class

Author: ilumsden

pydyad/pydyad/bindings.py

@@ -1,4 +1,5 @@
 import ctypes
+from ctypes.util import find_library
 import os
 from pathlib import Path
 import warnings
@@ -37,6 +38,7 @@ class DyadCtxWrapper(ctypes.Structure):
 class Dyad:
 
     def __init__(self):
+        self.initialized = False
         self.dyad_core_lib = None
         self.ctx = None
         self.dyad_init = None
@@ -47,7 +49,7 @@ def __init__(self):
         dyad_core_lib_file = None
         self.cons_path = None
         self.prod_path = None
-        dyad_core_lib_file = ctypes.util.find_library("dyad_core")
+        dyad_core_lib_file = find_library("dyad_core")
         if dyad_core_lib_file is None:
             raise FileNotFoundError("Cannot find libdyad_core.so using 'ctypes'")
         self.dyad_core_lib = ctypes.CDLL(dyad_core_lib_file)
@@ -122,6 +124,7 @@ def init(self, debug, check, shared_storage, key_depth,
             self.cons_path = None
         else:
             self.cons_path = Path(self.ctx.contents.cons_managed_path.decode("utf-8")).expanduser().resolve()
+        self.initialized = True
 
     def init_env(self):
         if self.dyad_init_env is None:
@@ -176,6 +179,8 @@ def consume(self, fname):
             raise RuntimeError("Cannot consume data with DYAD!")
 
     def finalize(self):
+        if not self.initialized:
+            return
         if self.dyad_finalize is None:
             warnings.warn(
                 "Trying to finalize DYAD when libdyad_core.so was not found",