summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-01-25 10:23:04 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-01-25 10:23:04 -0800
commitedea51cf93d1f9ffa6dbe9bac50b5f4d5e1e93ee (patch)
tree6fbe7a6a62c3db08e8b02dff79bb394ab61f4c55
parent76d0cf1b985e7ce776c0f716d5c3a4baecab1531 (diff)
parentd224eec126acb1f003f5a2c8b2449313fee0cdad (diff)
Merge branch '1.17' into 1.18
-rw-r--r--paramiko/file.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/paramiko/file.py b/paramiko/file.py
index 05f2d6e6..5b57dfd6 100644
--- a/paramiko/file.py
+++ b/paramiko/file.py
@@ -370,7 +370,7 @@ class BufferedFile (ClosingContextManager):
written yet. (Use `flush` or `close` to force buffered data to be
written out.)
- :param str data: data to write
+ :param str/bytes data: data to write
"""
data = b(data)
if self._closed: