eric6/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py

changeset 7775
4a1db75550bd
parent 7774
9eed155411f0
child 7900
72b88fb20261
child 7924
8a96736d465e
diff -r 9eed155411f0 -r 4a1db75550bd eric6/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py
--- a/eric6/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py	Sat Oct 10 16:03:53 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py	Sun Oct 11 17:54:52 2020 +0200
@@ -7,12 +7,12 @@
 Module implementing a dialog to browse the log history.
 """
 
-
+import re
 import os
 
 import pysvn
 
-from PyQt5.QtCore import Qt, QDate, QRegExp, pyqtSlot, QPoint
+from PyQt5.QtCore import Qt, QDate, pyqtSlot, QPoint
 from PyQt5.QtWidgets import (
     QHeaderView, QWidget, QApplication, QDialogButtonBox, QTreeWidgetItem
 )
@@ -567,18 +567,18 @@
             txt = self.fieldCombo.currentText()
             if txt == self.tr("Author"):
                 fieldIndex = 1
-                searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive)
+                searchRx = re.compile(self.rxEdit.text(), re.IGNORECASE)
             elif txt == self.tr("Revision"):
                 fieldIndex = 0
                 txt = self.rxEdit.text()
                 if txt.startswith("^"):
-                    searchRx = QRegExp(
-                        r"^\s*{0}".format(txt[1:]), Qt.CaseInsensitive)
+                    searchRx = re.compile(
+                        r"^\s*{0}".format(txt[1:]), re.IGNORECASE)
                 else:
-                    searchRx = QRegExp(txt, Qt.CaseInsensitive)
+                    searchRx = re.compile(txt, re.IGNORECASE)
             else:
                 fieldIndex = 3
-                searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive)
+                searchRx = re.compile(self.rxEdit.text(), re.IGNORECASE)
             
             currentItem = self.logTree.currentItem()
             for topIndex in range(self.logTree.topLevelItemCount()):
@@ -586,7 +586,7 @@
                 if (
                     topItem.text(2) <= to_ and
                     topItem.text(2) >= from_ and
-                    searchRx.indexIn(topItem.text(fieldIndex)) > -1
+                    searchRx.search(topItem.text(fieldIndex)) is not None
                 ):
                     topItem.setHidden(False)
                     if topItem is currentItem:

eric ide

mercurial