[linux-nfc] [PATCH v2 4/6] se: Use spaces only for SE Python test scripts
Mark Greer <[email protected]> Sun, 28 Nov 2021 22:06:04 -0700
| Newsgroups | org.01.lists.linux-nfc,dev.linux.lists.oe-linux-nfc |
|---|---|
| Message-ID | <[email protected]> |
The Python PEP 8 style guide prefers spaces over tabs so replace all tabs in the SE Python test scripts with spaces. See: https://www.python.org/dev/peps/pep-0008/#tabs-or-spaces Signed-off-by: Mark Greer <[email protected]> --- se/test/test-channel | 84 ++++++++++---------- se/test/test-seel | 178 +++++++++++++++++++++---------------------- 2 files changed, 131 insertions(+), 131 deletions(-) diff --git a/se/test/test-channel b/se/test/test-channel index e6ed0114c8c8..5fa9b7e7fc41 100755 --- a/se/test/test-channel +++ b/se/test/test-channel @@ -6,59 +6,59 @@ import dbus bus = dbus.SystemBus() def extract_byte_array(byte_array): - return ' '.join("{:02x}".format(byte) for byte in 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) + 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() - - 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 (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] + 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 e238a38851a9..16c797dbc6fc 100755 --- a/se/test/test-seel +++ b/se/test/test-seel @@ -6,109 +6,109 @@ 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) + 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() + 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 (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, error: - print "%s: %s" % (error._dbus_error_name, error.message) - sys.exit(0) + 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, 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] + 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") + seel = dbus.Interface(bus.get_object("org.neard.se", path), + "org.neard.se.SecureElement") - try: - channel = seel.OpenChannel(sys.argv[3].decode("hex")) + try: + channel = seel.OpenChannel(sys.argv[3].decode("hex")) - print "Opened channel: %s" % str(channel) - except dbus.DBusException, error: - print "%s: %s" % (error._dbus_error_name, error.message) - sys.exit(0) + print "Opened channel: %s" % str(channel) + except dbus.DBusException, 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, error: - print "%s: %s" % (error._dbus_error_name, error.message) - sys.exit(0) + 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, 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