@@ -51,6 +51,7 @@ def __init__(self, conn_params: ConnectionParams):
5151self .ssh_cmd = []
5252self .remote = True
5353self .username = conn_params .username or self .get_user ()
54+ self .ssh_dest = f"{ self .username } { self .host } if self .username else "{self.host}"
5455self .add_known_host (self .host )
5556self .tunnel_process = None
5657
@@ -95,9 +96,9 @@ def exec_command(self, cmd, wait_exit=False, verbose=False, expect_error=False,
9596 """
9697ssh_cmd = []
9798if isinstance (cmd ,str ):
98- ssh_cmd = ['ssh' ,f" { self .username } @ { self . host } " + self .ssh_cmd + [cmd ]
99+ ssh_cmd = ['ssh' ,self .ssh_dest ]+ self .ssh_cmd + [cmd ]
99100elif isinstance (cmd ,list ):
100- ssh_cmd = ['ssh' ,f" { self .username } @ { self . host } " + self .ssh_cmd + cmd
101+ ssh_cmd = ['ssh' ,self .ssh_dest ]+ self .ssh_cmd + cmd
101102process = subprocess .Popen (ssh_cmd ,stdin = subprocess .PIPE ,stdout = subprocess .PIPE ,stderr = subprocess .PIPE )
102103if get_process :
103104return process
@@ -246,9 +247,9 @@ def mkdtemp(self, prefix=None):
246247 - prefix (str): The prefix of the temporary directory name.
247248 """
248249if prefix :
249- command = ["ssh" ]+ self .ssh_cmd + [f" { self .username } @ { self . host } " f"mktemp -d{ prefix } ]
250+ command = ["ssh" ]+ self .ssh_cmd + [self .ssh_dest ,f"mktemp -d{ prefix } ]
250251else :
251- command = ["ssh" ]+ self .ssh_cmd + [f" { self .username } @ { self . host } " "mktemp -d" ]
252+ command = ["ssh" ]+ self .ssh_cmd + [self .ssh_dest ,"mktemp -d" ]
252253
253254result = subprocess .run (command ,stdout = subprocess .PIPE ,stderr = subprocess .PIPE ,text = True )
254255
@@ -292,7 +293,7 @@ def write(self, filename, data, truncate=False, binary=False, read_and_write=Fal
292293
293294with tempfile .NamedTemporaryFile (mode = mode ,delete = False )as tmp_file :
294295if not truncate :
295- scp_cmd = ['scp' ]+ self .ssh_cmd + [f"{ self .username } @ { self . host } { filename } ,tmp_file .name ]
296+ scp_cmd = ['scp' ]+ self .ssh_cmd + [f"{ self .ssh_dest } { filename } ,tmp_file .name ]
296297subprocess .run (scp_cmd ,check = False )# The file might not exist yet
297298tmp_file .seek (0 ,os .SEEK_END )
298299
@@ -308,11 +309,11 @@ def write(self, filename, data, truncate=False, binary=False, read_and_write=Fal
308309tmp_file .write (data )
309310
310311tmp_file .flush ()
311- scp_cmd = ['scp' ]+ self .ssh_cmd + [tmp_file .name ,f"{ self .username } @ { self . host } { filename } ]
312+ scp_cmd = ['scp' ]+ self .ssh_cmd + [tmp_file .name ,f"{ self .ssh_dest } { filename } ]
312313subprocess .run (scp_cmd ,check = True )
313314
314315remote_directory = os .path .dirname (filename )
315- mkdir_cmd = ['ssh' ]+ self .ssh_cmd + [f" { self .username } @ { self . host } " f"mkdir -p{ remote_directory } ]
316+ mkdir_cmd = ['ssh' ]+ self .ssh_cmd + [self .ssh_dest ,f"mkdir -p{ remote_directory } ]
316317subprocess .run (mkdir_cmd ,check = True )
317318
318319os .remove (tmp_file .name )
@@ -377,7 +378,7 @@ def get_pid(self):
377378return int (self .exec_command ("echo $$" ,encoding = get_default_encoding ()))
378379
379380def get_process_children (self ,pid ):
380- command = ["ssh" ]+ self .ssh_cmd + [f" { self .username } @ { self . host } " f"pgrep -P{ pid } ]
381+ command = ["ssh" ]+ self .ssh_cmd + [self .ssh_dest ,f"pgrep -P{ pid } ]
381382
382383result = subprocess .run (command ,stdout = subprocess .PIPE ,stderr = subprocess .PIPE ,text = True )
383384