Fixed an issue uncovered by the recent change to the DebugClientBase classes (only on Windows).

Fri, 16 Mar 2012 17:33:48 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Fri, 16 Mar 2012 17:33:48 +0100
changeset 1706
d0871e278075
parent 1705
b0fbc9300f2b
child 1708
4a3cd8372425

Fixed an issue uncovered by the recent change to the DebugClientBase classes (only on Windows).

DebugClients/Python/DebugClientBase.py file | annotate | diff | comparison | revisions
DebugClients/Python3/DebugClientBase.py file | annotate | diff | comparison | revisions
--- a/DebugClients/Python/DebugClientBase.py	Mon Mar 12 19:03:42 2012 +0100
+++ b/DebugClients/Python/DebugClientBase.py	Fri Mar 16 17:33:48 2012 +0100
@@ -207,7 +207,7 @@
         self.localsFilterObjects = []
 
         self.pendingResponse = DebugProtocol.ResponseOK
-        self.fncache = {}
+        self._fncache = {}
         self.dircache = []
         self.inRawMode = 0
         self.mainProcStr = None     # used for the passive mode
@@ -469,7 +469,7 @@
                 return
 
             if cmd == DebugProtocol.RequestLoad:
-                self.fncache = {}
+                self._fncache = {}
                 self.dircache = []
                 sys.argv = []
                 wd, fn, args, tracePython = arg.split('|')
@@ -1118,8 +1118,8 @@
             return fn
 
         # Check the cache.
-        if fn in self.fncache:
-            return self.fncache[fn]
+        if fn in self._fncache:
+            return self._fncache[fn]
 
         # Search sys.path.
         for p in sys.path:
@@ -1127,7 +1127,7 @@
             nafn = os.path.normcase(afn)
 
             if os.path.exists(nafn):
-                self.fncache[fn] = afn
+                self._fncache[fn] = afn
                 d = os.path.dirname(afn)
                 if (d not in sys.path) and (d not in self.dircache):
                     self.dircache.append(d)
@@ -1139,7 +1139,7 @@
             nafn = os.path.normcase(afn)
             
             if os.path.exists(nafn):
-                self.fncache[fn] = afn
+                self._fncache[fn] = afn
                 return afn
                 
         # Nothing found.
@@ -1736,7 +1736,7 @@
         self.__interact()
         
         # setup the debugger variables
-        self.fncache = {}
+        self._fncache = {}
         self.dircache = []
         self.mainFrame = None
         self.inRawMode = 0
@@ -1775,7 +1775,7 @@
         remoteAddress = self.__resolveHost(host)
         self.connectDebugger(port, remoteAddress, redirect)
         
-        self.fncache = {}
+        self._fncache = {}
         self.dircache = []
         sys.argv = progargs[:]
         sys.argv[0] = os.path.abspath(sys.argv[0])
--- a/DebugClients/Python3/DebugClientBase.py	Mon Mar 12 19:03:42 2012 +0100
+++ b/DebugClients/Python3/DebugClientBase.py	Fri Mar 16 17:33:48 2012 +0100
@@ -181,7 +181,7 @@
         self.localsFilterObjects = []
 
         self.pendingResponse = DebugProtocol.ResponseOK
-        self.fncache = {}
+        self._fncache = {}
         self.dircache = []
         self.inRawMode = False
         self.mainProcStr = None     # used for the passive mode
@@ -455,7 +455,7 @@
                 return
 
             if cmd == DebugProtocol.RequestLoad:
-                self.fncache = {}
+                self._fncache = {}
                 self.dircache = []
                 sys.argv = []
                 wd, fn, args, tracePython = arg.split('|')
@@ -1118,8 +1118,8 @@
             return fn
 
         # Check the cache.
-        if fn in self.fncache:
-            return self.fncache[fn]
+        if fn in self._fncache:
+            return self._fncache[fn]
 
         # Search sys.path.
         for p in sys.path:
@@ -1127,7 +1127,7 @@
             nafn = os.path.normcase(afn)
 
             if os.path.exists(nafn):
-                self.fncache[fn] = afn
+                self._fncache[fn] = afn
                 d = os.path.dirname(afn)
                 if (d not in sys.path) and (d not in self.dircache):
                     self.dircache.append(d)
@@ -1139,7 +1139,7 @@
             nafn = os.path.normcase(afn)
             
             if os.path.exists(nafn):
-                self.fncache[fn] = afn
+                self._fncache[fn] = afn
                 return afn
         
         # Nothing found.
@@ -1765,7 +1765,7 @@
         self.__interact()
         
         # setup the debugger variables
-        self.fncache = {}
+        self._fncache = {}
         self.dircache = []
         self.mainFrame = None
         self.inRawMode = False
@@ -1804,7 +1804,7 @@
         remoteAddress = self.__resolveHost(host)
         self.connectDebugger(port, remoteAddress, redirect)
         
-        self.fncache = {}
+        self._fncache = {}
         self.dircache = []
         sys.argv = progargs[:]
         sys.argv[0] = os.path.abspath(sys.argv[0])

eric ide

mercurial