Mercurial Repositories > eric / file diff

--- a/src/eric7/Project/ProjectSourcesBrowser.py	Fri Mar 08 15:51:14 2024 +0100
+++ b/src/eric7/Project/ProjectSourcesBrowser.py	Fri Mar 08 16:08:43 2024 +0100
@@ -1127,8 +1127,8 @@
         from .NewPythonPackageDialog import NewPythonPackageDialog
 
         isRemote = FileSystemUtilities.isRemoteFileName(self.project.getProjectPath())
-        remotefsInterface = ericApp().getObject("EricServer").getServiceInterface(
-            "FileSystem"
+        remotefsInterface = (
+            ericApp().getObject("EricServer").getServiceInterface("FileSystem")
         )
         separator = remotefsInterface.separator() if isRemote else os.sep
 
@@ -1206,8 +1206,8 @@
         Private method to add a new source file to the project.
         """
         isRemote = FileSystemUtilities.isRemoteFileName(self.project.getProjectPath())
-        remotefsInterface = ericApp().getObject("EricServer").getServiceInterface(
-            "FileSystem"
+        remotefsInterface = (
+            ericApp().getObject("EricServer").getServiceInterface("FileSystem")
         )
 
         dn = self.currentDirectory()
@@ -1455,8 +1455,8 @@
         Private method to handle the imports diagram context menu action.
         """
         isRemote = FileSystemUtilities.isRemoteFileName(self.project.getProjectPath())
-        remotefsInterface = ericApp().getObject("EricServer").getServiceInterface(
-            "FileSystem"
+        remotefsInterface = (
+            ericApp().getObject("EricServer").getServiceInterface("FileSystem")
         )
 
         itm = self.model().item(self.currentIndex())
@@ -1464,12 +1464,15 @@
             fn = itm.fileName()
         except AttributeError:
             fn = itm.dirName()
-        if isRemote:
-            package = (
-                fn if remotefsInterface.isdir(fn) else remotefsInterface.dirname(fn)
+        package = (
+            fn
+            if remotefsInterface.isdir(fn)
+            else (
+                remotefsInterface.dirname(fn)
+                if isRemote
+                else fn if os.path.isdir(fn) else os.path.dirname(fn)
             )
-        else:
-            package = fn if os.path.isdir(fn) else os.path.dirname(fn)
+        )
         res = EricMessageBox.yesNo(
             self,
             self.tr("Imports Diagram"),
@@ -1490,8 +1493,8 @@
         Private method to handle the package diagram context menu action.
         """
         isRemote = FileSystemUtilities.isRemoteFileName(self.project.getProjectPath())
-        remotefsInterface = ericApp().getObject("EricServer").getServiceInterface(
-            "FileSystem"
+        remotefsInterface = (
+            ericApp().getObject("EricServer").getServiceInterface("FileSystem")
         )
 
         itm = self.model().item(self.currentIndex())
@@ -1499,12 +1502,15 @@
             fn = itm.fileName()
         except AttributeError:
             fn = itm.dirName()
-        if isRemote:
-            package = (
-                fn if remotefsInterface.isdir(fn) else remotefsInterface.dirname(fn)
+        package = (
+            fn
+            if remotefsInterface.isdir(fn)
+            else (
+                remotefsInterface.dirname(fn)
+                if isRemote
+                else fn if os.path.isdir(fn) else os.path.dirname(fn)
             )
-        else:
-            package = fn if os.path.isdir(fn) else os.path.dirname(fn)
+        )
         res = EricMessageBox.yesNo(
             self,
             self.tr("Package Diagram"),