Mercurial Repositories > eric / file diff

--- a/eric7/PipInterface/Pip.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/PipInterface/Pip.py	Sat May 22 18:51:46 2021 +0200
@@ -18,8 +18,8 @@
     QNetworkAccessManager, QNetworkRequest, QNetworkReply
 )
 
-from E5Gui import E5MessageBox
-from E5Gui.E5Application import e5App
+from E5Gui import EricMessageBox
+from E5Gui.EricApplication import ericApp
 
 from EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
 try:
@@ -155,7 +155,7 @@
         
         pip = "pip.ini" if Globals.isWindowsPlatform() else "pip.conf"
         
-        venvManager = e5App().getObject("VirtualEnvManager")
+        venvManager = ericApp().getObject("VirtualEnvManager")
         venvDirectory = (
             os.path.dirname(self.getUserConfig())
             if venvManager.isGlobalEnvironment(venvName) else
@@ -173,7 +173,7 @@
         @return string for the project environment
         @rtype str
         """
-        if e5App().getObject("Project").isOpen():
+        if ericApp().getObject("Project").isOpen():
             return self.tr("<project>")
         else:
             return ""
@@ -189,7 +189,7 @@
         """
         if venvName == self.getProjectEnvironmentString():
             venvName = (
-                e5App().getObject("Project")
+                ericApp().getObject("Project")
                 .getDebugProperty("VIRTUALENV")
             )
             if not venvName:
@@ -197,11 +197,11 @@
                 return sys.executable
         
         interpreter = (
-            e5App().getObject("VirtualEnvManager")
+            ericApp().getObject("VirtualEnvManager")
             .getVirtualenvInterpreter(venvName)
         )
         if not interpreter:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 None,
                 self.tr("Interpreter for Virtual Environment"),
                 self.tr("""No interpreter configured for the selected"""
@@ -222,7 +222,7 @@
         @rtype list of str
         """
         return sorted(
-            e5App().getObject("VirtualEnvManager").getVirtualenvNames(
+            ericApp().getObject("VirtualEnvManager").getVirtualenvNames(
                 noRemote=noRemote, noConda=noConda))
     
     def installPip(self, venvName, userSite=False):
@@ -300,14 +300,14 @@
                                          "qscintilla", "sip"]]
         
         abort = (
-            not E5MessageBox.yesNo(
+            not EricMessageBox.yesNo(
                 None,
                 self.tr("Upgrade Packages"),
                 self.tr(
                     """You are trying to upgrade PyQt packages. This might"""
                     """ not work for the current instance of Python ({0})."""
                     """ Do you want to continue?""").format(sys.executable),
-                icon=E5MessageBox.Critical)
+                icon=EricMessageBox.Critical)
             if bool(pyqtPackages) else
             False
         )
@@ -773,7 +773,7 @@
         if venvName:
             interpreter = self.getVirtualenvInterpreter(venvName)
             if interpreter:
-                ok = E5MessageBox.yesNo(
+                ok = EricMessageBox.yesNo(
                     None,
                     self.tr("Purge Cache"),
                     self.tr("Do you really want to purge the pip cache? All"