Mercurial Repositories > eric / changeset
changeset
Fixed a bunch of indentation issues.
Sat, 19 Oct 2013 17:42:18 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 19 Oct 2013 17:42:18 +0200
- changeset 3039
- 8dd0165d805d
- parent 3038
- 7fe9a53280bd
- child 3040
- 5a72fcc6b62e
Fixed a bunch of indentation issues.
--- a/QScintilla/Editor.py Sat Oct 19 16:51:12 2013 +0200 +++ b/QScintilla/Editor.py Sat Oct 19 17:42:18 2013 +0200 @@ -253,10 +253,10 @@ # define the margins markers self.__changeMarkerSaved = self.markerDefine( self.__createChangeMarkerPixmap( - "OnlineChangeTraceMarkerSaved")) + "OnlineChangeTraceMarkerSaved")) self.__changeMarkerUnsaved = self.markerDefine( self.__createChangeMarkerPixmap( - "OnlineChangeTraceMarkerUnsaved")) + "OnlineChangeTraceMarkerUnsaved")) self.breakpoint = \ self.markerDefine(UI.PixmapCache.getPixmap("break.png")) self.cbreakpoint = \ @@ -318,10 +318,8 @@ self.trUtf8("""<p>The size of the file <b>{0}</b>""" """ is <b>{1} KB</b>.""" """ Do you really want to load it?</p>""") - .format( - self.fileName, - QFileInfo(self.fileName).size() // - 1024), + .format(self.fileName, + QFileInfo(self.fileName).size() // 1024), icon=E5MessageBox.Warning) if not res: raise IOError() @@ -1174,7 +1172,7 @@ self.trUtf8( """<p>No exporter available for the """ """export format <b>{0}</b>. Aborting...</p>""") - .format(exporterFormat)) + .format(exporterFormat)) else: E5MessageBox.critical( self, @@ -1734,7 +1732,7 @@ line0 = self.text(0) if line0.startswith("#!") and \ ("python2" in line0 or - ("python" in line0 and not "python3" in line0)): + ("python" in line0 and not "python3" in line0)): self.filetype = "Python2" return True @@ -2441,13 +2439,13 @@ from Tasks.Task import Task markers = { Task.TypeWarning: - Preferences.getTasks("TasksWarningMarkers").split(), + Preferences.getTasks("TasksWarningMarkers").split(), Task.TypeNote: - Preferences.getTasks("TasksNoteMarkers").split(), + Preferences.getTasks("TasksNoteMarkers").split(), Task.TypeTodo: - Preferences.getTasks("TasksTodoMarkers").split(), + Preferences.getTasks("TasksTodoMarkers").split(), Task.TypeFixme: - Preferences.getTasks("TasksFixmeMarkers").split(), + Preferences.getTasks("TasksFixmeMarkers").split(), } txtList = self.text().split(self.getLineSeparator()) @@ -2683,7 +2681,7 @@ self, self.trUtf8("File Modified"), self.trUtf8("<p>The file <b>{0}</b> has unsaved changes.</p>") - .format(fn), + .format(fn), self.saveFile) if res: self.vm.setEditorName(self, self.fileName) @@ -2836,7 +2834,7 @@ self.trUtf8('Save File'), self.trUtf8('<p>The file <b>{0}</b> could not be saved.<br/>' 'Reason: {1}</p>') - .format(fn, str(why))) + .format(fn, str(why))) return False def saveFile(self, saveas=False, path=None): @@ -3310,13 +3308,13 @@ # determine the start of the comment block begline = line while begline > 0 and \ - self.__isCommentedLine(self.text(begline - 1), commentStr): + self.__isCommentedLine(self.text(begline - 1), commentStr): begline -= 1 # determine the end of the comment block endline = line lines = self.lines() while endline < lines and \ - self.__isCommentedLine(self.text(endline + 1), commentStr): + self.__isCommentedLine(self.text(endline + 1), commentStr): endline += 1 self.setSelection(begline, 0, endline, self.lineLength(endline)) @@ -4928,8 +4926,8 @@ @return flag indicating this editor should be saved (boolean) """ return self.fileName is not None and \ - not self.autosaveManuallyDisabled and \ - not self.isReadOnly() + not self.autosaveManuallyDisabled and \ + not self.isReadOnly() def __autoSyntaxCheck(self): """ @@ -4980,9 +4978,10 @@ self.toggleSyntaxError(err.lineno, True, msg) elif self.isPy2File() and self.fileName is not None: syntaxError, _fn, errorline, errorindex, _code, _error, \ - warnings = Utilities.py2compile( - self.fileName, - checkFlakes=Preferences.getFlakes("IncludeInSyntaxCheck")) + warnings = Utilities.py2compile( + self.fileName, + checkFlakes=Preferences.getFlakes( + "IncludeInSyntaxCheck")) if syntaxError: self.toggleSyntaxError( int(errorline), int(errorindex), True, _error) @@ -5669,7 +5668,7 @@ self.trUtf8("Error loading macro"), self.trUtf8( "<p>The macro file <b>{0}</b> could not be read.</p>") - .format(fname)) + .format(fname)) return if len(lines) != 2: @@ -5677,7 +5676,7 @@ self, self.trUtf8("Error loading macro"), self.trUtf8("<p>The macro file <b>{0}</b> is corrupt.</p>") - .format(fname)) + .format(fname)) return macro = QsciMacro(lines[1], self) @@ -5731,7 +5730,7 @@ self.trUtf8("Error saving macro"), self.trUtf8( "<p>The macro file <b>{0}</b> could not be written.</p>") - .format(fname)) + .format(fname)) return def macroRecordingStart(self): @@ -6162,7 +6161,7 @@ self, self.trUtf8("Drop Error"), self.trUtf8("""<p><b>{0}</b> is not a file.</p>""") - .format(fname)) + .format(fname)) event.acceptProposedAction() else: super().dropEvent(event) @@ -6572,7 +6571,7 @@ style = self.styleAt(pos) if self.lexer_ is not None: return self.lexer_.isCommentStyle(style) or \ - self.lexer_.isStringStyle(style) + self.lexer_.isStringStyle(style) return True @pyqtSlot(int) @@ -6718,9 +6717,9 @@ (boolean, boolean, boolean, boolean) """ return self.fileName is not None and \ - self.project.isOpen() and \ - self.project.isProjectFile(self.fileName), \ - self.__isShared, self.__inSharedEdit, self.__inRemoteSharedEdit + self.project.isOpen() and \ + self.project.isProjectFile(self.fileName), \ + self.__isShared, self.__inSharedEdit, self.__inRemoteSharedEdit def shareConnected(self, connected): """
--- a/QScintilla/Exporters/ExporterHTML.py Sat Oct 19 16:51:12 2013 +0200 +++ b/QScintilla/Exporters/ExporterHTML.py Sat Oct 19 17:42:18 2013 +0200 @@ -408,6 +408,6 @@ self.trUtf8( """<p>The source could not be exported to""" """ <b>{0}</b>.</p><p>Reason: {1}</p>""") - .format(filename, str(err))) + .format(filename, str(err))) finally: QApplication.restoreOverrideCursor()
--- a/QScintilla/Exporters/ExporterPDF.py Sat Oct 19 16:51:12 2013 +0200 +++ b/QScintilla/Exporters/ExporterPDF.py Sat Oct 19 17:42:18 2013 +0200 @@ -196,11 +196,11 @@ # sanity check for page size and margins pageWidthMin = int(self.leading) + \ - self.pageMargins["left"] + self.pageMargins["right"] + self.pageMargins["left"] + self.pageMargins["right"] if self.pageWidth < pageWidthMin: self.pageWidth = pageWidthMin pageHeightMin = int(self.leading) + \ - self.pageMargins["top"] + self.pageMargins["bottom"] + self.pageMargins["top"] + self.pageMargins["bottom"] if self.pageHeight < pageHeightMin: self.pageHeight = pageHeightMin @@ -243,8 +243,8 @@ "/MediaBox[ 0 0 {1:d} {2:d}]\n" \ "/Contents {3:d} 0 R\n" \ "/Resources {4:d} 0 R\n>>\n".format( - pagesRef, self.pageWidth, self.pageHeight, - self.pageContentStart + i, resourceRef) + pagesRef, self.pageWidth, self.pageHeight, + self.pageContentStart + i, resourceRef) self.oT.add(buffer) # create page tree object (PDF1.4Ref(p86)) @@ -480,7 +480,7 @@ istyle = 0 while istyle <= QsciScintilla.STYLE_MAX: if (istyle <= QsciScintilla.STYLE_DEFAULT or - istyle > QsciScintilla.STYLE_LASTPREDEFINED): + istyle > QsciScintilla.STYLE_LASTPREDEFINED): if lex.description(istyle) or \ istyle == QsciScintilla.STYLE_DEFAULT: style = PDFStyle() @@ -600,6 +600,6 @@ self.trUtf8( """<p>The source could not be exported to""" """ <b>{0}</b>.</p><p>Reason: {1}</p>""") - .format(filename, str(err))) + .format(filename, str(err))) finally: QApplication.restoreOverrideCursor()
--- a/QScintilla/Exporters/ExporterRTF.py Sat Oct 19 16:51:12 2013 +0200 +++ b/QScintilla/Exporters/ExporterRTF.py Sat Oct 19 17:42:18 2013 +0200 @@ -171,7 +171,7 @@ istyle = 0 while istyle <= QsciScintilla.STYLE_MAX: if (istyle < QsciScintilla.STYLE_DEFAULT or - istyle > QsciScintilla.STYLE_LASTPREDEFINED): + istyle > QsciScintilla.STYLE_LASTPREDEFINED): if lex.description(istyle): font = lex.font(istyle) if wysiwyg: @@ -199,7 +199,7 @@ QFontInfo(font).pointSize() << 1) else: lastStyle += self.RTF_SETFONTSIZE + \ - "{0:d}".format(fontsize) + "{0:d}".format(fontsize) sColour = lex.color(istyle) sColourKey = None @@ -212,7 +212,7 @@ sColourKey = colorCount colorCount += 1 lastStyle += self.RTF_SETCOLOR + \ - "{0:d}".format(sColourKey) + "{0:d}".format(sColourKey) sColour = lex.paper(istyle) sColourKey = None @@ -225,7 +225,7 @@ sColourKey = colorCount colorCount += 1 lastStyle += self.RTF_SETBACKGROUND + \ - "{0:d}".format(sColourKey) + "{0:d}".format(sColourKey) if font.bold(): lastStyle += self.RTF_BOLD_ON @@ -248,11 +248,11 @@ istyle += 1 else: styles[0] = self.RTF_SETFONTFACE + "0" + \ - self.RTF_SETFONTSIZE + \ - "{0:d}".format(fontsize) + \ - self.RTF_SETCOLOR + "0" + \ - self.RTF_SETBACKGROUND + "1" + \ - self.RTF_BOLD_OFF + self.RTF_ITALIC_OFF + self.RTF_SETFONTSIZE + \ + "{0:d}".format(fontsize) + \ + self.RTF_SETCOLOR + "0" + \ + self.RTF_SETBACKGROUND + "1" + \ + self.RTF_BOLD_OFF + self.RTF_ITALIC_OFF f.write(self.RTF_FONTDEFCLOSE + self.RTF_COLORDEFOPEN) for value in list(colors.values()): @@ -267,10 +267,10 @@ self.RTF_SETFONTSIZE + "{0:d}".format(fontsize) + self.RTF_SETCOLOR + "0 ") lastStyle = self.RTF_SETFONTFACE + "0" + \ - self.RTF_SETFONTSIZE + "{0:d}".format(fontsize) + \ - self.RTF_SETCOLOR + "0" + \ - self.RTF_SETBACKGROUND + "1" + \ - self.RTF_BOLD_OFF + self.RTF_ITALIC_OFF + self.RTF_SETFONTSIZE + "{0:d}".format(fontsize) + \ + self.RTF_SETCOLOR + "0" + \ + self.RTF_SETBACKGROUND + "1" + \ + self.RTF_BOLD_OFF + self.RTF_ITALIC_OFF lengthDoc = self.editor.length() prevCR = False @@ -352,6 +352,6 @@ self.trUtf8( """<p>The source could not be exported to""" """ <b>{0}</b>.</p><p>Reason: {1}</p>""") - .format(filename, str(err))) + .format(filename, str(err))) finally: QApplication.restoreOverrideCursor()
--- a/QScintilla/Exporters/ExporterTEX.py Sat Oct 19 16:51:12 2013 +0200 +++ b/QScintilla/Exporters/ExporterTEX.py Sat Oct 19 17:42:18 2013 +0200 @@ -130,14 +130,14 @@ lex = self.editor.getLexer() self.defaultPaper = lex and \ - lex.paper(QsciScintilla.STYLE_DEFAULT) or \ - self.editor.paper().name() + lex.paper(QsciScintilla.STYLE_DEFAULT) or \ + self.editor.paper().name() self.defaultColor = lex and \ - lex.color(QsciScintilla.STYLE_DEFAULT) or \ - self.editor.color().name() + lex.color(QsciScintilla.STYLE_DEFAULT) or \ + self.editor.color().name() self.defaultFont = lex and \ - lex.color(QsciScintilla.STYLE_DEFAULT) or \ - Preferences.getEditorOtherFonts("DefaultFont") + lex.color(QsciScintilla.STYLE_DEFAULT) or \ + Preferences.getEditorOtherFonts("DefaultFont") lengthDoc = self.editor.length() styleIsUsed = {} @@ -273,6 +273,6 @@ self.trUtf8( """<p>The source could not be exported to""" """ <b>{0}</b>.</p><p>Reason: {1}</p>""") - .format(filename, str(err))) + .format(filename, str(err))) finally: QApplication.restoreOverrideCursor()
--- a/QScintilla/Lexers/LexerPygments.py Sat Oct 19 16:51:12 2013 +0200 +++ b/QScintilla/Lexers/LexerPygments.py Sat Oct 19 17:42:18 2013 +0200 @@ -18,51 +18,51 @@ import Utilities -PYGMENTS_DEFAULT, \ -PYGMENTS_COMMENT, \ -PYGMENTS_PREPROCESSOR, \ -PYGMENTS_KEYWORD, \ -PYGMENTS_PSEUDOKEYWORD, \ -PYGMENTS_TYPEKEYWORD, \ -PYGMENTS_OPERATOR, \ -PYGMENTS_WORD, \ -PYGMENTS_BUILTIN, \ -PYGMENTS_FUNCTION, \ -PYGMENTS_CLASS, \ -PYGMENTS_NAMESPACE, \ -PYGMENTS_EXCEPTION, \ -PYGMENTS_VARIABLE, \ -PYGMENTS_CONSTANT, \ -PYGMENTS_LABEL, \ -PYGMENTS_ENTITY, \ -PYGMENTS_ATTRIBUTE, \ -PYGMENTS_TAG, \ -PYGMENTS_DECORATOR, \ -PYGMENTS_STRING, \ -PYGMENTS_DOCSTRING, \ -PYGMENTS_SCALAR, \ -PYGMENTS_ESCAPE, \ -PYGMENTS_REGEX, \ -PYGMENTS_SYMBOL, \ -PYGMENTS_OTHER, \ -PYGMENTS_NUMBER, \ -PYGMENTS_HEADING, \ -PYGMENTS_SUBHEADING, \ -PYGMENTS_DELETED, \ -PYGMENTS_INSERTED = list(range(32)) +(PYGMENTS_DEFAULT, + PYGMENTS_COMMENT, + PYGMENTS_PREPROCESSOR, + PYGMENTS_KEYWORD, + PYGMENTS_PSEUDOKEYWORD, + PYGMENTS_TYPEKEYWORD, + PYGMENTS_OPERATOR, + PYGMENTS_WORD, + PYGMENTS_BUILTIN, + PYGMENTS_FUNCTION, + PYGMENTS_CLASS, + PYGMENTS_NAMESPACE, + PYGMENTS_EXCEPTION, + PYGMENTS_VARIABLE, + PYGMENTS_CONSTANT, + PYGMENTS_LABEL, + PYGMENTS_ENTITY, + PYGMENTS_ATTRIBUTE, + PYGMENTS_TAG, + PYGMENTS_DECORATOR, + PYGMENTS_STRING, + PYGMENTS_DOCSTRING, + PYGMENTS_SCALAR, + PYGMENTS_ESCAPE, + PYGMENTS_REGEX, + PYGMENTS_SYMBOL, + PYGMENTS_OTHER, + PYGMENTS_NUMBER, + PYGMENTS_HEADING, + PYGMENTS_SUBHEADING, + PYGMENTS_DELETED, + PYGMENTS_INSERTED) = list(range(32)) # 32 to 39 are reserved for QScintilla internal styles -PYGMENTS_GENERIC_ERROR, \ -PYGMENTS_EMPHASIZE, \ -PYGMENTS_STRONG, \ -PYGMENTS_PROMPT, \ -PYGMENTS_OUTPUT, \ -PYGMENTS_TRACEBACK, \ -PYGMENTS_ERROR, \ -PYGMENTS_MULTILINECOMMENT, \ -PYGMENTS_PROPERTY, \ -PYGMENTS_CHAR, \ -PYGMENTS_HEREDOC, \ -PYGMENTS_PUNCTUATION = list(range(40, 52)) +(PYGMENTS_GENERIC_ERROR, + PYGMENTS_EMPHASIZE, + PYGMENTS_STRONG, + PYGMENTS_PROMPT, + PYGMENTS_OUTPUT, + PYGMENTS_TRACEBACK, + PYGMENTS_ERROR, + PYGMENTS_MULTILINECOMMENT, + PYGMENTS_PROPERTY, + PYGMENTS_CHAR, + PYGMENTS_HEREDOC, + PYGMENTS_PUNCTUATION) = list(range(40, 52)) #-----------------------------------------------------------------------------#
--- a/QScintilla/MiniEditor.py Sat Oct 19 16:51:12 2013 +0200 +++ b/QScintilla/MiniEditor.py Sat Oct 19 17:42:18 2013 +0200 @@ -1308,9 +1308,9 @@ act = E5Action( QApplication.translate('ViewManager', 'Formfeed'), - QApplication.translate('ViewManager', 'Formfeed'), - 0, 0, - self.editorActGrp, 'vm_edit_formfeed') + QApplication.translate('ViewManager', 'Formfeed'), + 0, 0, + self.editorActGrp, 'vm_edit_formfeed') self.esm.setMapping(act, QsciScintilla.SCI_FORMFEED) act.triggered[()].connect(self.esm.map) self.editActions.append(act) @@ -1989,13 +1989,13 @@ 0, self, 'help_help_whats_this') self.whatsThisAct.setStatusTip(self.trUtf8('Context sensitive help')) self.whatsThisAct.setWhatsThis(self.trUtf8( - """<b>Display context sensitive help</b>""" - """<p>In What's This? mode, the mouse cursor shows an arrow""" - """ with a question mark, and you can click on the interface""" - """ elements to get a short description of what they do and""" - """ how to use them. In dialogs, this feature can be""" - """ accessed using the context help button in the titlebar.""" - """</p>""" + """<b>Display context sensitive help</b>""" + """<p>In What's This? mode, the mouse cursor shows an arrow""" + """ with a question mark, and you can click on the interface""" + """ elements to get a short description of what they do and""" + """ how to use them. In dialogs, this feature can be""" + """ accessed using the context help button in the titlebar.""" + """</p>""" )) self.whatsThisAct.triggered[()].connect(self.__whatsThis) self.helpActions.append(self.whatsThisAct) @@ -2157,7 +2157,7 @@ self, self.trUtf8('Open File'), self.trUtf8('<p>The file <b>{0}</b> could not be opened.</p>' '<p>Reason: {1}</p>') - .format(fileName, str(why))) + .format(fileName, str(why))) QApplication.restoreOverrideCursor() return @@ -2192,7 +2192,7 @@ self, self.trUtf8('Save File'), self.trUtf8('<p>The file <b>{0}</b> could not be saved.<br/>' 'Reason: {1}</p>') - .format(fileName, str(why))) + .format(fileName, str(why))) QApplication.restoreOverrideCursor() self.__checkActions() @@ -2795,7 +2795,7 @@ line0 = self.__textEdit.text(0) if line0.startswith("#!") and \ ("python2" in line0 or - ("python" in line0 and not "python3" in line0)): + ("python" in line0 and not "python3" in line0)): return True if self.__curFile is not None:
--- a/QScintilla/QsciScintillaCompat.py Sat Oct 19 16:51:12 2013 +0200 +++ b/QScintilla/QsciScintillaCompat.py Sat Oct 19 17:42:18 2013 +0200 @@ -494,8 +494,8 @@ """ startLine, startIndex, endLine, endIndex = self.getSelection() return startLine != -1 and \ - startLine != endLine and \ - self.SendScintilla(QsciScintilla.SCI_SELECTIONISRECTANGLE) + startLine != endLine and \ + self.SendScintilla(QsciScintilla.SCI_SELECTIONISRECTANGLE) def getRectangularSelection(self): """
--- a/QScintilla/SearchReplaceWidget.py Sat Oct 19 16:51:12 2013 +0200 +++ b/QScintilla/SearchReplaceWidget.py Sat Oct 19 17:42:18 2013 +0200 @@ -116,7 +116,7 @@ <td>This matches 1 or more times. For example, <code>Sa+m</code> matches <code>Sam</code>, <code>Saam</code>, <code>Saaam</code> and so on.</td></tr> </table> -""") +""") # __IGNORE_WARNING__ self.setWhatsThis(whatsThis) self.ui.closeButton.setIcon(UI.PixmapCache.getIcon("close.png")) @@ -424,16 +424,16 @@ else: ok = False elif (lineFrom == boundary[0] and indexFrom >= boundary[1]) or \ - (lineFrom > boundary[0] and lineFrom < boundary[2]) or \ - (lineFrom == boundary[2] and indexFrom <= boundary[3]): + (lineFrom > boundary[0] and lineFrom < boundary[2]) or \ + (lineFrom == boundary[2] and indexFrom <= boundary[3]): ok = True else: ok = False if not ok and len(self.__selections) > 1: # try again while not ok and \ - ((backwards and lineFrom >= boundary[0]) or - (not backwards and lineFrom <= boundary[2])): + ((backwards and lineFrom >= boundary[0]) or + (not backwards and lineFrom <= boundary[2])): for ind in range(len(self.__selections)): if lineFrom == self.__selections[ind][0]: after = indexTo > self.__selections[ind][3] @@ -695,8 +695,8 @@ else: ok = False elif (lineFrom == boundary[0] and indexFrom >= boundary[1]) or \ - (lineFrom > boundary[0] and lineFrom < boundary[2]) or \ - (lineFrom == boundary[2] and indexFrom <= boundary[3]): + (lineFrom > boundary[0] and lineFrom < boundary[2]) or \ + (lineFrom == boundary[2] and indexFrom <= boundary[3]): ok = True else: ok = False @@ -758,12 +758,12 @@ E5MessageBox.information( self, self.windowTitle(), self.trUtf8("Replaced {0} occurrences.") - .format(replacements)) + .format(replacements)) else: E5MessageBox.information( self, self.windowTitle(), self.trUtf8("Nothing replaced because '{0}' was not found.") - .format(ftxt)) + .format(ftxt)) aw.setCursorPosition(cline, cindex) aw.ensureCursorVisible()
--- a/QScintilla/Shell.py Sat Oct 19 16:51:12 2013 +0200 +++ b/QScintilla/Shell.py Sat Oct 19 17:42:18 2013 +0200 @@ -1269,7 +1269,7 @@ self.__write( self.trUtf8( 'Shell language "{0}" not supported.\n') - .format(cmdList[1])) + .format(cmdList[1])) self.__clientStatement(False) return cmd = '' @@ -1344,7 +1344,7 @@ else: idx = startIdx + 1 while idx < len(self.history) and \ - not self.history[idx].startswith(txt): + not self.history[idx].startswith(txt): idx += 1 return idx @@ -1361,7 +1361,7 @@ else: idx = startIdx - 1 while idx >= 0 and \ - not self.history[idx].startswith(txt): + not self.history[idx].startswith(txt): idx -= 1 return idx @@ -1543,7 +1543,7 @@ self, self.trUtf8("Drop Error"), self.trUtf8("""<p><b>{0}</b> is not a file.</p>""") - .format(fname)) + .format(fname)) event.acceptProposedAction() elif event.mimeData().hasText(): s = event.mimeData().text()
--- a/QScintilla/TypingCompleters/CompleterPython.py Sat Oct 19 16:51:12 2013 +0200 +++ b/QScintilla/TypingCompleters/CompleterPython.py Sat Oct 19 17:42:18 2013 +0200 @@ -259,14 +259,14 @@ if self.__elseRX.indexIn(txt) == 0 and edInd <= indentation: indentation = edInd - 1 elif self.__elifRX.indexIn(txt) == 0 and \ - edInd == indentation and \ - edInd == prevInd: - indentation = edInd - 1 + edInd == indentation and \ + edInd == prevInd: + indentation = edInd - 1 elif (self.__ifRX.indexIn(txt) == 0 or self.__whileRX.indexIn(txt) == 0 or self.__forRX.indexIn(txt) == 0 or self.__tryRX.indexIn(txt) == 0) and \ - edInd <= indentation: + edInd <= indentation: self.editor.cancelList() self.editor.setIndentation(line, edInd) break @@ -286,7 +286,8 @@ txt = self.editor.text(tryLine) edInd = self.editor.indentation(tryLine) if (self.__exceptcRX.indexIn(txt) == 0 or - self.__finallyRX.indexIn(txt) == 0) and edInd <= indentation: + self.__finallyRX.indexIn(txt) == 0) and \ + edInd <= indentation: indentation = edInd - 1 elif (self.__exceptRX.indexIn(txt) == 0 or self.__tryRX.indexIn(txt) == 0) and edInd <= indentation: @@ -367,10 +368,10 @@ self.editor.indentation(curLine) == indentation: return True elif self.__classRX.indexIn(txt) == 0 and \ - self.editor.indentation(curLine) < indentation: + self.editor.indentation(curLine) < indentation: return True elif self.__defRX.indexIn(txt) == 0 and \ - self.editor.indentation(curLine) <= indentation: + self.editor.indentation(curLine) <= indentation: return False curLine -= 1 return False
--- a/Snapshot/SnapWidget.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Snapshot/SnapWidget.py Sat Oct 19 17:42:18 2013 +0200 @@ -232,7 +232,7 @@ E5MessageBox.warning( self, self.trUtf8("Save Snapshot"), self.trUtf8("Cannot write file '{0}:\n{1}.") - .format(fileName, file.errorString())) + .format(fileName, file.errorString())) return False ok = self.__snapshot.save(file) @@ -242,7 +242,7 @@ E5MessageBox.warning( self, self.trUtf8("Save Snapshot"), self.trUtf8("Cannot write file '{0}:\n{1}.") - .format(fileName, file.errorString())) + .format(fileName, file.errorString())) return ok
--- a/Snapshot/SnapshotFreehandGrabber.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Snapshot/SnapshotFreehandGrabber.py Sat Oct 19 17:42:18 2013 +0200 @@ -176,7 +176,7 @@ boundingRect.moveCenter(polBoundingRect.center()) textRect.moveCenter(polBoundingRect.center()) elif polBoundingRect.y() - 3 > textRect.height() and \ - polBoundingRect.x() + textRect.width() < self.rect().width(): + polBoundingRect.x() + textRect.width() < self.rect().width(): # on top, left aligned boundingRect.moveBottomLeft( QPoint(polBoundingRect.x(), polBoundingRect.y() - 3)) @@ -190,7 +190,7 @@ QPoint(polBoundingRect.x() - 5, polBoundingRect.y())) elif (polBoundingRect.bottom() + 3 + textRect.height() < self.rect().bottom()) and \ - polBoundingRect.right() > textRect.width(): + polBoundingRect.right() > textRect.width(): # at bottom, right aligned boundingRect.moveTopRight( QPoint(polBoundingRect.right(), polBoundingRect.bottom() + 3))
--- a/Snapshot/SnapshotRegionGrabber.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Snapshot/SnapshotRegionGrabber.py Sat Oct 19 17:42:18 2013 +0200 @@ -195,7 +195,7 @@ boundingRect.moveCenter(r.center()) textRect.moveCenter(r.center()) elif r.y() - 3 > textRect.height() and \ - r.x() + textRect.width() < self.rect().width(): + r.x() + textRect.width() < self.rect().width(): # on top, left aligned boundingRect.moveBottomLeft(QPoint(r.x(), r.y() - 3)) textRect.moveBottomLeft(QPoint(r.x() + 2, r.y() - 3)) @@ -204,7 +204,7 @@ boundingRect.moveTopRight(QPoint(r.x() - 3, r.y())) textRect.moveTopRight(QPoint(r.x() - 5, r.y())) elif r.bottom() + 3 + textRect.height() < self.rect().bottom() and \ - r.right() > textRect.width(): + r.right() > textRect.width(): # at bottom, right aligned boundingRect.moveTopRight(QPoint(r.right(), r.bottom() + 3)) textRect.moveTopRight(QPoint(r.right() - 2, r.bottom() + 3))
--- a/Snapshot/SnapshotTimer.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Snapshot/SnapshotTimer.py Sat Oct 19 17:42:18 2013 +0200 @@ -115,7 +115,7 @@ if self.x() == screenGeom.left(): self.move( screenGeom.x() + - (screenGeom.width() // 2 - self.size().width() // 2), + (screenGeom.width() // 2 - self.size().width() // 2), screenGeom.top()) else: self.move(screenGeom.topLeft())
--- a/SqlBrowser/SqlBrowser.py Sat Oct 19 16:51:12 2013 +0200 +++ b/SqlBrowser/SqlBrowser.py Sat Oct 19 17:42:18 2013 +0200 @@ -100,11 +100,11 @@ self.trUtf8('Add &Connection...'), 0, 0, self, 'sql_file_add_connection') self.addConnectionAct.setStatusTip(self.trUtf8( - 'Open a dialog to add a new database connection')) + 'Open a dialog to add a new database connection')) self.addConnectionAct.setWhatsThis(self.trUtf8( - """<b>Add Connection</b>""" - """<p>This opens a dialog to add a new database""" - """ connection.</p>""" + """<b>Add Connection</b>""" + """<p>This opens a dialog to add a new database""" + """ connection.</p>""" )) self.addConnectionAct.triggered[()].connect( self.__browser.addConnectionByDialog) @@ -118,8 +118,8 @@ 0, self, 'sql_file_quit') self.exitAct.setStatusTip(self.trUtf8('Quit the SQL browser')) self.exitAct.setWhatsThis(self.trUtf8( - """<b>Quit</b>""" - """<p>Quit the SQL browser.</p>""" + """<b>Quit</b>""" + """<p>Quit the SQL browser.</p>""" )) self.exitAct.triggered[()].connect(qApp.closeAllWindows) @@ -130,8 +130,8 @@ self.aboutAct.setStatusTip(self.trUtf8( 'Display information about this software')) self.aboutAct.setWhatsThis(self.trUtf8( - """<b>About</b>""" - """<p>Display some information about this software.</p>""" + """<b>About</b>""" + """<p>Display some information about this software.</p>""" )) self.aboutAct.triggered[()].connect(self.__about) self.__actions.append(self.aboutAct) @@ -143,8 +143,8 @@ self.aboutQtAct.setStatusTip( self.trUtf8('Display information about the Qt toolkit')) self.aboutQtAct.setWhatsThis(self.trUtf8( - """<b>About Qt</b>""" - """<p>Display some information about the Qt toolkit.</p>""" + """<b>About Qt</b>""" + """<p>Display some information about the Qt toolkit.</p>""" )) self.aboutQtAct.triggered[()].connect(self.__aboutQt) self.__actions.append(self.aboutQtAct)
--- a/SqlBrowser/SqlBrowserWidget.py Sat Oct 19 16:51:12 2013 +0200 +++ b/SqlBrowser/SqlBrowserWidget.py Sat Oct 19 17:42:18 2013 +0200 @@ -215,7 +215,7 @@ else: model.setData( model.index(i, 1), "{0} ({1})".format( - QVariant.typeToName(fld.type()), fld.typeID())) + QVariant.typeToName(fld.type()), fld.typeID())) if fld.length() < 0: model.setData(model.index(i, 2), "?") else:
--- a/SqlBrowser/SqlConnectionWidget.py Sat Oct 19 16:51:12 2013 +0200 +++ b/SqlBrowser/SqlConnectionWidget.py Sat Oct 19 17:42:18 2013 +0200 @@ -184,4 +184,4 @@ self.__setBold(itm, True) self.__activeDb = QSqlDatabase.connectionNames()[ - self.__connectionTree.indexOfTopLevelItem(itm)] + self.__connectionTree.indexOfTopLevelItem(itm)]
--- a/Tasks/TaskFilter.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Tasks/TaskFilter.py Sat Oct 19 17:42:18 2013 +0200 @@ -104,11 +104,11 @@ @return flag indicating an active filter was found (boolean) """ return self.summaryFilter is not None or \ - self.filenameFilter is not None or \ - self.typeFilter != Task.TypeNone or \ - self.scopeFilter is not None or \ - self.statusFilter is not None or \ - self.prioritiesFilter is not None + self.filenameFilter is not None or \ + self.typeFilter != Task.TypeNone or \ + self.scopeFilter is not None or \ + self.statusFilter is not None or \ + self.prioritiesFilter is not None def showTask(self, task): """
--- a/Tasks/TaskViewer.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Tasks/TaskViewer.py Sat Oct 19 17:42:18 2013 +0200 @@ -291,8 +291,8 @@ """ self.addTask(summary, filename=filename, lineno=lineno, isProjectTask=( - self.project and - self.project.isProjectSource(filename)), + self.project and + self.project.isProjectSource(filename)), taskType=taskType, description=description) def getProjectTasks(self): @@ -524,7 +524,7 @@ """ markers = { Task.TypeWarning: - Preferences.getTasks("TasksWarningMarkers").split(), + Preferences.getTasks("TasksWarningMarkers").split(), Task.TypeNote: Preferences.getTasks("TasksNoteMarkers").split(), Task.TypeTodo: Preferences.getTasks("TasksTodoMarkers").split(), Task.TypeFixme: Preferences.getTasks("TasksFixmeMarkers").split(),
--- a/Templates/TemplatePropertiesDialog.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Templates/TemplatePropertiesDialog.py Sat Oct 19 17:42:18 2013 +0200 @@ -200,10 +200,10 @@ if self.groupMode: return (self.nameEdit.text(), self.languages[self.groupCombo.currentIndex()][0] - ) + ) else: return (self.nameEdit.text(), self.descriptionEdit.text(), self.groupCombo.currentText(), self.templateEdit.toPlainText() - ) + )
--- a/Templates/TemplateViewer.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Templates/TemplateViewer.py Sat Oct 19 17:42:18 2013 +0200 @@ -98,7 +98,7 @@ "TemplateGroup", """<p>The group <b>{0}</b> already contains a""" """ template named <b>{1}</b>.</p>""") - .format(self.name, name)) + .format(self.name, name)) return self.entries[name] = TemplateEntry(self, name, description, template) @@ -525,7 +525,7 @@ self, self.trUtf8("Remove Template"), self.trUtf8("""<p>Do you really want to remove <b>{0}</b>?</p>""") - .format(itm.getName())) + .format(itm.getName())) if not res: return @@ -643,11 +643,11 @@ if ext: ext = ext[1:] varValues.update({ - keyfmt.format('path_name'): path_name, - keyfmt.format('dir_name'): dir_name, - keyfmt.format('file_name'): file_name, - keyfmt.format('base_name'): base_name, - keyfmt.format('ext'): ext + keyfmt.format('path_name'): path_name, + keyfmt.format('dir_name'): dir_name, + keyfmt.format('file_name'): file_name, + keyfmt.format('base_name'): base_name, + keyfmt.format('ext'): ext }) varValues[keyfmt.format('clipboard:ml')] = \ @@ -713,7 +713,7 @@ if ok: line = editor.text(editor.getCursorPosition()[0])\ - .replace(os.linesep, "") + .replace(os.linesep, "") indent = line.replace(line.lstrip(), "") txt, lines, count = itm.getExpandedText(varValues, indent) # It should be done in this way to allow undo @@ -851,7 +851,7 @@ self.trUtf8("Edit Template Group"), self.trUtf8("""<p>A template group with the name""" """ <b>{0}</b> already exists.</p>""") - .format(newname)) + .format(newname)) return self.groups[newname] = self.groups[oldname] @@ -946,7 +946,7 @@ self.trUtf8( "<p>The templates file <b>{0}</b> could not be" " written.</p>") - .format(filename)) + .format(filename)) return False from E5XML.TemplatesWriter import TemplatesWriter @@ -979,7 +979,7 @@ self.trUtf8("Read templates"), self.trUtf8( "<p>The templates file <b>{0}</b> could not be read.</p>") - .format(filename)) + .format(filename)) def __configure(self): """
--- a/Toolbox/Startup.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Toolbox/Startup.py Sat Oct 19 17:42:18 2013 +0200 @@ -35,12 +35,12 @@ ] options.extend(appinfo["options"]) - print(""" -Usage: {bin} [OPTIONS] {arg} - -{name} - {description} - -Options:""".format(**appinfo)) + print("""\n""" + """Usage: {bin} [OPTIONS] {arg}\n""" + """\n""" + """{name} - {description}\n""" + """\n""" + """Options:""".format(**appinfo)) for opt in options: print(" {0} {1}".format(opt[0].ljust(optlen), opt[1])) sys.exit(0) @@ -52,15 +52,18 @@ @param appinfo dictionary describing the application """ - print(""" -{name} {version} - -{description} - -Copyright (c) 2002 - 2013 Detlev Offenbach <detlev@die-offenbachs.de> -This is free software; see LICENSE.GPL3 for copying conditions. -There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE.""".format(**appinfo)) + print("""\n""" + """{name} {version}\n""" + """\n""" + """{description}\n""" + """\n""" + """Copyright (c) 2002 - 2013 Detlev Offenbach""" + """ <detlev@die-offenbachs.de>\n""" + """This is free software; see LICENSE.GPL3 for copying""" + """ conditions.\n""" + """There is NO warranty; not even for MERCHANTABILITY or FITNESS""" + """ FOR A\n""" + """PARTICULAR PURPOSE.""".format(**appinfo)) sys.exit(0) @@ -79,7 +82,7 @@ "--version": version, "--help": usage, "-h": usage - } + } if '--' in argv: ddindex = argv.index("--") for a in args:
--- a/Tools/TRPreviewer.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Tools/TRPreviewer.py Sat Oct 19 17:42:18 2013 +0200 @@ -160,8 +160,8 @@ self.trUtf8('&Open UI Files...'), self) self.openUIAct.setStatusTip(self.trUtf8('Open UI files for display')) self.openUIAct.setWhatsThis(self.trUtf8( - """<b>Open UI Files</b>""" - """<p>This opens some UI files for display.</p>""" + """<b>Open UI Files</b>""" + """<p>This opens some UI files for display.</p>""" )) self.openUIAct.triggered[()].connect(self.__openWidget) @@ -171,8 +171,8 @@ self.openQMAct.setStatusTip(self.trUtf8( 'Open Translation files for display')) self.openQMAct.setWhatsThis(self.trUtf8( - """<b>Open Translation Files</b>""" - """<p>This opens some translation files for display.</p>""" + """<b>Open Translation Files</b>""" + """<p>This opens some translation files for display.</p>""" )) self.openQMAct.triggered[()].connect(self.__openTranslation) @@ -194,8 +194,8 @@ self.trUtf8("Ctrl+Q", "File|Quit"))) self.exitAct.setStatusTip(self.trUtf8('Quit the application')) self.exitAct.setWhatsThis(self.trUtf8( - """<b>Quit</b>""" - """<p>Quit the application.</p>""" + """<b>Quit</b>""" + """<p>Quit the application.</p>""" )) self.exitAct.triggered[()].connect(qApp.closeAllWindows) @@ -218,8 +218,8 @@ self.aboutAct.setStatusTip(self.trUtf8( 'Display information about this software')) self.aboutAct.setWhatsThis(self.trUtf8( - """<b>About</b>""" - """<p>Display some information about this software.</p>""" + """<b>About</b>""" + """<p>Display some information about this software.</p>""" )) self.aboutAct.triggered[()].connect(self.__about) @@ -227,8 +227,8 @@ self.aboutQtAct.setStatusTip( self.trUtf8('Display information about the Qt toolkit')) self.aboutQtAct.setWhatsThis(self.trUtf8( - """<b>About Qt</b>""" - """<p>Display some information about the Qt toolkit.</p>""" + """<b>About Qt</b>""" + """<p>Display some information about the Qt toolkit.</p>""" )) self.aboutQtAct.triggered[()].connect(self.__aboutQt) @@ -256,16 +256,16 @@ "Ctrl+W", "File|Close"))) self.closeAct.setStatusTip(self.trUtf8('Close the current window')) self.closeAct.setWhatsThis(self.trUtf8( - """<b>Close Window</b>""" - """<p>Close the current window.</p>""" + """<b>Close Window</b>""" + """<p>Close the current window.</p>""" )) self.closeAct.triggered[()].connect(self.preview.closeWidget) self.closeAllAct = QAction(self.trUtf8('Clos&e All'), self) self.closeAllAct.setStatusTip(self.trUtf8('Close all windows')) self.closeAllAct.setWhatsThis(self.trUtf8( - """<b>Close All Windows</b>""" - """<p>Close all windows.</p>""" + """<b>Close All Windows</b>""" + """<p>Close all windows.</p>""" )) self.closeAllAct.triggered[()].connect(self.preview.closeAllWidgets) @@ -510,7 +510,7 @@ self.trUtf8("Set Translator"), self.trUtf8( """<p>The translator <b>{0}</b> is not known.</p>""") - .format(name)) + .format(name)) return nTranslator = trans.translator @@ -727,7 +727,7 @@ self.trUtf8("Load UI File"), self.trUtf8( """<p>The file <b>{0}</b> could not be loaded.</p>""") - .format(self.__uiFileName)) + .format(self.__uiFileName)) self.__valid = False return @@ -783,7 +783,7 @@ self.trUtf8("Load UI File"), self.trUtf8( """<p>The file <b>{0}</b> could not be loaded.</p>""") - .format(uiFileName)) + .format(uiFileName)) return uname = name
--- a/Tools/UIPreviewer.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Tools/UIPreviewer.py Sat Oct 19 17:42:18 2013 +0200 @@ -131,8 +131,8 @@ QKeySequence(self.trUtf8("Ctrl+O", "File|Open"))) self.openAct.setStatusTip(self.trUtf8('Open a UI file for display')) self.openAct.setWhatsThis(self.trUtf8( - """<b>Open File</b>""" - """<p>This opens a new UI file for display.</p>""" + """<b>Open File</b>""" + """<p>This opens a new UI file for display.</p>""" )) self.openAct.triggered[()].connect(self.__openFile) @@ -143,8 +143,8 @@ QKeySequence(self.trUtf8("Ctrl+P", "File|Print"))) self.printAct.setStatusTip(self.trUtf8('Print a screen capture')) self.printAct.setWhatsThis(self.trUtf8( - """<b>Print</b>""" - """<p>Print a screen capture.</p>""" + """<b>Print</b>""" + """<p>Print a screen capture.</p>""" )) self.printAct.triggered[()].connect(self.__printImage) @@ -152,10 +152,10 @@ UI.PixmapCache.getIcon("printPreview.png"), self.trUtf8('Print Preview'), self) self.printPreviewAct.setStatusTip(self.trUtf8( - 'Print preview a screen capture')) + 'Print preview a screen capture')) self.printPreviewAct.setWhatsThis(self.trUtf8( - """<b>Print Preview</b>""" - """<p>Print preview a screen capture.</p>""" + """<b>Print Preview</b>""" + """<p>Print preview a screen capture.</p>""" )) self.printPreviewAct.triggered[()].connect(self.__printPreviewImage) @@ -167,8 +167,8 @@ self.imageAct.setStatusTip(self.trUtf8( 'Save a screen capture to an image file')) self.imageAct.setWhatsThis(self.trUtf8( - """<b>Screen Capture</b>""" - """<p>Save a screen capture to an image file.</p>""" + """<b>Screen Capture</b>""" + """<p>Save a screen capture to an image file.</p>""" )) self.imageAct.triggered[()].connect(self.__saveImage) @@ -178,8 +178,8 @@ QKeySequence(self.trUtf8("Ctrl+Q", "File|Quit"))) self.exitAct.setStatusTip(self.trUtf8('Quit the application')) self.exitAct.setWhatsThis(self.trUtf8( - """<b>Quit</b>""" - """<p>Quit the application.</p>""" + """<b>Quit</b>""" + """<p>Quit the application.</p>""" )) self.exitAct.triggered[()].connect(qApp.closeAllWindows) @@ -190,8 +190,8 @@ self.copyAct.setStatusTip( self.trUtf8('Copy screen capture to clipboard')) self.copyAct.setWhatsThis(self.trUtf8( - """<b>Copy</b>""" - """<p>Copy screen capture to clipboard.</p>""" + """<b>Copy</b>""" + """<p>Copy screen capture to clipboard.</p>""" )) self.copyAct.triggered[()].connect(self.__copyImageToClipboard) @@ -214,8 +214,8 @@ self.aboutAct.setStatusTip(self.trUtf8( 'Display information about this software')) self.aboutAct.setWhatsThis(self.trUtf8( - """<b>About</b>""" - """<p>Display some information about this software.</p>""" + """<b>About</b>""" + """<p>Display some information about this software.</p>""" )) self.aboutAct.triggered[()].connect(self.__about) @@ -223,8 +223,8 @@ self.aboutQtAct.setStatusTip( self.trUtf8('Display information about the Qt toolkit')) self.aboutQtAct.setWhatsThis(self.trUtf8( - """<b>About Qt</b>""" - """<p>Display some information about the Qt toolkit.</p>""" + """<b>About Qt</b>""" + """<p>Display some information about the Qt toolkit.</p>""" )) self.aboutQtAct.triggered[()].connect(self.__aboutQt) @@ -361,7 +361,7 @@ self.trUtf8("Load UI File"), self.trUtf8( """<p>The file <b>{0}</b> could not be loaded.</p>""") - .format(fn)) + .format(fn)) self.__updateActions() def __updateChildren(self, sstyle): @@ -483,7 +483,7 @@ self.trUtf8("Save Image"), self.trUtf8( """<p>The file <b>{0}</b> could not be saved.</p>""") - .format(fname)) + .format(fname)) def __copyImageToClipboard(self): """
--- a/UI/AuthenticationDialog.py Sat Oct 19 16:51:12 2013 +0200 +++ b/UI/AuthenticationDialog.py Sat Oct 19 17:42:18 2013 +0200 @@ -38,7 +38,7 @@ self.iconLabel.setText("") self.iconLabel.setPixmap( self.style().standardIcon(QStyle.SP_MessageBoxQuestion).pixmap( - 32, 32)) + 32, 32)) def setData(self, username, password): """
--- a/UI/BrowserModel.py Sat Oct 19 16:51:12 2013 +0200 +++ b/UI/BrowserModel.py Sat Oct 19 17:42:18 2013 +0200 @@ -85,7 +85,7 @@ if index.column() < item.columnCount(): return item.data(index.column()) elif index.column() == item.columnCount() and \ - index.column() < self.columnCount(self.parent(index)): + index.column() < self.columnCount(self.parent(index)): # This is for the case where an item under a multi-column # parent doesn't have a value for all the columns return "" @@ -574,7 +574,7 @@ node = BrowserCodingItem( parentItem, QApplication.translate("BrowserModel", "Coding: {0}") - .format(dict["@@Coding@@"].coding)) + .format(dict["@@Coding@@"].coding)) self._addItem(node, parentItem) if "@@Globals@@" in keys: node = BrowserClassAttributesItem( @@ -1107,8 +1107,8 @@ @return flag indicating a Python file (boolean) """ return self.fileext in Preferences.getPython("PythonExtensions") or \ - (self.fileext == "" and self.sourceLanguage in ["Python", - "Python2"]) + (self.fileext == "" and + self.sourceLanguage in ["Python", "Python2"]) def isPython3File(self): """ @@ -1117,7 +1117,7 @@ @return flag indicating a Python file (boolean) """ return self.fileext in Preferences.getPython("Python3Extensions") or \ - (self.fileext == "" and self.sourceLanguage == "Python3") + (self.fileext == "" and self.sourceLanguage == "Python3") def isRubyFile(self): """ @@ -1126,7 +1126,7 @@ @return flag indicating a Ruby file (boolean) """ return self.fileext == '.rb' or \ - (self.fileext == "" and self.sourceLanguage == "Ruby") + (self.fileext == "" and self.sourceLanguage == "Ruby") def isDesignerFile(self): """ @@ -1207,7 +1207,7 @@ @return flag indicating a D file (boolean) """ return self.fileext in ['.d', '.di'] or \ - (self.fileext == "" and self.sourceLanguage == "D") + (self.fileext == "" and self.sourceLanguage == "D") def lessThan(self, other, column, order): """ @@ -1298,7 +1298,7 @@ if self._classObject and \ (self._classObject.methods or self._classObject.classes or - self._classObject.attributes): + self._classObject.attributes): self._populated = False self._lazyPopulation = True @@ -1389,7 +1389,7 @@ Utilities.ClassBrowsers.ClbrBaseClasses.Function.Static: self.icon = UI.PixmapCache.getIcon("method_static.png") elif self._functionObject.modifier == \ - Utilities.ClassBrowsers.ClbrBaseClasses.Function.Class: + Utilities.ClassBrowsers.ClbrBaseClasses.Function.Class: self.icon = UI.PixmapCache.getIcon("method_class.png") elif self._functionObject.isPrivate(): self.icon = UI.PixmapCache.getIcon("method_private.png") @@ -1528,7 +1528,7 @@ if issubclass(other.__class__, BrowserCodingItem): return order == Qt.DescendingOrder elif issubclass(other.__class__, BrowserClassItem) or \ - issubclass(other.__class__, BrowserMethodItem): + issubclass(other.__class__, BrowserMethodItem): return order == Qt.AscendingOrder return BrowserItem.lessThan(self, other, column, order)
--- a/UI/CompareDialog.py Sat Oct 19 16:51:12 2013 +0200 +++ b/UI/CompareDialog.py Sat Oct 19 17:42:18 2013 +0200 @@ -66,18 +66,18 @@ IS_CHARACTER_JUNK): if not flag: yield ('e', linenumberformat.format(ln1), l1, - linenumberformat.format(ln2), l2) + linenumberformat.format(ln2), l2) continue if ln2 == "" and l2 == "\n": yield ('d', linenumberformat.format(ln1), removeMarkers(l1), - emptylineno, '\n') + emptylineno, '\n') continue if ln1 == "" and l1 == "\n": yield ('i', emptylineno, '\n', - linenumberformat.format(ln2), removeMarkers(l2)) + linenumberformat.format(ln2), removeMarkers(l2)) continue yield ('r', linenumberformat.format(ln1), l1, - linenumberformat.format(ln2), l2) + linenumberformat.format(ln2), l2) class CompareDialog(QWidget, Ui_CompareDialog): @@ -234,7 +234,7 @@ self.trUtf8("Compare Files"), self.trUtf8( """<p>The file <b>{0}</b> could not be read.</p>""") - .format(filename1)) + .format(filename1)) return filename2 = Utilities.toNativeSeparators(self.file2Edit.text()) @@ -248,7 +248,7 @@ self.trUtf8("Compare Files"), self.trUtf8( """<p>The file <b>{0}</b> could not be read.</p>""") - .format(filename2)) + .format(filename2)) return self.__compare(lines1, lines2)
--- a/UI/DiffDialog.py Sat Oct 19 16:51:12 2013 +0200 +++ b/UI/DiffDialog.py Sat Oct 19 17:42:18 2013 +0200 @@ -345,7 +345,7 @@ self.trUtf8("Compare Files"), self.trUtf8( """<p>The file <b>{0}</b> could not be read.</p>""") - .format(self.filename1)) + .format(self.filename1)) return self.filename2 = Utilities.toNativeSeparators(self.file2Edit.text()) @@ -363,7 +363,7 @@ self.trUtf8("Compare Files"), self.trUtf8( """<p>The file <b>{0}</b> could not be read.</p>""") - .format(self.filename2)) + .format(self.filename2)) return self.contents.clear()
--- a/UI/EmailDialog.py Sat Oct 19 16:51:12 2013 +0200 +++ b/UI/EmailDialog.py Sat Oct 19 17:42:18 2013 +0200 @@ -308,7 +308,7 @@ self.trUtf8("Send bug report"), self.trUtf8( """<p>Authentication failed.<br>Reason: {0}</p>""") - .format(errorStr), + .format(errorStr), E5MessageBox.Critical) if res: return self.__sendmail(msg) @@ -334,7 +334,7 @@ self.trUtf8("Send bug report"), self.trUtf8( """<p>Message could not be sent.<br>Reason: {0}</p>""") - .format(errorStr), + .format(errorStr), E5MessageBox.Critical) if res: return self.__sendmail(msg)
--- a/UI/FindFileDialog.py Sat Oct 19 16:51:12 2013 +0200 +++ b/UI/FindFileDialog.py Sat Oct 19 17:42:18 2013 +0200 @@ -309,7 +309,7 @@ files = [self.project.getRelativePath(file) for file in self.__getFileList( - self.project.getProjectPath(), filterRe)] + self.project.getProjectPath(), filterRe)] else: files = [] if self.sourcesCheckBox.isChecked(): @@ -328,7 +328,7 @@ ["^{0}$".format( assoc.replace(".", "\.").replace("*", ".*")) for assoc in list( - Preferences.getEditorLexerAssocs().keys()) + Preferences.getEditorLexerAssocs().keys()) if assoc not in self.formsExt + self.interfacesExt]) if self.formsCheckBox.isChecked(): filters.append(self.filterForms) @@ -558,7 +558,7 @@ files.extend([os.path.join(dirname, f) for f in names if re.match(filterRe, f)] - ) + ) return files def setSearchDirectory(self, searchDir): @@ -610,7 +610,7 @@ self.trUtf8( """<p>Could not read the file <b>{0}</b>.""" """ Skipping it.</p><p>Reason: {1}</p>""") - .format(fn, str(err)) + .format(fn, str(err)) ) progress += 1 self.findProgress.setValue(progress) @@ -626,7 +626,7 @@ """<p>The current and the original hash of the""" """ file <b>{0}</b> are different. Skipping it.""" """</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p>""") - .format(fn, origHash, hash) + .format(fn, origHash, hash) ) progress += 1 self.findProgress.setValue(progress) @@ -651,7 +651,7 @@ self.trUtf8( """<p>Could not save the file <b>{0}</b>.""" """ Skipping it.</p><p>Reason: {1}</p>""") - .format(fn, str(err)) + .format(fn, str(err)) ) progress += 1
--- a/UI/NotificationWidget.py Sat Oct 19 16:51:12 2013 +0200 +++ b/UI/NotificationWidget.py Sat Oct 19 17:42:18 2013 +0200 @@ -39,9 +39,9 @@ self.__settingPosition = setPosition flags = Qt.Tool | \ - Qt.FramelessWindowHint | \ - Qt.WindowStaysOnTopHint | \ - Qt.X11BypassWindowManagerHint + Qt.FramelessWindowHint | \ + Qt.WindowStaysOnTopHint | \ + Qt.X11BypassWindowManagerHint if Globals.isWindowsPlatform(): flags |= Qt.ToolTip self.setWindowFlags(flags)
--- a/UI/Previewer.py Sat Oct 19 16:51:12 2013 +0200 +++ b/UI/Previewer.py Sat Oct 19 17:42:18 2013 +0200 @@ -227,10 +227,10 @@ editor.getLanguage() == "HTML": language = "HTML" elif extension in \ - Preferences.getEditor("PreviewMarkdownFileNameExtensions"): + Preferences.getEditor("PreviewMarkdownFileNameExtensions"): language = "Markdown" elif extension in \ - Preferences.getEditor("PreviewRestFileNameExtensions"): + Preferences.getEditor("PreviewRestFileNameExtensions"): language = "ReST" else: self.__setHtml(fn, self.trUtf8(
--- a/UI/UserInterface.py Sat Oct 19 16:51:12 2013 +0200 +++ b/UI/UserInterface.py Sat Oct 19 17:42:18 2013 +0200 @@ -1587,7 +1587,7 @@ self.versionAct.setWhatsThis(self.trUtf8( """<b>Show Versions</b>""" """<p>Display version information.</p>""" - )) + )) self.versionAct.triggered[()].connect(self.__showVersions) self.actions.append(self.versionAct) @@ -1598,7 +1598,7 @@ self.checkUpdateAct.setWhatsThis(self.trUtf8( """<b>Check for Updates...</b>""" """<p>Checks the internet for updates of eric5.</p>""" - )) + )) self.checkUpdateAct.triggered[()].connect(self.performVersionCheck) self.actions.append(self.checkUpdateAct) @@ -1612,7 +1612,7 @@ """<b>Show downloadable versions...</b>""" """<p>Shows the eric5 versions available for download """ """from the internet.</p>""" - )) + )) self.showVersionsAct.triggered[()].connect( self.showAvailableVersionsInfo) self.actions.append(self.showVersionsAct) @@ -1625,7 +1625,7 @@ self.reportBugAct.setWhatsThis(self.trUtf8( """<b>Report Bug...</b>""" """<p>Opens a dialog to report a bug.</p>""" - )) + )) self.reportBugAct.triggered[()].connect(self.__reportBug) self.actions.append(self.reportBugAct) @@ -1638,7 +1638,7 @@ self.requestFeatureAct.setWhatsThis(self.trUtf8( """<b>Request Feature...</b>""" """<p>Opens a dialog to send a feature request.</p>""" - )) + )) self.requestFeatureAct.triggered[()].connect(self.__requestFeature) self.actions.append(self.requestFeatureAct) @@ -2909,7 +2909,7 @@ try: from PyQt4.QtWebKit import qWebKitVersion versionText += """<tr><td><b>WebKit</b></td><td>{0}</td></tr>"""\ - .format(qWebKitVersion()) + .format(qWebKitVersion()) except ImportError: pass versionText += """<tr><td><b>{0}</b></td><td>{1}</td></tr>"""\ @@ -4044,7 +4044,7 @@ self.trUtf8( '<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') - .format(fn)) + .format(fn)) return except EnvironmentError: E5MessageBox.critical( @@ -4053,7 +4053,7 @@ self.trUtf8( '<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') - .format(fn)) + .format(fn)) return if Utilities.isMacPlatform(): @@ -4111,7 +4111,7 @@ self.trUtf8( '<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') - .format(fn)) + .format(fn)) return except EnvironmentError: E5MessageBox.critical( @@ -4120,7 +4120,7 @@ self.trUtf8( '<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') - .format(fn)) + .format(fn)) return if Utilities.isMacPlatform(): @@ -4279,7 +4279,7 @@ self.trUtf8( '<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') - .format(fn)) + .format(fn)) return except EnvironmentError: E5MessageBox.critical( @@ -4288,7 +4288,7 @@ self.trUtf8( '<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') - .format(fn)) + .format(fn)) return if not os.path.isfile(viewer) or \ @@ -4330,7 +4330,7 @@ self.trUtf8( '<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') - .format(fn)) + .format(fn)) return except EnvironmentError: if not ignore: @@ -4340,7 +4340,7 @@ self.trUtf8( '<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') - .format(fn)) + .format(fn)) return if not os.path.isfile(viewer) or \ @@ -4452,7 +4452,7 @@ self, self.trUtf8("External Tools"), self.trUtf8("""No toolgroup entry '{0}' found.""") - .format(toolGroupName) + .format(toolGroupName) ) def __toolExecute(self, act): @@ -4618,7 +4618,7 @@ self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" """ "<b>{0}</b>" could not be found.</p>""") - .format(home)) + .format(home)) return if not home.endswith(".chm"): @@ -4675,7 +4675,7 @@ self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" """ "<b>{0}</b>" could not be found.</p>""") - .format(home)) + .format(home)) return if not home.endswith(".chm"): @@ -4744,7 +4744,7 @@ self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" """ "<b>{0}</b>" could not be found.</p>""") - .format(home)) + .format(home)) return if Utilities.isWindowsPlatform(): @@ -4802,7 +4802,7 @@ self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" """ "<b>{0}</b>" could not be found.</p>""") - .format(home)) + .format(home)) return if Utilities.isWindowsPlatform(): @@ -4864,7 +4864,7 @@ self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" """ "<b>{0}</b>" could not be found.</p>""") - .format(home)) + .format(home)) return if Utilities.isWindowsPlatform(): @@ -4900,7 +4900,7 @@ self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" """ "<b>{0}</b>" could not be found.</p>""") - .format(home)) + .format(home)) return if Utilities.isWindowsPlatform(): @@ -4948,7 +4948,7 @@ self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" """ "<b>{0}</b>" could not be found.</p>""") - .format(home)) + .format(home)) return if Utilities.isWindowsPlatform(): @@ -5374,7 +5374,7 @@ self.trUtf8("Save tasks"), self.trUtf8( "<p>The tasks file <b>{0}</b> could not be written.</p>") - .format(fn)) + .format(fn)) return from E5XML.TasksWriter import TasksWriter @@ -5400,7 +5400,7 @@ self.trUtf8("Read tasks"), self.trUtf8( "<p>The tasks file <b>{0}</b> could not be read.</p>") - .format(fn)) + .format(fn)) def __writeSession(self): """ @@ -5418,7 +5418,7 @@ self.trUtf8("Save session"), self.trUtf8( "<p>The session file <b>{0}</b> could not be written.</p>") - .format(fn)) + .format(fn)) def __readSession(self): """ @@ -5431,7 +5431,7 @@ self.trUtf8("Read session"), self.trUtf8( "<p>The session file <b>{0}</b> could not be read.</p>") - .format(fn)) + .format(fn)) return f = QFile(fn) @@ -5446,7 +5446,7 @@ self.trUtf8("Read session"), self.trUtf8( "<p>The session file <b>{0}</b> could not be read.</p>") - .format(fn)) + .format(fn)) def showFindFileByNameDialog(self): """ @@ -5628,7 +5628,7 @@ self, self.trUtf8("Drop Error"), self.trUtf8("""<p><b>{0}</b> is not a file.</p>""") - .format(fname)) + .format(fname)) self.inDragDrop = False @@ -5767,7 +5767,7 @@ if self.__versionCheckProgress is None: self.__versionCheckProgress = \ QProgressDialog("", self.trUtf8("&Cancel"), - 0, len(self.__httpAlternatives), self) + 0, len(self.__httpAlternatives), self) self.__versionCheckProgress.setMinimumDuration(0) self.__versionCheckProgress.canceled.connect( self.__versionsDownloadCanceled) @@ -5884,7 +5884,7 @@ """The update to <b>{0}</b> of eric5 is""" """ available at <b>{1}</b>. Would you like to""" """ get it?""") - .format(versions[2], versions[3]), + .format(versions[2], versions[3]), yesDefault=True) url = res and versions[3] or '' elif versions[0] > Version: @@ -5895,7 +5895,7 @@ """The update to <b>{0}</b> of eric5 is""" """ available at <b>{1}</b>. Would you like to""" """ get it?""") - .format(versions[0], versions[1]), + .format(versions[0], versions[1]), yesDefault=True) url = res and versions[1] or '' else: @@ -5916,7 +5916,7 @@ """The update to <b>{0}</b> of eric5 is""" """ available at <b>{1}</b>. Would you like""" """ to get it?""") - .format(versions[0], versions[1]), + .format(versions[0], versions[1]), yesDefault=True) url = res and versions[1] or '' else: @@ -5963,7 +5963,7 @@ """</td></tr>""".format( versions[line], versions[line + 1], 'sourceforge' in versions[line + 1] and - "SourceForge" or versions[line + 1]) + "SourceForge" or versions[line + 1]) line += 2 versionText += self.trUtf8("""</table>""")
--- a/Utilities/ClassBrowsers/__init__.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Utilities/ClassBrowsers/__init__.py Sat Oct 19 17:42:18 2013 +0200 @@ -65,8 +65,8 @@ dict = jsclbr.readmodule_ex(module, path) jsclbr._modules.clear() elif ext in Preferences.getPython("PythonExtensions") or \ - ext in Preferences.getPython("Python3Extensions") or \ - isPyFile: + ext in Preferences.getPython("Python3Extensions") or \ + isPyFile: from . import pyclbr dict = pyclbr.readmodule_ex(module, path, isPyFile=isPyFile) pyclbr._modules.clear()
--- a/Utilities/ClassBrowsers/idlclbr.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Utilities/ClassBrowsers/idlclbr.py Sat Oct 19 17:42:18 2013 +0200 @@ -83,7 +83,7 @@ | (?P<End> [ \t]* } [ \t]* ; ) -""", re.VERBOSE | re.DOTALL | re.MULTILINE).search +""", re.VERBOSE | re.DOTALL | re.MULTILINE).search # __IGNORE_WARNING__ # function to replace comments _commentsub = re.compile(r"""//[^\n]*\n|//[^\n]*$""").sub @@ -238,7 +238,7 @@ last_lineno_pos = start # close all interfaces/modules indented at least as much while classstack and \ - classstack[-1][1] >= thisindent: + classstack[-1][1] >= thisindent: if classstack[-1][0] is not None: # record the end line classstack[-1][0].setEndLine(lineno - 1) @@ -287,7 +287,7 @@ indent += 1 # close all interfaces/modules indented at least as much while classstack and \ - classstack[-1][1] >= thisindent: + classstack[-1][1] >= thisindent: if classstack[-1][0] is not None: # record the end line classstack[-1][0].setEndLine(lineno - 1) @@ -323,7 +323,7 @@ indent += 1 # close all interfaces/modules indented at least as much while classstack and \ - classstack[-1][1] >= thisindent: + classstack[-1][1] >= thisindent: if classstack[-1][0] is not None: # record the end line classstack[-1][0].setEndLine(lineno - 1)
--- a/Utilities/ClassBrowsers/pyclbr.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Utilities/ClassBrowsers/pyclbr.py Sat Oct 19 17:42:18 2013 +0200 @@ -104,7 +104,7 @@ | (?P<CodingLine> ^ \# \s* [*_-]* \s* coding[:=] \s* (?P<Coding> [-\w_.]+ ) \s* [*_-]* $ ) -""", re.VERBOSE | re.DOTALL | re.MULTILINE).search +""", re.VERBOSE | re.DOTALL | re.MULTILINE).search # __IGNORE_WARNING__ _commentsub = re.compile(r"""#[^\n]*\n|#[^\n]*$""").sub @@ -237,7 +237,7 @@ if inpackage: try: f, file, (suff, mode, type) = \ - ClassBrowsers.find_module(module, path) + ClassBrowsers.find_module(module, path) except ImportError: f = None if f is None: @@ -251,7 +251,7 @@ _modules[module] = dict path = [file] + path f, file, (suff, mode, type) = \ - ClassBrowsers.find_module('__init__', [file]) + ClassBrowsers.find_module('__init__', [file]) if f: f.close() if type not in SUPPORTED_TYPES: @@ -316,14 +316,14 @@ thisindent -= deltaindent else: while conditionalsstack and \ - conditionalsstack[-1] >= thisindent: + conditionalsstack[-1] >= thisindent: del conditionalsstack[-1] if deltastack: del deltastack[-1] deltaindentcalculated = 0 # close all classes indented at least as much while classstack and \ - classstack[-1][1] >= thisindent: + classstack[-1][1] >= thisindent: if classstack[-1][0] is not None: # record the end line classstack[-1][0].setEndLine(lineno - 1) @@ -368,7 +368,7 @@ thisindent = _indent(m.group("ClassIndent")) # close all classes indented at least as much while classstack and \ - classstack[-1][1] >= thisindent: + classstack[-1][1] >= thisindent: if classstack[-1][0] is not None: # record the end line classstack[-1][0].setEndLine(lineno - 1) @@ -473,7 +473,7 @@ # a conditional function/method definition thisindent = _indent(m.group("ConditionalDefineIndent")) while conditionalsstack and \ - conditionalsstack[-1] >= thisindent: + conditionalsstack[-1] >= thisindent: del conditionalsstack[-1] if deltastack: del deltastack[-1]
--- a/Utilities/ClassBrowsers/rbclbr.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Utilities/ClassBrowsers/rbclbr.py Sat Oct 19 17:42:18 2013 +0200 @@ -156,7 +156,7 @@ end \b [^_] ) ) -""", re.VERBOSE | re.DOTALL | re.MULTILINE).search +""", re.VERBOSE | re.DOTALL | re.MULTILINE).search # __IGNORE_WARNING__ _commentsub = re.compile(r"""#[^\n]*\n|#[^\n]*$""").sub @@ -302,8 +302,8 @@ thisindent = indent indent += 1 meth_name = m.group("MethodName") or \ - m.group("MethodName2") or \ - m.group("MethodName3") + m.group("MethodName2") or \ + m.group("MethodName3") meth_sig = m.group("MethodSignature") meth_sig = meth_sig and meth_sig.replace('\\\n', '') or '' meth_sig = _commentsub('', meth_sig) @@ -315,13 +315,13 @@ meth_name = meth_name[6:] # close all classes/modules indented at least as much while classstack and \ - classstack[-1][1] >= thisindent: + classstack[-1][1] >= thisindent: if classstack[-1][0] is not None: # record the end line classstack[-1][0].setEndLine(lineno - 1) del classstack[-1] while acstack and \ - acstack[-1][1] >= thisindent: + acstack[-1][1] >= thisindent: del acstack[-1] if classstack: # it's a class/module method @@ -381,7 +381,7 @@ last_lineno_pos = start # close all classes/modules indented at least as much while classstack and \ - classstack[-1][1] >= thisindent: + classstack[-1][1] >= thisindent: if classstack[-1][0] is not None: # record the end line classstack[-1][0].setEndLine(lineno - 1) @@ -415,7 +415,7 @@ cur_obj = cur_class classstack.append((cur_class, thisindent)) while acstack and \ - acstack[-1][1] >= thisindent: + acstack[-1][1] >= thisindent: del acstack[-1] acstack.append(["public", thisindent]) # default access control # is 'public' @@ -428,7 +428,7 @@ last_lineno_pos = start # close all classes/modules indented at least as much while classstack and \ - classstack[-1][1] >= thisindent: + classstack[-1][1] >= thisindent: if classstack[-1][0] is not None: # record the end line classstack[-1][0].setEndLine(lineno - 1) @@ -456,7 +456,7 @@ cur_obj = cur_class classstack.append((cur_class, thisindent)) while acstack and \ - acstack[-1][1] >= thisindent: + acstack[-1][1] >= thisindent: del acstack[-1] acstack.append(["public", thisindent]) # default access control # is 'public' @@ -468,7 +468,7 @@ while index >= -len(acstack): if acstack[index][1] < indent: actype = m.group("AccessControlType") or \ - m.group("AccessControlType2").split('_')[0] + m.group("AccessControlType2").split('_')[0] acstack[index][0] = actype.lower() break else: @@ -481,7 +481,7 @@ not classstack[index][1] >= indent: parent = classstack[index][0] actype = m.group("AccessControlType") or \ - m.group("AccessControlType2").split('_')[0] + m.group("AccessControlType2").split('_')[0] actype = actype.lower() for name in aclist.split(","): name = name.strip()[1:] # get rid of leading ':' @@ -531,8 +531,8 @@ break name = nv[0].strip()[1:] # get rid of leading ':' attr = parent._getattribute("@" + name) or \ - parent._getattribute("@@" + name) or \ - Attribute(module, "@" + name, file, lineno) + parent._getattribute("@@" + name) or \ + Attribute(module, "@" + name, file, lineno) if len(nv) == 1 or nv[1].strip() == "false": attr.setProtected() elif nv[1].strip() == "true": @@ -543,8 +543,8 @@ for name in m.group("AttrList").split(","): name = name.strip()[1:] # get rid of leading ':' attr = parent._getattribute("@" + name) or \ - parent._getattribute("@@" + name) or \ - Attribute(module, "@" + name, file, lineno) + parent._getattribute("@@" + name) or \ + Attribute(module, "@" + name, file, lineno) if access == "_accessor": attr.setPublic() elif access == "_reader" or access == "_writer":
--- a/Utilities/FtpUtilities.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Utilities/FtpUtilities.py Sat Oct 19 17:42:18 2013 +0200 @@ -63,7 +63,7 @@ @return flag indicating to ignore the line (boolean) """ return line.strip() == "" or \ - line.strip().lower().startswith("total ") + line.strip().lower().startswith("total ") def __parseUnixMode(self, modeString, urlInfo): """ @@ -201,7 +201,7 @@ @return URL info object containing the valid data (E5UrlInfo) """ modeString, nlink, user, group, size, month, day, \ - yearOrTime, name = self.__splitUnixLine(line) + yearOrTime, name = self.__splitUnixLine(line) if name in [".", ".."]: return None
--- a/Utilities/ModuleParser.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Utilities/ModuleParser.py Sat Oct 19 17:42:18 2013 +0200 @@ -188,7 +188,7 @@ (?P<ConditionalDefineIndent> [ \t]* ) (?: (?: if | elif ) [ \t]+ [^:]* | else [ \t]* ) : (?= \s* def) ) -""", re.VERBOSE | re.DOTALL | re.MULTILINE).search +""", re.VERBOSE | re.DOTALL | re.MULTILINE).search # __IGNORE_WARNING__ _rb_getnext = re.compile( r""" @@ -325,7 +325,7 @@ end \b [^_] ) ) -""", re.VERBOSE | re.DOTALL | re.MULTILINE).search +""", re.VERBOSE | re.DOTALL | re.MULTILINE).search # __IGNORE_WARNING__ _hashsub = re.compile(r"""^([ \t]*)#[ \t]?""", re.MULTILINE).sub @@ -567,14 +567,14 @@ thisindent -= deltaindent else: while conditionalsstack and \ - conditionalsstack[-1] >= thisindent: + conditionalsstack[-1] >= thisindent: del conditionalsstack[-1] if deltastack: del deltastack[-1] deltaindentcalculated = 0 # close all classes indented at least as much while classstack and \ - classstack[-1][1] >= thisindent: + classstack[-1][1] >= thisindent: if classstack[-1][0] is not None and \ isinstance(classstack[-1][0], (Class, Function)): # record the end line of this class or function @@ -632,7 +632,7 @@ contents = "" else: contents = 1 and m.group("DocstringContents1") \ - or m.group("DocstringContents2") + or m.group("DocstringContents2") if cur_obj: cur_obj.addDescription(contents) @@ -640,7 +640,7 @@ if modulelevel and \ (src[start - len('\r\n'):start] == '\r\n' or src[start - len('\n'):start] == '\n' or - src[start - len('\r'):start] == '\r'): + src[start - len('\r'):start] == '\r'): contents = m.group("StringContents3") if contents is not None: contents = _hashsub(r"\1", contents) @@ -649,7 +649,7 @@ contents = "" else: contents = 1 and m.group("StringContents1") \ - or m.group("StringContents2") + or m.group("StringContents2") if cur_obj: cur_obj.addDescription(contents) @@ -660,7 +660,7 @@ last_lineno_pos = start # close all classes indented at least as much while classstack and \ - classstack[-1][1] >= thisindent: + classstack[-1][1] >= thisindent: if classstack[-1][0] is not None and \ isinstance(classstack[-1][0], (Class, Function)): # record the end line of this class or function @@ -775,7 +775,7 @@ # a conditional function/method definition thisindent = _indent(m.group("ConditionalDefineIndent")) while conditionalsstack and \ - conditionalsstack[-1] >= thisindent: + conditionalsstack[-1] >= thisindent: del conditionalsstack[-1] if deltastack: del deltastack[-1] @@ -812,8 +812,8 @@ thisindent = indent indent += 1 meth_name = m.group("MethodName") or \ - m.group("MethodName2") or \ - m.group("MethodName3") + m.group("MethodName2") or \ + m.group("MethodName3") meth_sig = m.group("MethodSignature") meth_sig = meth_sig and meth_sig.replace('\\\n', '') or '' lineno = lineno + src.count('\n', last_lineno_pos, start) @@ -824,7 +824,7 @@ meth_name = meth_name[6:] # close all classes/modules indented at least as much while classstack and \ - classstack[-1][1] >= thisindent: + classstack[-1][1] >= thisindent: if classstack[-1][0] is not None and \ isinstance(classstack[-1][0], (Class, Function, RbModule)): @@ -832,7 +832,7 @@ classstack[-1][0].setEndLine(lineno - 1) del classstack[-1] while acstack and \ - acstack[-1][1] >= thisindent: + acstack[-1][1] >= thisindent: del acstack[-1] if classstack: csi = -1 @@ -902,7 +902,7 @@ last_lineno_pos = start # close all classes/modules indented at least as much while classstack and \ - classstack[-1][1] >= thisindent: + classstack[-1][1] >= thisindent: if classstack[-1][0] is not None and \ isinstance(classstack[-1][0], (Class, Function, RbModule)): @@ -926,8 +926,8 @@ if class_name in parent_obj.classes: cur_class = parent_obj.classes[class_name] elif classstack and \ - isinstance(classstack[-1][0], Class) and \ - class_name == "self": + isinstance(classstack[-1][0], Class) and \ + class_name == "self": cur_class = classstack[-1][0] else: parent_obj.addClass(class_name, cur_class) @@ -938,7 +938,7 @@ cur_obj = cur_class classstack.append((cur_class, thisindent)) while acstack and \ - acstack[-1][1] >= thisindent: + acstack[-1][1] >= thisindent: del acstack[-1] acstack.append(["public", thisindent]) # default access control is 'public' @@ -951,7 +951,7 @@ last_lineno_pos = start # close all classes/modules indented at least as much while classstack and \ - classstack[-1][1] >= thisindent: + classstack[-1][1] >= thisindent: if classstack[-1][0] is not None and \ isinstance(classstack[-1][0], (Class, Function, RbModule)): @@ -974,7 +974,7 @@ cur_obj = cur_class classstack.append((cur_class, thisindent)) while acstack and \ - acstack[-1][1] >= thisindent: + acstack[-1][1] >= thisindent: del acstack[-1] acstack.append(["public", thisindent]) # default access control is 'public' @@ -1063,8 +1063,8 @@ # get rid of leading ':' name = nv[0].strip()[1:] attr = parent.getAttribute("@" + name) or \ - parent.getAttribute("@@" + name) or \ - Attribute( + parent.getAttribute("@@" + name) or \ + Attribute( self.name, "@" + name, self.file, lineno) if len(nv) == 1 or nv[1].strip() == "false": attr.setProtected() @@ -1077,8 +1077,8 @@ # get rid of leading ':' name = name.strip()[1:] attr = parent.getAttribute("@" + name) or \ - parent.getAttribute("@@" + name) or \ - Attribute( + parent.getAttribute("@@" + name) or \ + Attribute( self.name, "@" + name, self.file, lineno) if access == "_accessor":
--- a/Utilities/PasswordChecker.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Utilities/PasswordChecker.py Sat Oct 19 17:42:18 2013 +0200 @@ -565,13 +565,13 @@ # beyond basic requirements self.recommendedPasswordLength["status"] = self.__determineStatus( self.recommendedPasswordLength["count"] - - self.recommendedPasswordLength["minimum"]) + self.recommendedPasswordLength["minimum"]) self.middleNumerics["status"] = self.__determineStatus( self.middleNumerics["count"] - - self.middleNumerics["minimum"]) + self.middleNumerics["minimum"]) self.middleSymbols["status"] = self.__determineStatus( self.middleSymbols["count"] - - self.middleSymbols["minimum"]) + self.middleSymbols["minimum"]) self.sequentialLetters["status"] = self.__determineBinaryStatus( self.sequentialLetters["count"]) self.sequentialNumerics["status"] = self.__determineBinaryStatus(
--- a/Utilities/__init__.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Utilities/__init__.py Sat Oct 19 17:42:18 2013 +0200 @@ -291,7 +291,7 @@ raise CodingError(coding) else: if orig_coding and orig_coding.endswith( - ('-selected', '-default', '-guessed', '-ignore')): + ('-selected', '-default', '-guessed', '-ignore')): coding = orig_coding\ .replace("-selected", "")\ .replace("-default", "")\ @@ -958,8 +958,8 @@ fentry = os.path.join(path, entry) if pattern and \ - not os.path.isdir(fentry) and \ - not fnmatch.fnmatch(entry, pattern): + not os.path.isdir(fentry) and \ + not fnmatch.fnmatch(entry, pattern): # entry doesn't fit the given pattern continue @@ -993,7 +993,7 @@ dirs = [] for name in names: if os.path.isdir(os.path.join(path, name)) and \ - not os.path.islink(os.path.join(path, name)): + not os.path.islink(os.path.join(path, name)): exclude = 0 for e in excludeDirs: if name.split(os.sep, 1)[0] == e: @@ -1363,7 +1363,7 @@ file, "1", QCoreApplication.translate("Utilities", "Python2 interpreter not configured.") - )]) + )]) syntaxChecker = os.path.join(getConfig('ericDir'), "UtilitiesPython2", "Py2SyntaxChecker.py") @@ -1381,8 +1381,8 @@ if finished: output = \ str(proc.readAllStandardOutput(), - Preferences.getSystem("IOEncoding"), - 'replace').splitlines() + Preferences.getSystem("IOEncoding"), + 'replace').splitlines() if output: syntaxerror = output[0] == "ERROR" @@ -1475,7 +1475,7 @@ return "{0}{1}{2}".format(Preferences.getQt("QtToolsPrefix4"), toolname, Preferences.getQt("QtToolsPostfix4") - ) + ) def getQtMacBundle(toolname):
--- a/Utilities/binplistlib.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Utilities/binplistlib.py Sat Oct 19 17:42:18 2013 +0200 @@ -723,7 +723,7 @@ 'offsetCount': len(self.computedUniques), 'offsetTableOffset': len(output), 'topLevelObjectNumber': 0 - }) + }) output = self.writeOffsetTable(output) output += pack('!xxxxxxBBQQQ', *self.trailer) @@ -866,7 +866,7 @@ if position is None: self.writtenReferences[obj] = len(self.writtenReferences) output += self.binaryInt(len(self.writtenReferences) - 1, - bytes=self.trailer.objectRefSize) + bytes=self.trailer.objectRefSize) return (True, output) else: output += self.binaryInt(
--- a/Utilities/crypto/py3AES.py Sat Oct 19 16:51:12 2013 +0200 +++ b/Utilities/crypto/py3AES.py Sat Oct 19 17:42:18 2013 +0200 @@ -344,12 +344,12 @@ for i in range(nbr): if isInv: state[statePointer:statePointer + 4] = \ - state[statePointer + 3:statePointer + 4] + \ - state[statePointer:statePointer + 3] + state[statePointer + 3:statePointer + 4] + \ + state[statePointer:statePointer + 3] else: state[statePointer:statePointer + 4] = \ - state[statePointer + 1:statePointer + 4] + \ - state[statePointer:statePointer + 1] + state[statePointer + 1:statePointer + 4] + \ + state[statePointer:statePointer + 1] return state def __mixColumns(self, state, isInv): @@ -391,13 +391,13 @@ g = self.__galois_multiplication column[0] = g(cpy[0], mult[0]) ^ g(cpy[3], mult[1]) ^ \ - g(cpy[2], mult[2]) ^ g(cpy[1], mult[3]) + g(cpy[2], mult[2]) ^ g(cpy[1], mult[3]) column[1] = g(cpy[1], mult[0]) ^ g(cpy[0], mult[1]) ^ \ - g(cpy[3], mult[2]) ^ g(cpy[2], mult[3]) + g(cpy[3], mult[2]) ^ g(cpy[2], mult[3]) column[2] = g(cpy[2], mult[0]) ^ g(cpy[1], mult[1]) ^ \ - g(cpy[0], mult[2]) ^ g(cpy[3], mult[3]) + g(cpy[0], mult[2]) ^ g(cpy[3], mult[3]) column[3] = g(cpy[3], mult[0]) ^ g(cpy[2], mult[1]) ^ \ - g(cpy[1], mult[2]) ^ g(cpy[0], mult[3]) + g(cpy[1], mult[2]) ^ g(cpy[0], mult[3]) return column def __aes_round(self, state, roundKey):
--- a/UtilitiesPython2/Tabnanny.py Sat Oct 19 16:51:12 2013 +0200 +++ b/UtilitiesPython2/Tabnanny.py Sat Oct 19 17:42:18 2013 +0200 @@ -255,8 +255,8 @@ for ts in range(1, n + 1): if self.indent_level(ts) != other.indent_level(ts): a.append((ts, - self.indent_level(ts), - other.indent_level(ts))) + self.indent_level(ts), + other.indent_level(ts))) return a # Return True iff self.indent_level(t) < other.indent_level(t) @@ -313,8 +313,8 @@ for ts in range(1, n + 1): if self.indent_level(ts) >= other.indent_level(ts): a.append((ts, - self.indent_level(ts), - other.indent_level(ts))) + self.indent_level(ts), + other.indent_level(ts))) return a
--- a/VCS/ProjectBrowserHelper.py Sat Oct 19 16:51:12 2013 +0200 +++ b/VCS/ProjectBrowserHelper.py Sat Oct 19 17:42:18 2013 +0200 @@ -139,11 +139,11 @@ if self.isTranslationsBrowser: names = [itm.dirName() for itm in self.browser.getSelectedItems( - [ProjectBrowserSimpleDirectoryItem])] + [ProjectBrowserSimpleDirectoryItem])] if not names: names = [itm.fileName() for itm in self.browser.getSelectedItems( - [ProjectBrowserFileItem])] + [ProjectBrowserFileItem])] else: names = [] for itm in self.browser.getSelectedItems(): @@ -162,11 +162,11 @@ if self.isTranslationsBrowser: names = [itm.dirName() for itm in self.browser.getSelectedItems( - [ProjectBrowserSimpleDirectoryItem])] + [ProjectBrowserSimpleDirectoryItem])] if not names: names = [itm.fileName() for itm in self.browser.getSelectedItems( - [ProjectBrowserFileItem])] + [ProjectBrowserFileItem])] else: names = [] for itm in self.browser.getSelectedItems():
--- a/ViewManager/ViewManager.py Sat Oct 19 16:51:12 2013 +0200 +++ b/ViewManager/ViewManager.py Sat Oct 19 17:42:18 2013 +0200 @@ -826,7 +826,7 @@ QApplication.translate( 'ViewManager', 'Revert to last saved state'), QApplication.translate( - 'ViewManager', 'Re&vert to last saved state'), + 'ViewManager', 'Re&vert to last saved state'), QKeySequence(QApplication.translate( 'ViewManager', "Ctrl+Y", "Edit|Revert")), 0, @@ -1043,9 +1043,9 @@ 0, self.editActGrp, 'vm_edit_toggle_comment') self.toggleCommentAct.setStatusTip(QApplication.translate( - 'ViewManager', - 'Toggle the comment of the current line, selection or' - ' comment block')) + 'ViewManager', + 'Toggle the comment of the current line, selection or' + ' comment block')) self.toggleCommentAct.setWhatsThis(QApplication.translate( 'ViewManager', """<b>Toggle Comment</b>""" @@ -3195,7 +3195,7 @@ 'ViewManager', """<b>Zoom in</b>""" """<p>Zoom in on the text. This makes the text bigger.</p>""" - )) + )) self.zoomInAct.triggered[()].connect(self.__zoomIn) self.viewActions.append(self.zoomInAct) @@ -3214,7 +3214,7 @@ 'ViewManager', """<b>Zoom out</b>""" """<p>Zoom out on the text. This makes the text smaller.</p>""" - )) + )) self.zoomOutAct.triggered[()].connect(self.__zoomOut) self.viewActions.append(self.zoomOutAct) @@ -3233,7 +3233,7 @@ """<b>Zoom reset</b>""" """<p>Reset the zoom of the text. """ """This sets the zoom factor to 100%.</p>""" - )) + )) self.zoomResetAct.triggered[()].connect(self.__zoomReset) self.viewActions.append(self.zoomResetAct) @@ -3252,7 +3252,7 @@ """<b>Zoom</b>""" """<p>Zoom the text. This opens a dialog where the""" """ desired size can be entered.</p>""" - )) + )) self.zoomToAct.triggered[()].connect(self.__zoom) self.viewActions.append(self.zoomToAct) @@ -3266,7 +3266,7 @@ 'ViewManager', """<b>Toggle all folds</b>""" """<p>Toggle all folds of the current editor.</p>""" - )) + )) self.toggleAllAct.triggered[()].connect(self.__toggleAll) self.viewActions.append(self.toggleAllAct) @@ -3283,7 +3283,7 @@ """<b>Toggle all folds (including children)</b>""" """<p>Toggle all folds of the current editor including""" """ all children.</p>""" - )) + )) self.toggleAllChildrenAct.triggered[()].connect( self.__toggleAllChildren) self.viewActions.append(self.toggleAllChildrenAct) @@ -3299,7 +3299,7 @@ """<b>Toggle current fold</b>""" """<p>Toggle the folds of the current line of the current""" """ editor.</p>""" - )) + )) self.toggleCurrentAct.triggered[()].connect(self.__toggleCurrent) self.viewActions.append(self.toggleCurrentAct) @@ -3315,7 +3315,7 @@ 'ViewManager', """<b>Remove all highlights</b>""" """<p>Remove the highlights of all editors.</p>""" - )) + )) self.unhighlightAct.triggered[()].connect(self.unhighlight) self.viewActions.append(self.unhighlightAct) @@ -3330,7 +3330,7 @@ 'ViewManager', """<b>Split view</b>""" """<p>Add a split to the view.</p>""" - )) + )) self.splitViewAct.triggered[()].connect(self.__splitView) self.viewActions.append(self.splitViewAct) @@ -3344,7 +3344,7 @@ 'ViewManager', """<b>Arrange horizontally</b>""" """<p>Arrange the splitted views horizontally.</p>""" - )) + )) self.splitOrientationAct.setChecked(False) self.splitOrientationAct.toggled[bool].connect(self.__splitOrientation) self.viewActions.append(self.splitOrientationAct) @@ -3360,7 +3360,7 @@ 'ViewManager', """<b>Remove split</b>""" """<p>Remove the current split.</p>""" - )) + )) self.splitRemoveAct.triggered[()].connect(self.removeSplit) self.viewActions.append(self.splitRemoveAct) @@ -3377,7 +3377,7 @@ 'ViewManager', """<b>Next split</b>""" """<p>Move to the next split.</p>""" - )) + )) self.nextSplitAct.triggered[()].connect(self.nextSplit) self.viewActions.append(self.nextSplitAct) @@ -3393,7 +3393,7 @@ 'ViewManager', """<b>Previous split</b>""" """<p>Move to the previous split.</p>""" - )) + )) self.prevSplitAct.triggered[()].connect(self.prevSplit) self.viewActions.append(self.prevSplitAct) @@ -3409,7 +3409,7 @@ """<b>Preview</b>""" """<p>This opens the web browser with a preview of""" """ the current file.</p>""" - )) + )) self.previewAct.setChecked(Preferences.getUI("ShowFilePreview")) self.previewAct.toggled[bool].connect(self.__previewEditor) self.viewActions.append(self.previewAct) @@ -3494,7 +3494,7 @@ 'ViewManager', """<b>Start Macro Recording</b>""" """<p>Start recording editor commands into a new macro.</p>""" - )) + )) self.macroStartRecAct.triggered[()].connect(self.__macroStartRecording) self.macroActions.append(self.macroStartRecAct) @@ -3508,7 +3508,7 @@ 'ViewManager', """<b>Stop Macro Recording</b>""" """<p>Stop recording editor commands into a new macro.</p>""" - )) + )) self.macroStopRecAct.triggered[()].connect(self.__macroStopRecording) self.macroActions.append(self.macroStopRecAct) @@ -3522,7 +3522,7 @@ 'ViewManager', """<b>Run Macro</b>""" """<p>Run a previously recorded editor macro.</p>""" - )) + )) self.macroRunAct.triggered[()].connect(self.__macroRun) self.macroActions.append(self.macroRunAct) @@ -3536,7 +3536,7 @@ 'ViewManager', """<b>Delete Macro</b>""" """<p>Delete a previously recorded editor macro.</p>""" - )) + )) self.macroDeleteAct.triggered[()].connect(self.__macroDelete) self.macroActions.append(self.macroDeleteAct) @@ -3550,7 +3550,7 @@ 'ViewManager', """<b>Load Macro</b>""" """<p>Load an editor macro from a file.</p>""" - )) + )) self.macroLoadAct.triggered[()].connect(self.__macroLoad) self.macroActions.append(self.macroLoadAct) @@ -3564,7 +3564,7 @@ 'ViewManager', """<b>Save Macro</b>""" """<p>Save a previously recorded editor macro to a file.</p>""" - )) + )) self.macroSaveAct.triggered[()].connect(self.__macroSave) self.macroActions.append(self.macroSaveAct) @@ -3608,7 +3608,7 @@ """<b>Toggle Bookmark</b>""" """<p>Toggle a bookmark at the current line of the current""" """ editor.</p>""" - )) + )) self.bookmarkToggleAct.triggered[()].connect(self.__toggleBookmark) self.bookmarkActions.append(self.bookmarkToggleAct) @@ -3626,7 +3626,7 @@ 'ViewManager', """<b>Next Bookmark</b>""" """<p>Go to next bookmark of the current editor.</p>""" - )) + )) self.bookmarkNextAct.triggered[()].connect(self.__nextBookmark) self.bookmarkActions.append(self.bookmarkNextAct) @@ -3644,7 +3644,7 @@ 'ViewManager', """<b>Previous Bookmark</b>""" """<p>Go to previous bookmark of the current editor.</p>""" - )) + )) self.bookmarkPreviousAct.triggered[()].connect(self.__previousBookmark) self.bookmarkActions.append(self.bookmarkPreviousAct) @@ -3661,7 +3661,7 @@ 'ViewManager', """<b>Clear Bookmarks</b>""" """<p>Clear bookmarks of all editors.</p>""" - )) + )) self.bookmarkClearAct.triggered[()].connect(self.__clearAllBookmarks) self.bookmarkActions.append(self.bookmarkClearAct) @@ -3677,7 +3677,7 @@ 'ViewManager', """<b>Goto Syntax Error</b>""" """<p>Go to next syntax error of the current editor.</p>""" - )) + )) self.syntaxErrorGotoAct.triggered[()].connect(self.__gotoSyntaxError) self.bookmarkActions.append(self.syntaxErrorGotoAct) @@ -3692,7 +3692,7 @@ 'ViewManager', """<b>Clear Syntax Errors</b>""" """<p>Clear syntax errors of all editors.</p>""" - )) + )) self.syntaxErrorClearAct.triggered[()].connect( self.__clearAllSyntaxErrors) self.bookmarkActions.append(self.syntaxErrorClearAct) @@ -3710,7 +3710,7 @@ """<b>Next warning message</b>""" """<p>Go to next line of the current editor""" """ having a py3flakes warning.</p>""" - )) + )) self.warningsNextAct.triggered[()].connect(self.__nextWarning) self.bookmarkActions.append(self.warningsNextAct) @@ -3728,7 +3728,7 @@ """<b>Previous warning message</b>""" """<p>Go to previous line of the current editor""" """ having a py3flakes warning.</p>""" - )) + )) self.warningsPreviousAct.triggered[()].connect(self.__previousWarning) self.bookmarkActions.append(self.warningsPreviousAct) @@ -3743,7 +3743,7 @@ 'ViewManager', """<b>Clear Warning Messages</b>""" """<p>Clear py3flakes warning messages of all editors.</p>""" - )) + )) self.warningsClearAct.triggered[()].connect(self.__clearAllWarnings) self.bookmarkActions.append(self.warningsClearAct) @@ -3760,7 +3760,7 @@ """<b>Next uncovered line</b>""" """<p>Go to next line of the current editor marked as not""" """ covered.</p>""" - )) + )) self.notcoveredNextAct.triggered[()].connect(self.__nextUncovered) self.bookmarkActions.append(self.notcoveredNextAct) @@ -3778,7 +3778,7 @@ """<b>Previous uncovered line</b>""" """<p>Go to previous line of the current editor marked""" """ as not covered.</p>""" - )) + )) self.notcoveredPreviousAct.triggered[()].connect( self.__previousUncovered) self.bookmarkActions.append(self.notcoveredPreviousAct) @@ -3795,7 +3795,7 @@ 'ViewManager', """<b>Next Task</b>""" """<p>Go to next line of the current editor having a task.</p>""" - )) + )) self.taskNextAct.triggered[()].connect(self.__nextTask) self.bookmarkActions.append(self.taskNextAct) @@ -3813,7 +3813,7 @@ """<b>Previous Task</b>""" """<p>Go to previous line of the current editor having a""" """ task.</p>""" - )) + )) self.taskPreviousAct.triggered[()].connect(self.__previousTask) self.bookmarkActions.append(self.taskPreviousAct) @@ -3830,7 +3830,7 @@ """<b>Next Change</b>""" """<p>Go to next line of the current editor having a change""" """ marker.</p>""" - )) + )) self.changeNextAct.triggered[()].connect(self.__nextChange) self.bookmarkActions.append(self.changeNextAct) @@ -3848,7 +3848,7 @@ """<b>Previous Change</b>""" """<p>Go to previous line of the current editor having""" """ a change marker.</p>""" - )) + )) self.changePreviousAct.triggered[()].connect(self.__previousChange) self.bookmarkActions.append(self.changePreviousAct) @@ -3956,7 +3956,7 @@ 'ViewManager', """<b>Check spelling</b>""" """<p>Perform a spell check of the current editor.</p>""" - )) + )) self.spellCheckAct.triggered[()].connect(self.__spellCheck) self.spellingActions.append(self.spellCheckAct) @@ -3974,7 +3974,7 @@ """<b>Automatic spell checking</b>""" """<p>Activate or deactivate the automatic spell checking""" """ function of all editors.</p>""" - )) + )) self.autoSpellCheckAct.setChecked( Preferences.getEditor("AutoSpellCheckingEnabled")) self.autoSpellCheckAct.triggered[()].connect( @@ -4104,7 +4104,7 @@ QApplication.translate( 'ViewManager', """<p>The file <b>{0}</b> has unsaved changes.</p>""") - .format(fn), + .format(fn), editor.saveFile) if res: self.setEditorName(editor, editor.getFileName()) @@ -4432,7 +4432,7 @@ self.sbLang.setText("") self.sbLang.setToolTip( QApplication.translate('ViewManager', 'Language: {0}') - .format(language)) + .format(language)) if eol is None: eol = '' @@ -5927,13 +5927,13 @@ return fileInfo = dictionaryFile if len(dictionaryFile) < 40 \ - else "...{0}".format(dictionaryFile[-40:]) + else "...{0}".format(dictionaryFile[-40:]) from QScintilla.SpellingDictionaryEditDialog import \ SpellingDictionaryEditDialog dlg = SpellingDictionaryEditDialog( data, QApplication.translate('ViewManager', "Editing {0}") - .format(fileInfo), + .format(fileInfo), self.ui) if dlg.exec_() == QDialog.Accepted: data = dlg.getData() @@ -6232,7 +6232,7 @@ self.autosaveInterval == 0: self.autosaveTimer.stop() elif not self.autosaveTimer.isActive() and \ - self.autosaveInterval > 0: + self.autosaveInterval > 0: self.autosaveTimer.start(self.autosaveInterval * 60000) self.__enableSpellingActions()
--- a/uninstall.py Sat Oct 19 16:51:12 2013 +0200 +++ b/uninstall.py Sat Oct 19 17:42:18 2013 +0200 @@ -211,8 +211,8 @@ except SystemExit: raise except: - print( -"""An internal error occured. Please report all the output of the program, -including the following traceback, to eric5-bugs@eric-ide.python-projects.org. -""") + print("""An internal error occured. Please report all the output of""" + """ the program,\n""" + """including the following traceback, to""" + """ eric5-bugs@eric-ide.python-projects.org.\n""") raise
