dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

code style and fix test.

This commit is contained in:
Robey Pointer 2010-04-13 18:52:29 -07:00
parent d268594ab1
commit f67cea44d0
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
paramiko/sftp_client.py
View File

@ -533,7 +533,7 @@ class SFTPClient (BaseSFTP):
""" """
return self._cwd return self._cwd
def put(self, localpath, remotepath, callback=None, confirm = True): def put(self, localpath, remotepath, callback=None, confirm=True):
""" """
Copy a local file (C{localpath}) to the SFTP server as C{remotepath}. Copy a local file (C{localpath}) to the SFTP server as C{remotepath}.
Any exception raised by operations will be passed through. This Any exception raised by operations will be passed through. This
@ -549,6 +549,10 @@ class SFTPClient (BaseSFTP):
transferred so far and the total bytes to be transferred transferred so far and the total bytes to be transferred
(since 1.7.4) (since 1.7.4)
@type callback: function(int, int) @type callback: function(int, int)
@param confirm: whether to do a stat() on the file afterwards to
confirm the file size (since 1.7.7)
@type confirm: bool
@return: an object containing attributes about the given file @return: an object containing attributes about the given file
(since 1.7.4) (since 1.7.4)
@rtype: SFTPAttributes @rtype: SFTPAttributes

8
tests/test_sftp.py
View File

@ -667,9 +667,10 @@ class SFTPTest (unittest.TestCase):
f.close() f.close()
finally: finally:
sftp.unlink(FOLDER + '/zero') sftp.unlink(FOLDER + '/zero')
def test_N_put_without_confirm(self): def test_N_put_without_confirm(self):
""" """
verify that get/put work. verify that get/put work without confirmation.
""" """
import os, warnings import os, warnings
warnings.filterwarnings('ignore', 'tempnam.*') warnings.filterwarnings('ignore', 'tempnam.*')
@ -682,10 +683,9 @@ class SFTPTest (unittest.TestCase):
saved_progress = [] saved_progress = []
def progress_callback(x, y): def progress_callback(x, y):
saved_progress.append((x, y)) saved_progress.append((x, y))
res = sftp.put(localname, FOLDER + '/bunny.txt', progress_callback, false) res = sftp.put(localname, FOLDER + '/bunny.txt', progress_callback, False)
self.assertEquals(SFTPAttributes(), res)
self.assertEquals(SFTPAttributes().attr, res.attr)
f = sftp.open(FOLDER + '/bunny.txt', 'r') f = sftp.open(FOLDER + '/bunny.txt', 'r')
self.assertEquals(text, f.read(128)) self.assertEquals(text, f.read(128))