From c7ea48bd5234ad44356339b076fff3b4d226cf37 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Fri, 21 Dec 2012 23:15:30 +0200 Subject: [PATCH] test: Make OBEX related scripts python 3 compatible --- test/ftp-client | 18 ++++++++++-------- test/map-client | 22 ++++++++++++---------- test/opp-client | 12 +++++++----- test/pbap-client | 16 +++++++++------- test/simple-obex-agent | 14 +++++++++++--- 5 files changed, 49 insertions(+), 33 deletions(-) diff --git a/test/ftp-client b/test/ftp-client index 1049197c2..eec910a93 100755 --- a/test/ftp-client +++ b/test/ftp-client @@ -1,5 +1,7 @@ #!/usr/bin/python +from __future__ import absolute_import, print_function, unicode_literals + import gobject import sys @@ -59,11 +61,11 @@ class FtpClient: self.transfer_path = path self.transfer_size = properties["Size"] if self.verbose: - print "Transfer created: %s" % path + print("Transfer created: %s" % path) def generic_reply(self): if self.verbose: - print "Operation succeeded" + print("Operation succeeded") def error(self, err): print err @@ -76,7 +78,7 @@ class FtpClient: if properties['Status'] == 'complete' or \ properties['Status'] == 'error': if self.verbose: - print "Transfer %s" % properties['Status'] + print("Transfer %s" % properties['Status']) mainloop.quit() return @@ -84,9 +86,9 @@ class FtpClient: return speed = (value - self.transferred) / 1000 - print "Transfer progress %d/%d at %d kBps" % (value, + print("Transfer progress %d/%d at %d kBps" % (value, self.transfer_size, - speed) + speed)) self.transferred = value def change_folder(self, new_dir): @@ -96,9 +98,9 @@ class FtpClient: def list_folder(self): for i in self.ftp.ListFolder(): if i["Type"] == "folder": - print "%s/" % (i["Name"]) + print("%s/" % (i["Name"])) else: - print "%s" % (i["Name"]) + print("%s" % (i["Name"])) def put_file(self, filename): self.ftp.PutFile(os.path.abspath(filename), @@ -145,7 +147,7 @@ if __name__ == '__main__': client = dbus.Interface(bus.get_object(BUS_NAME, PATH,), CLIENT_INTERFACE) - print "Creating Session" + print("Creating Session") path = client.CreateSession(options.device, { "Target": "ftp" }) ftp_client = FtpClient(path, options.verbose) diff --git a/test/map-client b/test/map-client index 62a075faf..9fb7a5e13 100755 --- a/test/map-client +++ b/test/map-client @@ -1,5 +1,7 @@ #!/usr/bin/python +from __future__ import absolute_import, print_function, unicode_literals + import gobject import sys @@ -88,12 +90,12 @@ class MapClient: self.transfer_path = path self.props[path] = properties if self.verbose: - print "Transfer created: %s (file %s)" % (path, - properties["Filename"]) + print("Transfer created: %s (file %s)" % (path, + properties["Filename"])) def generic_reply(self): if self.verbose: - print "Operation succeeded" + print("Operation succeeded") def error(self, err): print err @@ -101,16 +103,16 @@ class MapClient: def transfer_complete(self, path): if self.verbose: - print "Transfer finished" + print("Transfer finished") properties = self.props.get(path) if properties == None: return f = open(properties["Filename"], "r") os.remove(properties["Filename"]) - print f.readlines() + print(f.readlines()) def transfer_error(self, path): - print "Transfer %s error" % path + print("Transfer %s error" % path) mainloop.quit() def properties_changed(self, interface, properties, invalidated, path): @@ -131,11 +133,11 @@ class MapClient: def list_folders(self): for i in self.map.ListFolders(dict()): - print "%s/" % (i["Name"]) + print("%s/" % (i["Name"])) def list_messages(self, folder): ret = self.map.ListMessages(folder, dict()) - print pformat(unwrap(ret)) + print(pformat(unwrap(ret))) def get_message(self, handle): self.map.ListMessages("", dict()) @@ -151,7 +153,7 @@ class MapClient: obj = bus.get_object(BUS_NAME, path) msg = dbus.Interface(obj, "org.freedesktop.DBus.Properties") ret = msg.GetAll(MESSAGE_INTERFACE) - print pformat(unwrap(ret)) + print(pformat(unwrap(ret))) def set_message_property(self, handle, prop, flag): self.map.ListMessages("", dict()) @@ -182,7 +184,7 @@ if __name__ == '__main__': client = dbus.Interface(bus.get_object(BUS_NAME, PATH), CLIENT_INTERFACE) - print "Creating Session" + print("Creating Session") path = client.CreateSession(options.device, { "Target": "map" }) map_client = MapClient(path, options.verbose) diff --git a/test/opp-client b/test/opp-client index c58f7c282..3078d490a 100755 --- a/test/opp-client +++ b/test/opp-client @@ -1,5 +1,7 @@ #!/usr/bin/python +from __future__ import absolute_import, print_function, unicode_literals + import sys import dbus import gobject @@ -44,7 +46,7 @@ class OppClient: self.transfer_path = path self.transfer_size = properties["Size"] if self.verbose: - print "Transfer created: %s" % path + print("Transfer created: %s" % path) def error(self, err): print err @@ -57,7 +59,7 @@ class OppClient: if properties['Status'] == 'complete' or \ properties['Status'] == 'error': if self.verbose: - print "Transfer %s" % properties['Status'] + print("Transfer %s" % properties['Status']) mainloop.quit() return @@ -65,9 +67,9 @@ class OppClient: return speed = (value - self.transferred) / 1000 - print "Transfer progress %d/%d at %d kBps" % (value, + print("Transfer progress %d/%d at %d kBps" % (value, self.transfer_size, - speed) + speed)) self.transferred = value def pull_business_card(self, filename): @@ -98,7 +100,7 @@ if __name__ == '__main__': client = dbus.Interface(bus.get_object(BUS_NAME, PATH), CLIENT_INTERFACE) - print "Creating Session" + print("Creating Session") path = client.CreateSession(options.device, { "Target": "OPP" }) opp_client = OppClient(path, options.verbose) diff --git a/test/pbap-client b/test/pbap-client index a38b3ccc4..167384407 100755 --- a/test/pbap-client +++ b/test/pbap-client @@ -1,5 +1,7 @@ #!/usr/bin/python +from __future__ import absolute_import, print_function, unicode_literals + import gobject import sys @@ -39,11 +41,11 @@ class PbapClient: transfer.path = path transfer.filename = properties["Filename"] self.props[path] = transfer - print "Transfer created: %s (file %s)" % (path, - transfer.filename) + print("Transfer created: %s (file %s)" % (path, + transfer.filename)) def error(self, err): - print err + print(err) mainloop.quit() def transfer_complete(self, path): @@ -68,7 +70,7 @@ class PbapClient: f() def transfer_error(self, path): - print "Transfer %s error" % path + print("Transfer %s error" % path) mainloop.quit() def properties_changed(self, interface, properties, invalidated, path): @@ -117,7 +119,7 @@ if __name__ == '__main__': CLIENT_INTERFACE) if (len(sys.argv) < 2): - print "Usage: %s " % (sys.argv[0]) + print("Usage: %s " % (sys.argv[0])) sys.exit(1) print "Creating Session" @@ -127,9 +129,9 @@ if __name__ == '__main__': def process_result(lines, header): if header != None: - print header + print(header) for line in lines: - print line, + print(line), print def test_paths(paths): diff --git a/test/simple-obex-agent b/test/simple-obex-agent index 72f04f324..f15e9d1d6 100755 --- a/test/simple-obex-agent +++ b/test/simple-obex-agent @@ -1,5 +1,7 @@ #!/usr/bin/python +from __future__ import absolute_import, print_function, unicode_literals + import gobject import sys @@ -13,6 +15,12 @@ AGENT_MANAGER_INTERFACE = 'org.bluez.obex.AgentManager1' AGENT_INTERFACE = 'org.bluez.obex.Agent1' TRANSFER_INTERFACE = 'org.bluez.obex.Transfer1' +def ask(prompt): + try: + return raw_input(prompt) + except: + return input(prompt) + class Agent(dbus.service.Object): def __init__(self, conn=None, obj_path=None): dbus.service.Object.__init__(self, conn, obj_path) @@ -26,7 +34,7 @@ class Agent(dbus.service.Object): properties = transfer.GetAll(TRANSFER_INTERFACE); self.pending_auth = True - raw_input("Authorize (%s, %s) (Y/n):" % (path, + auth = ask("Authorize (%s, %s) (Y/n):" % (path, properties['Name'])) if auth == "n" or auth == "N": @@ -42,7 +50,7 @@ class Agent(dbus.service.Object): @dbus.service.method(AGENT_INTERFACE, in_signature="", out_signature="") def Cancel(self): - print "Authorization Canceled" + print("Authorization Canceled") self.pending_auth = False if __name__ == '__main__': @@ -58,7 +66,7 @@ if __name__ == '__main__': mainloop = gobject.MainLoop() manager.RegisterAgent(path) - print "Agent registered" + print("Agent registered") cont = True while cont: -- 2.47.3