src/eric7/Project/Project.py

branch
eric7
changeset 9210
15743bae8a50
parent 9209
b99e7fd55fd3
child 9214
bd28e56047d7
--- a/src/eric7/Project/Project.py	Thu Jul 07 11:23:56 2022 +0200
+++ b/src/eric7/Project/Project.py	Thu Jul 07 15:02:00 2022 +0200
@@ -3608,15 +3608,9 @@
         @return project relative path or unchanged path, if path doesn't
             belong to the project (string)
         """
-        if self.startswithProjectPath(path):
-            if self.ppath and path == self.ppath:
-                return ""
-            else:
-                relpath = path[len(self.ppath):]
-                if relpath.startswith(("/", "\\")):
-                    relpath = relpath[1:]
-                return relpath
-        else:
+        try:
+            return str(pathlib.Path(path).relative_to(self.ppath))
+        except ValueError:
             return path
         
     def getRelativeUniversalPath(self, path):
@@ -5097,7 +5091,7 @@
         from DataViews.CodeMetricsDialog import CodeMetricsDialog
         self.codemetrics = CodeMetricsDialog()
         self.codemetrics.show()
-        self.codemetrics.prepare(files, self)
+        self.codemetrics.prepare(files)
 
     def __showCodeCoverage(self):
         """

eric ide

mercurial