small issues

Author: gijzelaerr

snap7/client.py

@@ -30,8 +30,10 @@ class Client(object):
     """
     A snap7 client
     """
+    pointer = None
+    library = None
+
     def __init__(self):
-        self.pointer = False
         self.library = load_library()
         self.create()
 
@@ -51,7 +53,8 @@ def destroy(self):
         destroy a client.
         """
         logger.info("destroying snap7 client")
-        return self.library.Cli_Destroy(byref(self.pointer))
+        if self.library:
+            return self.library.Cli_Destroy(byref(self.pointer))
 
     def plc_stop(self):
         """

snap7/partner.py

@@ -29,8 +29,10 @@ class Partner(object):
     """
     A snap7 partner.
     """
+    pointer = None
+    library = None
+
     def __init__(self, active=False):
-        self.pointer = None
         self.library = load_library()
         self.create(active)
 
@@ -102,7 +104,8 @@ def destroy(self):
         Before destruction the Partner is stopped, all clients disconnected and
         all shared memory blocks released.
         """
-        return self.library.Par_Destroy(ctypes.byref(self.pointer))
+        if self.library:
+            return self.library.Par_Destroy(ctypes.byref(self.pointer))
 
     def get_last_error(self):
         """

snap7/server.py

@@ -25,14 +25,15 @@ class Server(object):
     """
     A fake S7 server.
     """
+    pointer = None
+    callback = None
+    library = None
 
     def __init__(self, log=True):
         """
         Create a fake S7 server. set log to false if you want to disable
         event logging to python logging.
         """
-        self.pointer = None
-        self._callback = None
         self.library = load_library()
         self.create()
         if log:
@@ -170,7 +171,8 @@ def destroy(self):
         destroy the server.
         """
         logger.info("destroying server")
-        self.library.Srv_Destroy(ctypes.byref(self.pointer))
+        if self.library:
+            self.library.Srv_Destroy(ctypes.byref(self.pointer))
 
     def get_status(self):
         """Reads the server status, the Virtual CPU status and the number of