diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-08-25 22:32:25 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-08-25 22:32:25 -0700 |
| commit | a22bf77030acaa476512752a2862244e90a3f1b6 (patch) | |
| tree | e55068f63c9bc3e8f60b7d6b020411670f7fc022 | |
| parent | ce1ec358abbd1726f39df9b19d6e4e681819abb9 (diff) | |
| parent | 5fc6969e23ec5e013f432e4efbe12d771150c1e1 (diff) | |
Merge branch '1.13' into 1.14
| -rw-r--r-- | paramiko/sftp_client.py | 10 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/paramiko/sftp_client.py b/paramiko/sftp_client.py index 1caaf165..2ff2d51d 100644 --- a/paramiko/sftp_client.py +++ b/paramiko/sftp_client.py @@ -534,9 +534,7 @@ class SFTPClient(BaseSFTP): an `.SFTPAttributes` object containing attributes about the given file. - .. versionadded:: 1.4 - .. versionchanged:: 1.7.4 - Began returning rich attribute objects. + .. versionadded:: 1.10 """ with self.file(remotepath, 'wb') as fr: fr.set_pipelined(True) @@ -584,7 +582,7 @@ class SFTPClient(BaseSFTP): """ file_size = os.stat(localpath).st_size with open(localpath, 'rb') as fl: - return self.putfo(fl, remotepath, os.stat(localpath).st_size, callback, confirm) + return self.putfo(fl, remotepath, file_size, callback, confirm) def getfo(self, remotepath, fl, callback=None): """ @@ -601,9 +599,7 @@ class SFTPClient(BaseSFTP): the bytes transferred so far and the total bytes to be transferred :return: the `number <int>` of bytes written to the opened file object - .. versionadded:: 1.4 - .. versionchanged:: 1.7.4 - Added the ``callable`` param. + .. versionadded:: 1.10 """ with self.open(remotepath, 'rb') as fr: file_size = self.stat(remotepath).st_size diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 81195a49..5b8e1702 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,10 @@ Changelog ========= +* :support:`229` Fix a couple of incorrectly-copied docstrings' ``.. + versionadded::`` RST directives. Thanks to Aarni Koskela for the catch. +* :support:`169 backported` Minor refactor of + `paramiko.sftp_client.SFTPClient.put` thanks to Abhinav Upadhyay. * :bug:`285` (also :issue:`352`) Update our Python 3 ``b()`` compatibility shim to handle ``buffer`` objects correctly; this fixes a frequently reported issue affecting many users, including users of the ``bzr`` software suite. |