diff -r 2bbec88047dd -r 2161475d9639 eric6/UI/LogView.py --- a/eric6/UI/LogView.py Wed Apr 21 19:40:50 2021 +0200 +++ b/eric6/UI/LogView.py Thu Apr 22 18:02:47 2021 +0200 @@ -173,10 +173,11 @@ """ message = Utilities.filterAnsiSequences(message) - if isErrorMessage: - filters = self.__stderrFilter + self.__stdxxxFilter - else: - filters = self.__stdoutFilter + self.__stdxxxFilter + filters = ( + self.__stderrFilter + self.__stdxxxFilter + if isErrorMessage else + self.__stdoutFilter + self.__stdxxxFilter + ) return any(msgFilter in message for msgFilter in filters) @@ -253,16 +254,17 @@ flags |= QTextDocument.FindFlag.FindCaseSensitively if wholeWord: flags |= QTextDocument.FindFlag.FindWholeWords - if regexp: - ok = self.find(QRegularExpression( + ok = ( + self.find(QRegularExpression( txt, QRegularExpression.PatternOption.NoPatternOption if caseSensitive else QRegularExpression.PatternOption.CaseInsensitiveOption), flags ) - else: - ok = self.find(txt, flags) + if regexp else + self.find(txt, flags) + ) self.searchStringFound.emit(ok) def searchPrev(self, txt, caseSensitive, wholeWord, regexp): @@ -286,16 +288,17 @@ flags |= QTextDocument.FindFlag.FindCaseSensitively if wholeWord: flags |= QTextDocument.FindFlag.FindWholeWords - if regexp: - ok = self.find(QRegularExpression( + ok = ( + self.find(QRegularExpression( txt, QRegularExpression.PatternOption.NoPatternOption if caseSensitive else QRegularExpression.PatternOption.CaseInsensitiveOption), flags ) - else: - ok = self.find(txt, flags) + if regexp else + self.find(txt, flags) + ) self.searchStringFound.emit(ok) def keyPressEvent(self, evt):