Mercurial Repositories > eric / changeset

--- a/DebugClients/Python/DebugBase.py	Wed Apr 12 19:52:15 2017 +0200
+++ b/DebugClients/Python/DebugBase.py	Wed Apr 12 19:52:56 2017 +0200
@@ -578,22 +578,22 @@
         """
         # get module name from __file__
         fn = frame.f_globals.get('__file__')
-        if fn is not None:
-            try:
-                return self._fnCache[fn]
-            except KeyError:
-                absFilename = os.path.abspath(fn)
-                if absFilename.endswith(('.pyc', '.pyo')):
-                    fixedName = absFilename[:-1]
-                    if not os.path.exists(fixedName):
-                        fixedName = absFilename
-                else:
+        try:
+            return self._fnCache[fn]
+        except KeyError:
+            if fn is None:
+                return frame.f_code.co_filename
+            
+            absFilename = os.path.abspath(fn)
+            if absFilename.endswith(('.pyc', '.pyo')):
+                fixedName = absFilename[:-1]
+                if not os.path.exists(fixedName):
                     fixedName = absFilename
-                # update cache
-                self._fnCache[fn] = fixedName
-                return fixedName
-        else:
-            return frame.f_code.co_filename
+            else:
+                fixedName = absFilename
+            # update cache
+            self._fnCache[fn] = fixedName
+            return fixedName
 
     def __checkBreakInFrame(self, frame):
         """

--- a/eric6.py	Wed Apr 12 19:52:15 2017 +0200
+++ b/eric6.py	Wed Apr 12 19:52:56 2017 +0200
@@ -27,11 +27,9 @@
     import Globals.compatibility_fixes     # __IGNORE_WARNING__
     import StringIO as io   # __IGNORE_EXCEPTION__
     import locale
-    coverage = 'Python'
 except ImportError:
     import io       # __IGNORE_WARNING__
     basestring = str
-    coverage = 'Python3'
 
 try:
     import sip
@@ -97,7 +95,7 @@
 sys.path.insert(2, os.path.join(os.path.dirname(__file__),
                                 "ThirdParty", "Jasy"))
 sys.path.insert(2, os.path.join(os.path.dirname(__file__),
-                                "DebugClients", coverage))
+                                "DebugClients", "Python"))
 
 from E5Gui.E5Application import E5Application