summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-01-25 10:23:08 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-01-25 10:23:08 -0800
commit03e5803055afca3069969cfde398d097f2ec1f9c (patch)
tree910db0e15769f3652ad6ea1cc3291ed26ce62513
parent4b01ee37609bf9cdf1ea7f3944f5a9265504c990 (diff)
parenta859d7f065e7a1b5b2c527f8dd6cdb30d51c20e8 (diff)
Merge branch '2.0' into 2.1
-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: