diff options
Diffstat (limited to 'test/test-connman')
-rwxr-xr-x | test/test-connman | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/test/test-connman b/test/test-connman index d047c86d..45a18d97 100755 --- a/test/test-connman +++ b/test/test-connman @@ -9,19 +9,19 @@ manager = dbus.Interface(bus.get_object("net.connman", "/"), "net.connman.Manager") if len(sys.argv) < 2: - print "Usage: %s <command>" % (sys.argv[0]) - print "" - print " state" - print " services" - print " autoconnect <service> [autoconnect]" - print " connect <service>" - print " disconnect <service>" - print " remove <service>" - print "" - print " scan <type>" - print " enable <type>" - print " disable <type>" - print " offlinemode [on|off]" + print("Usage: %s <command>" % (sys.argv[0])) + print("") + print(" state") + print(" services") + print(" autoconnect <service> [autoconnect]") + print(" connect <service>") + print(" disconnect <service>") + print(" remove <service>") + print("") + print(" scan <type>") + print(" enable <type>") + print(" disable <type>") + print(" offlinemode [on|off]") sys.exit(1) def print_services(services): @@ -45,25 +45,25 @@ def print_services(services): else: favorite = " " - if "Name" in properties.keys(): + if "Name" in list(properties.keys()): name = properties["Name"] else: name = "{" + properties["Type"] + "}" - print "%s%s%s %-26s { %s }" % (favorite, autoconnect, state, - name, identifier) + print("%s%s%s %-26s { %s }" % (favorite, autoconnect, state, + name, identifier)) if sys.argv[1] == "state": properties = manager.GetProperties() - print "System is %s" % (properties["State"]) + print("System is %s" % (properties["State"])) elif sys.argv[1] in ["services", "list", "show"]: print_services(manager.GetServices()) elif sys.argv[1] in ["autoconnect", "autoconn"]: if (len(sys.argv) < 3): - print "Need at least service parameter" + print("Need at least service parameter") sys.exit(1) path = "/net/connman/service/" + sys.argv[2] @@ -77,25 +77,25 @@ elif sys.argv[1] in ["autoconnect", "autoconn"]: service.SetProperty("AutoConnect", autoconnect); - print "Auto connect %s for %s" % (autoconnect, sys.argv[2]) + print("Auto connect %s for %s" % (autoconnect, sys.argv[2])) else: properties = service.GetProperties() - if "Name" in properties.keys(): + if "Name" in list(properties.keys()): name = properties["Name"] else: name = "{" + properties["Type"] + "}" - if "AutoConnect" in properties.keys(): + if "AutoConnect" in list(properties.keys()): autoconnect = properties["AutoConnect"] else: autoconnect = dbus.Boolean(0) - print "Auto connect %s for %s" % (autoconnect, name) + print("Auto connect %s for %s" % (autoconnect, name)) elif sys.argv[1] in ["connect", "conn"]: if (len(sys.argv) < 3): - print "Need at least service parameter" + print("Need at least service parameter") sys.exit(1) path = "/net/connman/service/" + sys.argv[2] @@ -105,12 +105,12 @@ elif sys.argv[1] in ["connect", "conn"]: try: service.Connect(timeout=60000) - except dbus.DBusException, error: - print "%s: %s" % (error._dbus_error_name, error.message) + except dbus.DBusException as error: + print("%s: %s" % (error._dbus_error_name, error.message)) elif sys.argv[1] in ["disconnect", "disc"]: if (len(sys.argv) < 3): - print "Need at least service parameter" + print("Need at least service parameter") sys.exit(1) path = "/net/connman/service/" + sys.argv[2] @@ -120,12 +120,12 @@ elif sys.argv[1] in ["disconnect", "disc"]: try: service.Disconnect() - except dbus.DBusException, error: - print "%s: %s" % (error._dbus_error_name, error.message) + except dbus.DBusException as error: + print("%s: %s" % (error._dbus_error_name, error.message)) elif sys.argv[1] in ["remove"]: if (len(sys.argv) < 3): - print "Need at least service parameter" + print("Need at least service parameter") sys.exit(1) path = "/net/connman/service/" + sys.argv[2] @@ -136,13 +136,13 @@ elif sys.argv[1] in ["remove"]: properties = service.GetProperties() if properties["Favorite"] == dbus.Boolean(0): - print "Only favorite services can be removed" + print("Only favorite services can be removed") sys.exit(1) try: service.Remove() - except dbus.DBusException, error: - print "%s: %s" % (error._dbus_error_name, error.message) + except dbus.DBusException as error: + print("%s: %s" % (error._dbus_error_name, error.message)) elif sys.argv[1] == "scan": if len(sys.argv) == 3: @@ -151,7 +151,7 @@ elif sys.argv[1] == "scan": "net.connman.Technology") technology.Scan() else: - print "'%s' takes two arguments" % sys.argv[1] + print("'%s' takes two arguments" % sys.argv[1]) elif sys.argv[1] == "enable": if len(sys.argv) == 3: @@ -160,7 +160,7 @@ elif sys.argv[1] == "enable": "net.connman.Technology") technology.SetProperty("Powered", True) else: - print "'%s' takes two arguments" % sys.argv[1] + print("'%s' takes two arguments" % sys.argv[1]) elif sys.argv[1] == "disable": if len(sys.argv) == 3: @@ -169,7 +169,7 @@ elif sys.argv[1] == "disable": "net.connman.Technology") technology.SetProperty("Powered", False) else: - print "'%s' takes two arguments" % sys.argv[1] + print("'%s' takes two arguments" % sys.argv[1]) elif sys.argv[1] in ["offlinemode", "flightmode"]: @@ -179,15 +179,15 @@ elif sys.argv[1] in ["offlinemode", "flightmode"]: elif sys.argv[2] == "off" or sys.argv[2] == "0" or sys.argv[2] == "no": active = dbus.Boolean(0) else: - print "Use either 'on', '1', 'yes', 'off', '0' or 'no'" + print("Use either 'on', '1', 'yes', 'off', '0' or 'no'") exit() manager.SetProperty("OfflineMode", active) elif len(sys.argv) == 2: properties = manager.GetProperties() - print "Offline mode is %s" % (properties["OfflineMode"]) + print("Offline mode is %s" % (properties["OfflineMode"])) else: - print "'%s' takes max. two arguments" % sys.argv[1] + print("'%s' takes max. two arguments" % sys.argv[1]) else: - print "Unknown command" + print("Unknown command") |