From 31ce7614698f8f89e5ac3958c92985cd740fcd07 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 19 Mar 2015 23:53:16 -0500 Subject: [PATCH] test: Make runnable with python3 --- test/simple-agent | 132 +++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 67 deletions(-) diff --git a/test/simple-agent b/test/simple-agent index 097d789c..d83d0de8 100755 --- a/test/simple-agent +++ b/test/simple-agent @@ -1,6 +1,6 @@ #!/usr/bin/python -import gobject +from gi.repository import GLib import dbus import dbus.service @@ -9,92 +9,90 @@ import sys from random import randrange class Canceled(dbus.DBusException): - _dbus_error_name = "net.connman.iwd.Error.Canceled" + _dbus_error_name = "net.connman.iwd.Error.Canceled" class Agent(dbus.service.Object): - passphrase = None + passphrase = None - @dbus.service.method("net.connman.iwd.Agent", - in_signature='', out_signature='') - def Release(self): - print("Release") - mainloop.quit() + @dbus.service.method("net.connman.iwd.Agent", + in_signature='', out_signature='') + def Release(self): + print("Release") + mainloop.quit() - def input_passphrase(self): - response = {} + def input_passphrase(self): + response = {} - if not self.passphrase: - print "Service credentials requested, type cancel to cancel" - args = raw_input('Answer: ') + if not self.passphrase: + print("Service credentials requested, type cancel to cancel") + args = input('Answer: ') - for arg in args.split(): - if arg.startswith("cancel"): - response["Error"] = arg - if arg.startswith("Passphrase="): - passphrase = arg.replace("Passphrase=", "", 1) - response["Passphrase"] = passphrase - else: - if self.passphrase: - response["Passphrase"] = self.passphrase + for arg in args.split(): + if arg.startswith("cancel"): + response["Error"] = arg - return response + if arg.startswith("Passphrase="): + passphrase = arg.replace("Passphrase=", "", 1) + response["Passphrase"] = passphrase + else: + if self.passphrase: + response["Passphrase"] = self.passphrase - @dbus.service.method("net.connman.iwd.Agent", - in_signature='o', - out_signature='s') - def RequestPassphrase(self, path): - print "RequestPassphrase (%s)" % (path) + return response - response = {} + @dbus.service.method("net.connman.iwd.Agent", + in_signature='o', + out_signature='s') + def RequestPassphrase(self, path): + print("RequestPassphrase (%s)" % (path)) - response.update(self.input_passphrase()) + response = {} + response.update(self.input_passphrase()) - if response.has_key("Error"): - if response["Error"] == "cancel": - raise Canceled("canceled") - return + if response.has_key("Error"): + if response["Error"] == "cancel": + raise Canceled("canceled") + return - print "returning (%s)" % (response["Passphrase"]) - - return response["Passphrase"] - - @dbus.service.method("net.connman.iwd.Agent", - in_signature='', out_signature='') - def Cancel(self): - print "Cancel" + print("returning (%s)" % (response["Passphrase"])) + return response["Passphrase"] + @dbus.service.method("net.connman.iwd.Agent", + in_signature='', out_signature='') + def Cancel(self): + print("Cancel") def print_usage(): - print "Usage:" - print "For WPA input:" - print "%s Passphrase=" % (sys.argv[0]) - print "Help: %s help" % (sys.argv[0]) - sys.exit(1) + print("Usage:") + print("For WPA input:") + print("%s Passphrase=" % (sys.argv[0])) + print("Help: %s help" % (sys.argv[0])) + sys.exit(1) if __name__ == '__main__': - if len(sys.argv) == 2 and sys.argv[1] == "help": - print_usage() + if len(sys.argv) == 2 and sys.argv[1] == "help": + print_usage() - dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) + dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) - bus = dbus.SystemBus() - manager = dbus.Interface(bus.get_object('net.connman.iwd', "/"), - 'net.connman.iwd.Manager') + bus = dbus.SystemBus() + manager = dbus.Interface(bus.get_object('net.connman.iwd', "/"), + 'net.connman.iwd.Manager') - path = "/test/agent/" + str(randrange(100)) - object = Agent(bus, path) + path = "/test/agent/" + str(randrange(100)) + object = Agent(bus, path) - if len(sys.argv) >= 2: - for arg in sys.argv[1:]: - if arg.startswith("Passphrase="): - object.passphrase = arg.replace("Passphrase=", "", 1) - else: - print_usage() + if len(sys.argv) >= 2: + for arg in sys.argv[1:]: + if arg.startswith("Passphrase="): + object.passphrase = arg.replace("Passphrase=", "", 1) + else: + print_usage() - try: - manager.RegisterAgent(path) - except: - print "Cannot register iwd agent." + try: + manager.RegisterAgent(path) + except: + print("Cannot register iwd agent.") - mainloop = gobject.MainLoop() - mainloop.run() + mainloop = GLib.MainLoop() + mainloop.run()