Mercurial Repositories > eric / changeset
changeset
Fixed some code style issues detected by the updated style checker (over-indented lines).
Wed, 13 Feb 2019 18:59:31 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 13 Feb 2019 18:59:31 +0100
- changeset 6735
- 31e263d49c04
- parent 6734
- 1eaf6955acf5
- child 6740
- 46bb5e2df095
- child 6742
- 7cb30f7f94f6
Fixed some code style issues detected by the updated style checker (over-indented lines).
--- a/DebugClients/Python/DebugClientBase.py Wed Feb 13 18:51:15 2019 +0100 +++ b/DebugClients/Python/DebugClientBase.py Wed Feb 13 18:59:31 2019 +0100 @@ -581,7 +581,7 @@ with codecs.open(sys.argv[0], encoding=self.__coding) as fp: script = fp.read() if script and not script.endswith('\n'): - script += '\n' + script += '\n' if script: self.running = sys.argv[0] @@ -1355,7 +1355,7 @@ elif scope: varDict = f.f_globals elif f.f_globals is f.f_locals: - scope = -1 + scope = -1 else: varDict = f.f_locals @@ -1407,7 +1407,7 @@ elif scope: varDict = f.f_globals elif f.f_globals is f.f_locals: - scope = -1 + scope = -1 else: varDict = f.f_locals
--- a/Plugins/PluginPipInterface.py Wed Feb 13 18:51:15 2019 +0100 +++ b/Plugins/PluginPipInterface.py Wed Feb 13 18:59:31 2019 +0100 @@ -202,7 +202,7 @@ self.PreferencesKey + "/" + key, value) if key == "CurrentEnvironment": - self.currentEnvironmentChanged.emit(value) + self.currentEnvironmentChanged.emit(value) def getMenu(self, name): """
--- a/Plugins/PluginWizardDotDesktop.py Wed Feb 13 18:51:15 2019 +0100 +++ b/Plugins/PluginWizardDotDesktop.py Wed Feb 13 18:59:31 2019 +0100 @@ -114,10 +114,10 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor is None: - E5MessageBox.critical( - self.__ui, - self.tr('No current editor'), - self.tr('Please open or create a file first.')) + E5MessageBox.critical( + self.__ui, + self.tr('No current editor'), + self.tr('Please open or create a file first.')) else: if editor.text(): ok = E5MessageBox.yesNo(
--- a/Plugins/PluginWizardE5MessageBox.py Wed Feb 13 18:51:15 2019 +0100 +++ b/Plugins/PluginWizardE5MessageBox.py Wed Feb 13 18:59:31 2019 +0100 @@ -123,10 +123,10 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor is None: - E5MessageBox.critical( - self.__ui, - self.tr('No current editor'), - self.tr('Please open or create a file first.')) + E5MessageBox.critical( + self.__ui, + self.tr('No current editor'), + self.tr('Please open or create a file first.')) else: code, ok = self.__callForm(editor) if ok:
--- a/Plugins/PluginWizardSetup.py Wed Feb 13 18:51:15 2019 +0100 +++ b/Plugins/PluginWizardSetup.py Wed Feb 13 18:59:31 2019 +0100 @@ -136,10 +136,10 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor is None: - E5MessageBox.critical( - self.__ui, - self.tr('No current editor'), - self.tr('Please open or create a file first.')) + E5MessageBox.critical( + self.__ui, + self.tr('No current editor'), + self.tr('Please open or create a file first.')) else: code, ok = self.__callForm(editor) if ok:
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Wed Feb 13 18:51:15 2019 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Wed Feb 13 18:59:31 2019 +0100 @@ -309,6 +309,6 @@ """ applied.</p><p>Reason: {0}</p>""") .format(error)) else: - self.__dirtyList = False - self.on_patchSelector_activated( - self.patchNameLabel.text()) + self.__dirtyList = False + self.on_patchSelector_activated( + self.patchNameLabel.text())
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Wed Feb 13 18:51:15 2019 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Wed Feb 13 18:59:31 2019 +0100 @@ -284,7 +284,7 @@ line = line.replace(self.summaryPath + '/', '') line = " ".join(line.split()) if line.startswith("--- ") or line.startswith("+++ "): - self.__processFileLine(line) + self.__processFileLine(line) self.__appendText(line) self.paras += 1
--- a/Preferences/ShortcutsDialog.py Wed Feb 13 18:51:15 2019 +0100 +++ b/Preferences/ShortcutsDialog.py Wed Feb 13 18:59:31 2019 +0100 @@ -312,8 +312,8 @@ # 3. check key name if itm.text(0) != keyname: - for col in [1, 2]: # check against primary, - # then alternative binding + for col in [1, 2]: + # check against primary, then alternative binding itmseq = itm.text(col) # step 1: check if shortcut is already allocated if keystr == itmseq:
--- a/Project/Project.py Wed Feb 13 18:51:15 2019 +0100 +++ b/Project/Project.py Wed Feb 13 18:59:31 2019 +0100 @@ -1407,7 +1407,7 @@ qmFile = self.__binaryTranslationsCallbacks[ self.pdata["PROJECTTYPE"]](langFile) except KeyError: - qmFile = langFile.replace('.ts', '.qm') + qmFile = langFile.replace('.ts', '.qm') if qmFile == langFile: qmFile = "" return qmFile
--- a/QScintilla/Editor.py Wed Feb 13 18:51:15 2019 +0100 +++ b/QScintilla/Editor.py Wed Feb 13 18:59:31 2019 +0100 @@ -3289,9 +3289,9 @@ @param modifiers keyboard modifiers (Qt.KeyboardModifiers) """ if margin == self.__bmMargin: - self.toggleBookmark(line + 1) + self.toggleBookmark(line + 1) elif margin == self.__bpMargin: - self.__toggleBreakpoint(line + 1) + self.__toggleBreakpoint(line + 1) elif margin == self.__indicMargin: if self.markersAtLine(line) & (1 << self.syntaxerror): self.__showSyntaxError(line)
--- a/Utilities/ModuleParser.py Wed Feb 13 18:51:15 2019 +0100 +++ b/Utilities/ModuleParser.py Wed Feb 13 18:59:31 2019 +0100 @@ -646,7 +646,7 @@ contents = _hashsub(r"\1", contents) else: if self.file.lower().endswith('.ptl'): - contents = "" + contents = "" else: contents = 1 and m.group("DocstringContents1") \ or m.group("DocstringContents2")
--- a/Utilities/__init__.py Wed Feb 13 18:51:15 2019 +0100 +++ b/Utilities/__init__.py Wed Feb 13 18:59:31 2019 +0100 @@ -1576,7 +1576,7 @@ project.isOpen() and project.isProjectFile(filename) and ext in py2Ext + py3Ext): - pyVer = pyAssignment.get(project.getProjectLanguage(), 0) + pyVer = pyAssignment.get(project.getProjectLanguage(), 0) elif ext in py2Ext and ext not in py3Ext: pyVer = 2 elif ext in py3Ext and ext not in py2Ext:
--- a/ViewManager/ViewManager.py Wed Feb 13 18:51:15 2019 +0100 +++ b/ViewManager/ViewManager.py Wed Feb 13 18:59:31 2019 +0100 @@ -5758,7 +5758,7 @@ text = self.quickFindtextCombo.lineEdit().text() if not text and again: - text = self.quickFindtextCombo.lastSearchText + text = self.quickFindtextCombo.lastSearchText if not text: if Preferences.getEditor("QuickSearchMarkersEnabled"): aw.clearSearchIndicators()
--- a/WebBrowser/Download/DownloadManager.py Wed Feb 13 18:51:15 2019 +0100 +++ b/WebBrowser/Download/DownloadManager.py Wed Feb 13 18:59:31 2019 +0100 @@ -197,7 +197,7 @@ if not page.url().isEmpty() and \ page.url().host() == url.host(): - return True + return True requestedUrl = page.requestedUrl() if requestedUrl.isEmpty():
