Thu, 10 Oct 2013 19:03:45 +0200
Continued to shorten the code lines to max. 79 characters.
--- a/Plugins/AboutPlugin/AboutDialog.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/AboutPlugin/AboutDialog.py Thu Oct 10 19:03:45 2013 +0200 @@ -21,8 +21,8 @@ aboutText = QApplication.translate("AboutDialog", """<p>{0} is an Integrated Development Environment for the Python""" - """ programming language. It is written using the PyQt Python bindings for""" - """ the Qt GUI toolkit and the QScintilla editor widget.</p>""" + """ programming language. It is written using the PyQt Python bindings""" + """ for the Qt GUI toolkit and the QScintilla editor widget.</p>""" """<p>For more information see""" """ <a href="{1}">{1}</a>.</p>""" """<p>Please send bug reports to <a href="mailto:{2}">{2}</a>.</p>""" @@ -31,7 +31,8 @@ """<p>{0} uses third party software which is copyrighted""" """ by its respective copyright holder. For details see""" """ the copyright notice of the individual package.</p>""" -).format(UI.Info.Program, UI.Info.Homepage, UI.Info.BugAddress, UI.Info.FeatureAddress) +).format(UI.Info.Program, UI.Info.Homepage, UI.Info.BugAddress, + UI.Info.FeatureAddress) authorsText = \ """\ @@ -64,8 +65,9 @@ Italian translations """ -thanksText = \ -"""Phil Thompson for providing PyQt and QScintilla and pushing me into this business. +thanksText = """\ +Phil Thompson for providing PyQt and QScintilla and pushing me into this +business. Andrew Bushnell of Fluent Inc. for contributing the multithreading debugger and a bunch of fixes to enhance the platform independence. @@ -739,7 +741,8 @@ self.setupUi(self) self.ericLabel.setText(titleText) - self.ericPixmap.setPixmap(UI.PixmapCache.getPixmap("eric.png").scaled(48, 48)) + self.ericPixmap.setPixmap( + UI.PixmapCache.getPixmap("eric.png").scaled(48, 48)) #################################################################### ## ABOUT
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Thu Oct 10 19:03:45 2013 +0200 @@ -433,13 +433,13 @@ stats.update(report.counters) else: if includeMessages: - select = [s.strip() for s in includeMessages.split(',') - if s.strip()] + select = [s.strip() for s in + includeMessages.split(',') if s.strip()] else: select = [] if excludeMessages: - ignore = [i.strip() for i in excludeMessages.split(',') - if i.strip()] + ignore = [i.strip() for i in + excludeMessages.split(',') if i.strip()] else: ignore = [] @@ -469,19 +469,23 @@ fname, lineno, position, text = error if lineno > len(source): lineno = len(source) - if "__IGNORE_WARNING__" not in Utilities.extractLineFlags( + if "__IGNORE_WARNING__" not in \ + Utilities.extractLineFlags( source[lineno - 1].strip()): self.noResults = False if fixer: - res, msg, id_ = fixer.fixIssue(lineno, position, text) + res, msg, id_ = fixer.fixIssue(lineno, + position, text) if res == 1: text += "\n" + \ self.trUtf8("Fix: {0}").format(msg) self.__createResultItem( - fname, lineno, position, text, True, True) + fname, lineno, position, text, True, + True) elif res == 0: self.__createResultItem( - fname, lineno, position, text, False, True) + fname, lineno, position, text, False, + True) else: itm = self.__createResultItem( fname, lineno, position, @@ -489,14 +493,16 @@ deferredFixes[id_] = itm else: self.__createResultItem( - fname, lineno, position, text, False, False) + fname, lineno, position, text, False, + False) if fixer: deferredResults = fixer.finalize() for id_ in deferredResults: fixed, msg = deferredResults[id_] itm = deferredFixes[id_] if fixed == 1: - text = "\n" + self.trUtf8("Fix: {0}").format(msg) + text = "\n" + \ + self.trUtf8("Fix: {0}").format(msg) self.__modifyFixedResultItem(itm, text, True) else: self.__modifyFixedResultItem(itm, "", False)
--- a/Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py Thu Oct 10 19:03:45 2013 +0200 @@ -404,7 +404,8 @@ """ if code in DocStyleChecker.Messages: return code + " " + QCoreApplication.translate( - "DocStyleChecker", DocStyleChecker.Messages[code]).format(*args) + "DocStyleChecker", + DocStyleChecker.Messages[code]).format(*args) else: return code + " " + QCoreApplication.translate( "DocStyleChecker", "no message for this code defined")
--- a/Plugins/CheckerPlugins/CodeStyleChecker/NamingStyleChecker.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/NamingStyleChecker.py Thu Oct 10 19:03:45 2013 +0200 @@ -127,10 +127,12 @@ @return translated and formatted message (string) """ if code in cls.Messages: - return code + " " + QCoreApplication.translate("NamingStyleChecker", + return code + " " + QCoreApplication.translate( + "NamingStyleChecker", cls.Messages[code]).format(*args) else: - return code + " " + QCoreApplication.translate("NamingStyleChecker", + return code + " " + QCoreApplication.translate( + "NamingStyleChecker", "no message for this code defined") def __visitTree(self, node):
--- a/Plugins/CheckerPlugins/CodeStyleChecker/pep8.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/pep8.py Thu Oct 10 19:03:45 2013 +0200 @@ -146,11 +146,13 @@ "E122": QT_TRANSLATE_NOOP("pep8", "continuation line missing indentation or outdented"), "E123": QT_TRANSLATE_NOOP("pep8", - "closing bracket does not match indentation of opening bracket's line"), + "closing bracket does not match indentation of opening" + " bracket's line"), "E124": QT_TRANSLATE_NOOP("pep8", "closing bracket does not match visual indentation"), "E125": QT_TRANSLATE_NOOP("pep8", - "continuation line does not distinguish itself from next logical line"), + "continuation line does not distinguish itself from next" + " logical line"), "E126": QT_TRANSLATE_NOOP("pep8", "continuation line over-indented for hanging indent"), "E127": QT_TRANSLATE_NOOP("pep8",
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Thu Oct 10 19:03:45 2013 +0200 @@ -11,8 +11,8 @@ import fnmatch from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QDialog, QDialogButtonBox, QTreeWidgetItem, QApplication, \ - QHeaderView +from PyQt4.QtGui import QDialog, QDialogButtonBox, QTreeWidgetItem, \ + QApplication, QHeaderView from E5Gui.E5Application import e5App @@ -209,7 +209,8 @@ isPy3 = False nok, fname, line, index, code, error, warnings = \ Utilities.py2compile(file, - checkFlakes=Preferences.getFlakes("IncludeInSyntaxCheck")) + checkFlakes=Preferences.getFlakes( + "IncludeInSyntaxCheck")) else: isPy3 = True nok, fname, line, index, code, error = \ @@ -222,7 +223,8 @@ if isPy3: try: from Utilities.py3flakes.checker import Checker - from Utilities.py3flakes.messages import ImportStarUsed + from Utilities.py3flakes.messages import \ + ImportStarUsed sourceLines = source.splitlines() warnings = Checker(source, file) warnings.messages.sort(key=lambda a: a.lineno) @@ -356,7 +358,8 @@ if citm.data(0, self.warningRole): editor.toggleFlakesWarning(lineno, True, error) else: - editor.toggleSyntaxError(lineno, index, True, error, show=True) + editor.toggleSyntaxError( + lineno, index, True, error, show=True) @pyqtSlot() def on_showButton_clicked(self):
--- a/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py Thu Oct 10 19:03:45 2013 +0200 @@ -35,7 +35,8 @@ # linenumber and the error message (boolean, string, string, string). The # values are only valid, if the status equals 1. # -# Mofifications Copyright (c) 2003-2013 Detlev Offenbach <detlev@die-offenbachs.de> +# Mofifications Copyright (c) 2003-2013 Detlev Offenbach +# <detlev@die-offenbachs.de> # __version__ = "6_eric" @@ -95,7 +96,8 @@ def check(file, text=""): """ - Private function to check one Python source file for whitespace related problems. + Private function to check one Python source file for whitespace related + problems. @param file source filename (string) @param text source text (string) @@ -125,7 +127,8 @@ return (True, file, "1", "Token Error: {0}".format(str(msg))) except IndentationError as err: - return (True, file, err.lineno, "Indentation Error: {0}".format(str(err.msg))) + return (True, file, err.lineno, + "Indentation Error: {0}".format(str(err.msg))) except NannyNag as nag: badline = nag.get_lineno() @@ -235,7 +238,8 @@ # for all t >= 1 def equal(self, other): """ - Method to compare the indentation levels of two Whitespace objects for equality. + Method to compare the indentation levels of two Whitespace objects for + equality. @param other Whitespace object to compare against. @return True, if we compare equal against the other Whitespace object. @@ -282,8 +286,8 @@ # Note that M is of the form (T*)(S*) iff len(M.norm[0]) <= 1. def less(self, other): """ - Method to compare the indentation level against another Whitespace objects to - be smaller. + Method to compare the indentation level against another Whitespace + objects to be smaller. @param other Whitespace object to compare against. @return True, if we compare less against the other Whitespace object. @@ -381,7 +385,8 @@ # Ouch! This assert triggers if the last line of the source # is indented *and* lacks a newline -- then DEDENTs pop out # of thin air. - # assert check_equal # else no earlier NEWLINE, or an earlier INDENT + # assert check_equal # else no earlier NEWLINE, or an + # earlier INDENT check_equal = 1 del indents[-1]
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Thu Oct 10 19:03:45 2013 +0200 @@ -4,15 +4,16 @@ # """ -Module implementing a dialog to show the output of the tabnanny command process. +Module implementing a dialog to show the output of the tabnanny command +process. """ import os import fnmatch from PyQt4.QtCore import pyqtSlot, Qt, QProcess -from PyQt4.QtGui import QDialog, QDialogButtonBox, QTreeWidgetItem, QApplication, \ - QHeaderView +from PyQt4.QtGui import QDialog, QDialogButtonBox, QTreeWidgetItem, \ + QApplication, QHeaderView from E5Gui.E5Application import e5App @@ -54,8 +55,9 @@ """ Private method to resort the tree. """ - self.resultList.sortItems(self.resultList.sortColumn(), - self.resultList.header().sortIndicatorOrder()) + self.resultList.sortItems( + self.resultList.sortColumn(), + self.resultList.header().sortIndicatorOrder()) def __createResultItem(self, file, line, sourcecode): """ @@ -113,15 +115,19 @@ elif os.path.isdir(fn): files = [] for ext in Preferences.getPython("Python3Extensions"): - files.extend(Utilities.direntries(fn, 1, '*{0}'.format(ext), 0)) + files.extend( + Utilities.direntries(fn, 1, '*{0}'.format(ext), 0)) for ext in Preferences.getPython("PythonExtensions"): - files.extend(Utilities.direntries(fn, 1, '*{0}'.format(ext), 0)) + files.extend( + Utilities.direntries(fn, 1, '*{0}'.format(ext), 0)) else: files = [fn] - py3files = [f for f in files \ - if f.endswith(tuple(Preferences.getPython("Python3Extensions")))] - py2files = [f for f in files \ - if f.endswith(tuple(Preferences.getPython("PythonExtensions")))] + py3files = [f for f in files + if f.endswith( + tuple(Preferences.getPython("Python3Extensions")))] + py2files = [f for f in files + if f.endswith( + tuple(Preferences.getPython("PythonExtensions")))] if len(py3files) + len(py2files) > 0: self.checkProgress.setMaximum(len(py3files) + len(py2files)) @@ -157,7 +163,8 @@ Preferences.getProject("DeterminePyFromProject") and \ self.__project.isOpen() and \ self.__project.isProjectFile(file) and \ - self.__project.getProjectLanguage() in ["Python", "Python2"]): + self.__project.getProjectLanguage() in ["Python", + "Python2"]): nok, fname, line, error = self.__py2check(file) else: from . import Tabnanny @@ -185,7 +192,8 @@ self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) if self.noResults: - self.__createResultItem(self.trUtf8('No indentation errors found.'), "", "") + self.__createResultItem( + self.trUtf8('No indentation errors found.'), "", "") QApplication.processEvents() self.resultList.header().resizeSections(QHeaderView.ResizeToContents) self.resultList.header().setStretchLastSection(True) @@ -240,9 +248,9 @@ e5App().getObject("ViewManager").openSourceFile(fn, lineno) - ############################################################################ + ########################################################################### ## Python 2 interface below - ############################################################################ + ########################################################################### def __py2check(self, filename): """
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Thu Oct 10 19:03:45 2013 +0200 @@ -40,7 +40,8 @@ self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) - for language in sorted(DocumentationTools.supportedExtensionsDictForApis.keys()): + for language in sorted( + DocumentationTools.supportedExtensionsDictForApis.keys()): self.languagesList.addItem(language) self.ppath = project.getProjectPath() @@ -62,19 +63,23 @@ self.ignoreDirCompleter = E5DirCompleter(self.ignoreDirEdit) self.recursionCheckBox.setChecked(self.parameters['useRecursion']) - self.includePrivateCheckBox.setChecked(self.parameters['includePrivate']) + self.includePrivateCheckBox.setChecked( + self.parameters['includePrivate']) self.outputFileEdit.setText(self.parameters['outputFile']) self.baseEdit.setText(self.parameters['basePackage']) self.ignoreDirsList.clear() for d in self.parameters['ignoreDirectories']: self.ignoreDirsList.addItem(d) - self.sourceExtEdit.setText(", ".join(self.parameters['sourceExtensions'])) - self.excludeFilesEdit.setText(", ".join(self.parameters['ignoreFilePatterns'])) + self.sourceExtEdit.setText( + ", ".join(self.parameters['sourceExtensions'])) + self.excludeFilesEdit.setText( + ", ".join(self.parameters['ignoreFilePatterns'])) for language in self.parameters['languages']: if language == "Python": # convert Python to the more specific Python2 language = "Python2" - items = self.languagesList.findItems(language, Qt.MatchFlags(Qt.MatchExactly)) + items = self.languagesList.findItems( + language, Qt.MatchFlags(Qt.MatchExactly)) items and items[0].setSelected(True) def __initializeDefaults(self): @@ -110,15 +115,16 @@ dictionary can be passed back upon object generation to overwrite the default settings. - @return a tuple of the commandline parameters and non default parameters - (list of strings, dictionary) + @return a tuple of the commandline parameters and non default + parameters (list of strings, dictionary) """ parms = {} args = [] # 1. the program name args.append(sys.executable) - args.append(Utilities.normabsjoinpath(getConfig('ericDir'), "eric5_api.py")) + args.append( + Utilities.normabsjoinpath(getConfig('ericDir'), "eric5_api.py")) # 2. the commandline options if self.parameters['outputFile'] != self.defaults['outputFile']: @@ -128,29 +134,36 @@ if os.path.isabs(self.parameters['outputFile']): args.append(self.parameters['outputFile']) else: - args.append(os.path.join(self.ppath, self.parameters['outputFile'])) + args.append( + os.path.join(self.ppath, self.parameters['outputFile'])) if self.parameters['basePackage'] != self.defaults['basePackage']: parms['basePackage'] = self.parameters['basePackage'] args.append('-b') args.append(self.parameters['basePackage']) - if self.parameters['ignoreDirectories'] != self.defaults['ignoreDirectories']: - parms['ignoreDirectories'] = self.parameters['ignoreDirectories'][:] + if self.parameters['ignoreDirectories'] != \ + self.defaults['ignoreDirectories']: + parms['ignoreDirectories'] = \ + self.parameters['ignoreDirectories'][:] for d in self.parameters['ignoreDirectories']: args.append('-x') args.append(d) - if self.parameters['ignoreFilePatterns'] != self.defaults['ignoreFilePatterns']: - parms['ignoreFilePatterns'] = self.parameters['ignoreFilePatterns'][:] + if self.parameters['ignoreFilePatterns'] != \ + self.defaults['ignoreFilePatterns']: + parms['ignoreFilePatterns'] = \ + self.parameters['ignoreFilePatterns'][:] for pattern in self.parameters['ignoreFilePatterns']: args.append("--exclude-file={0}".format(pattern)) if self.parameters['useRecursion'] != self.defaults['useRecursion']: parms['useRecursion'] = self.parameters['useRecursion'] args.append('-r') - if self.parameters['sourceExtensions'] != self.defaults['sourceExtensions']: + if self.parameters['sourceExtensions'] != \ + self.defaults['sourceExtensions']: parms['sourceExtensions'] = self.parameters['sourceExtensions'][:] for ext in self.parameters['sourceExtensions']: args.append('-t') args.append(ext) - if self.parameters['includePrivate'] != self.defaults['includePrivate']: + if self.parameters['includePrivate'] != \ + self.defaults['includePrivate']: parms['includePrivate'] = self.parameters['includePrivate'] args.append('-p') parms['languages'] = self.parameters['languages'][:] @@ -240,7 +253,8 @@ It saves the values in the parameters dictionary. """ self.parameters['useRecursion'] = self.recursionCheckBox.isChecked() - self.parameters['includePrivate'] = self.includePrivateCheckBox.isChecked() + self.parameters['includePrivate'] = \ + self.includePrivateCheckBox.isChecked() outfile = self.outputFileEdit.text() if outfile != '': outfile = os.path.normpath(outfile)
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py Thu Oct 10 19:03:45 2013 +0200 @@ -48,7 +48,8 @@ Public slot to start the ericapi command. @param args commandline arguments for ericapi program (list of strings) - @param fn filename or dirname to be processed by ericapi program (string) + @param fn filename or dirname to be processed by ericapi program + (string) @return flag indicating the successful start of the process (boolean) """ self.errorGroup.hide() @@ -78,7 +79,8 @@ self.process.readyReadStandardError.connect(self.__readStderr) self.process.finished.connect(self.__finish) - self.setWindowTitle(self.trUtf8('{0} - {1}').format(self.cmdname, self.filename)) + self.setWindowTitle( + self.trUtf8('{0} - {1}').format(self.cmdname, self.filename)) self.process.start(program, args) procStarted = self.process.waitForStarted(5000) if not procStarted:
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Thu Oct 10 19:03:45 2013 +0200 @@ -18,7 +18,8 @@ from E5Gui import E5FileDialog from .Ui_EricdocConfigDialog import Ui_EricdocConfigDialog -from DocumentationTools.Config import eric5docDefaultColors, eric5docColorParameterNames +from DocumentationTools.Config import eric5docDefaultColors, \ + eric5docColorParameterNames import Utilities from eric5config import getConfig @@ -50,10 +51,13 @@ '''<html><head>''' '''<title></title>''' '''</head>''' - '''<body style="background-color:{BodyBgColor};color:{BodyColor}">''' - '''<h1 style="background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}">''' + '''<body style="background-color:{BodyBgColor};''' + '''color:{BodyColor}">''' + '''<h1 style="background-color:{Level1HeaderBgColor};''' + '''color:{Level1HeaderColor}">''' '''Level 1 Header</h1>''' - '''<h3 style="background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}">''' + '''<h3 style="background-color:{Level2HeaderBgColor};''' + '''color:{Level2HeaderColor}">''' '''Level 2 Header</h3>''' '''<h2 style="background-color:{CFBgColor};color:{CFColor}">''' '''Class and Function Header</h2>''' @@ -76,7 +80,8 @@ self.parameters['outputDirectory'] = \ Utilities.toNativeSeparators(self.parameters['outputDirectory']) self.parameters['qtHelpOutputDirectory'] = \ - Utilities.toNativeSeparators(self.parameters['qtHelpOutputDirectory']) + Utilities.toNativeSeparators( + self.parameters['qtHelpOutputDirectory']) self.parameters['cssFile'] = \ Utilities.toNativeSeparators(self.parameters['cssFile']) if self.parameters['cssFile'].startswith("%PYTHON%"): @@ -98,8 +103,10 @@ for d in self.parameters['ignoreDirectories']: self.ignoreDirsList.addItem(d) self.cssEdit.setText(self.parameters['cssFile']) - self.sourceExtEdit.setText(", ".join(self.parameters['sourceExtensions'])) - self.excludeFilesEdit.setText(", ".join(self.parameters['ignoreFilePatterns'])) + self.sourceExtEdit.setText( + ", ".join(self.parameters['sourceExtensions'])) + self.excludeFilesEdit.setText( + ", ".join(self.parameters['ignoreFilePatterns'])) self.sample.setHtml(self.sampleText.format(**self.colors)) self.qtHelpGroup.setChecked(self.parameters['qtHelpEnabled']) @@ -107,7 +114,8 @@ self.qtHelpNamespaceEdit.setText(self.parameters['qtHelpNamespace']) self.qtHelpFolderEdit.setText(self.parameters['qtHelpVirtualFolder']) self.qtHelpFilterNameEdit.setText(self.parameters['qtHelpFilterName']) - self.qtHelpFilterAttributesEdit.setText(self.parameters['qtHelpFilterAttributes']) + self.qtHelpFilterAttributesEdit.setText( + self.parameters['qtHelpFilterAttributes']) self.qtHelpTitleEdit.setText(self.parameters['qtHelpTitle']) self.qtHelpGenerateCollectionCheckBox.setChecked( self.parameters['qtHelpCreateCollection']) @@ -149,33 +157,41 @@ dictionary can be passed back upon object generation to overwrite the default settings. - @return a tuple of the commandline parameters and non default parameters - (list of strings, dictionary) + @return a tuple of the commandline parameters and non default + parameters (list of strings, dictionary) """ parms = {} args = [] # 1. the program name args.append(sys.executable) - args.append(Utilities.normabsjoinpath(getConfig('ericDir'), "eric5_doc.py")) + args.append( + Utilities.normabsjoinpath(getConfig('ericDir'), "eric5_doc.py")) # 2. the commandline options # 2a. general commandline options - if self.parameters['outputDirectory'] != self.defaults['outputDirectory']: + if self.parameters['outputDirectory'] != \ + self.defaults['outputDirectory']: parms['outputDirectory'] = Utilities.fromNativeSeparators( - self.project.getRelativePath(self.parameters['outputDirectory'])) + self.project.getRelativePath( + self.parameters['outputDirectory'])) args.append('-o') if os.path.isabs(self.parameters['outputDirectory']): args.append(self.parameters['outputDirectory']) else: - args.append(os.path.join(self.ppath, self.parameters['outputDirectory'])) - if self.parameters['ignoreDirectories'] != self.defaults['ignoreDirectories']: - parms['ignoreDirectories'] = self.parameters['ignoreDirectories'][:] + args.append(os.path.join( + self.ppath, self.parameters['outputDirectory'])) + if self.parameters['ignoreDirectories'] != \ + self.defaults['ignoreDirectories']: + parms['ignoreDirectories'] = \ + self.parameters['ignoreDirectories'][:] for d in self.parameters['ignoreDirectories']: args.append('-x') args.append(d) - if self.parameters['ignoreFilePatterns'] != self.defaults['ignoreFilePatterns']: - parms['ignoreFilePatterns'] = self.parameters['ignoreFilePatterns'][:] + if self.parameters['ignoreFilePatterns'] != \ + self.defaults['ignoreFilePatterns']: + parms['ignoreFilePatterns'] = \ + self.parameters['ignoreFilePatterns'][:] for pattern in self.parameters['ignoreFilePatterns']: args.append("--exclude-file={0}".format(pattern)) if self.parameters['useRecursion'] != self.defaults['useRecursion']: @@ -187,7 +203,8 @@ if self.parameters['noempty'] != self.defaults['noempty']: parms['noempty'] = self.parameters['noempty'] args.append('-e') - if self.parameters['sourceExtensions'] != self.defaults['sourceExtensions']: + if self.parameters['sourceExtensions'] != \ + self.defaults['sourceExtensions']: parms['sourceExtensions'] = self.parameters['sourceExtensions'][:] for ext in self.parameters['sourceExtensions']: args.append('-t') @@ -204,12 +221,13 @@ if os.path.isabs(self.parameters['cssFile']): args.append(self.parameters['cssFile']) else: - args.append(os.path.join(self.ppath, self.parameters['cssFile'])) + args.append( + os.path.join(self.ppath, self.parameters['cssFile'])) for key, value in list(self.colors.items()): if self.colors[key] != eric5docDefaultColors[key]: parms[key] = self.colors[key] args.append("--{0}={1}".format( - eric5docColorParameterNames[key], self.colors[key])) + eric5docColorParameterNames[key], self.colors[key])) # 2c. QtHelp commandline options parms['qtHelpEnabled'] = self.parameters['qtHelpEnabled'] @@ -218,35 +236,45 @@ if self.parameters['qtHelpOutputDirectory'] != \ self.defaults['qtHelpOutputDirectory']: parms['qtHelpOutputDirectory'] = Utilities.fromNativeSeparators( - self.project.getRelativePath(self.parameters['qtHelpOutputDirectory'])) + self.project.getRelativePath( + self.parameters['qtHelpOutputDirectory'])) if os.path.isabs(self.parameters['outputDirectory']): args.append("--qhp-outdir={0}".format( self.parameters['qtHelpOutputDirectory'])) else: args.append("--qhp-outdir={0}".format( - os.path.join(self.ppath, self.parameters['qtHelpOutputDirectory']))) - if self.parameters['qtHelpNamespace'] != self.defaults['qtHelpNamespace']: + os.path.join(self.ppath, + self.parameters['qtHelpOutputDirectory']))) + if self.parameters['qtHelpNamespace'] != \ + self.defaults['qtHelpNamespace']: parms['qtHelpNamespace'] = self.parameters['qtHelpNamespace'] - args.append("--qhp-namespace={0}".format(self.parameters['qtHelpNamespace'])) - if self.parameters['qtHelpVirtualFolder'] != self.defaults['qtHelpVirtualFolder']: - parms['qtHelpVirtualFolder'] = self.parameters['qtHelpVirtualFolder'] + args.append("--qhp-namespace={0}".format( + self.parameters['qtHelpNamespace'])) + if self.parameters['qtHelpVirtualFolder'] != \ + self.defaults['qtHelpVirtualFolder']: + parms['qtHelpVirtualFolder'] = \ + self.parameters['qtHelpVirtualFolder'] args.append("--qhp-virtualfolder={0}".format( self.parameters['qtHelpVirtualFolder'])) - if self.parameters['qtHelpFilterName'] != self.defaults['qtHelpFilterName']: + if self.parameters['qtHelpFilterName'] != \ + self.defaults['qtHelpFilterName']: parms['qtHelpFilterName'] = self.parameters['qtHelpFilterName'] args.append("--qhp-filtername={0}".format( self.parameters['qtHelpFilterName'])) if self.parameters['qtHelpFilterAttributes'] != \ self.defaults['qtHelpFilterAttributes']: - parms['qtHelpFilterAttributes'] = self.parameters['qtHelpFilterAttributes'] + parms['qtHelpFilterAttributes'] = \ + self.parameters['qtHelpFilterAttributes'] args.append("--qhp-filterattribs={0}".format( self.parameters['qtHelpFilterAttributes'])) if self.parameters['qtHelpTitle'] != self.defaults['qtHelpTitle']: parms['qtHelpTitle'] = self.parameters['qtHelpTitle'] - args.append("--qhp-title={0}".format(self.parameters['qtHelpTitle'])) + args.append("--qhp-title={0}".format( + self.parameters['qtHelpTitle'])) if self.parameters['qtHelpCreateCollection'] != \ self.defaults['qtHelpCreateCollection']: - parms['qtHelpCreateCollection'] = self.parameters['qtHelpCreateCollection'] + parms['qtHelpCreateCollection'] = \ + self.parameters['qtHelpCreateCollection'] args.append('--create-qhc') return (args, parms) @@ -412,7 +440,8 @@ def __checkQtHelpOptions(self): """ - Private slot to check the QtHelp options and set the ok button accordingly. + Private slot to check the QtHelp options and set the ok button + accordingly. """ setOn = True if self.qtHelpGroup.isChecked():
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Thu Oct 10 19:03:45 2013 +0200 @@ -48,7 +48,8 @@ Public slot to start the ericdoc command. @param args commandline arguments for ericdoc program (list of strings) - @param fn filename or dirname to be processed by ericdoc program (string) + @param fn filename or dirname to be processed by ericdoc program + (string) @return flag indicating the successful start of the process (boolean) """ self.errorGroup.hide() @@ -78,7 +79,8 @@ self.process.readyReadStandardError.connect(self.__readStderr) self.process.finished.connect(self.__finish) - self.setWindowTitle(self.trUtf8('{0} - {1}').format(self.cmdname, self.filename)) + self.setWindowTitle( + self.trUtf8('{0} - {1}').format(self.cmdname, self.filename)) self.process.start(program, args) procStarted = self.process.waitForStarted(5000) if not procStarted:
--- a/Plugins/PluginAbout.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/PluginAbout.py Thu Oct 10 19:03:45 2013 +0200 @@ -73,11 +73,13 @@ """ acts = [] - self.aboutAct = E5Action(self.trUtf8('About {0}').format(UI.Info.Program), - UI.PixmapCache.getIcon("helpAbout.png"), - self.trUtf8('&About {0}').format(UI.Info.Program), - 0, 0, self, 'about_eric') - self.aboutAct.setStatusTip(self.trUtf8('Display information about this software')) + self.aboutAct = E5Action( + self.trUtf8('About {0}').format(UI.Info.Program), + UI.PixmapCache.getIcon("helpAbout.png"), + self.trUtf8('&About {0}').format(UI.Info.Program), + 0, 0, self, 'about_eric') + self.aboutAct.setStatusTip(self.trUtf8( + 'Display information about this software')) self.aboutAct.setWhatsThis(self.trUtf8( """<b>About {0}</b>""" """<p>Display some information about this software.</p>"""
--- a/Plugins/PluginCodeStyleChecker.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/PluginCodeStyleChecker.py Thu Oct 10 19:03:45 2013 +0200 @@ -87,7 +87,8 @@ """<p>This checks Python files for compliance to the""" """ code style conventions given in various PEPs.</p>""" )) - self.__projectAct.triggered[()].connect(self.__projectCodeStyleCheck) + self.__projectAct.triggered[()].connect( + self.__projectCodeStyleCheck) e5App().getObject("Project").addE5Actions([self.__projectAct]) menu.addAction(self.__projectAct) @@ -276,8 +277,8 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor is not None: if editor.checkDirty() and editor.getFileName() is not None: - from CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog import \ - CodeStyleCheckerDialog + from CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog \ + import CodeStyleCheckerDialog self.__editorCodeStyleCheckerDialog = CodeStyleCheckerDialog() self.__editorCodeStyleCheckerDialog.show() self.__editorCodeStyleCheckerDialog.start(
--- a/Plugins/PluginEricapi.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/PluginEricapi.py Thu Oct 10 19:03:45 2013 +0200 @@ -30,7 +30,8 @@ packageName = "__core__" shortDescription = "Show the Ericapi dialogs." longDescription = """This plugin implements the Ericapi dialogs.""" \ - """ Ericapi is used to generate a QScintilla API file for Python and Ruby projects.""" + """ Ericapi is used to generate a QScintilla API file for Python and Ruby"""\ + """ projects.""" pyqtApi = 2 # End-Of-Header @@ -91,11 +92,12 @@ """ menu = e5App().getObject("Project").getMenu("Apidoc") if menu: - self.__projectAct = E5Action(self.trUtf8('Generate API file (eric5_api)'), - self.trUtf8('Generate &API file (eric5_api)'), 0, 0, - self, 'doc_eric5_api') - self.__projectAct.setStatusTip( - self.trUtf8('Generate an API file using eric5_api')) + self.__projectAct = E5Action( + self.trUtf8('Generate API file (eric5_api)'), + self.trUtf8('Generate &API file (eric5_api)'), 0, 0, + self, 'doc_eric5_api') + self.__projectAct.setStatusTip(self.trUtf8( + 'Generate an API file using eric5_api')) self.__projectAct.setWhatsThis(self.trUtf8( """<b>Generate API file</b>""" """<p>Generate an API file using eric5_api.</p>""" @@ -112,7 +114,8 @@ """ Public method to deactivate this plugin. """ - e5App().getObject("Project").showMenu.disconnect(self.__projectShowMenu) + e5App().getObject("Project").showMenu.disconnect( + self.__projectShowMenu) menu = e5App().getObject("Project").getMenu("Apidoc") if menu: @@ -138,7 +141,8 @@ """ Private slot to perform the eric5_api api generation. """ - from DocumentationPlugins.Ericapi.EricapiConfigDialog import EricapiConfigDialog + from DocumentationPlugins.Ericapi.EricapiConfigDialog import \ + EricapiConfigDialog eolTranslation = { '\r': 'cr', '\n': 'lf', @@ -153,10 +157,12 @@ # add parameter for the eol setting if not project.useSystemEol(): - args.append("--eol={0}".format(eolTranslation[project.getEolString()])) + args.append( + "--eol={0}".format(eolTranslation[project.getEolString()])) # now do the call - from DocumentationPlugins.Ericapi.EricapiExecDialog import EricapiExecDialog + from DocumentationPlugins.Ericapi.EricapiExecDialog import \ + EricapiExecDialog dia = EricapiExecDialog("Ericapi") res = dia.start(args, project.ppath) if res: @@ -173,7 +179,8 @@ outfile = outputFileName else: root, ext = os.path.splitext(outputFileName) - outfile = "{0}-{1}{2}".format(root, progLanguage.lower(), ext) + outfile = "{0}-{1}{2}".format( + root, progLanguage.lower(), ext) outfile = project.getRelativePath(outfile) if outfile not in project.pdata['OTHERS']:
--- a/Plugins/PluginEricdoc.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/PluginEricdoc.py Thu Oct 10 19:03:45 2013 +0200 @@ -148,7 +148,8 @@ """ Public method to deactivate this plugin. """ - e5App().getObject("Project").showMenu.disconnect(self.__projectShowMenu) + e5App().getObject("Project").showMenu.disconnect( + self.__projectShowMenu) menu = e5App().getObject("Project").getMenu("Apidoc") if menu: @@ -174,7 +175,8 @@ """ Private slot to perform the eric5_doc api documentation generation. """ - from DocumentationPlugins.Ericdoc.EricdocConfigDialog import EricdocConfigDialog + from DocumentationPlugins.Ericdoc.EricdocConfigDialog import \ + EricdocConfigDialog eolTranslation = { '\r': 'cr', '\n': 'lf', @@ -189,10 +191,12 @@ # add parameter for the eol setting if not project.useSystemEol(): - args.append("--eol={0}".format(eolTranslation[project.getEolString()])) + args.append( + "--eol={0}".format(eolTranslation[project.getEolString()])) # now do the call - from DocumentationPlugins.Ericdoc.EricdocExecDialog import EricdocExecDialog + from DocumentationPlugins.Ericdoc.EricdocExecDialog import \ + EricdocExecDialog dia = EricdocExecDialog("Ericdoc") res = dia.start(args, project.ppath) if res: @@ -210,9 +214,11 @@ project.othersAdded(outdir) if parms['qtHelpEnabled']: - outdir = Utilities.toNativeSeparators(parms['qtHelpOutputDirectory']) + outdir = Utilities.toNativeSeparators( + parms['qtHelpOutputDirectory']) if outdir == '': - outdir = 'help' # that is eric5_docs default QtHelp output dir + outdir = 'help' # that is eric5_docs default QtHelp + # output dir # add it to the project data, if it isn't in already outdir = project.getRelativePath(outdir)
--- a/Plugins/PluginSyntaxChecker.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/PluginSyntaxChecker.py Thu Oct 10 19:03:45 2013 +0200 @@ -96,8 +96,10 @@ e5App().getObject("Project").showMenu.connect(self.__projectShowMenu) e5App().getObject("ProjectBrowser").getProjectBrowser("sources")\ .showMenu.connect(self.__projectBrowserShowMenu) - e5App().getObject("ViewManager").editorOpenedEd.connect(self.__editorOpened) - e5App().getObject("ViewManager").editorClosedEd.connect(self.__editorClosed) + e5App().getObject("ViewManager").editorOpenedEd.connect( + self.__editorOpened) + e5App().getObject("ViewManager").editorClosedEd.connect( + self.__editorClosed) for editor in e5App().getObject("ViewManager").getOpenEditors(): self.__editorOpened(editor) @@ -111,8 +113,10 @@ e5App().getObject("Project").showMenu.disconnect(self.__projectShowMenu) e5App().getObject("ProjectBrowser").getProjectBrowser("sources")\ .showMenu.disconnect(self.__projectBrowserShowMenu) - e5App().getObject("ViewManager").editorOpenedEd.disconnect(self.__editorOpened) - e5App().getObject("ViewManager").editorClosedEd.disconnect(self.__editorClosed) + e5App().getObject("ViewManager").editorOpenedEd.disconnect( + self.__editorOpened) + e5App().getObject("ViewManager").editorClosedEd.disconnect( + self.__editorClosed) menu = e5App().getObject("Project").getMenu("Checks") if menu: @@ -120,7 +124,8 @@ if self.__projectBrowserMenu: if self.__projectBrowserAct: - self.__projectBrowserMenu.removeAction(self.__projectBrowserAct) + self.__projectBrowserMenu.removeAction( + self.__projectBrowserAct) for editor in self.__editors: editor.showMenu.disconnect(self.__editorShowMenu) @@ -156,9 +161,10 @@ ["Python3", "Python2", "Python"]: self.__projectBrowserMenu = menu if self.__projectBrowserAct is None: - self.__projectBrowserAct = E5Action(self.trUtf8('Check Syntax'), - self.trUtf8('&Syntax...'), 0, 0, - self, "") + self.__projectBrowserAct = E5Action( + self.trUtf8('Check Syntax'), + self.trUtf8('&Syntax...'), 0, 0, + self, "") self.__projectBrowserAct.setWhatsThis(self.trUtf8( """<b>Check Syntax...</b>""" """<p>This checks Python files for syntax errors.</p>""" @@ -177,27 +183,31 @@ ppath = project.getProjectPath() files = [os.path.join(ppath, file) \ for file in project.pdata["SOURCES"] \ - if file.endswith(tuple(Preferences.getPython("Python3Extensions")) + - tuple(Preferences.getPython("PythonExtensions")))] + if file.endswith( + tuple(Preferences.getPython("Python3Extensions")) + + tuple(Preferences.getPython("PythonExtensions")))] - from CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog import SyntaxCheckerDialog + from CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog import \ + SyntaxCheckerDialog self.__projectSyntaxCheckerDialog = SyntaxCheckerDialog() self.__projectSyntaxCheckerDialog.show() self.__projectSyntaxCheckerDialog.prepare(files, project) def __projectBrowserSyntaxCheck(self): """ - Private method to handle the syntax check context menu action of the project - sources browser. + Private method to handle the syntax check context menu action of the + project sources browser. """ - browser = e5App().getObject("ProjectBrowser").getProjectBrowser("sources") + browser = e5App().getObject("ProjectBrowser").getProjectBrowser( + "sources") itm = browser.model().item(browser.currentIndex()) try: fn = itm.fileName() except AttributeError: fn = itm.dirName() - from CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog import SyntaxCheckerDialog + from CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog import \ + SyntaxCheckerDialog self.__projectBrowserSyntaxCheckerDialog = SyntaxCheckerDialog() self.__projectBrowserSyntaxCheckerDialog.show() self.__projectBrowserSyntaxCheckerDialog.start(fn) @@ -237,11 +247,13 @@ if menuName == "Checks": if not self.__editorAct in menu.actions(): menu.addAction(self.__editorAct) - self.__editorAct.setEnabled(editor.isPy3File() or editor.isPy2File()) + self.__editorAct.setEnabled( + editor.isPy3File() or editor.isPy2File()) def __editorSyntaxCheck(self): """ - Private slot to handle the syntax check context menu action of the editors. + Private slot to handle the syntax check context menu action of the + editors. """ editor = e5App().getObject("ViewManager").activeWindow() if editor is not None:
--- a/Plugins/PluginTabnanny.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/PluginTabnanny.py Thu Oct 10 19:03:45 2013 +0200 @@ -98,8 +98,10 @@ e5App().getObject("Project").showMenu.connect(self.__projectShowMenu) e5App().getObject("ProjectBrowser").getProjectBrowser("sources")\ .showMenu.connect(self.__projectBrowserShowMenu) - e5App().getObject("ViewManager").editorOpenedEd.connect(self.__editorOpened) - e5App().getObject("ViewManager").editorClosedEd.connect(self.__editorClosed) + e5App().getObject("ViewManager").editorOpenedEd.connect( + self.__editorOpened) + e5App().getObject("ViewManager").editorClosedEd.connect( + self.__editorClosed) for editor in e5App().getObject("ViewManager").getOpenEditors(): self.__editorOpened(editor) @@ -110,11 +112,14 @@ """ Public method to deactivate this plugin. """ - e5App().getObject("Project").showMenu.disconnect(self.__projectShowMenu) + e5App().getObject("Project").showMenu.disconnect( + self.__projectShowMenu) e5App().getObject("ProjectBrowser").getProjectBrowser("sources")\ .showMenu.disconnect(self.__projectBrowserShowMenu) - e5App().getObject("ViewManager").editorOpenedEd.disconnect(self.__editorOpened) - e5App().getObject("ViewManager").editorClosedEd.disconnect(self.__editorClosed) + e5App().getObject("ViewManager").editorOpenedEd.disconnect( + self.__editorOpened) + e5App().getObject("ViewManager").editorClosedEd.disconnect( + self.__editorClosed) menu = e5App().getObject("Project").getMenu("Checks") if menu: @@ -122,7 +127,8 @@ if self.__projectBrowserMenu: if self.__projectBrowserAct: - self.__projectBrowserMenu.removeAction(self.__projectBrowserAct) + self.__projectBrowserMenu.removeAction( + self.__projectBrowserAct) for editor in self.__editors: editor.showMenu.disconnect(self.__editorShowMenu) @@ -147,8 +153,8 @@ def __projectBrowserShowMenu(self, menuName, menu): """ - Private slot called, when the the project browser context menu or a submenu is - about to be shown. + Private slot called, when the the project browser context menu or a + submenu is about to be shown. @param menuName name of the menu to be shown (string) @param menu reference to the menu (QMenu) @@ -158,9 +164,10 @@ ["Python3", "Python2", "Python"]: self.__projectBrowserMenu = menu if self.__projectBrowserAct is None: - self.__projectBrowserAct = E5Action(self.trUtf8('Check Indentations'), - self.trUtf8('&Indentations...'), 0, 0, - self, "") + self.__projectBrowserAct = E5Action( + self.trUtf8('Check Indentations'), + self.trUtf8('&Indentations...'), 0, 0, + self, "") self.__projectBrowserAct.setWhatsThis(self.trUtf8( """<b>Check Indentations...</b>""" """<p>This checks Python files""" @@ -180,8 +187,9 @@ ppath = project.getProjectPath() files = [os.path.join(ppath, file) \ for file in project.pdata["SOURCES"] \ - if file.endswith(tuple(Preferences.getPython("Python3Extensions")) + - tuple(Preferences.getPython("PythonExtensions")))] + if file.endswith( + tuple(Preferences.getPython("Python3Extensions")) + + tuple(Preferences.getPython("PythonExtensions")))] from CheckerPlugins.Tabnanny.TabnannyDialog import TabnannyDialog self.__projectTabnannyDialog = TabnannyDialog() @@ -190,10 +198,11 @@ def __projectBrowserTabnanny(self): """ - Private method to handle the tabnanny context menu action of the project - sources browser. + Private method to handle the tabnanny context menu action of the + project sources browser. """ - browser = e5App().getObject("ProjectBrowser").getProjectBrowser("sources") + browser = e5App().getObject("ProjectBrowser").getProjectBrowser( + "sources") itm = browser.model().item(browser.currentIndex()) try: fn = itm.fileName() @@ -240,7 +249,8 @@ if menuName == "Checks": if not self.__editorAct in menu.actions(): menu.addAction(self.__editorAct) - self.__editorAct.setEnabled(editor.isPy3File() or editor.isPy2File()) + self.__editorAct.setEnabled( + editor.isPy3File() or editor.isPy2File()) def __editorTabnanny(self): """ @@ -249,7 +259,8 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor is not None: if editor.checkDirty() and editor.getFileName() is not None: - from CheckerPlugins.Tabnanny.TabnannyDialog import TabnannyDialog + from CheckerPlugins.Tabnanny.TabnannyDialog import \ + TabnannyDialog self.__editorTabnannyDialog = TabnannyDialog() self.__editorTabnannyDialog.show() self.__editorTabnannyDialog.start(editor.getFileName())
--- a/Plugins/PluginVcsMercurial.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/PluginVcsMercurial.py Thu Oct 10 19:03:45 2013 +0200 @@ -32,7 +32,8 @@ className = "VcsMercurialPlugin" packageName = "__core__" shortDescription = "Implements the Mercurial version control interface." -longDescription = """This plugin provides the Mercurial version control interface.""" +longDescription = \ + """This plugin provides the Mercurial version control interface.""" pyqtApi = 2 # End-Of-Header @@ -69,8 +70,8 @@ """ Public function to get the indicators for this version control system. - @return dictionary with indicator as key and a tuple with the vcs name (string) - and vcs display string (string) + @return dictionary with indicator as key and a tuple with the vcs name + (string) and vcs display string (string) """ global pluginTypename data = {} @@ -108,7 +109,8 @@ @return reference to the configuration page """ global mercurialCfgPluginObject - from VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage import MercurialPage + from VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage import \ + MercurialPage if mercurialCfgPluginObject is None: mercurialCfgPluginObject = VcsMercurialPlugin(None) page = MercurialPage(mercurialCfgPluginObject) @@ -119,7 +121,8 @@ """ Module function returning data as required by the configuration dialog. - @return dictionary with key "zzz_mercurialPage" containing the relevant data + @return dictionary with key "zzz_mercurialPage" containing the relevant + data """ return { "zzz_mercurialPage": \ @@ -134,7 +137,8 @@ """ Module function to prepare for an uninstallation. """ - if not e5App().getObject("PluginManager").isPluginLoaded("PluginVcsMercurial"): + if not e5App().getObject("PluginManager").isPluginLoaded( + "PluginVcsMercurial"): Preferences.Prefs.settings.remove("Mercurial") @@ -167,8 +171,8 @@ from VcsPlugins.vcsMercurial.ProjectHelper import HgProjectHelper self.__projectHelperObject = HgProjectHelper(None, None) try: - e5App().registerPluginObject(pluginTypename, self.__projectHelperObject, - pluginType) + e5App().registerPluginObject( + pluginTypename, self.__projectHelperObject, pluginType) except KeyError: pass # ignore duplicate registration readShortcuts(pluginName=pluginTypename) @@ -205,8 +209,8 @@ @param key the key of the value to get @return the requested setting """ - if key in ["StopLogOnCopy", "UseLogBrowser", "PullUpdate", "PreferUnbundle", - "CreateBackup"]: + if key in ["StopLogOnCopy", "UseLogBrowser", "PullUpdate", + "PreferUnbundle", "CreateBackup"]: return Preferences.toBool(Preferences.Prefs.settings.value( "Mercurial/" + key, self.__mercurialDefaults[key])) elif key in ["LogLimit", "CommitMessages", "ServerPort"]:
--- a/Plugins/PluginVcsPySvn.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/PluginVcsPySvn.py Thu Oct 10 19:03:45 2013 +0200 @@ -30,7 +30,8 @@ className = "VcsPySvnPlugin" packageName = "__core__" shortDescription = "Implements the PySvn version control interface." -longDescription = """This plugin provides the PySvn version control interface.""" +longDescription = \ + """This plugin provides the PySvn version control interface.""" pyqtApi = 2 # End-Of-Header @@ -69,8 +70,8 @@ """ Public function to get the indicators for this version control system. - @return dictionary with indicator as key and a tuple with the vcs name (string) - and vcs display string (string) + @return dictionary with indicator as key and a tuple with the vcs name + (string) and vcs display string (string) """ global pluginTypename data = {} @@ -102,7 +103,8 @@ @return reference to the configuration page """ global subversionCfgPluginObject - from VcsPlugins.vcsPySvn.ConfigurationPage.SubversionPage import SubversionPage + from VcsPlugins.vcsPySvn.ConfigurationPage.SubversionPage import \ + SubversionPage if subversionCfgPluginObject is None: subversionCfgPluginObject = VcsPySvnPlugin(None) page = SubversionPage(subversionCfgPluginObject) @@ -113,7 +115,8 @@ """ Module function returning data as required by the configuration dialog. - @return dictionary with key "zzz_subversionPage" containing the relevant data + @return dictionary with key "zzz_subversionPage" containing the relevant + data """ return { "zzz_subversionPage": \ @@ -128,7 +131,8 @@ """ Module function to prepare for an uninstallation. """ - if not e5App().getObject("PluginManager").isPluginLoaded("PluginVcsSubversion"): + if not e5App().getObject("PluginManager").isPluginLoaded( + "PluginVcsSubversion"): Preferences.Prefs.settings.remove("Subversion") @@ -154,8 +158,8 @@ from VcsPlugins.vcsPySvn.ProjectHelper import SvnProjectHelper self.__projectHelperObject = SvnProjectHelper(None, None) try: - e5App().registerPluginObject(pluginTypename, self.__projectHelperObject, - pluginType) + e5App().registerPluginObject( + pluginTypename, self.__projectHelperObject, pluginType) except KeyError: pass # ignore duplicate registration readShortcuts(pluginName=pluginTypename)
--- a/Plugins/PluginVcsSubversion.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/PluginVcsSubversion.py Thu Oct 10 19:03:45 2013 +0200 @@ -32,7 +32,8 @@ className = "VcsSubversionPlugin" packageName = "__core__" shortDescription = "Implements the Subversion version control interface." -longDescription = """This plugin provides the Subversion version control interface.""" +longDescription = \ + """This plugin provides the Subversion version control interface.""" pyqtApi = 2 # End-Of-Header @@ -69,8 +70,8 @@ """ Public function to get the indicators for this version control system. - @return dictionary with indicator as key and a tuple with the vcs name (string) - and vcs display string (string) + @return dictionary with indicator as key and a tuple with the vcs name + (string) and vcs display string (string) """ global pluginTypename data = {} @@ -93,7 +94,8 @@ if Utilities.isWindowsPlatform(): exe += '.exe' if Utilities.isinpath(exe): - return QApplication.translate('VcsSubversionPlugin', 'Subversion (svn)') + return QApplication.translate( + 'VcsSubversionPlugin', 'Subversion (svn)') else: return "" @@ -108,7 +110,8 @@ @return reference to the configuration page """ global subversionCfgPluginObject - from VcsPlugins.vcsSubversion.ConfigurationPage.SubversionPage import SubversionPage + from VcsPlugins.vcsSubversion.ConfigurationPage.SubversionPage import \ + SubversionPage if subversionCfgPluginObject is None: subversionCfgPluginObject = VcsSubversionPlugin(None) page = SubversionPage(subversionCfgPluginObject) @@ -119,7 +122,8 @@ """ Module function returning data as required by the configuration dialog. - @return dictionary with key "zzz_subversionPage" containing the relevant data + @return dictionary with key "zzz_subversionPage" containing the relevant + data """ return { "zzz_subversionPage": \ @@ -134,7 +138,8 @@ """ Module function to prepare for an uninstallation. """ - if not e5App().getObject("PluginManager").isPluginLoaded("PluginVcsSubversion"): + if not e5App().getObject("PluginManager").isPluginLoaded( + "PluginVcsSubversion"): Preferences.Prefs.settings.remove("Subversion") @@ -160,8 +165,8 @@ from VcsPlugins.vcsSubversion.ProjectHelper import SvnProjectHelper self.__projectHelperObject = SvnProjectHelper(None, None) try: - e5App().registerPluginObject(pluginTypename, self.__projectHelperObject, - pluginType) + e5App().registerPluginObject( + pluginTypename, self.__projectHelperObject, pluginType) except KeyError: pass # ignore duplicate registration readShortcuts(pluginName=pluginTypename)
--- a/Plugins/PluginWizardE5MessageBox.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/PluginWizardE5MessageBox.py Thu Oct 10 19:03:45 2013 +0200 @@ -74,8 +74,8 @@ self.action.setWhatsThis(self.trUtf8( """<b>E5MessageBox Wizard</b>""" """<p>This wizard opens a dialog for entering all the parameters""" - """ needed to create an E5MessageBox. The generated code is inserted""" - """ at the current cursor position.</p>""" + """ needed to create an E5MessageBox. The generated code is""" + """ inserted at the current cursor position.</p>""" )) self.action.triggered[()].connect(self.__handle)
--- a/Plugins/PluginWizardPyRegExp.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/PluginWizardPyRegExp.py Thu Oct 10 19:03:45 2013 +0200 @@ -74,8 +74,8 @@ self.action.setWhatsThis(self.trUtf8( """<b>Python re Wizard</b>""" """<p>This wizard opens a dialog for entering all the parameters""" - """ needed to create a Python re string. The generated code is inserted""" - """ at the current cursor position.</p>""" + """ needed to create a Python re string. The generated code is""" + """ inserted at the current cursor position.</p>""" )) self.action.triggered[()].connect(self.__handle)
--- a/Plugins/PluginWizardQColorDialog.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/PluginWizardQColorDialog.py Thu Oct 10 19:03:45 2013 +0200 @@ -74,8 +74,8 @@ self.action.setWhatsThis(self.trUtf8( """<b>QColorDialog Wizard</b>""" """<p>This wizard opens a dialog for entering all the parameters""" - """ needed to create a QColorDialog. The generated code is inserted""" - """ at the current cursor position.</p>""" + """ needed to create a QColorDialog. The generated code is""" + """ inserted at the current cursor position.</p>""" )) self.action.triggered[()].connect(self.__handle)
--- a/Plugins/PluginWizardQFileDialog.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/PluginWizardQFileDialog.py Thu Oct 10 19:03:45 2013 +0200 @@ -74,8 +74,8 @@ self.action.setWhatsThis(self.trUtf8( """<b>QFileDialog Wizard</b>""" """<p>This wizard opens a dialog for entering all the parameters""" - """ needed to create a QFileDialog. The generated code is inserted""" - """ at the current cursor position.</p>""" + """ needed to create a QFileDialog. The generated code is""" + """ inserted at the current cursor position.</p>""" )) self.action.triggered[()].connect(self.__handle)
--- a/Plugins/PluginWizardQFontDialog.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/PluginWizardQFontDialog.py Thu Oct 10 19:03:45 2013 +0200 @@ -74,8 +74,8 @@ self.action.setWhatsThis(self.trUtf8( """<b>QFontDialog Wizard</b>""" """<p>This wizard opens a dialog for entering all the parameters""" - """ needed to create a QFontDialog. The generated code is inserted""" - """ at the current cursor position.</p>""" + """ needed to create a QFontDialog. The generated code is""" + """ inserted at the current cursor position.</p>""" )) self.action.triggered[()].connect(self.__handle)
--- a/Plugins/PluginWizardQInputDialog.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/PluginWizardQInputDialog.py Thu Oct 10 19:03:45 2013 +0200 @@ -74,8 +74,8 @@ self.action.setWhatsThis(self.trUtf8( """<b>QInputDialog Wizard</b>""" """<p>This wizard opens a dialog for entering all the parameters""" - """ needed to create a QInputDialog. The generated code is inserted""" - """ at the current cursor position.</p>""" + """ needed to create a QInputDialog. The generated code is""" + """ inserted at the current cursor position.</p>""" )) self.action.triggered[()].connect(self.__handle)
--- a/Plugins/PluginWizardQMessageBox.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/PluginWizardQMessageBox.py Thu Oct 10 19:03:45 2013 +0200 @@ -74,8 +74,8 @@ self.action.setWhatsThis(self.trUtf8( """<b>QMessageBox Wizard</b>""" """<p>This wizard opens a dialog for entering all the parameters""" - """ needed to create a QMessageBox. The generated code is inserted""" - """ at the current cursor position.</p>""" + """ needed to create a QMessageBox. The generated code is""" + """ inserted at the current cursor position.</p>""" )) self.action.triggered[()].connect(self.__handle)
--- a/Plugins/PluginWizardQRegularExpression.py Thu Oct 10 18:40:16 2013 +0200 +++ b/Plugins/PluginWizardQRegularExpression.py Thu Oct 10 19:03:45 2013 +0200 @@ -74,8 +74,8 @@ self.action.setWhatsThis(self.trUtf8( """<b>QRegularExpression Wizard</b>""" """<p>This wizard opens a dialog for entering all the parameters""" - """ needed to create a QRegularExpression string. The generated code""" - """ is inserted at the current cursor position.</p>""" + """ needed to create a QRegularExpression string. The generated""" + """ code is inserted at the current cursor position.</p>""" )) self.action.triggered[()].connect(self.__handle) @@ -96,7 +96,8 @@ @param editor reference to the current editor @return the generated code (string) """ - from WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardDialog import \ + from WizardPlugins.QRegularExpressionWizard\ + .QRegularExpressionWizardDialog import \ QRegularExpressionWizardDialog dlg = QRegularExpressionWizardDialog(None, True) if dlg.exec_() == QDialog.Accepted: