@@ -46,9 +46,9 @@ def __init__(self, conn_params: ConnectionParams):
4646self .host = conn_params .host
4747self .ssh_key = conn_params .ssh_key
4848if self .ssh_key :
49- self .ssh_cmd = ["-i" ,self .ssh_key ]
49+ self .ssh_args = ["-i" ,self .ssh_key ]
5050else :
51- self .ssh_cmd = []
51+ self .ssh_args = []
5252self .remote = True
5353self .username = conn_params .username
5454self .ssh_dest = f"{ self .username } { self .host } if self .username else self .host
@@ -96,9 +96,9 @@ def exec_command(self, cmd, wait_exit=False, verbose=False, expect_error=False,
9696 """
9797ssh_cmd = []
9898if isinstance (cmd ,str ):
99- ssh_cmd = ['ssh' , self .ssh_dest ] + self .ssh_cmd + [ cmd ]
99+ ssh_cmd = ['ssh' ] + self .ssh_args + [ self .ssh_dest + cmd ]
100100elif isinstance (cmd ,list ):
101- ssh_cmd = ['ssh' , self .ssh_dest ] + self .ssh_cmd + cmd
101+ ssh_cmd = ['ssh' ] + self .ssh_args + [ self .ssh_dest ] + cmd
102102process = subprocess .Popen (ssh_cmd ,stdin = subprocess .PIPE ,stdout = subprocess .PIPE ,stderr = subprocess .PIPE )
103103if get_process :
104104return process
@@ -243,9 +243,9 @@ def mkdtemp(self, prefix=None):
243243 - prefix (str): The prefix of the temporary directory name.
244244 """
245245if prefix :
246- command = ["ssh" ]+ self .ssh_cmd + [self .ssh_dest ,f"mktemp -d{ prefix } ]
246+ command = ["ssh" ]+ self .ssh_args + [self .ssh_dest ,f"mktemp -d{ prefix } ]
247247else :
248- command = ["ssh" ]+ self .ssh_cmd + [self .ssh_dest ,"mktemp -d" ]
248+ command = ["ssh" ]+ self .ssh_args + [self .ssh_dest ,"mktemp -d" ]
249249
250250result = subprocess .run (command ,stdout = subprocess .PIPE ,stderr = subprocess .PIPE ,text = True )
251251
@@ -289,7 +289,7 @@ def write(self, filename, data, truncate=False, binary=False, read_and_write=Fal
289289
290290with tempfile .NamedTemporaryFile (mode = mode ,delete = False )as tmp_file :
291291if not truncate :
292- scp_cmd = ['scp' ]+ self .ssh_cmd + [f"{ self .ssh_dest } { filename } ,tmp_file .name ]
292+ scp_cmd = ['scp' ]+ self .ssh_args + [f"{ self .ssh_dest } { filename } ,tmp_file .name ]
293293subprocess .run (scp_cmd ,check = False )# The file might not exist yet
294294tmp_file .seek (0 ,os .SEEK_END )
295295
@@ -305,11 +305,11 @@ def write(self, filename, data, truncate=False, binary=False, read_and_write=Fal
305305tmp_file .write (data )
306306
307307tmp_file .flush ()
308- scp_cmd = ['scp' ]+ self .ssh_cmd + [tmp_file .name ,f"{ self .ssh_dest } { filename } ]
308+ scp_cmd = ['scp' ]+ self .ssh_args + [tmp_file .name ,f"{ self .ssh_dest } { filename } ]
309309subprocess .run (scp_cmd ,check = True )
310310
311311remote_directory = os .path .dirname (filename )
312- mkdir_cmd = ['ssh' ]+ self .ssh_cmd + [self .ssh_dest ,f"mkdir -p{ remote_directory } ]
312+ mkdir_cmd = ['ssh' ]+ self .ssh_args + [self .ssh_dest ,f"mkdir -p{ remote_directory } ]
313313subprocess .run (mkdir_cmd ,check = True )
314314
315315os .remove (tmp_file .name )
@@ -374,7 +374,7 @@ def get_pid(self):
374374return int (self .exec_command ("echo $$" ,encoding = get_default_encoding ()))
375375
376376def get_process_children (self ,pid ):
377- command = ["ssh" ]+ self .ssh_cmd + [self .ssh_dest ,f"pgrep -P{ pid } ]
377+ command = ["ssh" ]+ self .ssh_args + [self .ssh_dest ,f"pgrep -P{ pid } ]
378378
379379result = subprocess .run (command ,stdout = subprocess .PIPE ,stderr = subprocess .PIPE ,text = True )
380380