Merge pull request #144 from Senzing/issue-134.ant.1

Issue 134 - init functions

Author: antaenc

src/senzing/G2Config.py

@@ -144,9 +144,7 @@ def init(self, module_name_, ini_params_, debug_=False, *args, **kwargs):
         if self._debug:
             print("Initialization Status: " + str(ret_code))
 
-        if ret_code == -1:
-            raise G2ModuleNotInitialized('G2Config has not been successfully initialized')
-        elif ret_code < 0:
+        if ret_code < 0:
             self._lib_handle.G2Config_getLastException(tls_var.buf, sizeof(tls_var.buf))
             raise TranslateG2ModuleException(tls_var.buf.value)
 

src/senzing/G2ConfigMgr.py

@@ -169,9 +169,7 @@ def init(self, module_name_, ini_params_, debug_=False, *args, **kwargs):
         if self._debug:
             print("Initialization Status: " + str(ret_code))
 
-        if ret_code == -1:
-            raise G2ModuleNotInitialized('G2ConfigMgr has not been successfully initialized')
-        elif ret_code < 0:
+        if ret_code < 0:
             self._lib_handle.G2ConfigMgr_getLastException(tls_var.buf, sizeof(tls_var.buf))
             raise TranslateG2ModuleException(tls_var.buf.value)
 

src/senzing/G2Diagnostic.py

@@ -170,9 +170,7 @@ def init(self, module_name_, ini_params_, debug_=False, *args, **kwargs):
         if self._debug:
             print("Initialization Status: " + str(ret_code))
 
-        if ret_code == -1:
-            raise G2ModuleNotInitialized('G2Diagnostic has not been successfully initialized')
-        elif ret_code < 0:
+        if ret_code < 0:
             self._lib_handle.G2Diagnostic_getLastException(tls_var.buf, sizeof(tls_var.buf))
             raise TranslateG2ModuleException(tls_var.buf.value)
 
@@ -195,9 +193,7 @@ def initWithConfigID(self, engine_name_, ini_params_, initConfigID_, debug_, *ar
         if self._debug:
             print("Initialization Status: " + str(ret_code))
 
-        if ret_code == -1:
-            raise G2ModuleNotInitialized('G2Diagnostic has not been successfully initialized')
-        elif ret_code < 0:
+        if ret_code < 0:
             self._lib_handle.G2Diagnostic_getLastException(tls_var.buf, sizeof(tls_var.buf))
             raise TranslateG2ModuleException(tls_var.buf.value)
 
@@ -212,9 +208,7 @@ def reinit(self, initConfigID, *args, **kwargs):
         self._lib_handle.G2Diagnostic_reinit.argtypes = [c_longlong]
         ret_code = self._lib_handle.G2Diagnostic_reinit(configIDValue)
 
-        if ret_code == -1:
-            raise G2ModuleNotInitialized('G2Diagnostic has not been successfully initialized')
-        elif ret_code < 0:
+        if ret_code < 0:
             self._lib_handle.G2Diagnostic_getLastException(tls_var.buf, sizeof(tls_var.buf))
             raise TranslateG2ModuleException(tls_var.buf.value)
 

src/senzing/G2Engine.py

@@ -206,9 +206,7 @@ def init(self, engine_name_, ini_params_, debug_=False, *args, **kwargs):
         if self._debug:
             print("Initialization Status: " + str(ret_code))
 
-        if ret_code == -1:
-            raise G2ModuleNotInitialized('G2Engine has not been successfully initialized')
-        elif ret_code < 0:
+        if ret_code < 0:
             self._lib_handle.G2_getLastException(tls_var.buf, sizeof(tls_var.buf))
             raise TranslateG2ModuleException(tls_var.buf.value)
 
@@ -232,9 +230,7 @@ def initWithConfigID(self, engine_name_, ini_params_, initConfigID_, debug_, *ar
         if self._debug:
             print("Initialization Status: " + str(ret_code))
 
-        if ret_code == -1:
-            raise G2ModuleNotInitialized('G2Engine has not been successfully initialized')
-        elif ret_code < 0:
+        if ret_code < 0:
             self._lib_handle.G2_getLastException(tls_var.buf, sizeof(tls_var.buf))
             raise TranslateG2ModuleException(tls_var.buf.value)
 
@@ -249,9 +245,7 @@ def reinit(self, initConfigID_, *args, **kwargs):
         self._lib_handle.G2_reinit.argtypes = [c_longlong]
         ret_code = self._lib_handle.G2_reinit(configIDValue)
 
-        if ret_code == -1:
-            raise G2ModuleNotInitialized('G2Engine has not been successfully initialized')
-        elif ret_code < 0:
+        if ret_code < 0:
             self._lib_handle.G2_getLastException(tls_var.buf, sizeof(tls_var.buf))
             raise TranslateG2ModuleException(tls_var.buf.value)
 

src/senzing/G2Hasher.py

@@ -140,9 +140,7 @@ def init(self, hasher_name_, ini_params_, debug_=False, *args, **kwargs):
         if self._debug:
             print("Initialization Status: " + str(ret_code))
 
-        if ret_code == -1:
-            raise G2ModuleNotInitialized('G2Hasher has not been successfully initialized')
-        elif ret_code < 0:
+        if ret_code < 0:
             self._lib_handle.G2Hasher_getLastException(tls_var.buf, sizeof(tls_var.buf))
             raise TranslateG2ModuleException(tls_var.buf.value)
 
@@ -169,9 +167,7 @@ def initWithConfig(self, hasher_name_, ini_params_, config_, debug_, *args, **kw
         if self._debug:
             print("Initialization Status: " + str(ret_code))
 
-        if ret_code == -1:
-            raise G2ModuleNotInitialized('G2Hasher has not been successfully initialized')
-        elif ret_code < 0:
+        if ret_code < 0:
             self._lib_handle.G2Hasher_getLastException(tls_var.buf, sizeof(tls_var.buf))
             raise TranslateG2ModuleException(tls_var.buf.value)
 

src/senzing/G2Product.py

@@ -144,9 +144,7 @@ def init(self, module_name_, ini_params_, debug_=False, *args, **kwargs):
         if self._debug:
             print("Initialization Status: " + str(ret_code))
 
-        if ret_code == -1:
-            raise G2ModuleNotInitialized('G2Product has not been successfully initialized')
-        elif ret_code < 0:
+        if ret_code < 0:
             self._lib_handle.G2Product_getLastException(tls_var.buf, sizeof(tls_var.buf))
             raise TranslateG2ModuleException(tls_var.buf.value)