eric: comparison src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py

-:e9e7eca7efee
+:bf71ee032bb4
 """
 from PyQt6.QtCore import QRegularExpression
 from PyQt6.QtGui import QRegularExpressionValidator
 from PyQt6.QtWidgets import (
-QWidget, QDialog, QVBoxLayout, QHBoxLayout, QScrollArea, QPushButton,
+QWidget,
-QSpacerItem, QSizePolicy, QComboBox, QLineEdit, QLabel
+QDialog,
+QVBoxLayout,
+QHBoxLayout,
+QScrollArea,
+QPushButton,
+QSpacerItem,
+QSizePolicy,
+QComboBox,
+QLineEdit,
+QLabel,
 )
 from .Ui_QRegularExpressionWizardCharactersDialog import (
-Ui_QRegularExpressionWizardCharactersDialog
+Ui_QRegularExpressionWizardCharactersDialog,
 )
 class QRegularExpressionWizardCharactersDialog(
-QDialog, Ui_QRegularExpressionWizardCharactersDialog):
+QDialog, Ui_QRegularExpressionWizardCharactersDialog
+):
 """
 Class implementing a dialog for entering character classes.
 """
 def __init__(self, parent=None):
 """
 Constructor
 @param parent reference to the parent widget (QWidget)
 """
 super().__init__(parent)
 self.setupUi(self)
 self.__initCharacterSelectors()
 self.comboItems = []
-self.singleComboItems = []      # these are in addition to the above
+self.singleComboItems = []  # these are in addition to the above
 self.comboItems.append((self.tr("Normal character"), "-c"))
-self.comboItems.append((self.tr(
+self.comboItems.append(
-"Unicode character in hexadecimal notation"), "-h"))
+(self.tr("Unicode character in hexadecimal notation"), "-h")
-self.comboItems.append((self.tr(
+)
-"ASCII/Latin1 character in octal notation"), "-o"))
+self.comboItems.append(
-self.singleComboItems.extend([
+(self.tr("ASCII/Latin1 character in octal notation"), "-o")
-("---", "-i"),
+)
-(self.tr("Bell character (\\a)"), "\\a"),
+self.singleComboItems.extend(
-(self.tr("Escape character (\\e)"), "\\e"),
+[
-(self.tr("Page break (\\f)"), "\\f"),
+("---", "-i"),
-(self.tr("Line feed (\\n)"), "\\n"),
+(self.tr("Bell character (\\a)"), "\\a"),
-(self.tr("Carriage return (\\r)"), "\\r"),
+(self.tr("Escape character (\\e)"), "\\e"),
-(self.tr("Horizontal tabulator (\\t)"), "\\t"),
+(self.tr("Page break (\\f)"), "\\f"),
-("---", "-i"),
+(self.tr("Line feed (\\n)"), "\\n"),
-(self.tr("Character Category"), "-ccp"),
+(self.tr("Carriage return (\\r)"), "\\r"),
-(self.tr("Special Character Category"), "-csp"),
+(self.tr("Horizontal tabulator (\\t)"), "\\t"),
-(self.tr("Character Block"), "-cbp"),
+("---", "-i"),
-(self.tr("POSIX Named Set"), "-psp"),
+(self.tr("Character Category"), "-ccp"),
-(self.tr("Not Character Category"), "-ccn"),
+(self.tr("Special Character Category"), "-csp"),
-(self.tr("Not Character Block"), "-cbn"),
+(self.tr("Character Block"), "-cbp"),
-(self.tr("Not Special Character Category"), "-csn"),
+(self.tr("POSIX Named Set"), "-psp"),
-(self.tr("Not POSIX Named Set"), "-psn"),
+(self.tr("Not Character Category"), "-ccn"),
-])
+(self.tr("Not Character Block"), "-cbn"),
+(self.tr("Not Special Character Category"), "-csn"),
+(self.tr("Not POSIX Named Set"), "-psn"),
+]
+)
 self.charValidator = QRegularExpressionValidator(
-QRegularExpression(".{0,1}"), self)
+QRegularExpression(".{0,1}"), self
+)
 self.hexValidator = QRegularExpressionValidator(
-QRegularExpression("[0-9a-fA-F]{0,4}"), self)
+QRegularExpression("[0-9a-fA-F]{0,4}"), self
+)
 self.octValidator = QRegularExpressionValidator(
-QRegularExpression("[0-3]?[0-7]{0,2}"), self)
+QRegularExpression("[0-3]?[0-7]{0,2}"), self
+)
 # generate dialog part for single characters
 self.singlesBoxLayout = QVBoxLayout(self.singlesBox)
 self.singlesBoxLayout.setObjectName("singlesBoxLayout")
 self.singlesBoxLayout.setSpacing(6)
 self.singlesBoxLayout.setContentsMargins(6, 6, 6, 6)
 self.singlesBox.setLayout(self.singlesBoxLayout)
 self.singlesView = QScrollArea(self.singlesBox)
 self.singlesView.setObjectName("singlesView")
 self.singlesBoxLayout.addWidget(self.singlesView)
 self.singlesItemsBox = QWidget(self)
 self.singlesView.setWidget(self.singlesItemsBox)
 self.singlesItemsBox.setObjectName("singlesItemsBox")
 self.singlesItemsBox.setMinimumWidth(1000)
 self.singlesItemsBoxLayout = QVBoxLayout(self.singlesItemsBox)
 self.singlesItemsBoxLayout.setContentsMargins(6, 6, 6, 6)
 self.singlesItemsBoxLayout.setSpacing(6)
 self.singlesItemsBox.setLayout(self.singlesItemsBoxLayout)
 self.singlesEntries = []
 self.__addSinglesLine()
 hlayout0 = QHBoxLayout()
 hlayout0.setContentsMargins(0, 0, 0, 0)
 hlayout0.setSpacing(6)
 hlayout0.setObjectName("hlayout0")
 self.moreSinglesButton = QPushButton(
-self.tr("Additional Entries"), self.singlesBox)
+self.tr("Additional Entries"), self.singlesBox
+)
 self.moreSinglesButton.setObjectName("moreSinglesButton")
 hlayout0.addWidget(self.moreSinglesButton)
 hspacer0 = QSpacerItem(
-30, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+30, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum
+)
 hlayout0.addItem(hspacer0)
 self.singlesBoxLayout.addLayout(hlayout0)
 self.moreSinglesButton.clicked.connect(self.__addSinglesLine)
 # generate dialog part for character ranges
 self.rangesBoxLayout = QVBoxLayout(self.rangesBox)
 self.rangesBoxLayout.setObjectName("rangesBoxLayout")
 self.rangesBoxLayout.setSpacing(6)
 self.rangesBoxLayout.setContentsMargins(6, 6, 6, 6)
 self.rangesBox.setLayout(self.rangesBoxLayout)
 self.rangesView = QScrollArea(self.rangesBox)
 self.rangesView.setObjectName("rangesView")
 self.rangesBoxLayout.addWidget(self.rangesView)
 self.rangesItemsBox = QWidget(self)
 self.rangesView.setWidget(self.rangesItemsBox)
 self.rangesItemsBox.setObjectName("rangesItemsBox")
 self.rangesItemsBox.setMinimumWidth(1000)
 self.rangesItemsBoxLayout = QVBoxLayout(self.rangesItemsBox)
 self.rangesItemsBoxLayout.setContentsMargins(6, 6, 6, 6)
 self.rangesItemsBoxLayout.setSpacing(6)
 self.rangesItemsBox.setLayout(self.rangesItemsBoxLayout)
 self.rangesEntries = []
 self.__addRangesLine()
 hlayout1 = QHBoxLayout()
 hlayout1.setContentsMargins(0, 0, 0, 0)
 hlayout1.setSpacing(6)
 hlayout1.setObjectName("hlayout1")
 self.moreRangesButton = QPushButton(
-self.tr("Additional Entries"), self.rangesBox)
+self.tr("Additional Entries"), self.rangesBox
+)
 self.moreSinglesButton.setObjectName("moreRangesButton")
 hlayout1.addWidget(self.moreRangesButton)
 hspacer1 = QSpacerItem(
-30, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+30, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum
+)
 hlayout1.addItem(hspacer1)
 self.rangesBoxLayout.addLayout(hlayout1)
 self.moreRangesButton.clicked.connect(self.__addRangesLine)
 def __initCharacterSelectors(self):
 """
 Private method to initialize the W3C character selector entries.
 """
 self.__characterCategories = (
 (self.tr("Other, Format"), "Cf"),
 (self.tr("Other, Unassigned"), "Cn"),
 (self.tr("Other, Private Use"), "Co"),
 (self.tr("Other, Surrogat"), "Cn"),
 )
 self.__specialCharacterCategories = (
 # display name                           code
 (self.tr("Alphanumeric"), "Xan"),
 (self.tr("POSIX Space"), "Xps"),
 (self.tr("Perl Space"), "Xsp"),
 (self.tr("Universal Character"), "Xuc"),
 (self.tr("Perl Word"), "Xan"),
 )
 self.__characterBlocks = (
 # display name                           code
 (self.tr("Arabic"), "Arabic"),
 (self.tr("Armenian"), "Armenian"),
 (self.tr("Avestan"), "Avestan"),
 (self.tr("Tifinagh"), "Tifinagh"),
 (self.tr("Ugaritic"), "Ugaritic"),
 (self.tr("Vai"), "Vai"),
 (self.tr("Yi"), "Yi"),
 )
 self.__posixNamedSets = (
 # display name                                  code
 (self.tr("Alphanumeric"), "alnum"),
 (self.tr("Alphabetic"), "alpha"),
 (self.tr("ASCII"), "ascii"),
 (self.tr("Printing (excl. space)"), "graph"),
 (self.tr("Printing (incl. space)"), "print"),
 (self.tr("Printing (excl. alphanumeric)"), "punct"),
 (self.tr("Control Character"), "cntrl"),
 )
 def __populateCharTypeCombo(self, combo, isSingle):
 """
 Private method to populate a given character type selection combo box.
 @param combo reference to the combo box to be populated (QComboBox)
 @param isSingle flag indicating a singles combo (boolean)
 """
 for txt, value in self.comboItems:
 combo.addItem(txt, value)
 cb2a.setEditable(False)
 cb2a.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
 hboxLayout.addWidget(cb2a)
 cb2a.hide()
 self.singlesItemsBoxLayout.addWidget(hbox)
-cb1.activated[int].connect(
+cb1.activated[int].connect(lambda i: self.__singlesCharTypeSelected(i, cb1))
-lambda i: self.__singlesCharTypeSelected(i, cb1))
+cb2.activated[int].connect(lambda i: self.__singlesCharTypeSelected(i, cb2))
-cb2.activated[int].connect(
-lambda i: self.__singlesCharTypeSelected(i, cb2))
 hbox.show()
 self.singlesItemsBox.adjustSize()
 self.singlesEntries.append([cb1, le1, cb1a])
 self.singlesEntries.append([cb2, le2, cb2a])
 def __addRangesLine(self):
 """
 Private slot to add a line of entry widgets for character ranges.
 """
 hbox = QWidget(self.rangesItemsBox)
 hboxLayout.addWidget(l2)
 le2 = QLineEdit(hbox)
 le2.setValidator(self.charValidator)
 hboxLayout.addWidget(le2)
 self.rangesItemsBoxLayout.addWidget(hbox)
-cb1.activated[int].connect(
+cb1.activated[int].connect(lambda i: self.__rangesCharTypeSelected(i, cb1))
-lambda i: self.__rangesCharTypeSelected(i, cb1))
 hbox.show()
 self.rangesItemsBox.adjustSize()
 self.rangesEntries.append([cb1, le1, le2])
 def __populateCharacterCombo(self, combo, formatIdentifier):
 """
 Private method to populate a character selection combo.
 @param combo combo box to be populated (QComboBox)
 @param formatIdentifier format identifier (one of "-ccp", "-ccn",
 "-cbp", "-cbn", "-csp", "-csn", "-psp", "-psn")
 """
 combo.clear()
 if formatIdentifier in ["-ccp", "-ccn"]:
 items = self.__characterCategories
 elif formatIdentifier in ["-csp", "-csn"]:
 items = self.__specialCharacterCategories
 elif formatIdentifier in ["-cbp", "-cbn"]:
 items = self.__characterBlocks
 elif formatIdentifier in ["-psp", "-psn"]:
 items = self.__posixNamedSets
 comboLen = 0
 for txt, code in items:
 combo.addItem(txt, code)
 comboLen = max(comboLen, len(txt))
 combo.setMinimumContentsLength(comboLen)
 def __performSelectedAction(self, formatIdentifier, lineedit, combo):
 """
 Private method performing some actions depending on the input.
 @param formatIdentifier format of the selected entry (string)
 @param lineedit line edit widget to act on (QLineEdit)
 @param combo combo box widget to act on (QComboBox)
 """
 if formatIdentifier == "-i":
 return
 if formatIdentifier in ["-c", "-h", "-o"]:
 lineedit.show()
 lineedit.setEnabled(True)
 if combo is not None:
 combo.hide()
 lineedit.setValidator(self.charValidator)
 elif formatIdentifier == "-h":
 lineedit.setValidator(self.hexValidator)
 elif formatIdentifier == "-o":
 lineedit.setValidator(self.octValidator)
-elif formatIdentifier in ["-ccp", "-ccn", "-cbp", "-cbn", "-csp",
+elif formatIdentifier in [
-"-csn", "-psp", "-psn"]:
+"-ccp",
+"-ccn",
+"-cbp",
+"-cbn",
+"-csp",
+"-csn",
+"-psp",
+"-psn",
+]:
 lineedit.setEnabled(False)
 lineedit.hide()
 if combo is not None:
 combo.show()
 self.__populateCharacterCombo(combo, formatIdentifier)
 lineedit.setEnabled(False)
 lineedit.hide()
 if combo is not None:
 combo.hide()
 lineedit.clear()
 def __singlesCharTypeSelected(self, index, combo):
 """
 Private slot to handle the activated(int) signal of the single chars
 combo boxes.
 @param index selected list index
 @type int
 @param combo reference to the combo box
 @type QComboBox
 """
 for entriesList in self.singlesEntries:
 if combo == entriesList[0]:
 formatIdentifier = combo.itemData(index)
 self.__performSelectedAction(
-formatIdentifier, entriesList[1], entriesList[2])
+formatIdentifier, entriesList[1], entriesList[2]
+)
 break
 def __rangesCharTypeSelected(self, index, combo):
 """
 Private slot to handle the activated(int) signal of the char ranges
 combo boxes.
 @param index selected list index
 @type int
 @param combo reference to the combo box
 @type QComboBox
 """
 for entriesList in self.rangesEntries:
 if combo == entriesList[0]:
 formatIdentifier = combo.itemData(index)
-self.__performSelectedAction(formatIdentifier, entriesList[1],
+self.__performSelectedAction(formatIdentifier, entriesList[1], None)
-None)
+self.__performSelectedAction(formatIdentifier, entriesList[2], None)
-self.__performSelectedAction(formatIdentifier, entriesList[2],
-None)
 break
 def __formatCharacter(self, char, formatIdentifier):
 """
 Private method to format the characters entered into the dialog.
 @param char character string entered into the dialog (string)
 @param formatIdentifier string giving a special format (-c, -h, -i or
 -o) or the already formatted character (string)
 @return formatted character string (string)
 """
 if formatIdentifier == "-c":
 return char
 elif formatIdentifier == "-i":
 return ""
 if formatIdentifier == "-h":
 while len(char) < 2:
 char = "0" + char
 if len(char) > 2:
 return "\\x{{{0}}}".format(char.lower())
 return "[:{0}:]".format(char)
 elif formatIdentifier == "-psn":
 return "[:^{0}:]".format(char)
 else:
 return formatIdentifier
 def getCharacters(self):
 """
 Public method to return the character string assembled via the dialog.
 @return formatted string for character classes (string)
 """
 regexp = ""
 # negative character range
 if self.negativeCheckBox.isChecked():
 regexp += "^"
 # predefined character ranges
 if self.wordCharCheckBox.isChecked():
 regexp += "\\w"
 if self.nonWordCharCheckBox.isChecked():
 regexp += "\\W"
 regexp += "\\H"
 if self.verticalWhitespaceCheckBox.isChecked():
 regexp += "\\v"
 if self.nonVerticalWhitespaceCheckBox.isChecked():
 regexp += "\\V"
 # single characters
 for entrieslist in self.singlesEntries:
-formatIdentifier = entrieslist[0].itemData(
+formatIdentifier = entrieslist[0].itemData(entrieslist[0].currentIndex())
-entrieslist[0].currentIndex())
 char = (
 entrieslist[2].itemData(entrieslist[2].currentIndex())
-if formatIdentifier in ["-ccp", "-ccn", "-cbp", "-cbn", "-csp",
+if formatIdentifier
-"-csn", "-psp", "-psn"] else
+in ["-ccp", "-ccn", "-cbp", "-cbn", "-csp", "-csn", "-psp", "-psn"]
-entrieslist[1].text()
+else entrieslist[1].text()
 )
 regexp += self.__formatCharacter(char, formatIdentifier)
 # character ranges
 for entrieslist in self.rangesEntries:
-if (
+if not entrieslist[1].text() or not entrieslist[2].text():
-not entrieslist[1].text() or
-not entrieslist[2].text()
-):
 continue
-formatIdentifier = entrieslist[0].itemData(
+formatIdentifier = entrieslist[0].itemData(entrieslist[0].currentIndex())
-entrieslist[0].currentIndex())
 char1 = entrieslist[1].text()
 char2 = entrieslist[2].text()
 regexp += "{0}-{1}".format(
 self.__formatCharacter(char1, formatIdentifier),
-self.__formatCharacter(char2, formatIdentifier))
+self.__formatCharacter(char2, formatIdentifier),
+)
 if regexp:
 if (
-(regexp.startswith("\\") and
+regexp.startswith("\\")
-regexp.count("\\") == 1 and
+and regexp.count("\\") == 1
-"-" not in regexp) or
+and "-" not in regexp
-len(regexp) == 1
+) or len(regexp) == 1:
-):
 return regexp
 else:
 return "[{0}]".format(regexp)
 else:
 return ""

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py

src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py