Mercurial Repositories > eric / file diff

--- a/eric7/PipInterface/PipPackagesWidget.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/PipInterface/PipPackagesWidget.py	Sat May 22 18:51:46 2021 +0200
@@ -19,9 +19,9 @@
     QMenu, QDialog
 )
 
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox
-from E5Gui.E5OverrideCursor import E5OverrideCursor
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox
+from E5Gui.EricOverrideCursor import EricOverrideCursor
 
 from .Ui_PipPackagesWidget import Ui_PipPackagesWidget
 
@@ -207,13 +207,13 @@
         }
         self.infoWidget.setHeaderLabels(["Key", "Value"])
         
-        venvManager = e5App().getObject("VirtualEnvManager")
+        venvManager = ericApp().getObject("VirtualEnvManager")
         venvManager.virtualEnvironmentAdded.connect(
             self.on_refreshButton_clicked)
         venvManager.virtualEnvironmentRemoved.connect(
             self.on_refreshButton_clicked)
         
-        project = e5App().getObject("Project")
+        project = ericApp().getObject("Project")
         project.projectOpened.connect(
             self.on_refreshButton_clicked)
         project.projectClosed.connect(
@@ -361,7 +361,7 @@
                 self.statusLabel.setText(
                     self.tr("Getting installed packages..."))
                 
-                with E5OverrideCursor():
+                with EricOverrideCursor():
                     # 1. populate with installed packages
                     self.packagesList.setUpdatesEnabled(False)
                     installedPackages = self.__pip.getInstalledPackages(
@@ -467,7 +467,7 @@
                 args.append("--files")
             args.append(itm.text(0))
             
-            with E5OverrideCursor():
+            with EricOverrideCursor():
                 success, output = self.__pip.runProcess(args, interpreter)
                 
                 if success and output:
@@ -568,7 +568,7 @@
         self.environmentsComboBox.clear()
         self.packagesList.clear()
         
-        with E5OverrideCursor():
+        with EricOverrideCursor():
             self.__populateEnvironments()
             
             index = self.environmentsComboBox.findText(
@@ -772,7 +772,7 @@
         searchTerm = urlQuery.queryItemValue("q")
         
         if reply.error() != QNetworkReply.NetworkError.NoError:
-            E5MessageBox.warning(
+            EricMessageBox.warning(
                 None,
                 self.tr("Search PyPI"),
                 self.tr(
@@ -794,7 +794,7 @@
                 msg = self.tr("Showing first 20 packages found.")
             self.searchInfoLabel.setText(msg)
         else:
-            E5MessageBox.warning(
+            EricMessageBox.warning(
                 self,
                 self.tr("Search PyPI"),
                 self.tr("""<p>There were no results for <b>{0}</b>.</p>"""))
@@ -929,7 +929,7 @@
             (defaults to False)
         @type bool (optional)
         """
-        with E5OverrideCursor():
+        with EricOverrideCursor():
             packageData = self.__pip.getPackageDetails(
                 packageName, packageVersion)
         
@@ -957,7 +957,7 @@
             )
             self.__packageDetailsDialog.show()
         else:
-            E5MessageBox.warning(
+            EricMessageBox.warning(
                 self,
                 self.tr("Search PyPI"),
                 self.tr("""<p>No package details info for <b>{0}</b>"""
@@ -1195,7 +1195,7 @@
             cfgFile = self.__pip.getUserConfig()
         cfgDir = os.path.dirname(cfgFile)
         if not cfgDir:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 None,
                 self.tr("Edit Configuration"),
                 self.tr("""No valid configuration path determined."""
@@ -1206,7 +1206,7 @@
             if not os.path.isdir(cfgDir):
                 os.makedirs(cfgDir)
         except OSError:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 None,
                 self.tr("Edit Configuration"),
                 self.tr("""No valid configuration path determined."""
@@ -1219,7 +1219,7 @@
         
         # check, if the destination is writeable
         if not os.access(cfgFile, os.W_OK):
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 None,
                 self.tr("Edit Configuration"),
                 self.tr("""No valid configuration path determined."""
@@ -1233,7 +1233,7 @@
         """
         Private slot to open the configuration page.
         """
-        e5App().getObject("UserInterface").showPreferences("pipPage")
+        ericApp().getObject("UserInterface").showPreferences("pipPage")
     
     @pyqtSlot()
     def __showCacheInfo(self):