mirror of
https://git.kernel.org/pub/scm/network/wireless/iwd.git
synced 2025-02-10 06:54:22 +01:00
test: Make runnable with python3
This commit is contained in:
parent
dcb5045d8f
commit
31ce761469
@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/python
|
#!/usr/bin/python
|
||||||
|
|
||||||
import gobject
|
from gi.repository import GLib
|
||||||
|
|
||||||
import dbus
|
import dbus
|
||||||
import dbus.service
|
import dbus.service
|
||||||
@ -24,12 +24,13 @@ class Agent(dbus.service.Object):
|
|||||||
response = {}
|
response = {}
|
||||||
|
|
||||||
if not self.passphrase:
|
if not self.passphrase:
|
||||||
print "Service credentials requested, type cancel to cancel"
|
print("Service credentials requested, type cancel to cancel")
|
||||||
args = raw_input('Answer: ')
|
args = input('Answer: ')
|
||||||
|
|
||||||
for arg in args.split():
|
for arg in args.split():
|
||||||
if arg.startswith("cancel"):
|
if arg.startswith("cancel"):
|
||||||
response["Error"] = arg
|
response["Error"] = arg
|
||||||
|
|
||||||
if arg.startswith("Passphrase="):
|
if arg.startswith("Passphrase="):
|
||||||
passphrase = arg.replace("Passphrase=", "", 1)
|
passphrase = arg.replace("Passphrase=", "", 1)
|
||||||
response["Passphrase"] = passphrase
|
response["Passphrase"] = passphrase
|
||||||
@ -43,10 +44,9 @@ class Agent(dbus.service.Object):
|
|||||||
in_signature='o',
|
in_signature='o',
|
||||||
out_signature='s')
|
out_signature='s')
|
||||||
def RequestPassphrase(self, path):
|
def RequestPassphrase(self, path):
|
||||||
print "RequestPassphrase (%s)" % (path)
|
print("RequestPassphrase (%s)" % (path))
|
||||||
|
|
||||||
response = {}
|
response = {}
|
||||||
|
|
||||||
response.update(self.input_passphrase())
|
response.update(self.input_passphrase())
|
||||||
|
|
||||||
if response.has_key("Error"):
|
if response.has_key("Error"):
|
||||||
@ -54,21 +54,19 @@ class Agent(dbus.service.Object):
|
|||||||
raise Canceled("canceled")
|
raise Canceled("canceled")
|
||||||
return
|
return
|
||||||
|
|
||||||
print "returning (%s)" % (response["Passphrase"])
|
print("returning (%s)" % (response["Passphrase"]))
|
||||||
|
|
||||||
return response["Passphrase"]
|
return response["Passphrase"]
|
||||||
|
|
||||||
@dbus.service.method("net.connman.iwd.Agent",
|
@dbus.service.method("net.connman.iwd.Agent",
|
||||||
in_signature='', out_signature='')
|
in_signature='', out_signature='')
|
||||||
def Cancel(self):
|
def Cancel(self):
|
||||||
print "Cancel"
|
print("Cancel")
|
||||||
|
|
||||||
|
|
||||||
def print_usage():
|
def print_usage():
|
||||||
print "Usage:"
|
print("Usage:")
|
||||||
print "For WPA input:"
|
print("For WPA input:")
|
||||||
print "%s Passphrase=<passphrase>" % (sys.argv[0])
|
print("%s Passphrase=<passphrase>" % (sys.argv[0]))
|
||||||
print "Help: %s help" % (sys.argv[0])
|
print("Help: %s help" % (sys.argv[0]))
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
@ -94,7 +92,7 @@ if __name__ == '__main__':
|
|||||||
try:
|
try:
|
||||||
manager.RegisterAgent(path)
|
manager.RegisterAgent(path)
|
||||||
except:
|
except:
|
||||||
print "Cannot register iwd agent."
|
print("Cannot register iwd agent.")
|
||||||
|
|
||||||
mainloop = gobject.MainLoop()
|
mainloop = GLib.MainLoop()
|
||||||
mainloop.run()
|
mainloop.run()
|
||||||
|
Loading…
Reference in New Issue
Block a user