replace foo.replace( QRegExp(regexp), bar) with re.sub(regexp,bar,foo) (fixes #8066)

jef-n · jef-n · commit 192e13013b24 · 2013-06-15T22:44:31.000+02:00
diff --git a/python/plugins/GdalTools/tools/doFillNodata.py b/python/plugins/GdalTools/tools/doFillNodata.py
@@ -33,6 +33,7 @@
 import GdalTools_utils as Utils
 
 import os.path
+import re
 
 class GdalToolsDialog( QWidget, Ui_Widget, BaseBatchWidget ):
   def __init__( self, iface ):
@@ -228,7 +229,7 @@ def batchRun(self):
       for f in files:
         self.inFiles.append( inDir + "/" + f )
         if outDir != None:
-          outFile = f.replace( QRegExp( "\.[a-zA-Z0-9]{2,4}" ), outExt )
+          outFile = re.sub( f, "\.[a-zA-Z0-9]{2,4}", outExt )
           self.outFiles.append( outDir + "/" + outFile )
 
       self.errors = QStringList()
diff --git a/python/plugins/GdalTools/tools/doTranslate.py b/python/plugins/GdalTools/tools/doTranslate.py
@@ -33,6 +33,8 @@
 from dialogSRS import GdalToolsSRSDialog as SRSDialog
 import GdalTools_utils as Utils
 
+import re
+
 class GdalToolsDialog(QWidget, Ui_Widget, BaseBatchWidget):
 
   def __init__(self, iface):
@@ -298,7 +300,7 @@ def batchRun(self):
       for f in files:
         self.inFiles.append( inDir + "/" + f )
         if outDir != None:
-          outFile = f.replace( QRegExp( "\.[a-zA-Z0-9]{2,4}" ), outExt )
+          outFile = re.sub( "\.[a-zA-Z0-9]{2,4}", outExt, f )
           self.outFiles.append( outDir + "/" + outFile )
 
       self.errors = QStringList()
diff --git a/python/plugins/db_manager/dlg_sql_window.py b/python/plugins/db_manager/dlg_sql_window.py
@@ -34,6 +34,8 @@
 from .highlighter import SqlHighlighter
 from .completer import SqlCompleter
 
+import re
+
 class DlgSqlWindow(QDialog, Ui_Dialog):
 
   def __init__(self, iface, db, parent=None):
@@ -134,7 +136,7 @@ def getSql(self):
     if sql == "":
       sql = self.editSql.toPlainText()
     # try to sanitize query
-    sql = sql.replace( QRegExp( ";\\s*$" ), "" )
+    sql = re.sub( ";\\s*$", "", sql )
     return sql
 
   def clearSql(self):
