[linux-nfc] [PATCH v2 6/6] se: Reformat SE Python test scripts

Reformat the Python-based SE test scripts using the "Prettier"
beautifiers (default options).  This brings the code closer to
conformance with the PEP 8 style guide.

Signed-off-by: Mark Greer <[email protected]>
---
 se/test/test-channel |  98 ++++++++++----------
 se/test/test-seel    | 209 ++++++++++++++++++++++---------------------
 2 files changed, 161 insertions(+), 146 deletions(-)

diff --git a/se/test/test-channel b/se/test/test-channel
index 52af1b38e937..b9c58d57c78e 100755
--- a/se/test/test-channel
+++ b/se/test/test-channel
@@ -5,60 +5,66 @@ import dbus
 
 bus = dbus.SystemBus()
 
-def extract_byte_array(byte_array):
-        return ' '.join("{:02x}".format(byte) for byte in byte_array)
-
-def usage():
-        print("Usage: %s <command>" % (sys.argv[0]))
-        print("")
-        print("  list")
-        print("  send_apdu se/nfcX_<se_type>_seX channelX <apdu>")
-        sys.exit(1)
-
-if (len(sys.argv) < 2):
-        usage()
 
-if (sys.argv[1] == "list"):
-        if (len(sys.argv) != 3):
-                usage()
-        else:
-                path = "/org/neard/se/" + sys.argv[2]
-
-                seel = dbus.Interface(bus.get_object("org.neard.se", path),
-                                                        "org.neard.se.SecureElement")
-                properties = seel.GetProperties()
+def extract_byte_array(byte_array):
+    return " ".join("{:02x}".format(byte) for byte in byte_array)
 
-                for path in properties["Channels"]:
-                        print("[ %s ]" % (path))
 
-                        channel = dbus.Interface(bus.get_object("org.neard.se", path),
-                                                "org.neard.se.Channel")
-                        properties = channel.GetProperties()
+def usage():
+    print("Usage: %s <command>" % (sys.argv[0]))
+    print("")
+    print("  list")
+    print("  send_apdu se/nfcX_<se_type>_seX channelX <apdu>")
+    sys.exit(1)
 
-                        for key in properties.keys():
-                                if key in ["Basic"]:
-                                        if properties[key] == dbus.Boolean(1):
-                                                val = "true"
-                                        else:
-                                                val = "false"
-                                        print("    %s = %s" % (key, val))
 
-                                if key in ["AID"]:
-                                        print("    %s = %s" % (key, extract_byte_array(properties[key])))
-        sys.exit(0)
+if len(sys.argv) < 2:
+    usage()
 
-if (sys.argv[1] == "send_apdu"):
-        if (len(sys.argv) != 5):
-                usage()
-        else:
-                path = "/org/neard/se/" + sys.argv[2] + "/" + sys.argv[3]
+if sys.argv[1] == "list":
+    if len(sys.argv) != 3:
+        usage()
+    else:
+        path = "/org/neard/se/" + sys.argv[2]
+
+        seel = dbus.Interface(
+            bus.get_object("org.neard.se", path), "org.neard.se.SecureElement"
+        )
+        properties = seel.GetProperties()
+
+        for path in properties["Channels"]:
+            print("[ %s ]" % (path))
+
+            channel = dbus.Interface(
+                bus.get_object("org.neard.se", path), "org.neard.se.Channel"
+            )
+            properties = channel.GetProperties()
+
+            for key in properties.keys():
+                if key in ["Basic"]:
+                    if properties[key] == dbus.Boolean(1):
+                        val = "true"
+                    else:
+                        val = "false"
+                    print("    %s = %s" % (key, val))
+
+                if key in ["AID"]:
+                    print("    %s = %s" % (key, extract_byte_array(properties[key])))
+    sys.exit(0)
+
+if sys.argv[1] == "send_apdu":
+    if len(sys.argv) != 5:
+        usage()
+    else:
+        path = "/org/neard/se/" + sys.argv[2] + "/" + sys.argv[3]
 
-                channel = dbus.Interface(bus.get_object("org.neard.se", path),
-                                        "org.neard.se.Channel")
+        channel = dbus.Interface(
+            bus.get_object("org.neard.se", path), "org.neard.se.Channel"
+        )
 
-                response = channel.SendAPDU(sys.argv[4].decode("hex"))
+        response = channel.SendAPDU(sys.argv[4].decode("hex"))
 
-                print("--> %s" % extract_byte_array(response))
-        sys.exit(0)
+        print("--> %s" % extract_byte_array(response))
+    sys.exit(0)
 
 usage()
diff --git a/se/test/test-seel b/se/test/test-seel
index f3df3e7a7b95..21de41dd4877 100755
--- a/se/test/test-seel
+++ b/se/test/test-seel
@@ -5,110 +5,119 @@ import dbus
 
 bus = dbus.SystemBus()
 
+
 def extract_list(list):
-        val = "["
-        for i in list:
-                val += " " + str(i)
-        val += " ]"
-        return val
+    val = "["
+    for i in list:
+        val += " " + str(i)
+    val += " ]"
+    return val
+
 
 def usage():
-        print("Usage: %s <command>" % (sys.argv[0]))
-        print("")
-        print("  list")
-        print("  enabled se/nfcX_<se_type>_seX [on/off]")
-        print("  open_channel se/nfcX_<se_type>_seX <AID>")
-        print("  close_channel se/nfcX_<se_type>_seX channelX")
-        sys.exit(1)
-
-if (len(sys.argv) < 2):
+    print("Usage: %s <command>" % (sys.argv[0]))
+    print("")
+    print("  list")
+    print("  enabled se/nfcX_<se_type>_seX [on/off]")
+    print("  open_channel se/nfcX_<se_type>_seX <AID>")
+    print("  close_channel se/nfcX_<se_type>_seX channelX")
+    sys.exit(1)
+
+
+if len(sys.argv) < 2:
+    usage()
+
+if sys.argv[1] == "list":
+    if len(sys.argv) != 2:
+        usage()
+    else:
+        manager = dbus.Interface(
+            bus.get_object("org.neard.se", "/"), "org.neard.se.Manager"
+        )
+        properties = manager.GetProperties()
+
+        for path in properties["SecureElements"]:
+            print("[ %s ]" % (path))
+
+            seel = dbus.Interface(
+                bus.get_object("org.neard.se", path), "org.neard.se.SecureElement"
+            )
+            properties = seel.GetProperties()
+
+            for key in properties.keys():
+                if key in ["Enabled"]:
+                    if properties[key] == dbus.Boolean(1):
+                        val = "true"
+                    else:
+                        val = "false"
+                    print("    %s = %s" % (key, val))
+
+                if key in ["Type"]:
+                    print("    %s = %s" % (key, str(properties[key])))
+
+                if key in ["Channels"]:
+                    print("    %s = %s" % (key, extract_list(properties[key])))
+    sys.exit(0)
+
+if sys.argv[1] == "enabled":
+    if len(sys.argv) < 4:
         usage()
+    else:
+        path = "/org/neard/se/" + sys.argv[2]
+
+        seel = dbus.Interface(
+            bus.get_object("org.neard.se", path), "org.neard.se.SecureElement"
+        )
+
+        try:
+            if sys.argv[3] == "on":
+                val = seel.SetProperty("Enabled", dbus.Boolean(1), timeout=10)
+            elif sys.argv[3] == "off":
+                val = seel.SetProperty("Enabled", dbus.Boolean(0), timeout=10)
+            else:
+                print("Invalid option %s" % sys.argv[3])
+
+        except dbus.DBusException as error:
+            print("%s: %s" % (error._dbus_error_name, error.message))
+    sys.exit(0)
+
+if sys.argv[1] == "open_channel":
+    if len(sys.argv) < 4:
+        usage()
+    else:
+        path = "/org/neard/se/" + sys.argv[2]
+
+        seel = dbus.Interface(
+            bus.get_object("org.neard.se", path), "org.neard.se.SecureElement"
+        )
+
+        try:
+            channel = seel.OpenChannel(sys.argv[3].decode("hex"))
 
-if (sys.argv[1] == "list"):
-        if (len(sys.argv) != 2):
-                usage()
-        else:
-                manager = dbus.Interface(bus.get_object("org.neard.se", "/"),
-                                                        "org.neard.se.Manager")
-                properties = manager.GetProperties()
-
-                for path in properties["SecureElements"]:
-                        print("[ %s ]" % (path))
-
-                        seel = dbus.Interface(bus.get_object("org.neard.se", path),
-                                                "org.neard.se.SecureElement")
-                        properties = seel.GetProperties()
-
-                        for key in properties.keys():
-                                if key in ["Enabled"]:
-                                        if properties[key] == dbus.Boolean(1):
-                                                val = "true"
-                                        else:
-                                                val = "false"
-                                        print("    %s = %s" % (key, val))
-
-                                if key in ["Type"]:
-                                        print("    %s = %s" % (key, str(properties[key])))
-
-                                if key in ["Channels"]:
-                                        print("    %s = %s" % (key, extract_list(properties[key])))
-        sys.exit(0)
-
-if (sys.argv[1] == "enabled"):
-        if (len(sys.argv) < 4):
-                usage()
-        else:
-                path = "/org/neard/se/" + sys.argv[2]
-
-                seel = dbus.Interface(bus.get_object("org.neard.se", path),
-                                        "org.neard.se.SecureElement")
-
-                try:
-                        if (sys.argv[3] == "on"):
-                                val = seel.SetProperty("Enabled", dbus.Boolean(1), timeout = 10)
-                        elif (sys.argv[3] == "off"):
-                                val = seel.SetProperty("Enabled", dbus.Boolean(0), timeout = 10)
-                        else:
-                                print("Invalid option %s" % sys.argv[3])
-
-                except dbus.DBusException as error:
-                        print("%s: %s" % (error._dbus_error_name, error.message))
-        sys.exit(0)
-
-if (sys.argv[1] == "open_channel"):
-        if (len(sys.argv) < 4):
-                usage()
-        else:
-                path = "/org/neard/se/" + sys.argv[2]
-
-                seel = dbus.Interface(bus.get_object("org.neard.se", path),
-                                        "org.neard.se.SecureElement")
-
-                try:
-                        channel = seel.OpenChannel(sys.argv[3].decode("hex"))
-
-                        print("Opened channel: %s" % str(channel))
-                except dbus.DBusException as error:
-                        print("%s: %s" % (error._dbus_error_name, error.message))
-        sys.exit(0)
-
-if (sys.argv[1] == "close_channel"):
-        if (len(sys.argv) < 4):
-                usage()
-        else:
-                seel_path = "/org/neard/se/" + sys.argv[2]
-                channel_path = seel_path + "/" + sys.argv[3]
-
-                seel = dbus.Interface(bus.get_object("org.neard.se", seel_path),
-                                        "org.neard.se.SecureElement")
-
-                channel = dbus.Interface(bus.get_object("org.neard.se", channel_path),
-                                        "org.neard.se.Channel")
-                try:
-                        seel.CloseChannel(channel)
-
-                except dbus.DBusException as error:
-                        print("%s: %s" % (error._dbus_error_name, error.message))
-        sys.exit(0)
+            print("Opened channel: %s" % str(channel))
+        except dbus.DBusException as error:
+            print("%s: %s" % (error._dbus_error_name, error.message))
+    sys.exit(0)
+
+if sys.argv[1] == "close_channel":
+    if len(sys.argv) < 4:
+        usage()
+    else:
+        seel_path = "/org/neard/se/" + sys.argv[2]
+        channel_path = seel_path + "/" + sys.argv[3]
+
+        seel = dbus.Interface(
+            bus.get_object("org.neard.se", seel_path), "org.neard.se.SecureElement"
+        )
+
+        channel = dbus.Interface(
+            bus.get_object("org.neard.se", channel_path), "org.neard.se.Channel"
+        )
+        try:
+            seel.CloseChannel(channel)
+
+        except dbus.DBusException as error:
+            print("%s: %s" % (error._dbus_error_name, error.message))
+    sys.exit(0)
 
 usage()
-- 
2.33.1
_______________________________________________
Linux-nfc mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s