diff --git a/test/ftp-client b/test/ftp-client
index 1049197..eec910a 100755
--- a/test/ftp-client
+++ b/test/ftp-client
#!/usr/bin/python
+from __future__ import absolute_import, print_function, unicode_literals
+
import gobject
import sys
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
if properties['Status'] == 'complete' or \
properties['Status'] == 'error':
if self.verbose:
- print "Transfer %s" % properties['Status']
+ print("Transfer %s" % properties['Status'])
mainloop.quit()
return
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):
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),
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 62a075f..9fb7a5e 100755
--- a/test/map-client
+++ b/test/map-client
#!/usr/bin/python
+from __future__ import absolute_import, print_function, unicode_literals
+
import gobject
import sys
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
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):
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())
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())
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 c58f7c2..3078d49 100755
--- a/test/opp-client
+++ b/test/opp-client
#!/usr/bin/python
+from __future__ import absolute_import, print_function, unicode_literals
+
import sys
import dbus
import gobject
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
if properties['Status'] == 'complete' or \
properties['Status'] == 'error':
if self.verbose:
- print "Transfer %s" % properties['Status']
+ print("Transfer %s" % properties['Status'])
mainloop.quit()
return
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):
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 a38b3cc..1673844 100755
--- a/test/pbap-client
+++ b/test/pbap-client
#!/usr/bin/python
+from __future__ import absolute_import, print_function, unicode_literals
+
import gobject
import sys
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):
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):
CLIENT_INTERFACE)
if (len(sys.argv) < 2):
- print "Usage: %s <device>" % (sys.argv[0])
+ print("Usage: %s <device>" % (sys.argv[0]))
sys.exit(1)
print "Creating Session"
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 72f04f3..f15e9d1 100755
--- a/test/simple-obex-agent
+++ b/test/simple-obex-agent
#!/usr/bin/python
+from __future__ import absolute_import, print_function, unicode_literals
+
import gobject
import sys
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)
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":
@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__':
mainloop = gobject.MainLoop()
manager.RegisterAgent(path)
- print "Agent registered"
+ print("Agent registered")
cont = True
while cont: