diff -r f00d825fbdb3 -r d595f6f9cbf8 eric6/PluginManager/PluginRepositoryDialog.py
--- a/eric6/PluginManager/PluginRepositoryDialog.py Sat Sep 21 17:41:22 2019 +0200
+++ b/eric6/PluginManager/PluginRepositoryDialog.py Sat Sep 21 18:30:02 2019 +0200
@@ -15,12 +15,18 @@
import glob
import re
-from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QFile, QIODevice, QUrl, \
- QProcess, QPoint, QCoreApplication
-from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QAbstractButton, \
- QTreeWidgetItem, QDialog, QVBoxLayout, QMenu
-from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, \
- QNetworkReply, QNetworkConfigurationManager
+from PyQt5.QtCore import (
+ pyqtSignal, pyqtSlot, Qt, QFile, QIODevice, QUrl, QProcess, QPoint,
+ QCoreApplication
+)
+from PyQt5.QtWidgets import (
+ QWidget, QDialogButtonBox, QAbstractButton, QTreeWidgetItem, QDialog,
+ QVBoxLayout, QMenu
+)
+from PyQt5.QtNetwork import (
+ QNetworkAccessManager, QNetworkRequest, QNetworkReply,
+ QNetworkConfigurationManager
+)
from .Ui_PluginRepositoryDialog import Ui_PluginRepositoryDialog
@@ -97,9 +103,8 @@
self.__downloadCancelButton = self.buttonBox.addButton(
self.tr("Cancel"), QDialogButtonBox.ActionRole)
self.__downloadCancelButton.setEnabled(False)
- self.__installButton = \
- self.buttonBox.addButton(self.tr("Close && Install"),
- QDialogButtonBox.ActionRole)
+ self.__installButton = self.buttonBox.addButton(
+ self.tr("Close && Install"), QDialogButtonBox.ActionRole)
self.__installButton.setEnabled(False)
self.__closeButton = self.buttonBox.button(QDialogButtonBox.Close)
self.__closeButton.setEnabled(True)
@@ -123,8 +128,8 @@
self.__pluginContextMenu.addAction(
self.tr("Cleanup Downloads"), self.__cleanupDownloads)
- self.pluginRepositoryFile = \
- os.path.join(Utilities.getConfigDir(), "PluginRepository")
+ self.pluginRepositoryFile = os.path.join(Utilities.getConfigDir(),
+ "PluginRepository")
# attributes for the network objects
self.__networkManager = QNetworkAccessManager(self)
@@ -136,8 +141,9 @@
self.__replies = []
if Preferences.getUI("DynamicOnlineCheck"):
- self.__networkConfigurationManager = \
+ self.__networkConfigurationManager = (
QNetworkConfigurationManager(self)
+ )
self.__onlineStateChanged(
self.__networkConfigurationManager.isOnline())
self.__networkConfigurationManager.onlineStateChanged.connect(
@@ -614,30 +620,26 @@
if status == "stable":
if self.__stableItem is None:
- self.__stableItem = \
- QTreeWidgetItem(self.repositoryList,
- [self.tr("Stable")])
+ self.__stableItem = QTreeWidgetItem(
+ self.repositoryList, [self.tr("Stable")])
self.__stableItem.setExpanded(True)
parent = self.__stableItem
elif status == "unstable":
if self.__unstableItem is None:
- self.__unstableItem = \
- QTreeWidgetItem(self.repositoryList,
- [self.tr("Unstable")])
+ self.__unstableItem = QTreeWidgetItem(
+ self.repositoryList, [self.tr("Unstable")])
self.__unstableItem.setExpanded(True)
parent = self.__unstableItem
elif status == "obsolete":
if self.__obsoleteItem is None:
- self.__obsoleteItem = \
- QTreeWidgetItem(self.repositoryList,
- [self.tr("Obsolete")])
+ self.__obsoleteItem = QTreeWidgetItem(
+ self.repositoryList, [self.tr("Obsolete")])
self.__obsoleteItem.setExpanded(True)
parent = self.__obsoleteItem
else:
if self.__unknownItem is None:
- self.__unknownItem = \
- QTreeWidgetItem(self.repositoryList,
- [self.tr("Unknown")])
+ self.__unknownItem = QTreeWidgetItem(
+ self.repositoryList, [self.tr("Unknown")])
self.__unknownItem.setExpanded(True)
parent = self.__unknownItem
itm = QTreeWidgetItem(parent, [name, version, short])
@@ -687,8 +689,10 @@
# Check against installed/loaded plug-ins
pluginName = filename.rsplit('-', 1)[0]
pluginDetails = self.__pluginManager.getPluginDetails(pluginName)
- if pluginDetails is None or \
- pluginDetails["moduleName"] != pluginName:
+ if (
+ pluginDetails is None or
+ pluginDetails["moduleName"] != pluginName
+ ):
return PluginRepositoryWidget.PluginStatusNew
if pluginDetails["error"]:
return PluginRepositoryWidget.PluginStatusError
@@ -721,8 +725,10 @@
pluginDetails = self.__pluginManager.getPluginDetails(pluginName)
if pluginDetails is None:
return PluginRepositoryWidget.PluginStatusLocalUpdate
- if Globals.versionToTuple(pluginDetails["version"])[:3] < \
- Globals.versionToTuple(version)[:3]:
+ if (
+ Globals.versionToTuple(pluginDetails["version"])[:3] <
+ Globals.versionToTuple(version)[:3]
+ ):
return PluginRepositoryWidget.PluginStatusLocalUpdate
else:
return PluginRepositoryWidget.PluginStatusUpToDate
@@ -905,8 +911,10 @@
args.append(applPath)
args += self.cw.getDownloadedPlugins()
- if not os.path.isfile(applPath) or \
- not proc.startDetached(sys.executable, args):
+ if (
+ not os.path.isfile(applPath) or
+ not proc.startDetached(sys.executable, args)
+ ):
E5MessageBox.critical(
self,
self.tr('Process Generation Error'),
@@ -955,8 +963,9 @@
continue
try:
- pluginName, pluginVersion = \
+ pluginName, pluginVersion = (
pluginFile.replace(".zip", "").rsplit("-", 1)
+ )
pluginVersionList = re.split("[._-]", pluginVersion)
for index in range(len(pluginVersionList)):
try:
@@ -980,8 +989,10 @@
for pluginName in downloads:
downloads[pluginName].sort(key=lambda x: x[1])
- if pluginName in hiddenPlugins and \
- not Preferences.getPluginManager("KeepHidden"):
+ if (
+ pluginName in hiddenPlugins and
+ not Preferences.getPluginManager("KeepHidden")
+ ):
removeFiles = [f[0] for f in downloads[pluginName]]
else:
removeFiles = [f[0] for f in downloads[pluginName][
