Merged with more changes from Tobias.

Sun, 16 Oct 2016 12:20:30 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 16 Oct 2016 12:20:30 +0200
changeset 5243
f6346f4b46c2
parent 5241
883e7084818d (current diff)
parent 5242
26630d91f4cf (diff)
child 5244
54a0f215a6f0

Merged with more changes from Tobias.

--- a/DebugClients/Python/DebugClientBase.py	Sun Oct 16 12:18:42 2016 +0200
+++ b/DebugClients/Python/DebugClientBase.py	Sun Oct 16 12:20:30 2016 +0200
@@ -1261,6 +1261,9 @@
         @return the converted filename (string)
         """
         if os.path.isabs(fn):
+            if sys.version_info[0] == 2:
+                fn = fn.decode(sys.getfilesystemencoding())
+            
             return fn
 
         # Check the cache.
@@ -1273,6 +1276,9 @@
             nafn = os.path.normcase(afn)
 
             if os.path.exists(nafn):
+                if sys.version_info[0] == 2:
+                    afn = afn.decode(sys.getfilesystemencoding())
+                
                 self._fncache[fn] = afn
                 d = os.path.dirname(afn)
                 if (d not in sys.path) and (d not in self.dircache):

eric ide

mercurial