Modernize the use of QRegExp to use QRegularExpression

Apparently this was available since 5.0 TODO: read this to see if there is any incompatibility: https://doc.qt.io/qt-6/qregexp.html
spyder-ide · Jul 16, 2024 · 322b611 · 322b611
1 parent c72b4e5
commit 322b611
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/spyder/plugins/editor/widgets/codeeditor.py b/spyder/plugins/editor/widgets/codeeditor.py
@@ -34,8 +34,8 @@
 from packaging.version import parse
 from qtpy import QT_VERSION
 from qtpy.compat import to_qvariant
-from qtpy.QtCore import (QEvent, QEventLoop, QRegExp, Qt, QTimer, QThread,
-                         QUrl, Signal, Slot)
+from qtpy.QtCore import (QEvent, QEventLoop, QRegularExpression, Qt, QTimer,
+                         QThread, QUrl, Signal, Slot)
 from qtpy.QtGui import (QColor, QCursor, QFont, QKeySequence, QPaintEvent,
                         QPainter, QMouseEvent, QTextCursor, QDesktopServices,
                         QKeyEvent, QTextDocument, QTextFormat, QTextOption,
@@ -2590,15 +2590,17 @@ def __find_first(self, text):
         cursor = self.textCursor()
         # Scanning whole document
         cursor.movePosition(QTextCursor.Start)
-        regexp = QRegExp(r"\b%s\b" % QRegExp.escape(text), Qt.CaseSensitive)
+        regexp = QRegularExpression(
+            r"\b%s\b" % QRegularExpression.escape(text), Qt.CaseSensitive)
         cursor = self.document().find(regexp, cursor, flags)
         self.__find_first_pos = cursor.position()
         return cursor
 
     def __find_next(self, text, cursor):
         """Find next occurrence"""
         flags = QTextDocument.FindCaseSensitively|QTextDocument.FindWholeWords
-        regexp = QRegExp(r"\b%s\b" % QRegExp.escape(text), Qt.CaseSensitive)
+        regexp = QRegularExpression(
+            r"\b%s\b" % QRegularExpression.escape(text), Qt.CaseSensitive)
         cursor = self.document().find(regexp, cursor, flags)
         if cursor.position() != self.__find_first_pos:
             return cursor

diff --git a/spyder/plugins/explorer/widgets/fileassociations.py b/spyder/plugins/explorer/widgets/fileassociations.py
@@ -15,8 +15,8 @@
 
 # Third party imports
 from qtpy.compat import getopenfilename
-from qtpy.QtCore import QRegExp, QSize, Qt, Signal, Slot
-from qtpy.QtGui import QCursor, QRegExpValidator
+from qtpy.QtCore import QRegularExpression, QSize, Qt, Signal, Slot
+from qtpy.QtGui import QCursor, QRegularExpressionValidator
 from qtpy.QtWidgets import (QApplication, QDialog, QDialogButtonBox,
                             QHBoxLayout, QLabel, QLineEdit,
                             QListWidget, QListWidgetItem, QPushButton,
@@ -83,7 +83,7 @@ def set_regex_validation(self, regex):
         """Set the regular expression to validate content."""
         self._regex = regex
         self._reg = re.compile(regex, re.IGNORECASE)
-        validator = QRegExpValidator(QRegExp(regex))
+        validator = QRegularExpressionValidator(QRegularExpression(regex))
         self.lineedit.setValidator(validator)
 
     def text(self):

diff --git a/spyder/plugins/preferences/api.py b/spyder/plugins/preferences/api.py
@@ -16,8 +16,8 @@
 from qtpy import API
 from qtpy.compat import (getexistingdirectory, getopenfilename, from_qvariant,
                          to_qvariant)
-from qtpy.QtCore import Qt, Signal, Slot, QRegExp
-from qtpy.QtGui import QColor, QRegExpValidator, QTextOption
+from qtpy.QtCore import Qt, Signal, Slot, QRegularExpression
+from qtpy.QtGui import QColor, QRegularExpressionValidator, QTextOption
 from qtpy.QtWidgets import (QButtonGroup, QCheckBox, QComboBox, QDoubleSpinBox,
                             QFileDialog, QFontComboBox, QGridLayout, QGroupBox,
                             QHBoxLayout, QLabel, QLineEdit, QMessageBox,
@@ -494,7 +494,8 @@ def create_lineedit(self, text, option, default=NoDefault,
         if tip:
             edit.setToolTip(tip)
         if regex:
-            edit.setValidator(QRegExpValidator(QRegExp(regex)))
+            edit.setValidator(
+                QRegularExpressionValidator(QRegularExpression(regex)))
         if placeholder:
             edit.setPlaceholderText(placeholder)
         self.lineedits[edit] = (section, option, default)

diff --git a/spyder/widgets/helperwidgets.py b/spyder/widgets/helperwidgets.py
@@ -14,9 +14,10 @@
 # Third party imports
 import qstylizer.style
 from qtpy import PYQT5
-from qtpy.QtCore import QPoint, QRegExp, QSize, QSortFilterProxyModel, Qt
+from qtpy.QtCore import (QPoint, QRegularExpression, QSize,
+                         QSortFilterProxyModel, Qt)
 from qtpy.QtGui import (QAbstractTextDocumentLayout, QColor, QFontMetrics,
-                        QPainter, QRegExpValidator, QTextDocument, )
+                        QPainter, QRegularExpressionValidator, QTextDocument)
 from qtpy.QtWidgets import (QApplication, QCheckBox, QLineEdit, QMessageBox,
                             QSpacerItem, QStyle, QStyledItemDelegate,
                             QStyleOptionFrame, QStyleOptionViewItem,
@@ -345,8 +346,8 @@ def __init__(self, parent, callback=None, main=None,
         self.main = main
 
         # Widget setup
-        regex = QRegExp(regex_base + "{100}")
-        self.setValidator(QRegExpValidator(regex))
+        regex = QRegularExpression(regex_base + "{100}")
+        self.setValidator(QRegularExpressionValidator(regex))
 
         # Signals
         if callback: