Replace use of QRegExp in db manager

Author: nyalldawson

python/plugins/db_manager/db_plugins/data_model.py

@@ -20,7 +20,7 @@
 
 from qgis.PyQt.QtCore import (Qt,
                               QTime,
-                              QRegExp,
+                              QRegularExpression,
                               QAbstractTableModel,
                               pyqtSignal,
                               QObject)
@@ -286,11 +286,11 @@ def getObject(self, row):
         fld = val if val is not None else self._getNewObject()
         fld.name = self.data(self.index(row, 0)) or ""
         typestr = self.data(self.index(row, 1)) or ""
-        regex = QRegExp("([^\\(]+)\\(([^\\)]+)\\)")
-        startpos = regex.indexIn(typestr)
-        if startpos >= 0:
-            fld.dataType = regex.cap(1).strip()
-            fld.modifier = regex.cap(2).strip()
+        regex = QRegularExpression(r"([^\(]+)\(([^\)]+)\)")
+        match = regex.match(typestr)
+        if match.hasMatch():
+            fld.dataType = match.captured(1).strip()
+            fld.modifier = regex.captured(2).strip()
         else:
             fld.modifier = None
             fld.dataType = typestr

python/plugins/db_manager/db_plugins/postgis/connector.py

@@ -23,7 +23,7 @@
 from functools import cmp_to_key
 
 from qgis.PyQt.QtCore import (
-    QRegExp,
+    QRegularExpression,
     QFile,
     QVariant,
     QDateTime,
@@ -848,9 +848,10 @@ def getSpatialRefInfo(self, srid):
 
         srtext = sr[0]
         # try to extract just SR name (should be quoted in double quotes)
-        regex = QRegExp('"([^"]+)"')
-        if regex.indexIn(srtext) > -1:
-            srtext = regex.cap(1)
+        regex = QRegularExpression('"([^"]+)"')
+        match = regex.match(srtext)
+        if match.hasMatch():
+            srtext = match.captured(1)
         return srtext
 
     def isVectorTable(self, table):

python/plugins/db_manager/db_plugins/postgis/plugin.py

@@ -21,7 +21,11 @@
 # this will disable the dbplugin if the connector raise an ImportError
 from .connector import PostGisDBConnector
 
-from qgis.PyQt.QtCore import Qt, QRegExp, QCoreApplication
+from qgis.PyQt.QtCore import (
+    Qt,
+    QRegularExpression,
+    QCoreApplication
+)
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QAction, QApplication, QMessageBox
 from qgis.core import Qgis, QgsApplication, QgsSettings
@@ -407,10 +411,10 @@ def __init__(self, row, table):
 
         # get modifier (e.g. "precision,scale") from formatted type string
         trimmedTypeStr = typeStr.strip()
-        regex = QRegExp("\\((.+)\\)$")
-        startpos = regex.indexIn(trimmedTypeStr)
-        if startpos >= 0:
-            self.modifier = regex.cap(1).strip()
+        regex = QRegularExpression(r"\((.+)\)$")
+        match = regex.match(trimmedTypeStr)
+        if match.hasMatch():
+            self.modifier = match.captured(1).strip()
         else:
             self.modifier = None