diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/Debugger/DebuggerInterfacePython.py
--- a/eric7/Debugger/DebuggerInterfacePython.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Debugger/DebuggerInterfacePython.py Sat May 22 18:51:46 2021 +0200
@@ -17,8 +17,8 @@
QObject, QProcess, QProcessEnvironment, QTimer
)
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox
from . import DebugClientCapabilities
@@ -180,14 +180,14 @@
if not venvName:
venvName = Preferences.getDebugger("Python3VirtualEnv")
- venvManager = e5App().getObject("VirtualEnvManager")
+ venvManager = ericApp().getObject("VirtualEnvManager")
interpreter = venvManager.getVirtualenvInterpreter(venvName)
execPath = venvManager.getVirtualenvExecPath(venvName)
if interpreter == "":
# use the interpreter used to run eric for identical variants
interpreter = sys.executable.replace("w.exe", ".exe")
if interpreter == "":
- E5MessageBox.critical(
+ EricMessageBox.critical(
None,
self.tr("Start Debugger"),
self.tr(
@@ -247,7 +247,7 @@
process = self.__startProcess(args[0], args[1:],
workingDir=workingDir)
if process is None:
- E5MessageBox.critical(
+ EricMessageBox.critical(
None,
self.tr("Start Debugger"),
self.tr(
@@ -305,7 +305,7 @@
process = self.__startProcess(args[0], args[1:], clientEnv,
workingDir=workingDir)
if process is None:
- E5MessageBox.critical(
+ EricMessageBox.critical(
None,
self.tr("Start Debugger"),
self.tr(
@@ -323,7 +323,7 @@
workingDir=workingDir)
if process is None:
self.__startedVenv = ""
- E5MessageBox.critical(
+ EricMessageBox.critical(
None,
self.tr("Start Debugger"),
self.tr(
@@ -359,7 +359,7 @@
"""
global origPathEnv
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
if not project.isDebugPropertiesLoaded():
return None, self.__isNetworked, ""
@@ -383,7 +383,7 @@
else ''
)
- venvManager = e5App().getObject("VirtualEnvManager")
+ venvManager = ericApp().getObject("VirtualEnvManager")
interpreter = venvManager.getVirtualenvInterpreter(venvName)
execPath = venvManager.getVirtualenvExecPath(venvName)
if (
@@ -392,7 +392,7 @@
):
interpreter = sys.executable.replace("w.exe", ".exe")
if interpreter == "":
- E5MessageBox.critical(
+ EricMessageBox.critical(
None,
self.tr("Start Debugger"),
self.tr(
@@ -428,7 +428,7 @@
process = self.__startProcess(args[0], args[1:],
workingDir=workingDir)
if process is None:
- E5MessageBox.critical(
+ EricMessageBox.critical(
None,
self.tr("Start Debugger"),
self.tr(
@@ -488,7 +488,7 @@
process = self.__startProcess(args[0], args[1:], clientEnv,
workingDir=workingDir)
if process is None:
- E5MessageBox.critical(
+ EricMessageBox.critical(
None,
self.tr("Start Debugger"),
self.tr(
@@ -506,7 +506,7 @@
workingDir=workingDir)
if process is None:
self.__startedVenv = ""
- E5MessageBox.critical(
+ EricMessageBox.critical(
None,
self.tr("Start Debugger"),
self.tr(
@@ -1344,7 +1344,7 @@
try:
commandDict = json.loads(jsonStr.strip())
except (TypeError, ValueError) as err:
- E5MessageBox.critical(
+ EricMessageBox.critical(
None,
self.tr("Debug Protocol Error"),
self.tr("""<p>The response received from the debugger"""
@@ -1354,7 +1354,7 @@
"""<p>Error: {0}</p>"""
"""<p>Data:<br/>{1}</p>""").format(
str(err), Utilities.html_encode(jsonStr.strip())),
- E5MessageBox.Ok)
+ EricMessageBox.Ok)
return
method = commandDict["method"]
