sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
10
0
Fork 0
Code Issues Releases Activity

test: Make print calls compatible with Python 3 

Turn print calls into print() function calls and avoid using
comma-separated arguments, so that they work and look the same with
both Python 2 and 3.
wavecom
Martin Pitt 2014-03-11 17:39:18 +01:00 committed by Denis Kenzior
parent c54e4763f8
commit 0c1fcd2b50
86 changed files with 576 additions and 576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/activate-context
View File

@ -20,7 +20,7 @@ for path, properties in modems:
contexts = connman.GetContexts()
if (len(contexts) == 0):
print "No context available"
print("No context available")
sys.exit(1)
connman.SetProperty("Powered", dbus.Boolean(1))
@ -36,5 +36,5 @@ for path, properties in modems:
try:
context.SetProperty("Active", dbus.Boolean(1), timeout = 100)
except dbus.DBusException, e:
print "Error activating %s: %s" % (path, str(e))
print("Error activating %s: %s" % (path, str(e)))
exit(2)

4
test/answer-calls
View File

@ -10,7 +10,7 @@ manager = dbus.Interface(bus.get_object('org.ofono', '/'),
modems = manager.GetModems()
for path, properties in modems:
print "[ %s ]" % (path)
print("[ %s ]" % (path))
if "org.ofono.VoiceCallManager" not in properties["Interfaces"]:
continue
@ -22,7 +22,7 @@ for path, properties in modems:
for path, properties in calls:
state = properties["State"]
print "[ %s ] %s" % (path, state)
print("[ %s ] %s" % (path, state))
if state != "incoming":
continue

8
test/backtrace
View File

@ -6,7 +6,7 @@ import sys
import subprocess
if (len(sys.argv) < 3):
print "Usage: %s [binary] [log]" % (sys.argv[0])
print("Usage: %s [binary] [log]" % (sys.argv[0]))
sys.exit(1)
binary = sys.argv[1]
@ -50,8 +50,8 @@ child_stdout.close()
frame_count = len(frames);
count = 0
print "-------- backtrace --------"
print("-------- backtrace --------")
while count < frame_count:
print "[%d]: %s() [%s]" % (count/2, frames[count], frames[count + 1])
print("[%d]: %s() [%s]" % (count/2, frames[count], frames[count + 1]))
count = count + 2
print "---------------------------"
print("---------------------------")

2
test/cancel-ussd
View File

@ -21,7 +21,7 @@ ussd = dbus.Interface(bus.get_object('org.ofono', path),
properties = ussd.GetProperties()
state = properties["State"]
print "State: %s" % (state)
print("State: %s" % (state))
if state != "idle":
ussd.Cancel()

2
test/cdma-connman-disable
View File

@ -13,7 +13,7 @@ else:
modems = manager.GetModems()
path = modems[0][0]
print "Disconnecting CDMA Packet Data Service on modem %s..." % path
print("Disconnecting CDMA Packet Data Service on modem %s..." % path)
cm = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.cdma.ConnectionManager')

2
test/cdma-connman-enable
View File

@ -13,7 +13,7 @@ else:
modems = manager.GetModems()
path = modems[0][0]
print "Connecting CDMA Packet Data Service on modem %s..." % path
print("Connecting CDMA Packet Data Service on modem %s..." % path)
cm = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.cdma.ConnectionManager')

2
test/cdma-dial-number
View File

@ -16,7 +16,7 @@ else:
path, properties = modems[0]
number = sys.argv[1]
print "Using modem %s" % path
print("Using modem %s" % path)
manager = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.cdma.VoiceCallManager')

4
test/cdma-list-call
View File

@ -10,7 +10,7 @@ manager = dbus.Interface(bus.get_object('org.ofono', '/'),
modems = manager.GetModems()
for path, properties in modems:
print "[ %s ]" % (path)
print("[ %s ]" % (path))
if "org.ofono.cdma.VoiceCallManager" not in properties["Interfaces"]:
continue
@ -22,4 +22,4 @@ for path, properties in modems:
for key in properties.keys():
val = str(properties[key])
print " %s = %s" % (key, val)
print(" %s = %s" % (key, val))

6
test/cdma-set-credentials
View File

@ -17,12 +17,12 @@ for path, properties in modems:
cm = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.cdma.ConnectionManager')
print "Connecting CDMA Packet Data Service on modem %s..." % path
print("Connecting CDMA Packet Data Service on modem %s..." % path)
if len(sys.argv) > 1:
cm.SetProperty("Username", (sys.argv[1]))
print "Setting Username to %s" % (sys.argv[1])
print("Setting Username to %s" % (sys.argv[1]))
if len(sys.argv) > 2:
cm.SetProperty("Password", (sys.argv[2]))
print "Setting Password to %s" % (sys.argv[2])
print("Setting Password to %s" % (sys.argv[2]))

4
test/change-pin
View File

@ -19,10 +19,10 @@ elif len(sys.argv) == 3:
old_pin = sys.argv[2]
new_pin = sys.argv[3]
else:
print "%s [PATH] pin_type old_pin new_pin" % (sys.argv[0])
print("%s [PATH] pin_type old_pin new_pin" % (sys.argv[0]))
sys.exit(0)
print "Change %s for modem %s..." % (pin_type, path)
print("Change %s for modem %s..." % (pin_type, path))
simmanager = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.SimManager')

10
test/create-internet-context
View File

@ -27,21 +27,21 @@ for path, properties in modems:
if path == "":
path = connman.AddContext("internet")
print "Created new context %s" % (path)
print("Created new context %s" % (path))
else:
print "Found context %s" % (path)
print("Found context %s" % (path))
context = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.ConnectionContext')
if len(sys.argv) > 1:
context.SetProperty("AccessPointName", sys.argv[1])
print "Setting APN to %s" % (sys.argv[1])
print("Setting APN to %s" % (sys.argv[1]))
if len(sys.argv) > 2:
context.SetProperty("Username", sys.argv[2])
print "Setting username to %s" % (sys.argv[2])
print("Setting username to %s" % (sys.argv[2]))
if len(sys.argv) > 3:
context.SetProperty("Password", sys.argv[3])
print "Setting password to %s" % (sys.argv[3])
print("Setting password to %s" % (sys.argv[3]))

10
test/create-mms-context
View File

@ -27,21 +27,21 @@ for path, properties in modems:
if path == "":
path = connman.AddContext("mms")
print "Created new context %s" % (path)
print("Created new context %s" % (path))
else:
print "Found context %s" % (path)
print("Found context %s" % (path))
context = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.ConnectionContext')
if len(sys.argv) > 1:
context.SetProperty("AccessPointName", sys.argv[1])
print "Setting APN to %s" % (sys.argv[1])
print("Setting APN to %s" % (sys.argv[1]))
if len(sys.argv) > 2:
context.SetProperty("Username", sys.argv[2])
print "Setting username to %s" % (sys.argv[2])
print("Setting username to %s" % (sys.argv[2]))
if len(sys.argv) > 3:
context.SetProperty("Password", sys.argv[3])
print "Setting password to %s" % (sys.argv[3])
print("Setting password to %s" % (sys.argv[3]))

2
test/create-multiparty
View File

@ -21,4 +21,4 @@ manager = dbus.Interface(bus.get_object('org.ofono', path),
mpty = manager.CreateMultiparty()
for path in mpty:
print path
print(path)

4
test/deactivate-context
View File

@ -20,7 +20,7 @@ for path, properties in modems:
contexts = connman.GetContexts()
if (len(contexts) == 0):
print "No context available"
print("No context available")
sys.exit(1)
if len(sys.argv) > 1:
@ -34,5 +34,5 @@ for path, properties in modems:
try:
context.SetProperty("Active", dbus.Boolean(0))
except dbus.DBusException, e:
print "Error activating %s: %s" % (path, str(e))
print("Error activating %s: %s" % (path, str(e)))
exit(2)

6
test/dial-number
View File

@ -4,7 +4,7 @@ import sys
import dbus
if (len(sys.argv) < 2):
print "Usage: %s [modem] <number> [hide_callerid]" % (sys.argv[0])
print("Usage: %s [modem] <number> [hide_callerid]" % (sys.argv[0]))
sys.exit(1)
bus = dbus.SystemBus()
@ -32,11 +32,11 @@ else:
number = sys.argv[2]
hide_callerid = sys.argv[3]
print "Using modem %s" % modem
print("Using modem %s" % modem)
vcm = dbus.Interface(bus.get_object('org.ofono', modem),
'org.ofono.VoiceCallManager')
path = vcm.Dial(number, hide_callerid)
print path
print(path)

12
test/disable-call-forwarding
View File

@ -8,17 +8,17 @@ import dbus.mainloop.glib
def property_changed(property, value):
if len(value.__str__()) > 0:
print "CF property %s changed to %s" % (property, value)
print("CF property %s changed to %s" % (property, value))
else:
print "CF property %s changed to disabled" % (property)
print("CF property %s changed to disabled" % (property))
if canexit:
mainloop.quit();
if __name__ == "__main__":
if len(sys.argv) < 2:
print "Usage: %s <type>" % (sys.argv[0])
print "Type can be: all, conditional"
print("Usage: %s <type>" % (sys.argv[0]))
print("Type can be: all, conditional")
sys.exit(1)
canexit = False
@ -42,10 +42,10 @@ if __name__ == "__main__":
try:
cf.DisableAll(type, timeout = 100)
except dbus.DBusException, e:
print "Unable to DisableAll", e
print("Unable to DisableAll %s" % e)
sys.exit(1);
print "DisableAll successful"
print("DisableAll successful")
canexit = True

2
test/disable-gprs
View File

@ -13,7 +13,7 @@ else:
modems = manager.GetModems()
path = modems[0][0]
print "Disconnecting GPRS on modem %s..." % path
print("Disconnecting GPRS on modem %s..." % path)
cm = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.ConnectionManager')

2
test/disable-modem
View File

@ -13,7 +13,7 @@ else:
modems = manager.GetModems()
path = modems[0][0]
print "Disconnecting modem %s..." % path
print("Disconnecting modem %s..." % path)
modem = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.Modem')

4
test/display-icon
View File

@ -4,7 +4,7 @@ import sys
import dbus
if (len(sys.argv) < 2):
print "Usage: %s [modem] icon_id" % (sys.argv[0])
print("Usage: %s [modem] icon_id" % (sys.argv[0]))
sys.exit(1)
bus = dbus.SystemBus()
@ -21,7 +21,7 @@ elif (len(sys.argv) == 3):
modem = sys.argv[1]
icon = sys.argv[2]
print "Using modem %s" % modem
print("Using modem %s" % modem)
sim = dbus.Interface(bus.get_object('org.ofono', modem),
'org.ofono.SimManager')

2
test/dundee-connect
View File

@ -13,7 +13,7 @@ else:
devices = manager.GetDevices()
path = devices[0][0]
print "Connect device %s..." % path
print("Connect device %s..." % path)
device = dbus.Interface(bus.get_object('org.ofono.dundee', path),
'org.ofono.dundee.Device')

2
test/dundee-disconnect
View File

@ -13,7 +13,7 @@ else:
devices = manager.GetDevices()
path = devices[0][0]
print "Disconnect device %s..." % path
print("Disconnect device %s..." % path)
device = dbus.Interface(bus.get_object('org.ofono.dundee', path),
'org.ofono.dundee.Device')

2
test/enable-cbs
View File

@ -13,7 +13,7 @@ else:
modems = manager.GetModems()
path = modems[0][0]
print "Enabling cell broadcast on modem %s..." % path
print("Enabling cell broadcast on modem %s..." % path)
cbs = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.CellBroadcast')

2
test/enable-gprs
View File

@ -13,7 +13,7 @@ else:
modems = manager.GetModems()
path = modems[0][0]
print "Connecting modem %s..." % path
print("Connecting modem %s..." % path)
cm = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.ConnectionManager')

2
test/enable-modem
View File

@ -13,7 +13,7 @@ else:
modems = manager.GetModems()
path = modems[0][0]
print "Connecting modem %s..." % path
print("Connecting modem %s..." % path)
modem = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.Modem')

4
test/enter-pin
View File

@ -17,10 +17,10 @@ elif len(sys.argv) == 3:
pin_type = sys.argv[1]
pin = sys.argv[2]
else:
print "%s [PATH] pin_type pin" % (sys.argv[0])
print("%s [PATH] pin_type pin" % (sys.argv[0]))
sys.exit(0)
print "Enter Pin for modem %s..." % path
print("Enter Pin for modem %s..." % path)
simmanager = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.SimManager')

4
test/get-icon
View File

@ -8,7 +8,7 @@ bus = dbus.SystemBus()
if len(sys.argv) == 2:
id = sys.argv[1]
else:
print "%s <icon id>" % (sys.argv[0])
print("%s <icon id>" % (sys.argv[0]))
sys.exit(0)
manager = dbus.Interface(bus.get_object("org.ofono", "/"),
@ -28,4 +28,4 @@ icon = sim.GetIcon(dbus.Byte(int(sys.argv[1])))
xpm = ""
for byte in icon:
xpm += str(byte)
print xpm
print(xpm)

6
test/get-operators
View File

@ -22,7 +22,7 @@ for entry in operators:
path = entry[0]
properties = entry[1]
print "[ %s ]" % (path)
print("[ %s ]" % (path))
for key in properties.keys():
if key in ["Technologies"]:
@ -31,7 +31,7 @@ for entry in operators:
val += i + " "
else:
val = str(properties[key])
print " %s = %s" % (key, val)
print(" %s = %s" % (key, val))
print
print('')

2
test/get-tech-preference
View File

@ -17,4 +17,4 @@ radiosettings = dbus.Interface(bus.get_object('org.ofono', path),
properties = radiosettings.GetProperties()
print "Technology preference: %s" % (properties["TechnologyPreference"])
print("Technology preference: %s" % (properties["TechnologyPreference"]))

2
test/hangup-active
View File

@ -18,7 +18,7 @@ calls = manager.GetCalls()
for path, properties in calls:
state = properties["State"]
print "[ %s ] %s" % (path, state)
print("[ %s ] %s" % (path, state))
if state != "active":
continue

2
test/hangup-call
View File

@ -6,7 +6,7 @@ import dbus
bus = dbus.SystemBus()
if (len(sys.argv) < 2):
print "Usage: %s [ Call Path ]" % (sys.argv[0])
print("Usage: %s [ Call Path ]" % (sys.argv[0]))
sys.exit(1)
call = dbus.Interface(bus.get_object('org.ofono', sys.argv[1]),

12
test/initiate-ussd
View File

@ -4,7 +4,7 @@ import sys
import dbus
if (len(sys.argv) < 2):
print "Usage: %s [modem] <ussd-string>" % (sys.argv[0])
print("Usage: %s [modem] <ussd-string>" % (sys.argv[0]))
sys.exit(1)
bus = dbus.SystemBus()
@ -27,7 +27,7 @@ ussd = dbus.Interface(bus.get_object('org.ofono', path),
properties = ussd.GetProperties()
state = properties["State"]
print "State: %s" % (state)
print("State: %s" % (state))
if state != "idle":
sys.exit(1);
@ -37,12 +37,12 @@ result = ussd.Initiate(ussdstring, timeout=100)
properties = ussd.GetProperties()
state = properties["State"]
print result[0] + ": " + result[1]
print(result[0] + ": " + result[1])
if state == "idle":
sys.exit(0)
print "State: %s" % (state)
print("State: %s" % (state))
while state == "user-response":
response = raw_input("Enter response: ")
@ -52,7 +52,7 @@ while state == "user-response":
properties = ussd.GetProperties()
state = properties["State"]
print result
print(result)
if state != "idle":
print "State: %s" % (state)
print("State: %s" % (state))

8
test/list-calls
View File

@ -10,7 +10,7 @@ manager = dbus.Interface(bus.get_object('org.ofono', '/'),
modems = manager.GetModems()
for path, properties in modems:
print "[ %s ]" % (path)
print("[ %s ]" % (path))
if "org.ofono.VoiceCallManager" not in properties["Interfaces"]:
continue
@ -21,11 +21,11 @@ for path, properties in modems:
calls = mgr.GetCalls()
for path, properties in calls:
print " [ %s ]" % (path)
print(" [ %s ]" % (path))
for key in properties.keys():
if key == 'Icon':
print " %s = %d" % (key, properties[key])
print(" %s = %d" % (key, properties[key]))
else:
val = str(properties[key])
print " %s = %s" % (key, val)
print(" %s = %s" % (key, val))

8
test/list-contexts
View File

@ -10,7 +10,7 @@ manager = dbus.Interface(bus.get_object('org.ofono', '/'),
modems = manager.GetModems()
for path, properties in modems:
print "[ %s ]" % (path)
print("[ %s ]" % (path))
if "org.ofono.ConnectionManager" not in properties["Interfaces"]:
continue
@ -21,7 +21,7 @@ for path, properties in modems:
contexts = connman.GetContexts()
for path, properties in contexts:
print " [ %s ]" % (path)
print(" [ %s ]" % (path))
for key in properties.keys():
if key in ["Settings"] or key in ["IPv6.Settings"]:
@ -39,6 +39,6 @@ for path, properties in modems:
val += " }"
else:
val = str(properties[key])
print " %s = %s" % (key, val)
print(" %s = %s" % (key, val))
print
print('')

8
test/list-messages
View File

@ -10,7 +10,7 @@ manager = dbus.Interface(bus.get_object('org.ofono', '/'),
modems = manager.GetModems()
for path, properties in modems:
print "[ %s ]" % (path)
print("[ %s ]" % (path))
if "org.ofono.MessageManager" not in properties["Interfaces"]:
continue
@ -21,10 +21,10 @@ for path, properties in modems:
contexts = connman.GetMessages()
for path, properties in contexts:
print " [ %s ]" % (path)
print(" [ %s ]" % (path))
for key in properties.keys():
val = str(properties[key])
print " %s = %s" % (key, val)
print(" %s = %s" % (key, val))
print
print('')

10
test/list-modems
View File

@ -10,7 +10,7 @@ manager = dbus.Interface(bus.get_object('org.ofono', '/'),
modems = manager.GetModems()
for path, properties in modems:
print "[ %s ]" % (path)
print("[ %s ]" % (path))
for key in properties.keys():
if key in ["Interfaces", "Features"]:
@ -19,13 +19,13 @@ for path, properties in modems:
val += i + " "
else:
val = properties[key]
print " %s = %s" % (key, val)
print(" %s = %s" % (key, val))
for interface in properties["Interfaces"]:
object = dbus.Interface(bus.get_object('org.ofono', path),
interface)
print " [ %s ]" % (interface)
print(" [ %s ]" % (interface))
try:
properties = object.GetProperties()
@ -77,6 +77,6 @@ for path, properties in modems:
val += " }"
else:
val = properties[key]
print " %s = %s" % (key, val)
print(" %s = %s" % (key, val))
print
print('')

8
test/list-operators
View File

@ -11,7 +11,7 @@ manager = dbus.Interface(bus.get_object('org.ofono', '/'),
modems = manager.GetModems()
for path, properties in modems:
print "[ %s ]" % (path)
print("[ %s ]" % (path))
if "org.ofono.NetworkRegistration" not in properties["Interfaces"]:
continue
@ -25,7 +25,7 @@ for path, properties in modems:
operators = netreg.GetOperators()
for path, properties in operators:
print " [ %s ]" % (path)
print(" [ %s ]" % (path))
for key in properties.keys():
if key in ["Technologies"]:
@ -34,6 +34,6 @@ for path, properties in modems:
val += i + " "
else:
val = str(properties[key])
print " %s = %s" % (key, val)
print(" %s = %s" % (key, val))
print
print('')

4
test/lock-pin
View File

@ -17,10 +17,10 @@ elif len(sys.argv) == 3:
pin_type = sys.argv[1]
pin = sys.argv[2]
else:
print "%s [PATH] pin_type pin" % (sys.argv[0])
print("%s [PATH] pin_type pin" % (sys.argv[0]))
sys.exit(0)
print "Lock %s %s for modem %s..." % (pin_type, pin, path)
print("Lock %s %s for modem %s..." % (pin_type, pin, path))
simmanager = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.SimManager')

4
test/lockdown-modem
View File

@ -13,13 +13,13 @@ else:
modems = manager.GetModems()
path = modems[0][0]
print "Locking and disconnecting modem %s..." % path
print("Locking and disconnecting modem %s..." % path)
modem = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.Modem')
modem.SetProperty("Lockdown", dbus.Boolean(1))
print "press ENTER to unlock the modem %s" % path
print("press ENTER to unlock the modem %s" % path)
sys.stdin.readline()
modem.SetProperty("Lockdown", dbus.Boolean(0))

16
test/monitor-dundee
View File

@ -52,32 +52,32 @@ def pretty(d):
def property_changed(name, value, path, interface):
iface = interface[interface.rfind(".") + 1:]
print "{%s} [%s] %s = %s" % (iface, path, name, pretty(value))
print("{%s} [%s] %s = %s" % (iface, path, name, pretty(value)))
def added(name, value, member, path, interface):
iface = interface[interface.rfind(".") + 1:]
print "{%s} [%s] %s %s" % (iface, member, name, pretty(value))
print("{%s} [%s] %s %s" % (iface, member, name, pretty(value)))
def removed(name, member, path, interface):
iface = interface[interface.rfind(".") + 1:]
print "{%s} [%s] %s" % (iface, member, name)
print("{%s} [%s] %s" % (iface, member, name))
def event(member, path, interface):
iface = interface[interface.rfind(".") + 1:]
print "{%s} [%s] %s" % (iface, path, member)
print("{%s} [%s] %s" % (iface, path, member))
def message(msg, args, member, path, interface):
iface = interface[interface.rfind(".") + 1:]
print "{%s} [%s] %s %s (%s)" % (iface, path, member,
str(msg), pretty(args))
print("{%s} [%s] %s %s (%s)" % (iface, path, member,
str(msg), pretty(args)))
def ussd(msg, member, path, interface):
iface = interface[interface.rfind(".") + 1:]
print "{%s} [%s] %s %s" % (iface, path, member, str(msg))
print("{%s} [%s] %s %s" % (iface, path, member, str(msg)))
def value(value, member, path, interface):
iface = interface[interface.rfind(".") + 1:]
print "{%s} [%s] %s %s" % (iface, path, member, str(value))
print("{%s} [%s] %s %s" % (iface, path, member, str(value)))
if __name__ == '__main__':
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)

16
test/monitor-ofono
View File

@ -55,32 +55,32 @@ def pretty(d):
def property_changed(name, value, path, interface):
iface = interface[interface.rfind(".") + 1:]
print "{%s} [%s] %s = %s" % (iface, path, name, pretty(value))
print("{%s} [%s] %s = %s" % (iface, path, name, pretty(value)))
def added(name, value, member, path, interface):
iface = interface[interface.rfind(".") + 1:]
print "{%s} [%s] %s %s" % (iface, member, name, pretty(value))
print("{%s} [%s] %s %s" % (iface, member, name, pretty(value)))
def removed(name, member, path, interface):
iface = interface[interface.rfind(".") + 1:]
print "{%s} [%s] %s" % (iface, name, member)
print("{%s} [%s] %s" % (iface, name, member))
def event(member, path, interface):
iface = interface[interface.rfind(".") + 1:]
print "{%s} [%s] %s" % (iface, path, member)
print("{%s} [%s] %s" % (iface, path, member))
def message(msg, args, member, path, interface):
iface = interface[interface.rfind(".") + 1:]
print "{%s} [%s] %s %s (%s)" % (iface, path, member,
msg, pretty(args))
print("{%s} [%s] %s %s (%s)" % (iface, path, member,
msg, pretty(args)))
def ussd(msg, member, path, interface):
iface = interface[interface.rfind(".") + 1:]
print "{%s} [%s] %s %s" % (iface, path, member, msg)
print("{%s} [%s] %s %s" % (iface, path, member, msg))
def value(value, member, path, interface):
iface = interface[interface.rfind(".") + 1:]
print "{%s} [%s] %s %s" % (iface, path, member, str(value))
print("{%s} [%s] %s %s" % (iface, path, member, str(value)))
if __name__ == '__main__':
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)

2
test/offline-modem
View File

@ -12,6 +12,6 @@ else:
modems = manager.GetModems()
path = modems[0][0]
print "Setting modem %s offline..." % path
print("Setting modem %s offline..." % path)
modem = dbus.Interface(bus.get_object('org.ofono', path), 'org.ofono.Modem')
modem.SetProperty("Online", dbus.Boolean(0), timeout = 120)

2
test/online-modem
View File

@ -12,6 +12,6 @@ else:
modems = manager.GetModems()
path = modems[0][0]
print "Setting modem %s online..." % path
print("Setting modem %s online..." % path)
modem = dbus.Interface(bus.get_object('org.ofono', path), 'org.ofono.Modem')
modem.SetProperty("Online", dbus.Boolean(1), timeout = 120)

2
test/private-chat
View File

@ -23,4 +23,4 @@ manager = dbus.Interface(bus.get_object('org.ofono', path),
mpty = manager.PrivateChat(callid, timeout=100)
for path in mpty:
print path
print(path)

14
test/process-context-settings
View File

@ -23,7 +23,7 @@ for path, properties in modems:
if properties["Active"] == dbus.Boolean(0):
continue
print "Configuring %s" % (path)
print("Configuring %s" % (path))
settings = properties["Settings"]
@ -35,20 +35,20 @@ for path, properties in modems:
gateway = "0.0.0.0";
if settings["Method"] == "dhcp":
print " Run DHCP on interface %s" % (interface)
print(" Run DHCP on interface %s" % (interface))
else:
print " Interface is %s" % (interface)
print " IP address is %s" % (address)
print " Gateway is %s" % (gateway)
print(" Interface is %s" % (interface))
print(" IP address is %s" % (address))
print(" Gateway is %s" % (gateway))
cmd = "ifconfig " + interface + " " + address
cmd += " netmask 255.255.255.255"
os.system(cmd);
for i in settings["DomainNameServers"]:
print " Nameserver is %s" % (i)
print(" Nameserver is %s" % (i))
cmd = "route add -host " + i
cmd +=" dev " + interface
os.system(cmd);
print
print('')

4
test/receive-sms
View File

@ -6,11 +6,11 @@ import dbus
import dbus.mainloop.glib
def incoming_message(message, details, path, interface):
print "%s" % (message)
print("%s" % (message))
for key in details:
val = details[key]
print " %s = %s" % (key, val)
print(" %s = %s" % (key, val))
if __name__ == '__main__':
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)

4
test/reject-calls
View File

@ -10,7 +10,7 @@ manager = dbus.Interface(bus.get_object('org.ofono', '/'),
modems = manager.GetModems()
for path, properties in modems:
print "[ %s ]" % (path)
print("[ %s ]" % (path))
if "org.ofono.VoiceCallManager" not in properties["Interfaces"]:
continue
@ -22,7 +22,7 @@ for path, properties in modems:
for path, properties in calls:
state = properties["State"]
print "[ %s ] %s" % (path, state)
print("[ %s ] %s" % (path, state))
if state != "incoming":
continue

2
test/release-and-answer
View File

@ -10,7 +10,7 @@ manager = dbus.Interface(bus.get_object('org.ofono', '/'),
modems = manager.GetModems()
for path, properties in modems:
print "[ %s ]" % (path)
print("[ %s ]" % (path))
if "org.ofono.VoiceCallManager" not in properties["Interfaces"]:
continue

2
test/release-and-swap
View File

@ -10,7 +10,7 @@ manager = dbus.Interface(bus.get_object('org.ofono', '/'),
modems = manager.GetModems()
for path, properties in modems:
print "[ %s ]" % (path)
print("[ %s ]" % (path))
if "org.ofono.VoiceCallManager" not in properties["Interfaces"]:
continue

2
test/remove-contexts
View File

@ -20,4 +20,4 @@ for path, properties in modems:
for path, properties in contexts:
connman.RemoveContext(path)
print"Removed: [ %s ]" % (path)
print("Removed: [ %s ]" % (path))

4
test/reset-pin
View File

@ -14,9 +14,9 @@ elif len(sys.argv) == 4:
path = modems[0][0]
puk_type, puk, pin = sys.argv[1:]
else:
print "%s [PATH] puk_type puk pin" % (sys.argv[0])
print("%s [PATH] puk_type puk pin" % (sys.argv[0]))
print "Reset pin for modem %s..." % path
print("Reset pin for modem %s..." % path)
simmanager = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.SimManager')

8
test/scan-for-operators
View File

@ -13,7 +13,7 @@ else:
modems = manager.GetModems()
path = modems[0][0]
print "Scanning operators on modem %s..." % path
print("Scanning operators on modem %s..." % path)
netreg = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.NetworkRegistration')
@ -23,7 +23,7 @@ for entry in operators:
path = entry[0]
properties = entry[1]
print "[ %s ]" % (path)
print("[ %s ]" % (path))
for key in properties.keys():
if key in ["Technologies"]:
@ -32,7 +32,7 @@ for entry in operators:
val += i + " "
else:
val = str(properties[key])
print " %s = %s" % (key, val)
print(" %s = %s" % (key, val))
print
print('')

8
test/send-sms
View File

@ -4,8 +4,8 @@ import sys
import dbus
if len(sys.argv) < 4:
print "Usage: %s [modem] <to> <message> <delivery report>" %\
(sys.argv[0])
print("Usage: %s [modem] <to> <message> <delivery report>" %\
(sys.argv[0]))
sys.exit(1)
bus = dbus.SystemBus()
@ -18,7 +18,7 @@ else:
modems = manager.GetModems()
path = modems[0][0]
print "Send message using modem %s ..." % path
print("Send message using modem %s ..." % path)
mm = dbus.Interface(bus.get_object('org.ofono', path),
@ -31,4 +31,4 @@ else:
mm.SetProperty("UseDeliveryReports", dbus.Boolean(int(sys.argv[3])))
path = mm.SendMessage(sys.argv[1], sys.argv[2])
print path
print(path)

14
test/send-ussd
View File

@ -4,7 +4,7 @@ import sys
import dbus
if (len(sys.argv) < 2):
print "Usage: %s [modem] <ussd-string>" % (sys.argv[0])
print("Usage: %s [modem] <ussd-string>" % (sys.argv[0]))
sys.exit(1)
bus = dbus.SystemBus()
@ -27,13 +27,13 @@ ussd = dbus.Interface(bus.get_object('org.ofono', path),
properties = ussd.GetProperties()
state = properties["State"]
print "State: %s" % (state)
print("State: %s" % (state))
if state == "idle":
result = ussd.Initiate(ussdstring, timeout=100)
print result[0] + ": " + result[1]
print(result[0] + ": " + result[1])
elif state == "user-response":
print ussd.Respond(ussdstring, timeout=100)
print(ussd.Respond(ussdstring, timeout=100))
else:
sys.exit(1);
@ -43,15 +43,15 @@ state = properties["State"]
if state == "idle":
sys.exit(0)
print "State: %s" % (state)
print("State: %s" % (state))
while state == "user-response":
response = raw_input("Enter response: ")
print ussd.Respond(response, timeout=100)
print(ussd.Respond(response, timeout=100))
properties = ussd.GetProperties()
state = properties["State"]
if state != "idle":
print "State: %s" % (state)
print("State: %s" % (state))

6
test/send-vcal
View File

@ -4,7 +4,7 @@ import sys
import dbus
if len(sys.argv) < 3:
print "Usage: %s [modem] <to> <vcal file>" % (sys.argv[0])
print("Usage: %s [modem] <to> <vcal file>" % (sys.argv[0]))
sys.exit(1)
bus = dbus.SystemBus()
@ -17,7 +17,7 @@ else:
modems = manager.GetModems()
path = modems[0][0]
print "Send vcal using modem %s ..." % path
print("Send vcal using modem %s ..." % path)
sm = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.SmartMessaging')
@ -29,4 +29,4 @@ else:
vcal = file(sys.argv[2]).read()
path = sm.SendAppointment(sys.argv[1], vcal)
print path
print(path)

6
test/send-vcard
View File

@ -4,7 +4,7 @@ import sys
import dbus
if len(sys.argv) < 3:
print "Usage: %s [modem] <to> <vcard file>" % (sys.argv[0])
print("Usage: %s [modem] <to> <vcard file>" % (sys.argv[0]))
sys.exit(1)
bus = dbus.SystemBus()
@ -17,7 +17,7 @@ else:
modems = manager.GetModems()
path = modems[0][0]
print "Send vcard using modem %s ..." % path
print("Send vcard using modem %s ..." % path)
sm = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.SmartMessaging')
@ -29,4 +29,4 @@ else:
vcard = file(sys.argv[2]).read()
path = sm.SendBusinessCard(sys.argv[1], vcard)
print path
print(path)

18
test/set-call-forwarding
View File

@ -8,19 +8,19 @@ import dbus.mainloop.glib
def property_changed(property, value):
if len(value.__str__()) > 0:
print "CF property %s changed to %s" % (property, value)
print("CF property %s changed to %s" % (property, value))
else:
print "CF property %s changed to disabled" % (property)
print("CF property %s changed to disabled" % (property))
if canexit:
mainloop.quit();
if __name__ == "__main__":
if len(sys.argv) < 3:
print "Usage: %s <property> <value>" % (sys.argv[0])
print "Properties can be: VoiceUnconditional, VoiceBusy,"
print " VoiceNoReply, VoiceNoReplyTimeout, VoiceNotReachable"
print "Value: number to or the timeout"
print("Usage: %s <property> <value>" % (sys.argv[0]))
print("Properties can be: VoiceUnconditional, VoiceBusy,")
print(" VoiceNoReply, VoiceNoReplyTimeout, VoiceNotReachable")
print("Value: number to or the timeout")
sys.exit(1)
property = sys.argv[1]
@ -47,16 +47,16 @@ if __name__ == "__main__":
cf.SetProperty(property, dbus.UInt16(value),
timeout = 100)
except dbus.DBusException, e:
print "Unable SetProperty", e
print("Unable SetProperty %s" % e)
sys.exit(1);
else:
try:
cf.SetProperty(property, value, timeout = 100)
except dbus.DBusException, e:
print "Unable SetProperty", e
print("Unable SetProperty %s" % e)
sys.exit(1);
print "Set Property successful"
print("Set Property successful")
canexit = True

4
test/set-cbs-topics
View File

@ -15,9 +15,9 @@ elif len(sys.argv) == 2:
path = modems[0][0]
topics = sys.argv[1]
else:
print "%s [PATH] topics" % (sys.argv[0])
print("%s [PATH] topics" % (sys.argv[0]))
print "Setting cell broadcast topics for modem %s..." % path
print("Setting cell broadcast topics for modem %s..." % path)
cbs = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.CellBroadcast')

8
test/set-context-property
View File

@ -4,7 +4,7 @@ import sys
import dbus
if len(sys.argv) < 4:
print "Usage: set-context-property <context> <name> <value>"
print("Usage: set-context-property <context> <name> <value>")
sys.exit(1)
bus = dbus.SystemBus()
@ -24,7 +24,7 @@ for path, properties in modems:
contexts = connman.GetContexts()
if (len(contexts) == 0):
print "No context available"
print("No context available")
sys.exit(1)
path = contexts[int(sys.argv[1])][0]
@ -34,6 +34,6 @@ for path, properties in modems:
try:
context.SetProperty(sys.argv[2], sys.argv[3])
except dbus.DBusException, e:
print "Error setting context %s property %s: %s" %\
(path, sys.argv[2], str(e))
print("Error setting context %s property %s: %s" %\
(path, sys.argv[2], str(e)))
exit(2)

4
test/set-fast-dormancy
View File

@ -15,10 +15,10 @@ elif len(sys.argv) == 2:
path = modems[0][0]
enable = int(sys.argv[1])
else:
print "%s [PATH] {0|1}" % (sys.argv[0])
print("%s [PATH] {0|1}" % (sys.argv[0]))
exit(1)
print "Setting fast dormancy for modem %s..." % path
print("Setting fast dormancy for modem %s..." % path)
radiosettings = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.RadioSettings')

4
test/set-gsm-band
View File

@ -15,10 +15,10 @@ elif len(sys.argv) == 2:
path = modems[0][0]
band = sys.argv[1]
else:
print "%s [PATH] band" % (sys.argv[0])
print("%s [PATH] band" % (sys.argv[0]))
exit(1)
print "Setting gsm band for modem %s..." % path
print("Setting gsm band for modem %s..." % path)
radiosettings = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.RadioSettings')

8
test/set-mms-details
View File

@ -26,18 +26,18 @@ for path, properties in modems:
break
if path == "":
print "No MMS context"
print("No MMS context")
exit(1)
context = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.ConnectionContext')
if len(sys.argv) < 3:
print "Usage: %s <proxy> <center>" % (sys.argv[0])
print("Usage: %s <proxy> <center>" % (sys.argv[0]))
exit(1)
context.SetProperty("MessageProxy", sys.argv[1])
print "Setting MMS Proxy to %s" % (sys.argv[1])
print("Setting MMS Proxy to %s" % (sys.argv[1]))
context.SetProperty("MessageCenter", sys.argv[2])
print "Setting MMSC to %s" % (sys.argv[2])
print("Setting MMSC to %s" % (sys.argv[2]))

4
test/set-msisdn
View File

@ -15,10 +15,10 @@ elif len(sys.argv) == 2:
path = modems[0][0]
number = sys.argv[1]
else:
print "%s [PATH] <number>" % (sys.argv[0])
print("%s [PATH] <number>" % (sys.argv[0]))
exit(1)
print "Setting MSISDN for modem %s..." % path
print("Setting MSISDN for modem %s..." % path)
sim = dbus.Interface(bus.get_object('org.ofono', path), 'org.ofono.SimManager')
sim.SetProperty("SubscriberNumbers", [number]);

2
test/set-roaming-allowed
View File

@ -24,4 +24,4 @@ for path, properties in modems:
connman.SetProperty("RoamingAllowed", allowed)
print "Setting %s to RoamingAllowed=%d" % (path, allowed)
print("Setting %s to RoamingAllowed=%d" % (path, allowed))

4
test/set-tech-preference
View File

@ -15,9 +15,9 @@ elif len(sys.argv) == 2:
path = modems[0][0]
tech = sys.argv[1]
else:
print "%s [PATH] technology" % (sys.argv[0])
print("%s [PATH] technology" % (sys.argv[0]))
print "Setting technology preference for modem %s..." % path
print("Setting technology preference for modem %s..." % path)
radiosettings = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.RadioSettings')

4
test/set-tty
View File

@ -15,10 +15,10 @@ elif len(sys.argv) == 2:
path = modems[0][0]
enable = int(sys.argv[1])
else:
print "%s [PATH] {0|1}" % (sys.argv[0])
print("%s [PATH] {0|1}" % (sys.argv[0]))
exit(1)
print "Setting TTY for modem %s..." % path
print("Setting TTY for modem %s..." % path)
texttelephony = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.TextTelephony')