@@ -283,8 +283,10 @@ def write(self, filename, data, truncate=False, binary=False, read_and_write=Fal
283283mode = "r+b" if binary else "r+"
284284
285285with tempfile .NamedTemporaryFile (mode = mode ,delete = False )as tmp_file :
286+ scp_ssh_cmd = ['-P' if x == '-p' else x for x in self .ssh_cmd ]
287+
286288if not truncate :
287- scp_cmd = ['scp' ]+ self . ssh_cmd + [f"{ self .username } { self .host } { filename } ,tmp_file .name ]
289+ scp_cmd = ['scp' ]+ scp_ssh_cmd + [f"{ self .username } { self .host } { filename } ,tmp_file .name ]
288290subprocess .run (scp_cmd ,check = False )# The file might not exist yet
289291tmp_file .seek (0 ,os .SEEK_END )
290292
@@ -300,11 +302,12 @@ def write(self, filename, data, truncate=False, binary=False, read_and_write=Fal
300302tmp_file .write (data )
301303
302304tmp_file .flush ()
303- scp_cmd = ['scp' ]+ self .ssh_cmd + [tmp_file .name ,f"{ self .username } { self .host } { filename } ]
305+ # Because in scp we set up port using -P option
306+ scp_cmd = ['scp' ]+ scp_ssh_cmd + [tmp_file .name ,f"{ self .username } { self .host } { filename } ]
304307subprocess .run (scp_cmd ,check = True )
305308
306309remote_directory = os .path .dirname (filename )
307- mkdir_cmd = ['ssh' ]+ self . ssh_cmd + [f"{ self .username } { self .host } ,f"mkdir -p{ remote_directory } ]
310+ mkdir_cmd = ['ssh' ]+ scp_ssh_cmd + [f"{ self .username } { self .host } ,f"mkdir -p{ remote_directory } ]
308311subprocess .run (mkdir_cmd ,check = True )
309312
310313os .remove (tmp_file .name )
