summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-08-25 22:32:21 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-08-25 22:32:21 -0700
commit5fc6969e23ec5e013f432e4efbe12d771150c1e1 (patch)
treea5d500d1cfda5d4dc8ef5767b2dc5b091756d109
parent87f6f56196b0b384c906db96ef5593c5cb6a0c61 (diff)
Fix docstrings re: addition of `getfo`/`putfo`, closes #229
-rw-r--r--paramiko/sftp_client.py8
-rw-r--r--sites/www/changelog.rst2
2 files changed, 4 insertions, 6 deletions
diff --git a/paramiko/sftp_client.py b/paramiko/sftp_client.py
index cbef8f71..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)
@@ -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 b9d0df0b..cdd513f4 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
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