Imported Upstream connman version 1.38

Change-Id: I9e650762f3b2b2a31945b66e044e67a77e3b4b12
Signed-off-by: Niraj Kumar Goit <niraj.g@samsung.com>

37 files changed, 330 insertions, 309 deletions

diff --git a/test/backtrace b/test/backtrace
index c906f369..c6247090 100755
--- a/test/backtrace
+++ b/test/backtrace
@@ -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("---------------------------")
diff --git a/test/connect-provider b/test/connect-provider
index 15128c85..504bce47 100755
--- a/test/connect-provider
+++ b/test/connect-provider
@@ -4,15 +4,15 @@ import sys
 import dbus
 
 if (len(sys.argv) < 4):
-	print "Usage: %s <type> ... " % (sys.argv[0])
-	print "  type: openconnect"
-	print "      <name> <host> <domain> <cookie> [servercert]"
-	print "  type: openvpn"
-	print "      <name> <host> <domain> [<cafile> <certfile> <keyfile>]"
-	print "  type: pptp"
-	print "      <name> <host> <domain> <user> <password>"
-	print "  type: l2tp"
-	print "      <name> <host> <domain> <user> <password>"
+	print("Usage: %s <type> ... " % (sys.argv[0]))
+	print("  type: openconnect")
+	print("      <name> <host> <domain> <cookie> [servercert]")
+	print("  type: openvpn")
+	print("      <name> <host> <domain> [<cafile> <certfile> <keyfile>]")
+	print("  type: pptp")
+	print("      <name> <host> <domain> <user> <password>")
+	print("  type: l2tp")
+	print("      <name> <host> <domain> <user> <password>")
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -20,7 +20,7 @@ bus = dbus.SystemBus()
 manager = dbus.Interface(bus.get_object("net.connman", "/"),
 					"net.connman.Manager")
 
-print "Attempting to connect service %s" % (sys.argv[3])
+print("Attempting to connect service %s" % (sys.argv[3]))
 
 if sys.argv[1] == "openconnect":
 	if (len(sys.argv) > 6):
@@ -67,7 +67,7 @@ elif sys.argv[1] == "l2tp":
 					"L2TP.Password": sys.argv[6]}))
 
 else:
-	print "Unknown VPN type"
+	print("Unknown VPN type")
 	sys.exit(1)
 
-print "VPN service path is %s" %(path)
+print("VPN service path is %s" %(path))
diff --git a/test/disable-tethering b/test/disable-tethering
index a3d5908c..41f3d798 100755
--- a/test/disable-tethering
+++ b/test/disable-tethering
@@ -4,7 +4,7 @@ import sys
 import dbus
 
 if (len(sys.argv) != 2):
-	print "Usage: %s type" % (sys.argv[0])
+	print("Usage: %s type" % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -18,10 +18,10 @@ def technology_disable_tethering(path, tech_type):
 
 	properties = tech.GetProperties()
 
-	for key in properties.keys():
+	for key in list(properties.keys()):
 		if key in ["Type"]:
 			if properties[key] == tech_type:
-				print "Disabling %s tethering" % tech_type
+				print("Disabling %s tethering" % tech_type)
 				tech.SetProperty("Tethering", dbus.Boolean(0))
 
 				return tech_type
@@ -37,4 +37,4 @@ for path,_ in technologies:
 		break;
 
 if tech == None:
-	print "Failed to disable %s tethering" % (sys.argv[1])
+	print("Failed to disable %s tethering" % (sys.argv[1]))
diff --git a/test/enable-tethering b/test/enable-tethering
index cbcd4e72..13e5a18c 100755
--- a/test/enable-tethering
+++ b/test/enable-tethering
@@ -4,10 +4,10 @@ import sys
 import dbus
 
 if (len(sys.argv) >= 3 and len(sys.argv) != 4 and sys.argv[1] == "wifi"):
-	print "Usage: %s wifi [SSID] [passphrase]" % (sys.argv[0])
+	print("Usage: %s wifi [SSID] [passphrase]" % (sys.argv[0]))
 	sys.exit(1)
 elif (len(sys.argv) < 2):
-	print "Usage: %s type" % (sys.argv[0])
+	print("Usage: %s type" % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -21,7 +21,7 @@ def technology_enable_tethering(path, tech_type, ssid, psk):
 
 	properties = tech.GetProperties()
 
-	for key in properties.keys():
+	for key in list(properties.keys()):
 		if key in ["Type"]:
 			if properties[key] == tech_type:
 				if len(ssid) > 0:
@@ -30,7 +30,7 @@ def technology_enable_tethering(path, tech_type, ssid, psk):
 				if len(psk) > 0:
 					tech.SetProperty("TetheringPassphrase",
 								psk)
-				print "Enabling %s tethering" % tech_type
+				print("Enabling %s tethering" % tech_type)
 				tech.SetProperty("Tethering", dbus.Boolean(1))
 
 				return tech_type
@@ -51,4 +51,4 @@ for path,_ in technologies:
 		break;
 
 if tech == None:
-	print "Failed to enable %s tethering" % (sys.argv[1])
+	print("Failed to enable %s tethering" % (sys.argv[1]))
diff --git a/test/get-global-timeservers b/test/get-global-timeservers
index adcf175a..2436b363 100755
--- a/test/get-global-timeservers
+++ b/test/get-global-timeservers
@@ -9,4 +9,4 @@ clock = dbus.Interface(bus.get_object('net.connman', '/'),
 
 properties = clock.GetProperties()
 
-print "Timeserver is %s" % (properties["Timeservers"])
+print("Timeserver is %s" % (properties["Timeservers"]))
diff --git a/test/get-proxy-autoconfig b/test/get-proxy-autoconfig
index 6709a9e8..b96e800e 100755
--- a/test/get-proxy-autoconfig
+++ b/test/get-proxy-autoconfig
@@ -1,12 +1,12 @@
 #!/usr/bin/python
 
 import dbus
-import urllib
+import urllib.request, urllib.parse, urllib.error
 
 def get_pac(url):
-	conn = urllib.urlopen(url, proxies={})
+	conn = urllib.request.urlopen(url, proxies={})
 	data = conn.read()
-	print data
+	print(data)
 	conn.close()
 
 bus = dbus.SystemBus()
@@ -23,15 +23,15 @@ for entry in services:
 	proxy = properties["Proxy"]
 
 	if "Method" in proxy:
-		print "[ %s ]" % (path)
+		print("[ %s ]" % (path))
 
 		method = proxy["Method"]
-		print "Method = %s" % (method)
+		print("Method = %s" % (method))
 
 		if method in ["auto"]:
 			url = proxy["URL"]
-			print "URL = %s" % (url)
-			print
+			print("URL = %s" % (url))
+			print()
 			get_pac(url)
 		else:
-			print
+			print()
diff --git a/test/get-services b/test/get-services
index 09564804..2fa8b5b7 100755
--- a/test/get-services
+++ b/test/get-services
@@ -4,7 +4,7 @@ import dbus
 
 def extract_values(values):
 	val = "{"
-	for key in values.keys():
+	for key in list(values.keys()):
 		val += " " + key + "="
 		if key in ["Servers", "Excludes"]:
 			val += extract_list(values[key])
@@ -31,9 +31,9 @@ for entry in services:
 	path = entry[0]
 	properties = entry[1]
 
-	print "[ %s ]" % (path)
+	print("[ %s ]" % (path))
 
-	for key in properties.keys():
+	for key in list(properties.keys()):
 		if key in ["IPv4", "IPv4.Configuration",
 					"IPv6", "IPv6.Configuration",
 					"Proxy", "Proxy.Configuration",
@@ -53,6 +53,6 @@ for entry in services:
 			val = int(properties[key])
 		else:
 			val = str(properties[key])
-		print "    %s = %s" % (key, val)
+		print("    %s = %s" % (key, val))
 
-	print
+	print()
diff --git a/test/get-state b/test/get-state
index 75d5a16a..e991f583 100755
--- a/test/get-state
+++ b/test/get-state
@@ -9,4 +9,4 @@ manager = dbus.Interface(bus.get_object('net.connman', "/"),
 
 properties = manager.GetProperties()
 
-print "System is %s" % (properties["State"])
+print("System is %s" % (properties["State"]))
diff --git a/test/list-services b/test/list-services
index a2610d7e..4accf773 100755
--- a/test/list-services
+++ b/test/list-services
@@ -4,7 +4,7 @@ import dbus
 
 def extract_values(values):
 	val = "{"
-	for key in values.keys():
+	for key in list(values.keys()):
 		val += " " + key + "="
 		if key in ["PrefixLength"]:
 			val += "%s" % (int(values[key]))
@@ -34,9 +34,9 @@ for path, properties in manager.GetServices():
 	service = dbus.Interface(bus.get_object("net.connman", path),
 						"net.connman.Service")
 	identifier = path[path.rfind("/") + 1:]
-	print "[ %s ]" % (identifier)
+	print("[ %s ]" % (identifier))
 
-	for key in properties.keys():
+	for key in list(properties.keys()):
 		if key in ["IPv4", "IPv4.Configuration",
 				"IPv6", "IPv6.Configuration",
 					"Proxy", "Proxy.Configuration",
@@ -58,6 +58,6 @@ for path, properties in manager.GetServices():
 			val = int(properties[key])
 		else:
 			val = properties[key]
-		print "    %s = %s" % (key, val)
+		print("    %s = %s" % (key, val))
 
-	print
+	print()
diff --git a/test/monitor-connman b/test/monitor-connman
index 1b3b84c7..8403f913 100755
--- a/test/monitor-connman
+++ b/test/monitor-connman
@@ -19,7 +19,7 @@ def extract_list(list):
 
 def extract_values(values):
 	val = "{"
-	for key in values.keys():
+	for key in list(values.keys()):
 		val += " " + key + "="
 		if key in ["PrefixLength"]:
 			val += "%s" % (int(values[key]))
@@ -54,7 +54,7 @@ def property_changed(name, value, path, interface):
 	iface = interface[interface.rfind(".") + 1:]
 	val = extract(name, value)
 
-	print "{%s} [%s] %s = %s" % (iface, path, name, val)
+	print("{%s} [%s] %s = %s" % (iface, path, name, val))
 
 def message_filter(connection, message):
 	if not isinstance(message, MethodCallMessage):
diff --git a/test/monitor-services b/test/monitor-services
index 9476bf8f..d570e5f5 100755
--- a/test/monitor-services
+++ b/test/monitor-services
@@ -7,7 +7,7 @@ import dbus.mainloop.glib
 
 def extract_values(values):
 	val = "{"
-	for key in values.keys():
+	for key in list(values.keys()):
 		val += " " + key + "="
 		if key in ["Servers", "Excludes"]:
 			val += extract_list(values[key])
@@ -42,27 +42,27 @@ def property_changed(name, value, path):
 		val = int(value)
 	else:
 		val = str(value)
-	print "[%s] %s = %s" % (service, name, val)
+	print("[%s] %s = %s" % (service, name, val))
 
 def services_changed(services, removed):
 	for i in services:
 		service = i[0][i[0].rfind("/") + 1:]
-		print "[%s] changed" % (service)
-		for n in i[1].keys():
+		print("[%s] changed" % (service))
+		for n in list(i[1].keys()):
 			property_changed(n, i[1][n], i[0])
 	for i in removed:
 		service = i[i.rfind("/") + 1:]
-		print "[%s] removed" % (service)
+		print("[%s] removed" % (service))
 
 def technology_added(path, properties):
 	technology = path[path.rfind("/") + 1:]
-	print "[%s] added" % (technology)
-	for n in properties.keys():
+	print("[%s] added" % (technology))
+	for n in list(properties.keys()):
 		property_changed(n, properties[n], technology)
 
 def technology_removed(path):
 	technology = path[path.rfind("/") + 1:]
-	print "[%s] removed" % (technology)
+	print("[%s] removed" % (technology))
 
 if __name__ == '__main__':
 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
diff --git a/test/monitor-vpn b/test/monitor-vpn
index 2b636871..e019e6ec 100755
--- a/test/monitor-vpn
+++ b/test/monitor-vpn
@@ -21,7 +21,7 @@ def extract_list(list):
 
 def extract_values(values):
 	val = "{"
-	for key in values.keys():
+	for key in list(values.keys()):
 		val += " " + key + "="
 		if key in ["ProtocolFamily"]:
 			val += "%s" % (int(values[key]))
@@ -50,7 +50,7 @@ def property_changed(name, value, path, interface):
 	iface = interface[interface.rfind(".") + 1:]
 	val = extract(name, value)
 
-	print "{%s} [%s] %s = %s" % (iface, path, name, val)
+	print("{%s} [%s] %s = %s" % (iface, path, name, val))
 
 def message_filter(connection, message):
 	if not isinstance(message, MethodCallMessage):
diff --git a/test/p2p-on-supplicant b/test/p2p-on-supplicant
index 8cc76e81..339d5eba 100755
--- a/test/p2p-on-supplicant
+++ b/test/p2p-on-supplicant
@@ -38,7 +38,7 @@ class InputLine:
 
     def prompt(self):
         self.line = ''
-        print '> ',
+        print('> ', end=' ')
         stdout.flush()
 
     def input_cb(self, fd, event):
@@ -58,7 +58,7 @@ class InputLine:
         return True
 
 def error_print(ex):
-    print 'Command Error: %s' % ex
+    print('Command Error: %s' % ex)
 
 def checkarg(nb_args = 0, min_args = False):
     def under(function):
@@ -81,11 +81,11 @@ def print_dict(d):
     for k in d:
         try:
             if type(d[k]) is dbus.Byte:
-                print 'Key %s --> 0x%x' % (k, d[k])
+                print('Key %s --> 0x%x' % (k, d[k]))
             else:
-                print 'Key %s --> %s' % (k, d[k])
+                print('Key %s --> %s' % (k, d[k]))
         except:
-            print "Error: Key %s content cannot be printed" % k
+            print("Error: Key %s content cannot be printed" % k)
             pass
 
 def print_tuple(t):
@@ -93,7 +93,7 @@ def print_tuple(t):
         if type(e) is dbus.Dictionary:
             print_dict(e)
         else:
-            print 'Element: %s' % e
+            print('Element: %s' % e)
 
 class Wpa_s:
     def __init__(self, bus, iface_name, command):
@@ -116,41 +116,41 @@ class Wpa_s:
             try:
                 self.create_if([iface_name])
             except:
-                print "Error creating interface: %s" % iface_name
+                print("Error creating interface: %s" % iface_name)
 
         if len(command.strip(' ')):
             self.__command(command)
 
     def help(self, args):
-        list = self.command_list.keys()
+        list = list(self.command_list.keys())
         list.sort()
         for key in list:
             help = ''
-            if (self.command_list[key].has_key(ArgFields.help)):
+            if (ArgFields.help in self.command_list[key]):
                 help = self.command_list[key][ArgFields.help]
 
-            print "%s\t%s" % (key.rjust(25), help.ljust(50))
+            print("%s\t%s" % (key.rjust(25), help.ljust(50)))
 
     def __command(self, cmd_line):
         cmd = cmd_line.split(' ')
 
         try:
             func = getattr(self, cmd[0])
-        except Exception, e:
-            print 'Error: command unknown - %s' % e
+        except Exception as e:
+            print('Error: command unknown - %s' % e)
             return
 
         try:
             func(cmd[1:])
-        except Exception, e:
+        except Exception as e:
             error_print(e)
 
     def __wpa_property_changed(*args, **kwargs):
-        print 'WPA - Signal:  %s' % kwargs.get('signal')
+        print('WPA - Signal:  %s' % kwargs.get('signal'))
 
     def __if_property_changed(*args, **kwargs):
         signal = kwargs.get('signal')
-        print 'IF - Signal:  %s' % signal
+        print('IF - Signal:  %s' % signal)
 
         if signal == 'BSSAdded':
             return
@@ -159,12 +159,12 @@ class Wpa_s:
             print_tuple(args[1:])
 
     def __p2p_property_changed(*args, **kwargs):
-        print 'IF P2P - Signal:  %s' % kwargs.get('signal')
+        print('IF P2P - Signal:  %s' % kwargs.get('signal'))
         if args[0].debug:
             print_tuple(args[1:])
 
     def __peer_if_p2p_property_changed(*args, **kwargs):
-        print 'Peer - ',
+        print('Peer - ', end=' ')
         args[0].__p2p_property_changed(*args, **kwargs)
 
     def __DeviceFound(self, object_path):
@@ -187,31 +187,31 @@ class Wpa_s:
             del self.peers[object_path]
 
     def __PeerJoined(self, object_path):
-        print 'Peer %s joined' % object_path
+        print('Peer %s joined' % object_path)
 
     def __PeerDisconnected(self, object_path):
-        print 'Peer %s disconnected' % object_path
+        print('Peer %s disconnected' % object_path)
 
     def __group_if_property_changed(*args, **kwargs):
-        print 'Group - ',
+        print('Group - ', end=' ')
         args[0].__if_property_changed(*args, **kwargs)
 
     def __group_if_p2p_property_changed(*args, **kwargs):
-        print 'Group - ',
+        print('Group - ', end=' ')
         args[0].__p2p_property_changed(*args, **kwargs)
 
     def __GroupFinished(self, properties):
-        print 'Group running on %s is being removed' % ifname
+        print('Group running on %s is being removed' % ifname)
         self.group_obj = self.group_if = self.group_iface_path = None
 
         if self.debug:
             print_dict(properties)
 
     def __InvitationResult(self, response):
-        print 'Invitation result status: %d ' % response['status']
+        print('Invitation result status: %d ' % response['status'])
 
-        if response.has_key('bssid'):
-            print 'bssid: %s' % response['bssid']
+        if 'bssid' in response:
+            print('bssid: %s' % response['bssid'])
 
         if self.debug:
             print_dict(response)
@@ -257,11 +257,11 @@ class Wpa_s:
     def __ServiceDiscoveryResponse(self, response):
         peer = response['peer_object']
         if peer in self.peers:
-            print 'Peer %s has this TLVs:' % (self.peers[peer]['DeviceName'])
-            print response['tlvs']
+            print('Peer %s has this TLVs:' % (self.peers[peer]['DeviceName']))
+            print(response['tlvs'])
 
     def __InterfaceAdded(self, path, properties):
-        print 'Interface %s Added (%s)' % (properties['Ifname'], path)
+        print('Interface %s Added (%s)' % (properties['Ifname'], path))
         if self.debug:
             print_dict(properties)
             p2p = dbus.Interface(self.bus.get_object(WPA_INTF,
@@ -269,7 +269,7 @@ class Wpa_s:
             print_dict(p2p.GetAll(WPA_P2P_INTF))
 
     def __InterfaceRemoved(self, path):
-        print 'Interface Removed (%s)' % (path)
+        print('Interface Removed (%s)' % (path))
 
     def __listen_if_signals(self):
         self.bus.add_signal_receiver(self.__if_property_changed,
@@ -312,7 +312,7 @@ class Wpa_s:
         p2p_if.Set(WPA_P2P_INTF, 'P2PDeviceConfig',
                    dbus.Dictionary({ 'DeviceName' : 'ConnManP2P' },
                                    signature='sv'))
-        print 'Interface %s: %s' % (iface_name, self.iface_path)
+        print('Interface %s: %s' % (iface_name, self.iface_path))
         self.iface_name = iface_name
         self.__listen_if_signals()
 
@@ -342,7 +342,7 @@ class Wpa_s:
             return
 
         self.wpa.RemoveInterface(self.iface_path)
-        print 'Interface %s removed' % self.iface_name
+        print('Interface %s removed' % self.iface_name)
         self.__reset()
 
     @checkarg()
@@ -351,7 +351,7 @@ class Wpa_s:
             return
 
         self.iface.Scan(({ 'Type': 'passive' }))
-        print 'Scan started'
+        print('Scan started')
 
     @checkarg()
     def quit(self, args = None):
@@ -382,7 +382,7 @@ class Wpa_s:
             return
 
         for p in self.peers:
-            print 'Peer Name=%s' % (self.peers[p]['DeviceName'])
+            print('Peer Name=%s' % (self.peers[p]['DeviceName']))
 
     def __find_peer(self, peer_name, ret_object_path = False):
         if len(self.peers) == 0:
@@ -395,7 +395,7 @@ class Wpa_s:
                 break
 
         if not peer:
-            print 'No peer found under the name: %s' % peer_name
+            print('No peer found under the name: %s' % peer_name)
             p = None
 
         if ret_object_path:
@@ -426,19 +426,19 @@ class Wpa_s:
 
         if (peer['groupcapability'] & P2P_GROUP_CAPAB_GROUP_OWNER ==
                                             P2P_GROUP_CAPAB_GROUP_OWNER):
-            print 'Joining an existing P2P group'
+            print('Joining an existing P2P group')
             pin = self.p2p.Connect(({ 'peer' : peer_path,
                                       'wps_method' : 'pbc',
                                       'join' : True,
                                       'go_intent' : 0 }))
         else:
-            print 'Associating with another P2P device'
+            print('Associating with another P2P device')
             pin = self.p2p.Connect(({ 'peer' : peer_path,
                                       'wps_method' : 'pbc',
                                       'join' : False,
                                       'go_intent' : 7 }))
             if not pin:
-                print 'WPS PIN in use: %s' % pin
+                print('WPS PIN in use: %s' % pin)
 
     @checkarg(nb_args = 1)
     def p2p_disconnect(self, args):
@@ -450,7 +450,7 @@ class Wpa_s:
             return
 
         if not self.group_if:
-            print 'Peer %s is not connected' % (peer['DeviceName'])
+            print('Peer %s is not connected' % (peer['DeviceName']))
             return
 
         self.group_if.Disconnect()
@@ -496,7 +496,7 @@ class Wpa_s:
             sd_req.append(dbus.Byte(a))
 
         ref = self.p2p.ServiceDiscoveryRequest(({ 'tlv' : sd_req }))
-        print 'Service discovery reference: %s' % ref
+        print('Service discovery reference: %s' % ref)
 
     @checkarg(nb_args = 1)
     def p2p_serv_disc_cancel_req(self, args):
@@ -518,7 +518,7 @@ class Wpa_s:
             service['query'] = args[1]
             service['response'] = args[2]
         else:
-            print 'Unknown service: %s' % args[0]
+            print('Unknown service: %s' % args[0])
             return
 
         self.p2p.AddService((service))
@@ -535,7 +535,7 @@ class Wpa_s:
         elif args[0] == 'bonjour':
             service['query'] = args[1]
         else:
-            print 'Unknown service: %s' % args[0]
+            print('Unknown service: %s' % args[0])
             return
 
         self.p2p.DeleteService((service))
@@ -593,16 +593,16 @@ def build_args(parser):
     command['p2p_service_flush'] = {}
     command['p2p_invite'] = {ArgFields.help:'<p2p device name>'}
 
-    command_list = command.keys()
+    command_list = list(command.keys())
     command_list.sort()
     subparsers = parser.add_subparsers(help='commands', dest='command')
     subparsers.add_parser('')
     for key in command_list:
         help=None
         metavar=None
-        if command[key].has_key(ArgFields.help):
+        if ArgFields.help in command[key]:
             help = command[key][ArgFields.help]
-        if command[key].has_key(ArgFields.metavar):
+        if ArgFields.metavar in command[key]:
             metavar = command[key][ArgFields.metavar]
         command_parser = subparsers.add_parser(key, help=help)
         command_parser.add_argument(key, nargs='*', metavar=metavar, help=help)
@@ -611,7 +611,7 @@ def build_args(parser):
 
 def main():
     if version_info.major != 2:
-        print 'You need to run this under Python 2.x'
+        print('You need to run this under Python 2.x')
         exit(1)
 
     parser = argparse.ArgumentParser(description='Connman P2P Test')
diff --git a/test/remove-provider b/test/remove-provider
index 39f8de77..a2f3e6f4 100755
--- a/test/remove-provider
+++ b/test/remove-provider
@@ -4,7 +4,7 @@ import sys
 import dbus
 
 if (len(sys.argv) < 2):
-	print "Usage: %s <VPN service path> " % (sys.argv[0])
+	print("Usage: %s <VPN service path> " % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -14,6 +14,6 @@ manager = dbus.Interface(bus.get_object("net.connman", "/"),
 
 path = "" + sys.argv[1]
 
-print "remove path is %s" %(path)
+print("remove path is %s" %(path))
 
 manager.RemoveProvider(sys.argv[1])
diff --git a/test/service-move-before b/test/service-move-before
index d912c88b..81526377 100755
--- a/test/service-move-before
+++ b/test/service-move-before
@@ -4,7 +4,7 @@ import sys
 import dbus
 
 def print_usage():
-	print "Usage: %s <service> <target service>" % (sys.argv[0])
+	print("Usage: %s <service> <target service>" % (sys.argv[0]))
 
 
 if (len(sys.argv) < 2):
@@ -20,8 +20,8 @@ path2 = "/net/connman/service/" + sys.argv[2]
 service2 = dbus.Interface(bus.get_object('net.connman', path2),
 					'net.connman.Service')
 
-print "Moving %s before %s" % (sys.argv[1], sys.argv[2])
+print("Moving %s before %s" % (sys.argv[1], sys.argv[2]))
 
 service.MoveBefore(service2)
 
-print
+print()
diff --git a/test/set-clock b/test/set-clock
index a9db3e32..bb443d07 100755
--- a/test/set-clock
+++ b/test/set-clock
@@ -4,7 +4,7 @@ import sys
 import dbus
 
 def print_usage():
-	print "Usage: %s TimeUpdates|TimezoneUpdates manual|auto" % (sys.argv[0])
+	print("Usage: %s TimeUpdates|TimezoneUpdates manual|auto" % (sys.argv[0]))
 	sys.exit(1)
 
 
@@ -26,7 +26,7 @@ bus = dbus.SystemBus()
 clock = dbus.Interface(bus.get_object('net.connman', '/'),
 					'net.connman.Clock')
 
-print "Setting %s to %s" % (sys.argv[1], sys.argv[2])
+print("Setting %s to %s" % (sys.argv[1], sys.argv[2]))
 
 clock.SetProperty(sys.argv[1], make_variant(sys.argv[2]),
 		  signature=dbus.Signature('sv'))
diff --git a/test/set-domains b/test/set-domains
index 87e563e0..ec98c5e3 100755
--- a/test/set-domains
+++ b/test/set-domains
@@ -4,7 +4,7 @@ import sys
 import dbus
 
 if (len(sys.argv) < 2):
-	print "Usage: %s <service> [domain*]" % (sys.argv[0])
+	print("Usage: %s <service> [domain*]" % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -14,7 +14,7 @@ service = dbus.Interface(bus.get_object('net.connman', path),
 
 properties = service.GetProperties()
 
-print "Setting domains to %s" % (sys.argv[2:])
+print("Setting domains to %s" % (sys.argv[2:]))
 
 service.SetProperty("Domains.Configuration", 
 	dbus.Array(sys.argv[2:], signature=dbus.Signature('s')))
diff --git a/test/set-global-timeservers b/test/set-global-timeservers
index d7551a11..1489ec71 100755
--- a/test/set-global-timeservers
+++ b/test/set-global-timeservers
@@ -4,7 +4,7 @@ import sys
 import dbus
 
 if (len(sys.argv) < 1):
-	print "Usage: %s [timeserver*]" % (sys.argv[0])
+	print("Usage: %s [timeserver*]" % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -12,7 +12,7 @@ bus = dbus.SystemBus()
 clock = dbus.Interface(bus.get_object('net.connman', '/'),
 					'net.connman.Clock')
 
-print "Setting timeserver to %s" % (sys.argv[1:])
+print("Setting timeserver to %s" % (sys.argv[1:]))
 
 clock.SetProperty("Timeservers", dbus.Array(sys.argv[1:],
 					signature=dbus.Signature('s')))
diff --git a/test/set-ipv4-method b/test/set-ipv4-method
index 235113fe..09c194d7 100755
--- a/test/set-ipv4-method
+++ b/test/set-ipv4-method
@@ -7,7 +7,7 @@ def make_variant(string):
 	return dbus.String(string, variant_level=1)
 
 def print_usage():
-	print "Usage: %s <service> [off|dhcp|manual <address> [netmask] [gateway]]" % (sys.argv[0])
+	print("Usage: %s <service> [off|dhcp|manual <address> [netmask] [gateway]]" % (sys.argv[0]))
 
 
 if (len(sys.argv) < 3):
@@ -21,7 +21,7 @@ service = dbus.Interface(bus.get_object('net.connman', path),
 
 properties = service.GetProperties()
 
-print "Setting method %s for %s" % (sys.argv[2], sys.argv[1])
+print("Setting method %s for %s" % (sys.argv[2], sys.argv[1]))
 
 ipv4_configuration = { "Method": make_variant(sys.argv[2]) }
 if (len(sys.argv) > 3):
@@ -32,6 +32,6 @@ if (len(sys.argv) > 5):
         ipv4_configuration["Gateway"] = make_variant(sys.argv[5])
 
 service.SetProperty("IPv4.Configuration", ipv4_configuration)
-print "New IPv4.Configuration: ", ipv4_configuration
+print("New IPv4.Configuration: ", ipv4_configuration)
 
-print
+print()
diff --git a/test/set-ipv6-method b/test/set-ipv6-method
index eb1f1b5b..5536e6f0 100755
--- a/test/set-ipv6-method
+++ b/test/set-ipv6-method
@@ -10,7 +10,7 @@ def make_byte_variant(string):
     return dbus.Byte(int(string), variant_level=1)
 
 def print_usage():
-	print "Usage: %s <service> off|manual|auto [<address> [prefixlen] [gateway]] [<privacy>]" % (sys.argv[0])
+	print("Usage: %s <service> off|manual|auto [<address> [prefixlen] [gateway]] [<privacy>]" % (sys.argv[0]))
 
 if (len(sys.argv) < 3):
 	print_usage()
@@ -23,7 +23,7 @@ service = dbus.Interface(bus.get_object('net.connman', path),
 
 properties = service.GetProperties()
 
-print "Setting method %s for %s" % (sys.argv[2], sys.argv[1])
+print("Setting method %s for %s" % (sys.argv[2], sys.argv[1]))
 
 ipv6_configuration = { "Method": make_variant(sys.argv[2])}
 if sys.argv[2] == "auto":
@@ -38,6 +38,6 @@ else:
 		ipv6_configuration["Gateway"] = make_variant(sys.argv[5])
 
 service.SetProperty("IPv6.Configuration", ipv6_configuration)
-print "New IPv6.Configuration: ", ipv6_configuration
+print("New IPv6.Configuration: ", ipv6_configuration)
 
-print
+print()
diff --git a/test/set-nameservers b/test/set-nameservers
index ece69b87..584df7ea 100755
--- a/test/set-nameservers
+++ b/test/set-nameservers
@@ -4,7 +4,7 @@ import sys
 import dbus
 
 if (len(sys.argv) < 2):
-	print "Usage: %s <service> [nameserver*]" % (sys.argv[0])
+	print("Usage: %s <service> [nameserver*]" % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -14,7 +14,7 @@ service = dbus.Interface(bus.get_object('net.connman', path),
 
 properties = service.GetProperties()
 
-print "Setting nameserver to %s" % (sys.argv[2:])
+print("Setting nameserver to %s" % (sys.argv[2:]))
 
 service.SetProperty("Nameservers.Configuration", 
 	dbus.Array(sys.argv[2:], signature=dbus.Signature('s')))
diff --git a/test/set-proxy b/test/set-proxy
index b9da7b09..f308d327 100755
--- a/test/set-proxy
+++ b/test/set-proxy
@@ -4,12 +4,12 @@ import sys
 import dbus
 
 if (len(sys.argv) < 2):
-	print "Usage:"
-	print "%s <service> direct" % (sys.argv[0])
-	print "%s <service> manual [servers=uri1,uri2,...] [excludes=host1,host2,...]" % (sys.argv[0])
-	print "%s <service> auto url=[pac-url]" % (sys.argv[0])
-	print "Example: %s service0 manual servers=proxy.example.com:8080" % sys.argv[0]
-	print "         This would set the proxy uri and the method to manual"
+	print("Usage:")
+	print("%s <service> direct" % (sys.argv[0]))
+	print("%s <service> manual [servers=uri1,uri2,...] [excludes=host1,host2,...]" % (sys.argv[0]))
+	print("%s <service> auto url=[pac-url]" % (sys.argv[0]))
+	print("Example: %s service0 manual servers=proxy.example.com:8080" % sys.argv[0])
+	print("         This would set the proxy uri and the method to manual")
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -40,5 +40,5 @@ for arg in sys.argv[3:]:
 
 try:
 	service.SetProperty("Proxy.Configuration", dbus.Dictionary(values, signature='sv'))
-except dbus.exceptions.DBusException, e_msg:
-	print e_msg
+except dbus.exceptions.DBusException as e_msg:
+	print(e_msg)
diff --git a/test/set-timeservers b/test/set-timeservers
index 19cc9389..55a1984a 100755
--- a/test/set-timeservers
+++ b/test/set-timeservers
@@ -4,7 +4,7 @@ import sys
 import dbus
 
 if (len(sys.argv) < 2):
-	print "Usage: %s <service> [timeserver*]" % (sys.argv[0])
+	print("Usage: %s <service> [timeserver*]" % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -14,7 +14,7 @@ service = dbus.Interface(bus.get_object('net.connman', path),
 
 properties = service.GetProperties()
 
-print "Setting timeserver to %s" % (sys.argv[2:])
+print("Setting timeserver to %s" % (sys.argv[2:]))
 
 service.SetProperty("Timeservers.Configuration",
 	dbus.Array(sys.argv[2:], signature=dbus.Signature('s')))
diff --git a/test/set-timezone b/test/set-timezone
new file mode 100755
index 00000000..4808bd87
--- /dev/null
+++ b/test/set-timezone
@@ -0,0 +1,21 @@
+#!/usr/bin/python
+
+import sys
+import dbus
+
+if (len(sys.argv) != 2):
+	print("Usage: %s <timezone>" % (sys.argv[0]))
+	sys.exit(1)
+
+bus = dbus.SystemBus()
+
+clock = dbus.Interface(bus.get_object('net.connman', '/'),
+					'net.connman.Clock')
+
+print("Setting timezone to %s" % (sys.argv[1]))
+
+try:
+	clock.SetProperty("Timezone", dbus.String(sys.argv[1], variant_level=1),
+			  signature=dbus.Signature('sv'))
+except dbus.exceptions.DBusException as e_msg:
+	print(e_msg)
diff --git a/test/show-introspection b/test/show-introspection
index 4b6450f0..983b36fe 100755
--- a/test/show-introspection
+++ b/test/show-introspection
@@ -7,7 +7,7 @@ bus = dbus.SystemBus()
 object = dbus.Interface(bus.get_object("net.connman", '/'),
 				"org.freedesktop.DBus.Introspectable")
 
-print object.Introspect()
+print(object.Introspect())
 
 manager = dbus.Interface(bus.get_object("net.connman", "/"),
 					"net.connman.Manager")
@@ -18,4 +18,4 @@ for path, properties in technologies:
 	object = dbus.Interface(bus.get_object("net.connman", path),
 					"org.freedesktop.DBus.Introspectable")
 
-	print object.Introspect()
+	print(object.Introspect())
diff --git a/test/simple-agent b/test/simple-agent
index 01c82baf..282785e2 100755
--- a/test/simple-agent
+++ b/test/simple-agent
@@ -32,8 +32,8 @@ class Agent(dbus.service.Object):
 		response = {}
 
 		if not self.identity and not self.passphrase and not self.wpspin:
-			print "Service credentials requested, type cancel to cancel"
-			args = raw_input('Answer: ')
+			print("Service credentials requested, type cancel to cancel")
+			args = input('Answer: ')
 
 			for arg in args.split():
 				if arg.startswith("cancel"):
@@ -62,9 +62,9 @@ class Agent(dbus.service.Object):
 		response = {}
 
 		if not self.username and not self.password:
-			print "User login requested, type cancel to cancel"
-			print "or browser to login through the browser by yourself."
-			args = raw_input('Answer: ')
+			print("User login requested, type cancel to cancel")
+			print("or browser to login through the browser by yourself.")
+			args = input('Answer: ')
 
 			for arg in args.split():
 				if arg.startswith("cancel") or arg.startswith("browser"):
@@ -87,7 +87,7 @@ class Agent(dbus.service.Object):
 		response = {}
 
 		if not self.name and not self.ssid:
-			args = raw_input('Answer ')
+			args = input('Answer ')
 
 			for arg in args.split():
 				if arg.startswith("Name="):
@@ -110,18 +110,18 @@ class Agent(dbus.service.Object):
 					in_signature='oa{sv}',
 					out_signature='a{sv}')
 	def RequestInput(self, path, fields):
-		print "RequestInput (%s,%s)" % (path, fields)
+		print("RequestInput (%s,%s)" % (path, fields))
 
 		response = {}
 
-		if fields.has_key("Name"):
+		if "Name" in fields:
 			response.update(self.input_hidden())
-		if fields.has_key("Passphrase"):
+		if "Passphrase" in fields:
 			response.update(self.input_passphrase())
-		if fields.has_key("Username"):
+		if "Username" in fields:
 			response.update(self.input_username())
 
-		if response.has_key("Error"):
+		if "Error" in response:
 			if response["Error"] == "cancel":
 				raise Canceled("canceled")
 				return
@@ -129,7 +129,7 @@ class Agent(dbus.service.Object):
 				raise LaunchBrowser("launch browser")
 				return
 
-		print "returning (%s)" % (response)
+		print("returning (%s)" % (response))
 
 		return response
 
@@ -137,12 +137,12 @@ class Agent(dbus.service.Object):
 					in_signature='os',
 					out_signature='')
 	def RequestBrowser(self, path, url):
-		print "RequestBrowser (%s,%s)" % (path, url)
+		print("RequestBrowser (%s,%s)" % (path, url))
 
-		print "Please login through the given url in a browser"
-		print "Then press enter to accept or some text to cancel"
+		print("Please login through the given url in a browser")
+		print("Then press enter to accept or some text to cancel")
 
-		args = raw_input('> ')
+		args = input('> ')
 
 		if len(args) > 0:
 			raise Canceled("canceled")
@@ -153,8 +153,8 @@ class Agent(dbus.service.Object):
 					in_signature='os',
 					out_signature='')
 	def ReportError(self, path, error):
-		print "ReportError %s, %s" % (path, error)
-		retry = raw_input("Retry service (yes/no): ")
+		print("ReportError %s, %s" % (path, error))
+		retry = input("Retry service (yes/no): ")
 		if (retry == "yes"):
 			class Retry(dbus.DBusException):
 				_dbus_error_name = "net.connman.Agent.Error.Retry"
@@ -167,7 +167,7 @@ class Agent(dbus.service.Object):
 	@dbus.service.method("net.connman.Agent",
 					in_signature='', out_signature='')
 	def Cancel(self):
-		print "Cancel"
+		print("Cancel")
 
 class VpnAgent(dbus.service.Object):
 	name = None
@@ -185,8 +185,8 @@ class VpnAgent(dbus.service.Object):
 		response = {}
 
 		if not self.cookie:
-			print "VPN credentials requested, type cancel to cancel"
-			args = raw_input('Answer: ')
+			print("VPN credentials requested, type cancel to cancel")
+			args = input('Answer: ')
 
 			for arg in args.split():
 				if arg.startswith("cancel"):
@@ -204,8 +204,8 @@ class VpnAgent(dbus.service.Object):
 		response = {}
 
 		if not self.username and not self.password:
-			print "User login requested, type cancel to cancel"
-			args = raw_input('Answer: ')
+			print("User login requested, type cancel to cancel")
+			args = input('Answer: ')
 
 			for arg in args.split():
 				if arg.startswith("cancel"):
@@ -228,21 +228,21 @@ class VpnAgent(dbus.service.Object):
 					in_signature='oa{sv}',
 					out_signature='a{sv}')
 	def RequestInput(self, path, fields):
-		print "RequestInput (%s,%s)" % (path, fields)
+		print("RequestInput (%s,%s)" % (path, fields))
 
 		response = {}
 
-		if fields.has_key("OpenConnect.Cookie"):
+		if "OpenConnect.Cookie" in fields:
 			response.update(self.input_cookie())
-		if fields.has_key("Username") or fields.has_key("Password"):
+		if "Username" in fields or "Password" in fields:
 			response.update(self.input_username())
 
-		if response.has_key("Error"):
+		if "Error" in response:
 			if response["Error"] == "cancel":
 				raise Canceled("canceled")
 				return
 
-		print "returning (%s)" % (response)
+		print("returning (%s)" % (response))
 
 		return response
 
@@ -250,8 +250,8 @@ class VpnAgent(dbus.service.Object):
 					in_signature='os',
 					out_signature='')
 	def ReportError(self, path, error):
-		print "ReportError %s, %s" % (path, error)
-		retry = raw_input("Retry service (yes/no): ")
+		print("ReportError %s, %s" % (path, error))
+		retry = input("Retry service (yes/no): ")
 		if (retry == "yes"):
 			class Retry(dbus.DBusException):
 				_dbus_error_name = "net.connman.vpn.Agent.Error.Retry"
@@ -264,7 +264,7 @@ class VpnAgent(dbus.service.Object):
 	@dbus.service.method("net.connman.vpn.Agent",
 					in_signature='', out_signature='')
 	def Cancel(self):
-		print "Cancel"
+		print("Cancel")
 
 def vpnNameOwnerChanged(proxy):
 	if proxy:
@@ -276,22 +276,22 @@ def vpnNameOwnerChanged(proxy):
 						     'net.connman.vpn.Manager')
 			vpn_manager.RegisterAgent(path)
 		except:
-			print "vpn agent is not registered"
+			print("vpn agent is not registered")
 	else:
 		print("vpnd is disconnected from system bus")
 		vpn_manager = None
 
 def print_usage():
-	print "Usage:"
-	print "For hidden service:"
-	print "%s Name=<hidden service name> [SSID=<hidden ssid>]" % (sys.argv[0])
-	print "For EAP/WPA input:"
-	print "%s Identity=<identity> Passphrase=<passphrase> WPS=<wpspin>" % (sys.argv[0])
-	print "For WISPr login, L2TP or PPTP input:"
-	print "%s Username=<username> Password=<password>" % (sys.argv[0])
-	print "For OpenConnect input:"
-	print "%s Cookie=<string>" % (sys.argv[0])
-	print "Help: %s help" % (sys.argv[0])
+	print("Usage:")
+	print("For hidden service:")
+	print("%s Name=<hidden service name> [SSID=<hidden ssid>]" % (sys.argv[0]))
+	print("For EAP/WPA input:")
+	print("%s Identity=<identity> Passphrase=<passphrase> WPS=<wpspin>" % (sys.argv[0]))
+	print("For WISPr login, L2TP or PPTP input:")
+	print("%s Username=<username> Password=<password>" % (sys.argv[0]))
+	print("For OpenConnect input:")
+	print("%s Cookie=<string>" % (sys.argv[0]))
+	print("Help: %s help" % (sys.argv[0]))
 	sys.exit(1)
 
 if __name__ == '__main__':
@@ -314,7 +314,7 @@ if __name__ == '__main__':
 		vpn_object = VpnAgent(bus, vpn_path)
 	except:
 		vpn_manager = None
-		print "net.connman.vpn is not present"
+		print("net.connman.vpn is not present")
 
 	if len(sys.argv) >= 2:
 		for arg in sys.argv[1:]:
@@ -342,7 +342,7 @@ if __name__ == '__main__':
 	try:
 		manager.RegisterAgent(path)
 	except:
-		print "Cannot register connman agent."
+		print("Cannot register connman agent.")
 
 	if vpn_manager != None:
 		try:
diff --git a/test/test-clock b/test/test-clock
index e9b76fca..c086ffc6 100755
--- a/test/test-clock
+++ b/test/test-clock
@@ -9,11 +9,11 @@ clock = dbus.Interface(bus.get_object("net.connman", "/"),
 
 properties = clock.GetProperties()
 
-for key in properties.keys():
+for key in list(properties.keys()):
 	if key in ["Timeservers"]:
 		list = ""
 		for val in properties[key]:
 			list = list + val + " "
-		print "%s = [ %s]" % (key, list)
+		print("%s = [ %s]" % (key, list))
 	else:
-		print "%s = %s" % (key, properties[key])
+		print("%s = %s" % (key, properties[key]))
diff --git a/test/test-compat b/test/test-compat
index cd1ca7a7..c9cdbab3 100755
--- a/test/test-compat
+++ b/test/test-compat
@@ -12,4 +12,4 @@ states = [ "unknown", "asleep", "connecting", "connected", "disconnected" ]
 
 state = manager.state()
 
-print "System is %s" % (states[state])
+print("System is %s" % (states[state]))
diff --git a/test/test-connman b/test/test-connman
index d047c86d..45a18d97 100755
--- a/test/test-connman
+++ b/test/test-connman
@@ -9,19 +9,19 @@ manager = dbus.Interface(bus.get_object("net.connman", "/"),
 					"net.connman.Manager")
 
 if len(sys.argv) < 2:
-	print "Usage: %s <command>" % (sys.argv[0])
-	print ""
-	print "  state"
-	print "  services"
-	print "  autoconnect <service> [autoconnect]"
-	print "  connect <service>"
-	print "  disconnect <service>"
-	print "  remove <service>"
-	print ""
-	print "  scan <type>"
-	print "  enable <type>"
-	print "  disable <type>"
-	print "  offlinemode [on|off]"
+	print("Usage: %s <command>" % (sys.argv[0]))
+	print("")
+	print("  state")
+	print("  services")
+	print("  autoconnect <service> [autoconnect]")
+	print("  connect <service>")
+	print("  disconnect <service>")
+	print("  remove <service>")
+	print("")
+	print("  scan <type>")
+	print("  enable <type>")
+	print("  disable <type>")
+	print("  offlinemode [on|off]")
 	sys.exit(1)
 
 def print_services(services):
@@ -45,25 +45,25 @@ def print_services(services):
 		else:
 			favorite = " "
 
-		if "Name" in properties.keys():
+		if "Name" in list(properties.keys()):
 			name = properties["Name"]
 		else:
 			name = "{" + properties["Type"] + "}"
 
-		print "%s%s%s %-26s { %s }" % (favorite, autoconnect, state,
-					       name, identifier)
+		print("%s%s%s %-26s { %s }" % (favorite, autoconnect, state,
+					       name, identifier))
 
 if sys.argv[1] == "state":
 	properties = manager.GetProperties()
 
-	print "System is %s" % (properties["State"])
+	print("System is %s" % (properties["State"]))
 
 elif sys.argv[1] in ["services", "list", "show"]:
 	print_services(manager.GetServices())
 
 elif sys.argv[1] in ["autoconnect", "autoconn"]:
 	if (len(sys.argv) < 3):
-		print "Need at least service parameter"
+		print("Need at least service parameter")
 		sys.exit(1)
 
 	path = "/net/connman/service/" + sys.argv[2]
@@ -77,25 +77,25 @@ elif sys.argv[1] in ["autoconnect", "autoconn"]:
 
 		service.SetProperty("AutoConnect", autoconnect);
 
-		print "Auto connect %s for %s" % (autoconnect, sys.argv[2])
+		print("Auto connect %s for %s" % (autoconnect, sys.argv[2]))
 	else:
 		properties = service.GetProperties()
 
-		if "Name" in properties.keys():
+		if "Name" in list(properties.keys()):
 			name = properties["Name"]
 		else:
 			name = "{" + properties["Type"] + "}"
 
-		if "AutoConnect" in properties.keys():
+		if "AutoConnect" in list(properties.keys()):
 			autoconnect = properties["AutoConnect"]
 		else:
 			autoconnect = dbus.Boolean(0)
 
-		print "Auto connect %s for %s" % (autoconnect, name)
+		print("Auto connect %s for %s" % (autoconnect, name))
 
 elif sys.argv[1] in ["connect", "conn"]:
 	if (len(sys.argv) < 3):
-		print "Need at least service parameter"
+		print("Need at least service parameter")
 		sys.exit(1)
 
 	path = "/net/connman/service/" + sys.argv[2]
@@ -105,12 +105,12 @@ elif sys.argv[1] in ["connect", "conn"]:
 
 	try:
 		service.Connect(timeout=60000)
-	except dbus.DBusException, error:
-		print "%s: %s" % (error._dbus_error_name, error.message)
+	except dbus.DBusException as error:
+		print("%s: %s" % (error._dbus_error_name, error.message))
 
 elif sys.argv[1] in ["disconnect", "disc"]:
 	if (len(sys.argv) < 3):
-		print "Need at least service parameter"
+		print("Need at least service parameter")
 		sys.exit(1)
 
 	path = "/net/connman/service/" + sys.argv[2]
@@ -120,12 +120,12 @@ elif sys.argv[1] in ["disconnect", "disc"]:
 
 	try:
 		service.Disconnect()
-	except dbus.DBusException, error:
-		print "%s: %s" % (error._dbus_error_name, error.message)
+	except dbus.DBusException as error:
+		print("%s: %s" % (error._dbus_error_name, error.message))
 
 elif sys.argv[1] in ["remove"]:
 	if (len(sys.argv) < 3):
-		print "Need at least service parameter"
+		print("Need at least service parameter")
 		sys.exit(1)
 
 	path = "/net/connman/service/" + sys.argv[2]
@@ -136,13 +136,13 @@ elif sys.argv[1] in ["remove"]:
 	properties = service.GetProperties()
 
 	if properties["Favorite"] == dbus.Boolean(0):
-		print "Only favorite services can be removed"
+		print("Only favorite services can be removed")
 		sys.exit(1)
 
 	try:
 		service.Remove()
-	except dbus.DBusException, error:
-		print "%s: %s" % (error._dbus_error_name, error.message)
+	except dbus.DBusException as error:
+		print("%s: %s" % (error._dbus_error_name, error.message))
 
 elif sys.argv[1] == "scan":
 	if len(sys.argv) == 3:
@@ -151,7 +151,7 @@ elif sys.argv[1] == "scan":
 						"net.connman.Technology")
 		technology.Scan()
 	else:
-		print "'%s' takes two arguments" % sys.argv[1]
+		print("'%s' takes two arguments" % sys.argv[1])
 
 elif sys.argv[1] == "enable":
 	if len(sys.argv) == 3:
@@ -160,7 +160,7 @@ elif sys.argv[1] == "enable":
 					    "net.connman.Technology")
 		technology.SetProperty("Powered", True)
 	else:
-		print "'%s' takes two arguments" % sys.argv[1]
+		print("'%s' takes two arguments" % sys.argv[1])
 
 elif sys.argv[1] == "disable":
 	if len(sys.argv) == 3:
@@ -169,7 +169,7 @@ elif sys.argv[1] == "disable":
 					    "net.connman.Technology")
 		technology.SetProperty("Powered", False)
 	else:
-		print "'%s' takes two arguments" % sys.argv[1]
+		print("'%s' takes two arguments" % sys.argv[1])
 
 
 elif sys.argv[1] in ["offlinemode", "flightmode"]:
@@ -179,15 +179,15 @@ elif sys.argv[1] in ["offlinemode", "flightmode"]:
 		elif sys.argv[2] == "off" or sys.argv[2] == "0" or sys.argv[2] == "no":
 			active = dbus.Boolean(0)
 		else:
-			print "Use either 'on', '1', 'yes', 'off', '0' or 'no'"
+			print("Use either 'on', '1', 'yes', 'off', '0' or 'no'")
 			exit()
 
 		manager.SetProperty("OfflineMode", active)
 	elif len(sys.argv) == 2:
 		properties = manager.GetProperties()
-		print "Offline mode is %s" % (properties["OfflineMode"])
+		print("Offline mode is %s" % (properties["OfflineMode"]))
 	else:
-		print "'%s' takes max. two arguments" % sys.argv[1]
+		print("'%s' takes max. two arguments" % sys.argv[1])
 
 else:
-	print "Unknown command"
+	print("Unknown command")
diff --git a/test/test-counter b/test/test-counter
index ce835802..c09aabc1 100755
--- a/test/test-counter
+++ b/test/test-counter
@@ -24,7 +24,7 @@ def make_bytes_readable(bytes):
 	return ''
 
 def print_stats(stats):
-	keys = stats.keys()
+	keys = list(stats.keys())
 	keys.sort()
 
 	for key in keys:
@@ -36,7 +36,7 @@ def print_stats(stats):
 			if hstr:
 				str = "%s (%s)" % (str, hstr)
 
-		print str
+		print(str)
 
 class Counter(dbus.service.Object):
 	@dbus.service.method("net.connman.Counter",
@@ -48,13 +48,13 @@ class Counter(dbus.service.Object):
 	@dbus.service.method("net.connman.Counter",
 				in_signature='oa{sv}a{sv}', out_signature='')
 	def Usage(self, path, home, roaming):
-		print "%s" % (path)
+		print("%s" % (path))
 
 		if len(home) > 0:
-			print "  Home"
+			print("  Home")
 			print_stats(home)
 		if len(roaming) > 0:
-			print "  Roaming"
+			print("  Roaming")
 			print_stats(roaming)
 
 if __name__ == '__main__':
diff --git a/test/test-manager b/test/test-manager
index 2b4493c5..2bc53acc 100755
--- a/test/test-manager
+++ b/test/test-manager
@@ -4,7 +4,7 @@ import dbus
 
 def extract_values(values):
 	val = "{"
-	for key in values.keys():
+	for key in list(values.keys()):
 		val += " " + key + "="
 		if key in ["PrefixLength"]:
 			val += "%s" % (int(values[key]))
@@ -30,23 +30,23 @@ manager = dbus.Interface(bus.get_object("net.connman", "/"),
 
 properties = manager.GetProperties()
 
-for key in properties.keys():
+for key in list(properties.keys()):
 	if key in ["OfflineMode", "SessionMode"]:
-		print "%s" % (key)
+		print("%s" % (key))
 		if properties[key] == dbus.Boolean(1):
-			print "    true"
+			print("    true")
 		else:
-			print "    false"
+			print("    false")
 	else:
-		print "%s" % (key)
-		print "    %s" % (properties[key])
+		print("%s" % (key))
+		print("    %s" % (properties[key]))
 
 print ("Services")
 services = manager.GetServices()
 
 for (path, properties) in services:
-	print "    %s" % (path)
-	for key in properties.keys():
+	print("    %s" % (path))
+	for key in list(properties.keys()):
 		if key in ["Available", "Remember", "Default",
 				"Favorite", "Immutable", "AutoConnect",
 					"LoginRequired",
@@ -73,14 +73,14 @@ for (path, properties) in services:
 		else:
 			val = str(properties[key])
 
-		print "        %s = %s" % (key, val)
+		print("        %s = %s" % (key, val))
 
 print ("Technologies")
 technologies = manager.GetTechnologies()
 
 for (path, properties) in technologies:
-	print "    %s" % (path)
-	for key in properties.keys():
+	print("    %s" % (path))
+	for key in list(properties.keys()):
 
 		if key in ["Connected", "Powered", "Tethering"]:
 			if properties[key] == dbus.Boolean(1):
@@ -90,4 +90,4 @@ for (path, properties) in technologies:
 		else:
 			val = properties[key]
 
-		print "        %s = %s" % (key, val)
+		print("        %s = %s" % (key, val))
diff --git a/test/test-new-supplicant b/test/test-new-supplicant
index be230dc4..face1308 100755
--- a/test/test-new-supplicant
+++ b/test/test-new-supplicant
@@ -11,4 +11,4 @@ bus = dbus.SystemBus()
 dummy = dbus.Interface(bus.get_object(WPA_NAME, WPA_PATH),
 				'org.freedesktop.DBus.Introspectable')
 
-print dummy.Introspect()
+print(dummy.Introspect())
diff --git a/test/test-session b/test/test-session
index 2d82fb65..e45d22b8 100755
--- a/test/test-session
+++ b/test/test-session
@@ -21,7 +21,7 @@ def extract_list(list):
 
 def extract_values(values):
 	val = "{"
-	for key in values.keys():
+	for key in list(values.keys()):
 		val += " " + key + "="
 		if key in ["PrefixLength"]:
 			val += "%s" % (int(values[key]))
@@ -41,26 +41,26 @@ class Notification(dbus.service.Object):
 	@dbus.service.method("net.connman.Notification",
 				in_signature='', out_signature='')
 	def Release(self):
-		print "Release %s" % (self._object_path)
+		print("Release %s" % (self._object_path))
 		session_name = self._object_path.split('/')[-1]
 		self.app.release(session_name)
 
 	@dbus.service.method("net.connman.Notification",
 				in_signature='a{sv}', out_signature='')
 	def Update(self, settings):
-		print "Update called at %s" % (self._object_path)
+		print("Update called at %s" % (self._object_path))
 
 		try:
-			for key in settings.keys():
+			for key in list(settings.keys()):
 				if key in ["IPv4", "IPv6"]:
 					val = extract_values(settings[key])
 				elif key in  ["AllowedBearers"]:
 					val = extract_list(settings[key])
 				else:
 					val = settings[key]
-				print "    %s = %s" % (key, val)
+				print("    %s = %s" % (key, val))
 		except:
-			print "Exception:"
+			print("Exception:")
 			traceback.print_exc()
 
 class SessionApplication(dbus.service.Object):
@@ -80,15 +80,15 @@ class SessionApplication(dbus.service.Object):
 	def connman_name_owner_changed(self, proxy):
 		try:
 			if proxy:
-				print "connman appeared on D-Bus ", str(proxy)
+				print("connman appeared on D-Bus ", str(proxy))
 
 				bus = dbus.SystemBus()
 				self.manager = dbus.Interface(bus.get_object("net.connman", "/"),
 							      "net.connman.Manager")
 			else:
-				print "connman disappeared on D-Bus"
+				print("connman disappeared on D-Bus")
 				self.manager = None
-				for s in self.sessions.keys():
+				for s in list(self.sessions.keys()):
 					self.sessions[s]['notify'].remove_from_connection()
 					self.sessions[s]['notify'] = None
 
@@ -127,18 +127,18 @@ class SessionApplication(dbus.service.Object):
 		return value
 
 	def find_session(self, session_name):
-		if not session_name in self.sessions.keys():
+		if not session_name in list(self.sessions.keys()):
 			return None
 		return self.sessions[session_name]
 
 	@dbus.service.method("com.example.TestSession",
 				in_signature='', out_signature='')
 	def CreateSession(self, session_name):
-		print "Create session"
+		print("Create session")
 
 		s = self.find_session(session_name)
 		if s and s['session'] :
-			print "Session %s already created-> drop reqest" % (session_name)
+			print("Session %s already created-> drop request" % (session_name))
 			return
 
 		try:
@@ -149,29 +149,29 @@ class SessionApplication(dbus.service.Object):
 			s['notify_path'] = self._object_path + "/" + session_name
 			s['notify'] = Notification(bus, self, s['notify_path'])
 			s['notify'].add_to_connection(bus, s['notify_path'])
-			if not 'settings' in s.keys():
+			if not 'settings' in list(s.keys()):
 				s['settings'] = {};
 			s['session_path'] = self.manager.CreateSession(s['settings'], s['notify_path'])
-			print "notify path %s" % (s['notify_path'])
-			print "session path %s" % (s['session_path'])
+			print("notify path %s" % (s['notify_path']))
+			print("session path %s" % (s['session_path']))
 			s['session'] = dbus.Interface(bus.get_object("net.connman", s['session_path']),
 						      "net.connman.Session")
 			self.sessions[session_name] = s
 
-		except dbus.DBusException, e:
+		except dbus.DBusException as e:
 			if e.get_dbus_name() in ['net.connman.Error.Failed']:
-				print e.get_dbus_message()
+				print(e.get_dbus_message())
 				return
 			traceback.print_exc()
 
 	@dbus.service.method("com.example.TestSession",
 				in_signature='', out_signature='')
 	def DestroySession(self, session_name):
-		print "Destroy session"
+		print("Destroy session")
 
 		s = self.find_session(session_name)
 		if s == None or s['session'] == None:
-			print "The session is not running -> drop request"
+			print("The session is not running -> drop request")
 			return
 
 		try:
@@ -182,92 +182,92 @@ class SessionApplication(dbus.service.Object):
 	@dbus.service.method("com.example.TestSession",
 				in_signature='', out_signature='')
 	def Connect(self, session_name):
-		print "Connect session"
+		print("Connect session")
 
 		s = self.find_session(session_name)
 		if s == None or s['session'] == None:
-			print "The session is not running -> drop request"
+			print("The session is not running -> drop request")
 			return
 
 		try:
 			s['session'].Connect()
-		except dbus.DBusException, e:
+		except dbus.DBusException as e:
 			if e.get_dbus_name() in ['net.connman.Error.Failed']:
-				print e.get_dbus_message()
+				print(e.get_dbus_message())
 				return
 			traceback.print_exc()
 
 	@dbus.service.method("com.example.TestSession",
 				in_signature='', out_signature='')
 	def Disconnect(self, session_name):
-		print "Disconnect session"
+		print("Disconnect session")
 
 		s = self.find_session(session_name)
 		if s == None or s['session'] == None:
-			print "The session is not running -> drop request"
+			print("The session is not running -> drop request")
 			return
 
 		try:
 			s['session'].Disconnect()
-		except dbus.DBusException, e:
+		except dbus.DBusException as e:
 			if e.get_dbus_name() in ['net.connman.Error.Failed']:
-				print e.get_dbus_message()
+				print(e.get_dbus_message())
 				return
 			traceback.print_exc()
 
 	@dbus.service.method("com.example.TestSession",
 				in_signature='', out_signature='')
 	def Change(self, session_name, key, value):
-		print "Update session settings"
+		print("Update session settings")
 
 		s = self.find_session(session_name)
 		if s == None or s['session'] == None:
-			print "The session is not running -> drop request"
+			print("The session is not running -> drop request")
 			return
 
 		try:
 			val = self.type_convert(key, value)
 			s['session'].Change(key, val)
-		except dbus.DBusException, e:
+		except dbus.DBusException as e:
 			if e.get_dbus_name() in ['net.connman.Error.Failed']:
-				print e.get_dbus_message()
+				print(e.get_dbus_message())
 				return
 			traceback.print_exc()
 
 	@dbus.service.method("com.example.TestSession",
 				in_signature='', out_signature='')
 	def Configure(self, session_name, key, value):
-		print "Configure session settings"
+		print("Configure session settings")
 		s = self.find_session(session_name)
 		if s == None:
 			s = {}
 			s['notify_path'] = None
 			s['notify'] = None
-			if not 'settings' in s.keys():
+			if not 'settings' in list(s.keys()):
 				s['settings'] = {};
 			s['session_path'] = None
 			s['session'] = None
 			self.sessions[session_name] = s
 		if s and s['session']:
-			print "The session is running, use change -> drop request"
+			print("The session is running, use change -> drop request")
 			return
 		val = self.type_convert(key, value)
 		s['settings'][key] = val
 
 def main():
 	if len(sys.argv) < 2:
-		print "Usage: %s <command>" % (sys.argv[0])
-		print ""
-		print "  enable"
-		print "  disable"
-		print "  create <app_path> <session_name>"
-		print "  destroy <app_path> <session_name>"
-		print "  connect <app_path> <session_name>"
-		print "  disconnect <app_path> <session_name>"
-		print "  change <app_path> <session_name> <key> <value>"
-		print "  configure <app_path> <session_name> <key> <value>"
-		print ""
-		print "  run <app_path>"
+		print("Usage: %s <command>" % (sys.argv[0]))
+		print("")
+		print("  enable")
+		print("  disable")
+		print("  create <app_path> <session_name>")
+		print("  destroy <app_path> <session_name>")
+		print("  connect <app_path> <session_name>")
+		print("  disconnect <app_path> <session_name>")
+		print("  change <app_path> <session_name> <key> <value>")
+		print("  configure <app_path> <session_name> <key> <value>")
+		print("")
+		print("  run <app_path>")
 		sys.exit(1)
 
 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -287,7 +287,7 @@ def main():
 		return
 
 	if (len(sys.argv) < 3):
-		print "Need test application path"
+		print("Need test application path")
 		sys.exit(1)
 
 	app_path = sys.argv[2]
@@ -321,20 +321,20 @@ def main():
 
 	elif sys.argv[1] == "change":
 		if len(sys.argv) < 5:
-			print "Arguments missing"
+			print("Arguments missing")
 			sys.exit(1)
 
 		app.Change(sys.argv[3], sys.argv[4], sys.argv[5:])
 
 	elif sys.argv[1] == "configure":
 		if len(sys.argv) < 5:
-			print "Arguments missing"
+			print("Arguments missing")
 			sys.exit(1)
 
 		app.Configure(sys.argv[3], sys.argv[4], sys.argv[5:])
 
 	else:
-		print "Unknown command '%s'" % sys.argv[1]
+		print("Unknown command '%s'" % sys.argv[1])
 		sys.exit(1)
 
 if __name__ == '__main__':
diff --git a/test/vpn-connect b/test/vpn-connect
index 0f8636da..29753dc8 100755
--- a/test/vpn-connect
+++ b/test/vpn-connect
@@ -4,7 +4,7 @@ import sys
 import dbus
 
 if (len(sys.argv) < 2):
-	print "Usage: %s <VPN connection id>" % (sys.argv[0])
+	print("Usage: %s <VPN connection id>" % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -16,7 +16,7 @@ connections = manager.GetConnections()
 
 path = "/net/connman/vpn/connection/" + sys.argv[1]
 
-print "Attempting to connect VPN %s" % (path)
+print("Attempting to connect VPN %s" % (path))
 
 connection = dbus.Interface(bus.get_object("net.connman.vpn", path),
 					    "net.connman.vpn.Connection")
diff --git a/test/vpn-disconnect b/test/vpn-disconnect
index d7a49ba9..dccad2c8 100755
--- a/test/vpn-disconnect
+++ b/test/vpn-disconnect
@@ -4,7 +4,7 @@ import sys
 import dbus
 
 if (len(sys.argv) < 1):
-	print "Usage: %s <VPN connection id>" % (sys.argv[0])
+	print("Usage: %s <VPN connection id>" % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -16,7 +16,7 @@ connections = manager.GetConnections()
 
 path = "/net/connman/vpn/connection/" + sys.argv[1]
 
-print "Attempting to disconnect VPN %s" % (path)
+print("Attempting to disconnect VPN %s" % (path))
 
 connection = dbus.Interface(bus.get_object("net.connman.vpn", path),
 					    "net.connman.vpn.Connection")
diff --git a/test/vpn-get b/test/vpn-get
index f1f760cc..c9c5a700 100755
--- a/test/vpn-get
+++ b/test/vpn-get
@@ -4,7 +4,7 @@ import dbus
 
 def extract_values(values):
 	val = "{"
-	for key in values.keys():
+	for key in list(values.keys()):
 		val += " " + key + "="
 		if key in ["Servers", "Excludes"]:
 			val += extract_list(values[key])
@@ -34,15 +34,15 @@ for entry in manager.GetConnections():
 	path = entry[0]
 	properties = entry[1]
 
-	print "[ %s ]" % (path)
+	print("[ %s ]" % (path))
 
-	for key in properties.keys():
+	for key in list(properties.keys()):
 		if key in ["IPv4", "IPv6" ]:
 			val = extract_values(properties[key])
 		elif key in ["Nameservers","ServerRoutes","UserRoutes"]:
 			val = extract_list(properties[key])
 		else:
 			val = str(properties[key])
-		print "    %s = %s" % (key, val)
+		print("    %s = %s" % (key, val))
 
-	print
+	print()
diff --git a/test/vpn-property b/test/vpn-property
index d05f4c7a..feddb5fc 100755
--- a/test/vpn-property
+++ b/test/vpn-property
@@ -8,7 +8,7 @@ def make_variant(string):
 
 def extract_values(values):
 	val = "{"
-	for key in values.keys():
+	for key in list(values.keys()):
 		val += " " + key + "="
 		if key in ["Servers", "Excludes"]:
 			val += extract_list(values[key])
@@ -32,7 +32,7 @@ def extract_list(list):
 argc = len(sys.argv)
 
 if (argc < 2):
-	print "Usage: %s <VPN connection id> [<property name>] [<property values>]" % (sys.argv[0])
+	print("Usage: %s <VPN connection id> [<property name>] [<property values>]" % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -44,29 +44,29 @@ connections = manager.GetConnections()
 
 path = "/net/connman/vpn/connection/" + sys.argv[1]
 
-print "Attempting to connect VPN %s" % (path)
+print("Attempting to connect VPN %s" % (path))
 
 connection = dbus.Interface(bus.get_object("net.connman.vpn", path),
 					    "net.connman.vpn.Connection")
 
 if (argc < 3):
 	properties = connection.GetProperties()
-	for key in properties.keys():
+	for key in list(properties.keys()):
 		if key in ["IPv4", "IPv6" ]:
 			val = extract_values(properties[key])
 		elif key in ["Nameservers","ServerRoutes","UserRoutes"]:
 			val = extract_list(properties[key])
 		else:
 			val = str(properties[key])
-		print "    %s = %s" % (key, val)
+		print("    %s = %s" % (key, val))
 
 elif (argc < 4):
 	try:
 		connection.ClearProperty(sys.argv[2])
-	except dbus.DBusException, error:
-		print "%s: %s" % (error._dbus_error_name, error.message)
+	except dbus.DBusException as error:
+		print("%s: %s" % (error._dbus_error_name, error.message))
 else:
 	try:
 		connection.SetProperty(sys.argv[2], sys.argv[3])
-	except dbus.DBusException, error:
-		print "%s: %s" % (error._dbus_error_name, error.message)
+	except dbus.DBusException as error:
+		print("%s: %s" % (error._dbus_error_name, error.message))