Skip to content

Fix several pylint warning in debugger python client #1704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 31, 2017
Merged

Fix several pylint warning in debugger python client #1704

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 33 additions & 18 deletions jerry-debugger/jerry-client-ws.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,12 @@
def arguments_parse():
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("-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)")
parser.add_argument("address", action="store", nargs="?", default="localhost:5001",
help="specify a unique network address for connection (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()

Expand Down Expand Up @@ -169,6 +172,12 @@ def insert_breakpoint(self, args):
else:
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):
""" Exit JerryScript debugger """
self.do_delete("all")
Expand Down Expand Up @@ -215,12 +224,10 @@ def do_next(self, args):

def do_list(self, args):
""" Lists the available breakpoints """
if args != "":
print("Error: No argument expected")
if self.disable_args(args):
return

for breakpoint in self.debugger.active_breakpoint_list.values():
source = breakpoint.function.source
print("%d: %s" % (breakpoint.active_index, breakpoint.to_string()))

def do_delete(self, args):
Expand All @@ -237,8 +244,8 @@ def do_delete(self, args):
else:
try:
breakpoint_index = int(args)
except:
print("Error: Integer number expected")
except ValueError as val_errno:
print("Error: Integer number expected, %s" % (val_errno))
return

if breakpoint_index in self.debugger.active_breakpoint_list:
Expand All @@ -258,8 +265,8 @@ def exec_backtrace(self, args):
if max_depth <= 0:
print("Error: Positive integer number expected")
return
except:
print("Error: Positive integer number expected")
except ValueError as val_errno:
print("Error: Positive integer number expected, %s" % (val_errno))
return

message = struct.pack(self.debugger.byte_order + "BBIB" + self.debugger.idx_format,
Expand All @@ -279,11 +286,17 @@ def do_backtrace(self, args):

def do_src(self, args):
""" Get current source code """
if self.disable_args(args):
return

if self.debugger.last_breakpoint_hit:
print(self.debugger.last_breakpoint_hit.function.source)

def do_dump(self, args):
""" Dump all of the debugger data """
if self.disable_args(args):
return

pprint(self.debugger.function_list)

def eval_string(self, args):
Expand Down Expand Up @@ -469,7 +482,7 @@ def __init__(self, address):

self.idx_format = "I"

logging.debug("Compressed pointer size: %d" % (self.cp_size))
logging.debug("Compressed pointer size: %d", self.cp_size)
Copy link
Member

@zherczeg zherczeg Mar 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the problem with this?

Copy link
Contributor Author

@polaroi8d polaroi8d Mar 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no problem, but this is the PEP8 logging standard.

Copy link
Member

@zherczeg zherczeg Mar 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK.


if len_result > len_expected:
self.message_data = result[len_expected:]
Expand Down Expand Up @@ -573,7 +586,7 @@ def parse_source(debugger, data):
buffer_type = ord(data[2])
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:
logging.error("Parser error!")
Expand All @@ -589,7 +602,7 @@ def parse_source(debugger, data):
function_name += data[3:]

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,
data[3: 3 + 4 + 4])
Expand All @@ -608,7 +621,7 @@ def parse_source(debugger, data):
if buffer_type == JERRY_DEBUGGER_BREAKPOINT_OFFSET_LIST:
name = "offsets"

logging.debug("Breakpoint %s received" % (name))
logging.debug("Breakpoint %s received", name)

buffer_pos = 3
while buffer_size > 0:
Expand All @@ -622,7 +635,7 @@ def parse_source(debugger, data):
byte_code_cp = struct.unpack(debugger.byte_order + debugger.cp_format,
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()

Expand Down Expand Up @@ -687,7 +700,7 @@ def release_function(debugger, data):

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):
Expand Down Expand Up @@ -729,6 +742,7 @@ def set_breakpoint(debugger, string):
print("Breakpoint not found")
return


def get_breakpoint(debugger, breakpoint_data):
function = debugger.function_list[breakpoint_data[0]]
offset = breakpoint_data[1]
Expand All @@ -747,14 +761,15 @@ def get_breakpoint(debugger, breakpoint_data):

return (function.offsets[nearest_offset], False)


def main():
args = arguments_parse()

debugger = JerryDebugger(args.address)

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.prompt = "(jerry-debugger) "
Expand All @@ -778,7 +793,7 @@ def main():
buffer_type = ord(data[2])
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,
JERRY_DEBUGGER_BYTE_CODE_CP,
Expand Down