Mercurial Repositories > eric / file diff

--- a/src/eric7/VirtualEnv/VirtualenvManager.py	Sun Nov 06 11:22:39 2022 +0100
+++ b/src/eric7/VirtualEnv/VirtualenvManager.py	Mon Nov 07 17:19:58 2022 +0100
@@ -19,6 +19,7 @@
 from eric7 import Globals, Preferences
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
+from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
 
 
 class VirtualenvManager(QObject):
@@ -196,6 +197,7 @@
         @type str
         """
         from .VirtualenvConfigurationDialog import VirtualenvConfigurationDialog
+        from .VirtualenvExecDialog import VirtualenvExecDialog
 
         if not baseDir:
             baseDir = self.__virtualEnvironmentsBaseDir
@@ -219,8 +221,6 @@
                     )
             else:
                 # now do the call
-                from .VirtualenvExecDialog import VirtualenvExecDialog
-
                 dia = VirtualenvExecDialog(resultDict, self)
                 dia.show()
                 dia.start(resultDict["arguments"])
@@ -237,6 +237,7 @@
         from .VirtualenvUpgradeConfigurationDialog import (
             VirtualenvUpgradeConfigurationDialog,
         )
+        from .VirtualenvUpgradeExecDialog import VirtualenvUpgradeExecDialog
 
         venvDirectory = self.getVirtualenvDirectory(venvName)
         if not os.path.exists(os.path.join(venvDirectory, "pyvenv.cfg")):
@@ -247,8 +248,6 @@
         if dlg.exec() == QDialog.DialogCode.Accepted:
             pythonExe, args, createLog = dlg.getData()
 
-            from .VirtualenvUpgradeExecDialog import VirtualenvUpgradeExecDialog
-
             dia = VirtualenvUpgradeExecDialog(venvName, pythonExe, createLog, self)
             dia.show()
             dia.start(args)
@@ -286,6 +285,11 @@
         @param description descriptive text for the environment
         @type str
         """
+        from .VirtualenvInterpreterSelectionDialog import (
+            VirtualenvInterpreterSelectionDialog,
+        )
+        from .VirtualenvNameDialog import VirtualenvNameDialog
+
         if venvName in self.__virtualEnvironments:
             ok = EricMessageBox.yesNo(
                 None,
@@ -297,8 +301,6 @@
                 icon=EricMessageBox.Warning,
             )
             if not ok:
-                from .VirtualenvNameDialog import VirtualenvNameDialog
-
                 dlg = VirtualenvNameDialog(
                     list(self.__virtualEnvironments.keys()), venvName
                 )
@@ -308,10 +310,6 @@
                 venvName = dlg.getName()
 
         if not venvInterpreter:
-            from .VirtualenvInterpreterSelectionDialog import (
-                VirtualenvInterpreterSelectionDialog,
-            )
-
             dlg = VirtualenvInterpreterSelectionDialog(venvName, venvDirectory)
             if dlg.exec() == QDialog.DialogCode.Accepted:
                 venvInterpreter = dlg.getData()
@@ -471,10 +469,6 @@
                     )
                 )
         if venvMessages:
-            from eric7.UI.DeleteFilesConfirmationDialog import (
-                DeleteFilesConfirmationDialog,
-            )
-
             dlg = DeleteFilesConfirmationDialog(
                 None,
                 self.tr("Delete Virtual Environments"),
@@ -540,10 +534,6 @@
                     )
                 )
         if venvMessages:
-            from eric7.UI.DeleteFilesConfirmationDialog import (
-                DeleteFilesConfirmationDialog,
-            )
-
             dlg = DeleteFilesConfirmationDialog(
                 None,
                 self.tr("Remove Virtual Environments"),
@@ -582,9 +572,9 @@
         @param modal flag indicating that the dialog should be shown in
             a blocking mode
         """
+        from .VirtualenvManagerWidgets import VirtualenvManagerDialog
+
         if modal:
-            from .VirtualenvManagerWidgets import VirtualenvManagerDialog
-
             virtualenvManagerDialog = VirtualenvManagerDialog(self, self.__ui)
             virtualenvManagerDialog.exec()
             self.virtualEnvironmentsListChanged.emit()