diff -r 8c3b52d1b4b6 -r c6236bed1b50 eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py
--- a/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py Wed Jun 09 17:13:01 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py Wed Jun 09 17:48:02 2021 +0200
@@ -79,20 +79,20 @@
self.namedGroups = re.compile(r"""\(?P<([^>]+)>""").findall
- # start the PyQt5 server part
- self.__pyqt5Available = False
- self.__pyqt5Server = QProcess(self)
- self.__pyqt5Server.start(
+ # start the PyQt6 server part
+ self.__pyqt6Available = False
+ self.__pyqt6Server = QProcess(self)
+ self.__pyqt6Server.start(
sys.executable, [os.path.join(
os.path.dirname(__file__), "QRegularExpressionWizardServer.py")
])
- if self.__pyqt5Server.waitForStarted(5000):
- self.__pyqt5Server.setReadChannel(
+ if self.__pyqt6Server.waitForStarted(5000):
+ self.__pyqt6Server.setReadChannel(
QProcess.ProcessChannel.StandardOutput)
if self.__sendCommand("available"):
response = self.__receiveResponse()
if response and response["available"]:
- self.__pyqt5Available = True
+ self.__pyqt6Available = True
self.saveButton = self.buttonBox.addButton(
self.tr("Save"), QDialogButtonBox.ButtonRole.ActionRole)
@@ -102,7 +102,7 @@
self.tr("Load"), QDialogButtonBox.ButtonRole.ActionRole)
self.loadButton.setToolTip(
self.tr("Load a regular expression from a file"))
- if self.__pyqt5Available:
+ if self.__pyqt6Available:
self.validateButton = self.buttonBox.addButton(
self.tr("Validate"), QDialogButtonBox.ButtonRole.ActionRole)
self.validateButton.setToolTip(
@@ -153,8 +153,8 @@
commandDict.update(kw)
commandStr = json.dumps(commandDict) + "\n"
data = QByteArray(commandStr.encode("utf-8"))
- self.__pyqt5Server.write(data)
- result = self.__pyqt5Server.waitForBytesWritten(10000)
+ self.__pyqt6Server.write(data)
+ result = self.__pyqt6Server.waitForBytesWritten(10000)
return result
def __receiveResponse(self):
@@ -164,8 +164,8 @@
@return response dictionary (dict)
"""
responseDict = {}
- if self.__pyqt5Server.waitForReadyRead(10000):
- data = bytes(self.__pyqt5Server.readAllStandardOutput())
+ if self.__pyqt6Server.waitForReadyRead(10000):
+ data = bytes(self.__pyqt6Server.readAllStandardOutput())
responseStr = data.decode("utf-8")
responseDict = json.loads(responseStr)
if responseDict["error"]:
@@ -184,7 +184,7 @@
Public method to shut down the PyQt5 server part.
"""
self.__sendCommand("exit")
- self.__pyqt5Server.waitForFinished(5000)
+ self.__pyqt6Server.waitForFinished(5000)
def __insertString(self, s, steps=0):
"""
@@ -481,8 +481,8 @@
"""
Private slot to validate the entered QRegularExpression.
"""
- if not self.__pyqt5Available:
- # only available for PyQt5
+ if not self.__pyqt6Available:
+ # only available for PyQt6
return
regexp = self.regexpTextEdit.toPlainText()
@@ -554,8 +554,8 @@
@param startpos starting position for the QRegularExpression matching
"""
- if not self.__pyqt5Available:
- # only available for PyQt5
+ if not self.__pyqt6Available:
+ # only available for PyQt6
return
regexp = self.regexpTextEdit.toPlainText()
@@ -780,7 +780,7 @@
code += '{0}{1}{2}'.format(os.linesep, i1string, options)
else:
code += 'r"""{0}"""'.format(regexp.replace('"', '\\"'))
- code += '){0}'.format(estring)
+ code += '{0}){0}'.format(estring)
return code
