Merge pull request #52 from itaiin/master

fixed a bug in paramiko machine login
tomerfiliba · Dec 17, 2012 · abf17bc · abf17bc
2 parents 81d88f4 + eec1ba2
commit abf17bc
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/plumbum/paramiko_machine.py b/plumbum/paramiko_machine.py
@@ -134,14 +134,15 @@ class ParamikoMachine(BaseRemoteMachine):
     def __init__(self, host, user = None, port = None, password = None, keyfile = None, 
             load_system_host_keys = True, missing_host_policy = None, encoding = "utf8"):
         self.host = host
+        kwargs = {}
         if user:
             self._fqhost = "%s@%s" % (user, host)
+            kwargs['username'] = user
         else:
             self._fqhost = host
         self._client = paramiko.SSHClient()
         if load_system_host_keys:
             self._client.load_system_host_keys()
-        kwargs = {}
         if port is not None:
             kwargs["port"] = port
         if keyfile is not None: