# HG changeset patch
# User etisserant
# Date 1230673635 -3600
# Node ID 3fecc96090c8dffe82fdf15bd11ba53248683dae
# Parent  d0e6fc0701fb07f5e5ad8d9af0f1c510a1b06293
Fixed problem with re-use of Pyro connector proxy copy across debug sessions

diff -r d0e6fc0701fb -r 3fecc96090c8 connectors/PYRO/__init__.py
--- a/connectors/PYRO/__init__.py	Tue Dec 30 22:43:48 2008 +0100
+++ b/connectors/PYRO/__init__.py	Tue Dec 30 22:47:15 2008 +0100
@@ -61,14 +61,16 @@
         pluginsroot.logger.write_error("Cannot get PLC status - connection failed.\n")
         return None
 
-    # for safe use in from debug thread, must create a copy
-    RemotePLCObjectProxyCopy = copy.copy(RemotePLCObjectProxy)
-        
+
     class PyroProxyProxy:
         """
         A proxy proxy class to handle Beremiz Pyro interface specific behavior.
         And to put pyro exception catcher in between caller and pyro proxy
         """
+        def __init__(self):
+            # for safe use in from debug thread, must create a copy
+            self.RemotePLCObjectProxyCopy = None
+
         def GetPyroProxy(self):
             """
             This func returns the real Pyro Proxy.
@@ -94,6 +96,7 @@
                 # let remote PLC time to resurect.(freeze app)
                 sleep(0.5)
                 pluginsroot._Connect()
+            self.RemotePLCObjectProxyCopy = copy.copy(pluginsroot._connector.GetPyroProxy())
             return pluginsroot._connector.GetPyroProxy().StartPLC(*args, **kwargs)
         StartPLC = PyroCatcher(_PyroStartPLC, False)
 
@@ -102,11 +105,11 @@
             """
             for safe use in from debug thread, must use the copy
             """
-            if RemotePLCObjectProxyCopy.GetPLCstatus() == "Started":
-                return RemotePLCObjectProxyCopy.GetTraceVariables()
+            if self.RemotePLCObjectProxyCopy is not None and self.RemotePLCObjectProxyCopy.GetPLCstatus() == "Started":
+                return self.RemotePLCObjectProxyCopy.GetTraceVariables()
             else:
                 return None,None
-        GetTraceVariables = PyroCatcher(_PyroGetTraceVariables)
+        GetTraceVariables = PyroCatcher(_PyroGetTraceVariables,(None,None))
 
         
         def __getattr__(self, attrName):