--- a/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Sat Oct 10 16:03:53 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Sun Oct 11 17:54:52 2020 +0200 @@ -8,8 +8,9 @@ """ import os +import re -from PyQt5.QtCore import pyqtSlot, Qt, QRegExp, QCoreApplication +from PyQt5.QtCore import pyqtSlot, Qt, QCoreApplication from PyQt5.QtWidgets import ( QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem ) @@ -230,20 +231,20 @@ searchRxText = self.rxEdit.text() filterTop = self.categoryCombo.currentText() == self.tr("Revision") if filterTop and searchRxText.startswith("^"): - searchRx = QRegExp( - r"^\s*{0}".format(searchRxText[1:]), Qt.CaseInsensitive) + searchRx = re.compile( + r"^\s*{0}".format(searchRxText[1:]), re.IGNORECASE) else: - searchRx = QRegExp(searchRxText, Qt.CaseInsensitive) + searchRx = re.compile(searchRxText, re.IGNORECASE) for topIndex in range(self.signaturesList.topLevelItemCount()): topLevelItem = self.signaturesList.topLevelItem(topIndex) if filterTop: topLevelItem.setHidden( - searchRx.indexIn(topLevelItem.text(0)) == -1) + searchRx.search(topLevelItem.text(0)) is None) else: visibleChildren = topLevelItem.childCount() for childIndex in range(topLevelItem.childCount()): childItem = topLevelItem.child(childIndex) - if searchRx.indexIn(childItem.text(0)) == -1: + if searchRx.search(childItem.text(0)) is None: childItem.setHidden(True) visibleChildren -= 1 else: