Mercurial Repositories > eric / file diff

diff -r 960850ec284c -r a22eee00b052 eric6/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py
--- a/eric6/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Sat Aug 31 12:29:57 2019 +0200
+++ b/eric6/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Sat Aug 31 12:58:11 2019 +0200
@@ -409,14 +409,8 @@
                     flags |= re.DOTALL
                 if self.verboseCheckBox.isChecked():
                     flags |= re.VERBOSE
-                if self.py2Button.isChecked():
-                    if self.localeCheckBox.isChecked():
-                        flags |= re.LOCALE
-                    if self.unicodeCheckBox.isChecked():
-                        flags |= re.UNICODE
-                else:
-                    if self.unicodeCheckBox.isChecked():
-                        flags |= re.ASCII
+                if self.unicodeCheckBox.isChecked():
+                    flags |= re.ASCII
                 re.compile(regex, flags)
                 E5MessageBox.information(
                     self,
@@ -465,14 +459,8 @@
                     flags |= re.DOTALL
                 if self.verboseCheckBox.isChecked():
                     flags |= re.VERBOSE
-                if self.py2Button.isChecked():
-                    if self.localeCheckBox.isChecked():
-                        flags |= re.LOCALE
-                    if self.unicodeCheckBox.isChecked():
-                        flags |= re.UNICODE
-                else:
-                    if self.unicodeCheckBox.isChecked():
-                        flags |= re.ASCII
+                if self.unicodeCheckBox.isChecked():
+                    flags |= re.ASCII
                 regobj = re.compile(regex, flags)
                 matchobj = regobj.search(text, startpos)
                 if matchobj is not None:
@@ -608,31 +596,6 @@
         """
         self.nextButton.setEnabled(False)
         
-    @pyqtSlot(bool)
-    def on_py2Button_toggled(self, checked):
-        """
-        Private slot called when the Python version was selected.
-        
-        @param checked state of the Python 2 button (boolean)
-        """
-        # set the checkboxes
-        self.localeCheckBox.setEnabled(checked)
-        if checked:
-            self.unicodeCheckBox.setText(self.tr("Unicode"))
-        else:
-            self.unicodeCheckBox.setText(self.tr("ASCII"))
-        self.unicodeCheckBox.setChecked(not self.unicodeCheckBox.isChecked())
-        
-        # clear the result table
-        self.resultTable.clear()
-        self.resultTable.setColumnCount(0)
-        self.resultTable.setRowCount(0)
-        
-        # remove the highlight
-        tc = self.textTextEdit.textCursor()
-        tc.setPosition(0)
-        self.textTextEdit.setTextCursor(tc)
-        
     def getCode(self, indLevel, indString):
         """
         Public method to get the source code.
@@ -662,14 +625,8 @@
             flags.append('re.DOTALL')
         if self.verboseCheckBox.isChecked():
             flags.append('re.VERBOSE')
-        if self.localeCheckBox.isChecked() and \
-           self.py2Button.isChecked():
-            flags.append('re.LOCALE')
         if self.unicodeCheckBox.isChecked():
-            if self.py2Button.isChecked():
-                flags.append('re.UNICODE')
-            else:
-                flags.append('re.ASCII')
+            flags.append('re.ASCII')
         flags = " | ".join(flags)
         
         code = ''