Imported Upstream connman version 1.38

[platform/upstream/connman.git] / test / vpn-property

diff --git a/test/vpn-property b/test/vpn-property
index d05f4c7..feddb5f 100755 (executable)
--- 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))