Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py

changeset 3119
8b19074bb239
parent 2965
d133c7edd88a
child 3142
55030c09e142
child 3160
209a07d7e401
diff -r b1278ba1d7fe -r 8b19074bb239 Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Sat Nov 30 16:33:11 2013 +0100
+++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Sat Nov 30 18:01:00 2013 +0100
@@ -756,12 +756,15 @@
             options.append("QRegularExpression.UseUnicodePropertiesOption")
         if self.captureCheckBox.isChecked():
             options.append("QRegularExpression.DontCaptureOption")
-        options = " | \\{0}{1}".format(os.linesep, i1string).join(options)
+        options = " |{0}{1}".format(os.linesep, i1string).join(options)
         
-        code = '{0} = QRegularExpression(r"""{1}"""'.format(
-            reVar, regexp.replace('"', '\\"'))
+        code = '{0} = QRegularExpression('.format(reVar)
         if options:
-            code += ', {0}{1}{2}'.format(os.linesep, i1string, options)
+            code += '{0}{1}r"""{2}""",'.format(
+                os.linesep, i1string, regexp.replace('"', '\\"'))
+            code += '{0}{1}{2}'.format(os.linesep, i1string, options)
+        else:
+            code += 'r"""{0}"""'.format(regexp.replace('"', '\\"'))
         code += '){0}'.format(estring)
         return code
 

eric ide

mercurial