Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py

branch
Py2 comp.
changeset 3142
55030c09e142
parent 3057
10516539f238
parent 3119
8b19074bb239
child 3145
a9de05d4a22f
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -758,12 +758,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