Refactor ssh_runcmd for code clarity

1 files changed, 9 insertions, 8 deletions

diff --git a/cliapp/runcmd.py b/cliapp/runcmd.py
index 5ac8da5..79794a1 100644
--- a/cliapp/runcmd.py
+++ b/cliapp/runcmd.py
@@ -305,16 +305,17 @@ def ssh_runcmd(target, argv, **kwargs): # pragma: no cover
 
     '''
 
-    tty = kwargs.get('tty', None)
+    ssh_argv = ['ssh']
+
+    tty = kwargs.pop('tty', None)
     if tty:
-        ssh_cmd = ['ssh', '-tt', target, '--']
+        ssh_argv.append('-tt')
     elif tty is False:
-        ssh_cmd = ['ssh', '-T', target, '--']
-    else:
-        ssh_cmd = ['ssh', target, '--']
-    if 'tty' in kwargs:
-        del kwargs['tty']
+        ssh_argv.append('-T')
+
+    ssh_argv.append(target)
+    ssh_argv.append('--')
 
-    local_argv = ssh_cmd + map(shell_quote, argv)
+    local_argv = ssh_argv + map(shell_quote, argv)
     return runcmd(local_argv, **kwargs)