diff -r 58fe260e7469 -r 7ce719013078 QScintilla/TypingCompleters/CompleterPython.py --- a/QScintilla/TypingCompleters/CompleterPython.py Sat Oct 19 12:28:12 2013 +0200 +++ b/QScintilla/TypingCompleters/CompleterPython.py Sat Oct 19 13:03:39 2013 +0200 @@ -236,7 +236,7 @@ edInd = self.editor.indentation(ifLine) if self.__elseRX.indexIn(txt) == 0 and edInd <= indentation: indentation = edInd - 1 - elif (self.__ifRX.indexIn(txt) == 0 or \ + elif (self.__ifRX.indexIn(txt) == 0 or self.__elifRX.indexIn(txt) == 0) and edInd <= indentation: self.editor.cancelList() self.editor.setIndentation(line, edInd) @@ -262,9 +262,9 @@ 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 \ + 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: self.editor.cancelList() @@ -285,10 +285,10 @@ while tryLine >= 0: txt = self.editor.text(tryLine) edInd = self.editor.indentation(tryLine) - if (self.__exceptcRX.indexIn(txt) == 0 or \ + if (self.__exceptcRX.indexIn(txt) == 0 or self.__finallyRX.indexIn(txt) == 0) and edInd <= indentation: indentation = edInd - 1 - elif (self.__exceptRX.indexIn(txt) == 0 or \ + elif (self.__exceptRX.indexIn(txt) == 0 or self.__tryRX.indexIn(txt) == 0) and edInd <= indentation: self.editor.cancelList() self.editor.setIndentation(line, edInd) @@ -307,8 +307,8 @@ txt = self.editor.text(tryLine) edInd = self.editor.indentation(tryLine) if self.__py24StyleTry: - if (self.__exceptcRX.indexIn(txt) == 0 or \ - self.__exceptRX.indexIn(txt) == 0 or \ + if (self.__exceptcRX.indexIn(txt) == 0 or + self.__exceptRX.indexIn(txt) == 0 or self.__finallyRX.indexIn(txt) == 0) and \ edInd <= indentation: indentation = edInd - 1 @@ -319,8 +319,8 @@ else: if self.__finallyRX.indexIn(txt) == 0 and edInd <= indentation: indentation = edInd - 1 - elif (self.__tryRX.indexIn(txt) == 0 or \ - self.__exceptcRX.indexIn(txt) == 0 or \ + elif (self.__tryRX.indexIn(txt) == 0 or + self.__exceptcRX.indexIn(txt) == 0 or self.__exceptRX.indexIn(txt) == 0) and \ edInd <= indentation: self.editor.cancelList() @@ -362,7 +362,7 @@ curLine = line - 1 while curLine >= 0: txt = self.editor.text(curLine) - if (self.__defSelfRX.indexIn(txt) == 0 or \ + if (self.__defSelfRX.indexIn(txt) == 0 or self.__defClsRX.indexIn(txt) == 0) and \ self.editor.indentation(curLine) == indentation: return True