client: changed some strings

dist/cloud.py

@@ -46,9 +46,11 @@ def parse_arguments():
     parser.add_argument("-u", "--username", type=str)
     parser.add_argument("-p", "--password", type=str)
     parser.add_argument(
-        "-d", "--driver",
-        help="Select webdriver. Aside from Firefox, you have to install "
-        + "first the proper driver.", type=str,
+        "-d",
+        "--driver",
+        help=("Select webdriver. Aside from Firefox, you have to install "
+              "first the proper driver."),
+        type=str,
         choices=['firefox', 'chrome', 'ie', 'opera'],
         default="firefox")
     args = parser.parse_args()

dist/cloud_connect_from_linux.py

@@ -27,7 +27,7 @@ def connect(vm):
     """
     if vm.protocol == "SSH":
         command = ("sshpass -p %s ssh -p %s" % (vm.password, vm.port)
-                   + " -o StrictHostKeyChecking=no %s@%s" % (vm.user, vm.host))
+                   " -o StrictHostKeyChecking=no %s@%s" % (vm.user, vm.host))
         subprocess.call(command, shell=True)
     elif vm.protocol in ("NX", "RDP"):
         server = "%s:%s" % (vm.host, vm.port)
@@ -48,9 +48,14 @@ def connect(vm):
                 f.write(NX_template)
             else:
                 f.write(RDP_template)
-            f.write("name=%s:%s\n" % (vm.protocol, server)
-                    + "protocol=%s\nserver=%s\n" % (vm.protocol, server)
-                    + "username=%s\npassword=%s\n" % (vm.user, password))
+            f.write("name=%(protocol)s:%(server)s\nprotocol=%(protocol)s\n"
+                    "server=%(server)s\nusername=%(username)s\n"
+                    "password=%(password)s\n" % {
+                        'protocol': vm.protocol,
+                        'server': server,
+                        'username': vm.user,
+                        'password': vm.password
+                    })
             f.close()
         subprocess.call(["remmina", "-c", config_file])
 

src/python/cloud.py

@@ -46,9 +46,11 @@ def parse_arguments():
     parser.add_argument("-u", "--username", type=str)
     parser.add_argument("-p", "--password", type=str)
     parser.add_argument(
-        "-d", "--driver",
-        help="Select webdriver. Aside from Firefox, you have to install "
-        + "first the proper driver.", type=str,
+        "-d",
+        "--driver",
+        help=("Select webdriver. Aside from Firefox, you have to install "
+              "first the proper driver."),
+        type=str,
         choices=['firefox', 'chrome', 'ie', 'opera'],
         default="firefox")
     args = parser.parse_args()

src/python/cloud_connect_from_linux.py

@@ -27,7 +27,7 @@ def connect(vm):
     """
     if vm.protocol == "SSH":
         command = ("sshpass -p %s ssh -p %s" % (vm.password, vm.port)
-                   + " -o StrictHostKeyChecking=no %s@%s" % (vm.user, vm.host))
+                   " -o StrictHostKeyChecking=no %s@%s" % (vm.user, vm.host))
         subprocess.call(command, shell=True)
     elif vm.protocol in ("NX", "RDP"):
         server = "%s:%s" % (vm.host, vm.port)
@@ -48,9 +48,14 @@ def connect(vm):
                 f.write(NX_template)
             else:
                 f.write(RDP_template)
-            f.write("name=%s:%s\n" % (vm.protocol, server)
-                    + "protocol=%s\nserver=%s\n" % (vm.protocol, server)
-                    + "username=%s\npassword=%s\n" % (vm.user, password))
+            f.write("name=%(protocol)s:%(server)s\nprotocol=%(protocol)s\n"
+                    "server=%(server)s\nusername=%(username)s\n"
+                    "password=%(password)s\n" % {
+                        'protocol': vm.protocol,
+                        'server': server,
+                        'username': vm.user,
+                        'password': vm.password
+                    })
             f.close()
         subprocess.call(["remmina", "-c", config_file])