YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix pylint warning in debugger python client (#1704)

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Levente Orban orbanl@inf.u-szeged.hu
This commit is contained in:
Levente Orban
2017-03-31 10:48:40 +02:00
committed by Zoltan Herczeg
parent 5525f5241d
commit efa7975ce9
1 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-debugger/jerry-client-ws.py
+33 -18
View File
@@ -69,9 +69,12 @@ WEBSOCKET_FIN_BIT = 0x80
def arguments_parse(): def arguments_parse():
parser = argparse.ArgumentParser(description="JerryScript debugger client") parser = argparse.ArgumentParser(description="JerryScript debugger client")
parser.add_argument("address", action="store", nargs="?", default="localhost:5001", help="specify a unique network address for connection (default: %(default)s)") parser.add_argument("address", action="store", nargs="?", default="localhost:5001",
parser.add_argument("-v", "--verbose", action="store_true", default=False, help="increase verbosity (default: %(default)s)") help="specify a unique network address for connection (default: %(default)s)")
parser.add_argument("--non-interactive", action="store_true", default=False, help="disable stop when newline is pressed (default: %(default)s)") parser.add_argument("-v", "--verbose", action="store_true", default=False,
help="increase verbosity (default: %(default)s)")
parser.add_argument("--non-interactive", action="store_true", default=False,
help="disable stop when newline is pressed (default: %(default)s)")
args = parser.parse_args() args = parser.parse_args()
@@ -169,6 +172,12 @@ class DebuggerPrompt(Cmd):
else: else:
set_breakpoint(self.debugger, args) set_breakpoint(self.debugger, args)
def disable_args(self, args):
if args:
print("Error: No argument expected")
return True
return False
def do_quit(self, args): def do_quit(self, args):
""" Exit JerryScript debugger """ """ Exit JerryScript debugger """
self.do_delete("all") self.do_delete("all")
@@ -216,12 +225,10 @@ class DebuggerPrompt(Cmd):
def do_list(self, args): def do_list(self, args):
""" Lists the available breakpoints """ """ Lists the available breakpoints """
if args != "": if self.disable_args(args):
print("Error: No argument expected")
return return
for breakpoint in self.debugger.active_breakpoint_list.values(): for breakpoint in self.debugger.active_breakpoint_list.values():
source = breakpoint.function.source
print("%d: %s" % (breakpoint.active_index, breakpoint.to_string())) print("%d: %s" % (breakpoint.active_index, breakpoint.to_string()))
def do_delete(self, args): def do_delete(self, args):
@@ -238,8 +245,8 @@ class DebuggerPrompt(Cmd):
else: else:
try: try:
breakpoint_index = int(args) breakpoint_index = int(args)
except: except ValueError as val_errno:
print("Error: Integer number expected") print("Error: Integer number expected, %s" % (val_errno))
return return
if breakpoint_index in self.debugger.active_breakpoint_list: if breakpoint_index in self.debugger.active_breakpoint_list:
@@ -259,8 +266,8 @@ class DebuggerPrompt(Cmd):
if max_depth <= 0: if max_depth <= 0:
print("Error: Positive integer number expected") print("Error: Positive integer number expected")
return return
except: except ValueError as val_errno:
print("Error: Positive integer number expected") print("Error: Positive integer number expected, %s" % (val_errno))
return return
message = struct.pack(self.debugger.byte_order + "BBIB" + self.debugger.idx_format, message = struct.pack(self.debugger.byte_order + "BBIB" + self.debugger.idx_format,
@@ -280,11 +287,17 @@ class DebuggerPrompt(Cmd):
def do_src(self, args): def do_src(self, args):
""" Get current source code """ """ Get current source code """
if self.disable_args(args):
return
if self.debugger.last_breakpoint_hit: if self.debugger.last_breakpoint_hit:
print(self.debugger.last_breakpoint_hit.function.source) print(self.debugger.last_breakpoint_hit.function.source)
def do_dump(self, args): def do_dump(self, args):
""" Dump all of the debugger data """ """ Dump all of the debugger data """
if self.disable_args(args):
return
pprint(self.debugger.function_list) pprint(self.debugger.function_list)
def eval_string(self, args): def eval_string(self, args):
@@ -470,7 +483,7 @@ class JerryDebugger(object):
self.idx_format = "I" self.idx_format = "I"
logging.debug("Compressed pointer size: %d" % (self.cp_size)) logging.debug("Compressed pointer size: %d", self.cp_size)
if len_result > len_expected: if len_result > len_expected:
self.message_data = result[len_expected:] self.message_data = result[len_expected:]
@@ -574,7 +587,7 @@ def parse_source(debugger, data):
buffer_type = ord(data[2]) buffer_type = ord(data[2])
buffer_size = ord(data[1]) - 1 buffer_size = ord(data[1]) - 1
logging.debug("Parser buffer type: %d, message size: %d" % (buffer_type, buffer_size)) logging.debug("Parser buffer type: %d, message size: %d", buffer_type, buffer_size)
if buffer_type == JERRY_DEBUGGER_PARSE_ERROR: if buffer_type == JERRY_DEBUGGER_PARSE_ERROR:
logging.error("Parser error!") logging.error("Parser error!")
@@ -590,7 +603,7 @@ def parse_source(debugger, data):
function_name += data[3:] function_name += data[3:]
elif buffer_type == JERRY_DEBUGGER_PARSE_FUNCTION: elif buffer_type == JERRY_DEBUGGER_PARSE_FUNCTION:
logging.debug("Source name: %s, function name: %s" % (source_code_name, function_name)) logging.debug("Source name: %s, function name: %s", source_code_name, function_name)
position = struct.unpack(debugger.byte_order + debugger.idx_format + debugger.idx_format, position = struct.unpack(debugger.byte_order + debugger.idx_format + debugger.idx_format,
data[3: 3 + 4 + 4]) data[3: 3 + 4 + 4])
@@ -609,7 +622,7 @@ def parse_source(debugger, data):
if buffer_type == JERRY_DEBUGGER_BREAKPOINT_OFFSET_LIST: if buffer_type == JERRY_DEBUGGER_BREAKPOINT_OFFSET_LIST:
name = "offsets" name = "offsets"
logging.debug("Breakpoint %s received" % (name)) logging.debug("Breakpoint %s received", name)
buffer_pos = 3 buffer_pos = 3
while buffer_size > 0: while buffer_size > 0:
@@ -623,7 +636,7 @@ def parse_source(debugger, data):
byte_code_cp = struct.unpack(debugger.byte_order + debugger.cp_format, byte_code_cp = struct.unpack(debugger.byte_order + debugger.cp_format,
data[3: 3 + debugger.cp_size])[0] data[3: 3 + debugger.cp_size])[0]
logging.debug("Byte code cptr received: {0x%x}" % (byte_code_cp)) logging.debug("Byte code cptr received: {0x%x}", byte_code_cp)
func_desc = stack.pop() func_desc = stack.pop()
@@ -688,7 +701,7 @@ def release_function(debugger, data):
debugger.send_bytecode_cp(byte_code_cp) debugger.send_bytecode_cp(byte_code_cp)
logging.debug("Function {0x%x} byte-code released" % byte_code_cp) logging.debug("Function {0x%x} byte-code released", byte_code_cp)
def enable_breakpoint(debugger, breakpoint): def enable_breakpoint(debugger, breakpoint):
@@ -730,6 +743,7 @@ def set_breakpoint(debugger, string):
print("Breakpoint not found") print("Breakpoint not found")
return return
def get_breakpoint(debugger, breakpoint_data): def get_breakpoint(debugger, breakpoint_data):
function = debugger.function_list[breakpoint_data[0]] function = debugger.function_list[breakpoint_data[0]]
offset = breakpoint_data[1] offset = breakpoint_data[1]
@@ -748,6 +762,7 @@ def get_breakpoint(debugger, breakpoint_data):
return (function.offsets[nearest_offset], False) return (function.offsets[nearest_offset], False)
def main(): def main():
args = arguments_parse() args = arguments_parse()
@@ -755,7 +770,7 @@ def main():
non_interactive = args.non_interactive non_interactive = args.non_interactive
logging.debug("Connected to JerryScript on %d port" % (debugger.port)) logging.debug("Connected to JerryScript on %d port", debugger.port)
prompt = DebuggerPrompt(debugger) prompt = DebuggerPrompt(debugger)
prompt.prompt = "(jerry-debugger) " prompt.prompt = "(jerry-debugger) "
@@ -779,7 +794,7 @@ def main():
buffer_type = ord(data[2]) buffer_type = ord(data[2])
buffer_size = ord(data[1]) - 1 buffer_size = ord(data[1]) - 1
logging.debug("Main buffer type: %d, message size: %d" % (buffer_type, buffer_size)) logging.debug("Main buffer type: %d, message size: %d", buffer_type, buffer_size)
if buffer_type in [JERRY_DEBUGGER_PARSE_ERROR, if buffer_type in [JERRY_DEBUGGER_PARSE_ERROR,
JERRY_DEBUGGER_BYTE_CODE_CP, JERRY_DEBUGGER_BYTE_CODE_CP,