eric: comparison eric6/DebugClients/Python/DebugClientBase.py

-:39e3db2b4936
+:eefe954f01e8
 import json
 import re
 import atexit
 import signal
 import time
-if sys.version_info >= (3, 4):
+import types
-import types
+import importlib
-else:
-import imp
 import DebugClientCapabilities
 import DebugVariables
 from DebugBase import setRecursionLimit, printerr   # __IGNORE_WARNING__
 # special objects representing the main scripts thread and frame
 self.mainThread = self
 self.framenr = 0
 # The context to run the debugged program in.
-if sys.version_info >= (3, 4):
+self.debugMod = types.ModuleType('__main__')
-self.debugMod = types.ModuleType("__main__")
-else:
-self.debugMod = imp.new_module('__main__')
 self.debugMod.__dict__['__builtins__'] = __builtins__
 # The list of complete lines to execute.
 self.buffer = ''
 self.__debuggerId = ""
 self.callTraceEnabled = None
 self.compile_command = codeop.CommandCompiler()
 self.coding_re = re.compile(r"coding[:=]\s*([-\w_.]+)")
 self.defaultCoding = 'utf-8'
 self.__coding = self.defaultCoding
 if self.noencoding:
 self.__coding = sys.getdefaultencoding()
 else:
 default = 'utf-8'
 try:
-f = open(filename, 'rb')
+with open(filename, 'rb') as f:
 # read the first and second line
 text = f.readline()
 text = "{0}{1}".format(text, f.readline())
-f.close()
 except IOError:
 self.__coding = default
 return
 for line in text.splitlines():
 stack = self.currentThread.getStack()
 self.sendJsonCommand("ResponseStack", {
 "stack": stack,
 })
+elif method == "RequestDisassembly":
+if self.disassembly is not None:
+self.sendJsonCommand("ResponseDisassembly", {
+"disassembly": self.disassembly
+})
+else:
+self.sendJsonCommand("ResponseDisassembly", {
+"disassembly": {}
+})
 elif method == "RequestCapabilities":
 clientType = "Python3"
 self.sendJsonCommand("ResponseCapabilities", {
 "capabilities": self.__clientCapabilities(),
 "clientType": clientType
 os.environ[key] = value
 elif method == "RequestLoad":
 self._fncache = {}
 self.dircache = []
+self.disassembly = None
 sys.argv = []
 self.__setCoding(params["filename"])
 sys.argv.append(params["filename"])
 sys.argv.extend(params["argv"])
 sys.path = self.__getSysPath(os.path.dirname(sys.argv[0]))
 if code:
 sys.setprofile(self.callTraceEnabled)
 self.mainThread.run(code, self.debugMod.__dict__, debug=True)
 elif method == "RequestRun":
+self.disassembly = None
 sys.argv = []
 self.__setCoding(params["filename"])
 sys.argv.append(params["filename"])
 sys.argv.extend(params["argv"])
 sys.path = self.__getSysPath(os.path.dirname(sys.argv[0]))
 if code:
 self.mainThread.run(code, self.debugMod.__dict__, debug=False)
 elif method == "RequestCoverage":
 from coverage import Coverage
+self.disassembly = None
 sys.argv = []
 self.__setCoding(params["filename"])
 sys.argv.append(params["filename"])
 sys.argv.extend(params["argv"])
 sys.path = self.__getSysPath(os.path.dirname(sys.argv[0]))
 self.cover.save()
 elif method == "RequestProfile":
 sys.setprofile(None)
 import PyProfile
+self.disassembly = None
 sys.argv = []
 self.__setCoding(params["filename"])
 sys.argv.append(params["filename"])
 sys.argv.extend(params["argv"])
 sys.path = self.__getSysPath(os.path.dirname(sys.argv[0]))
 else:
 self.test = testLoader.discover(
 discoveryStart, top_level_dir=top_level_dir)
 else:
 if params["filename"]:
-if sys.version_info >= (3, 4):
+spec = importlib.util.spec_from_file_location(
-import importlib
+params["testname"], params["filename"])
-spec = importlib.util.spec_from_file_location(
+utModule = importlib.util.module_from_spec(spec)
-params["testname"], params["filename"])
-utModule = importlib.util.module_from_spec(spec)
-else:
-utModule = imp.load_source(
-params["testname"], params["filename"])
 else:
 utModule = None
 if params["failed"]:
 if utModule:
 failed = [t.split(".", 1)[1]
 "message": "",
 })
 elif method == "RequestUTRun":
 from DCTestResult import DCTestResult
+self.disassembly = None
 self.testResult = DCTestResult(self, params["failfast"])
 if self.cover:
 self.cover.start()
 self.debugging = params["debug"]
 if params["debug"]:
 test.__module__.replace(".", os.sep) + ".py")
 testCases.append(
 (test.id(), test.shortDescription(), filename)
 )
 return testCases
+def setDisassembly(self, disassembly):
+"""
+Public method to store a disassembly of the code object raising an
+exception.
+@param disassembly dictionary containing the disassembly information
+@type dict
+"""
+self.disassembly = disassembly
 def sendJsonCommand(self, method, params):
 """
 Public method to send a single command or response to the IDE.
 varlist.append(("column", "int", "{0}".format(value.column())))
 varlist.append(
 ("internalId", "int", "{0}".format(value.internalId())))
 varlist.append(("internalPointer", "void *",
 "{0}".format(value.internalPointer())))
-elif qttype == 'QRegExp':
+elif qttype in ('QRegExp', "QRegularExpression"):
 varlist.append(("pattern", "str", "{0}".format(value.pattern())))
 # GUI stuff
 elif qttype == 'QAction':
 varlist.append(("name", "str", "{0}".format(value.objectName())))

Mercurial Repositories > eric / file comparison

comparison: eric6/DebugClients/Python/DebugClientBase.py

eric6/DebugClients/Python/DebugClientBase.py