eric: comparison eric6/PluginManager/PluginInstallDialog.py

-:f00d825fbdb3
+:d595f6f9cbf8
 import urllib.parse as parse
 except (ImportError):
 import urlparse as parse    # __IGNORE_WARNING__
 from PyQt5.QtCore import pyqtSlot, Qt, QDir, QFileInfo
-from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QAbstractButton, \
+from PyQt5.QtWidgets import (
-QApplication, QDialog, QVBoxLayout
+QWidget, QDialogButtonBox, QAbstractButton, QApplication, QDialog,
+QVBoxLayout
+)
 from E5Gui import E5FileDialog
 from E5Gui.E5MainWindow import E5MainWindow
 from .Ui_PluginInstallDialog import Ui_PluginInstallDialog
 self.__finishButton.setEnabled(True)
 self.__closeButton.hide()
 self.__cancelButton.show()
 msg = self.tr(
-"Plugin ZIP-Archives:\n{0}\n\nDestination:\n{1} ({2})")\
+"Plugin ZIP-Archives:\n{0}\n\nDestination:\n{1} ({2})"
-.format("\n".join(self.__createArchivesList()),
+).format(
-self.destinationCombo.currentText(),
+"\n".join(self.__createArchivesList()),
-self.destinationCombo.itemData(
+self.destinationCombo.currentText(),
-self.destinationCombo.currentIndex())
+self.destinationCombo.itemData(
-)
+self.destinationCombo.currentIndex()
+)
+)
 self.summaryEdit.setPlainText(msg)
 @pyqtSlot()
 def on_addArchivesButton_clicked(self):
 """
 if url[0].lower() == 'file':
 archive = url[2]
 # check, if the archive exists
 if not os.path.exists(archive):
-return False, \
+return (
+False,
 self.tr(
 """<p>The archive file <b>{0}</b> does not exist. """
-"""Aborting...</p>""").format(archive), \
+"""Aborting...</p>""").format(archive),
 False
+)
 # check, if the archive is a valid zip file
 if not zipfile.is_zipfile(archive):
-return False, \
+return (
+False,
 self.tr(
 """<p>The file <b>{0}</b> is not a valid plugin """
-"""ZIP-archive. Aborting...</p>""").format(archive), \
+"""ZIP-archive. Aborting...</p>""").format(archive),
 False
+)
 # check, if the destination is writeable
 if not os.access(destination, os.W_OK):
-return False, \
+return (
+False,
 self.tr(
 """<p>The destination directory <b>{0}</b> is not """
-"""writeable. Aborting...</p>""").format(destination), \
+"""writeable. Aborting...</p>""").format(destination),
 False
+)
 zipFile = zipfile.ZipFile(archive, "r")
 # check, if the archive contains a valid plugin
 pluginFound = False
 pluginFound = True
 pluginFileName = name
 break
 if not pluginFound:
-return False, \
+return (
+False,
 self.tr(
 """<p>The file <b>{0}</b> is not a valid plugin """
-"""ZIP-archive. Aborting...</p>""").format(archive), \
+"""ZIP-archive. Aborting...</p>""").format(archive),
 False
+)
 # parse the plugin module's plugin header
 pluginSource = Utilities.decode(zipFile.read(pluginFileName))[0]
 packageName = ""
 internalPackages = []
 pyqtApi = 0
 doCompile = True
 for line in pluginSource.splitlines():
 if line.startswith("packageName"):
 tokens = line.split("=")
-if tokens[0].strip() == "packageName" and \
+if (
-tokens[1].strip()[1:-1] != "__core__":
+tokens[0].strip() == "packageName" and
+tokens[1].strip()[1:-1] != "__core__"
+):
 if tokens[1].strip()[0] in ['"', "'"]:
 packageName = tokens[1].strip()[1:-1]
 else:
 if tokens[1].strip() == "None":
 packageName = "None"
 doCompile = False
 elif line.startswith("# End-Of-Header"):
 break
 if not packageName:
-return False, \
+return (
+False,
 self.tr(
 """<p>The plugin module <b>{0}</b> does not contain """
-"""a 'packageName' attribute. Aborting...</p>""")\
+"""a 'packageName' attribute. Aborting...</p>"""
-.format(pluginFileName), \
+).format(pluginFileName),
 False
+)
 if pyqtApi < 2:
-return False, \
+return (
+False,
 self.tr(
 """<p>The plugin module <b>{0}</b> does not conform"""
-""" with the PyQt v2 API. Aborting...</p>""")\
+""" with the PyQt v2 API. Aborting...</p>"""
-.format(pluginFileName), \
+).format(pluginFileName),
 False
+)
 # check, if it is a plugin, that collides with others
-if not os.path.exists(os.path.join(destination, pluginFileName)) and \
+if (
-packageName != "None" and \
+not os.path.exists(os.path.join(destination, pluginFileName)) and
-os.path.exists(os.path.join(destination, packageName)):
+packageName != "None" and
-return False, \
+os.path.exists(os.path.join(destination, packageName))
+):
+return (
+False,
 self.tr("""<p>The plugin package <b>{0}</b> exists. """
-"""Aborting...</p>""")\
+"""Aborting...</p>""").format(
-.format(os.path.join(destination, packageName)), \
+os.path.join(destination, packageName)),
 False
+)
-if os.path.exists(os.path.join(destination, pluginFileName)) and \
-packageName != "None" and \
+if (
-not os.path.exists(os.path.join(destination, packageName)):
+os.path.exists(os.path.join(destination, pluginFileName)) and
-return False, \
+packageName != "None" and
+not os.path.exists(os.path.join(destination, packageName))
+):
+return (
+False,
 self.tr("""<p>The plugin module <b>{0}</b> exists. """
-"""Aborting...</p>""")\
+"""Aborting...</p>""").format(
-.format(os.path.join(destination, pluginFileName)), \
+os.path.join(destination, pluginFileName)),
 False
+)
 activatePlugin = False
 if not self.__external:
-activatePlugin = \
+activatePlugin = (
 not self.__pluginManager.isPluginLoaded(
-installedPluginName) or \
+installedPluginName) or
 (self.__pluginManager.isPluginLoaded(installedPluginName) and
 self.__pluginManager.isPluginActive(installedPluginName))
+)
 # try to unload a plugin with the same name
 self.__pluginManager.unloadPlugin(installedPluginName)
 # uninstall existing plug-in first to get clean conditions
-if packageName != "None" and \
+if (
+packageName != "None" and
 not os.path.exists(
-os.path.join(destination, packageName, "__init__.py")):
+os.path.join(destination, packageName, "__init__.py"))
+):
 # package directory contains just data, don't delete it
 self.__uninstallPackage(destination, pluginFileName, "")
 else:
 self.__uninstallPackage(destination, pluginFileName, packageName)
 QApplication.processEvents()
 for name in namelist:
 self.progress.setValue(prog)
 QApplication.processEvents()
 prog += 1
-if name == pluginFileName or \
+if (
-name.startswith("{0}/".format(packageName)) or \
+name == pluginFileName or
-name.startswith("{0}\\".format(packageName)):
+name.startswith("{0}/".format(packageName)) or
+name.startswith("{0}\\".format(packageName))
+):
 outname = name.replace("/", os.sep)
 outname = os.path.join(destination, outname)
 if outname.endswith("/") or outname.endswith("\\"):
 # it is a directory entry
 outname = outname[:-1]
 f.write(pluginSource)
 f.close()
 self.__installedFiles.append(outname)
 except os.error as why:
 self.__rollback()
-return False, \
+return (
-self.tr(
+False,
-"Error installing plugin. Reason: {0}").format(str(why)), \
+self.tr(
-False
+"Error installing plugin. Reason: {0}").format(str(why)),
+False
+)
 except IOError as why:
 self.__rollback()
-return False, \
+return (
-self.tr(
+False,
-"Error installing plugin. Reason: {0}").format(str(why)), \
+self.tr(
-False
+"Error installing plugin. Reason: {0}").format(str(why)),
+False
+)
 except OSError as why:
 self.__rollback()
-return False, \
+return (
-self.tr(
+False,
-"Error installing plugin. Reason: {0}").format(str(why)), \
+self.tr(
-False
+"Error installing plugin. Reason: {0}").format(str(why)),
+False
+)
 except Exception:
 sys.stderr.write("Unspecific exception installing plugin.\n")
 self.__rollback()
-return False, \
+return (
-self.tr("Unspecific exception installing plugin."), \
+False,
-False
+self.tr("Unspecific exception installing plugin."),
+False
+)
 # now compile the plugins
 if doCompile:
 dirName = os.path.join(destination, packageName)
 files = os.path.join(destination, pluginFileName)

Mercurial Repositories > eric / file comparison

comparison: eric6/PluginManager/PluginInstallDialog.py

eric6/PluginManager/PluginInstallDialog.py