Merge branch 'master' of github.com:paramiko/paramiko

Conflicts:
	paramiko/sftp_file.py
	sites/www/changelog.rst

1 files changed, 7 insertions, 1 deletions

diff --git a/tests/test_sftp.py b/tests/test_sftp.py
index b1829b4c..53b73ee0 100755
--- a/tests/test_sftp.py
+++ b/tests/test_sftp.py
@@ -697,7 +697,8 @@ class SFTPTest (unittest.TestCase):
                 f.readv([(0, 12)])
 
             with sftp.open(FOLDER + '/zero', 'r') as f:
-                f.prefetch()
+                file_size = f.stat().st_size
+                f.prefetch(file_size)
                 f.read(100)
         finally:
             sftp.unlink(FOLDER + '/zero')
@@ -812,6 +813,11 @@ class SFTPTest (unittest.TestCase):
             sftp.remove('%s/nonutf8data' % FOLDER)
 
 
+    def test_sftp_attributes_empty_str(self):
+        sftp_attributes = SFTPAttributes()
+        self.assertEqual(str(sftp_attributes), "?---------   1 0        0               0 (unknown date) ?")
+
+
 if __name__ == '__main__':
     SFTPTest.init_loopback()
     # logging is required by test_N_file_with_percent