commit a0136b9850442a7241184b8fc98fae77bf64e6c7
author Ulf Magnusson <Ulf.Magnusson@nordicsemi.no> Fri Sep 13 15:47:16 2019 +0200
committer Anas Nashif <anas.nashif@intel.com> Sat Sep 14 13:36:41 2019 +0800
tree f134d7324319029dda8263137825fee47f2201a2
parent d8accb55d18a68686381759361a6df305f33a9df

gen_syscalls.py: Remove semicolons, unused variables, and a '!= None'

Fix new pylint warnings:

    scripts/gen_syscalls.py:195:0: W0301: Unnecessary semicolon
    (unnecessary-semicolon)

    scripts/gen_syscalls.py:249:0: W0301: Unnecessary semicolon
    (unnecessary-semicolon)

    scripts/gen_syscalls.py:251:0: W0301: Unnecessary semicolon
    (unnecessary-semicolon)

    scripts/gen_syscalls.py:253:0: W0301: Unnecessary semicolon
    (unnecessary-semicolon)

    scripts/gen_syscalls.py:264:0: W0301: Unnecessary semicolon
    (unnecessary-semicolon)

    scripts/gen_syscalls.py:265:0: W0301: Unnecessary semicolon
    (unnecessary-semicolon)

    scripts/gen_syscalls.py:152:8: W0612: Unused variable 'i'
    (unused-variable)

    scripts/gen_syscalls.py:231:18: W0612: Unused variable 'argname'
    (unused-variable)

    scripts/gen_syscalls.py:344:7: C0121: Comparison to None should be
    'expr is not None' (singleton-comparison)

None is a global object, so 'is' (which is like a pointer comparison) is
cleaner, and more idiomatic Python.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>

scripts/gen_syscalls.py

diff --git a/scripts/gen_syscalls.py b/scripts/gen_syscalls.py
index 7d8bff5..ce2fbbb 100755
--- a/scripts/gen_syscalls.py
+++ b/scripts/gen_syscalls.py
@@ -149,8 +149,7 @@
     mrsh_args = [] # List of rvalue expressions for the marshalled invocation
     split_args = []
     nsplit = 0
-    for i, argrec in enumerate(args):
-        (argtype, argname) = argrec
+    for argtype, argname in args:
         if need_split(argtype):
             split_args.append((argtype, argname))
             mrsh_args.append("parm%d.split.lo" % nsplit)
@@ -192,7 +191,7 @@
         wrap += "\t\t" + "return (%s)ret64;\n" % func_type
     elif func_type == "void":
         wrap += "\t\t" + "%s;\n" % invoke
-        wrap += "\t\t" + "return;\n";
+        wrap += "\t\t" + "return;\n"
     else:
         wrap += "\t\t" + "return (%s) %s;\n" % (func_type, invoke)
 
@@ -227,8 +226,7 @@
     nmrsh = 0        # number of marshalled u32_t parameter
     vrfy_parms = []  # list of (arg_num, mrsh_or_parm_num, bool_is_split)
     split_parms = [] # list of a (arg_num, mrsh_num) for each split
-    for i, argrec in enumerate(args):
-        (argtype, argname) = argrec
+    for i, (argtype, _) in enumerate(args):
         if need_split(argtype):
             vrfy_parms.append((i, len(split_parms), True))
             split_parms.append((i, nmrsh))
@@ -246,11 +244,11 @@
 
     mrsh += "u32_t %s(u32_t arg0, u32_t arg1, u32_t arg2,\n" % mrsh_name
     if nmrsh <= 6:
-        mrsh += "\t\t" + "u32_t arg3, u32_t arg4, u32_t arg5, void *ssf)\n";
+        mrsh += "\t\t" + "u32_t arg3, u32_t arg4, u32_t arg5, void *ssf)\n"
     else:
-        mrsh += "\t\t" + "u32_t arg3, u32_t arg4, void *more, void *ssf)\n";
+        mrsh += "\t\t" + "u32_t arg3, u32_t arg4, void *more, void *ssf)\n"
     mrsh += "{\n"
-    mrsh += "\t" + "_current_cpu->syscall_frame = ssf;\n";
+    mrsh += "\t" + "_current_cpu->syscall_frame = ssf;\n"
 
     for unused_arg in range(nmrsh, 6):
         mrsh += "\t(void) arg%d;\t/* unused */\n" % unused_arg
@@ -261,8 +259,8 @@
 
     for i, split_rec in enumerate(split_parms):
         arg_num, mrsh_num = split_rec
-        arg_type = args[arg_num][0];
-        mrsh += "\t%s parm%d;\n" % (union_decl(arg_type), i);
+        arg_type = args[arg_num][0]
+        mrsh += "\t%s parm%d;\n" % (union_decl(arg_type), i)
         mrsh += "\t" + "parm%d.split.lo = %s;\n" % (i, mrsh_rval(mrsh_num,
                                                                  nmrsh))
         mrsh += "\t" + "parm%d.split.hi = %s;\n" % (i, mrsh_rval(mrsh_num + 1,
@@ -341,7 +339,7 @@
 def main():
     parse_args()
 
-    if args.split_type != None:
+    if args.split_type is not None:
         for t in args.split_type:
             types64.append(t)