Merge branch '2.4'

1 files changed, 73 insertions, 66 deletions

diff --git a/tests/test_file.py b/tests/test_file.py
index 3d2c94e6..deacd60a 100644
--- a/tests/test_file.py
+++ b/tests/test_file.py
@@ -30,18 +30,19 @@ from paramiko.py3compat import BytesIO
 from .util import needs_builtin
 
 
-class LoopbackFile (BufferedFile):
+class LoopbackFile(BufferedFile):
     """
     BufferedFile object that you can write data into, and then read it back.
     """
-    def __init__(self, mode='r', bufsize=-1):
+
+    def __init__(self, mode="r", bufsize=-1):
         BufferedFile.__init__(self)
         self._set_mode(mode, bufsize)
         self.buffer = BytesIO()
         self.offset = 0
 
     def _read(self, size):
-        data = self.buffer.getvalue()[self.offset:self.offset+size]
+        data = self.buffer.getvalue()[self.offset : self.offset + size]
         self.offset += len(data)
         return data
 
@@ -50,44 +51,46 @@ class LoopbackFile (BufferedFile):
         return len(data)
 
 
-class BufferedFileTest (unittest.TestCase):
+class BufferedFileTest(unittest.TestCase):
 
     def test_1_simple(self):
-        f = LoopbackFile('r')
+        f = LoopbackFile("r")
         try:
-            f.write(b'hi')
-            self.assertTrue(False, 'no exception on write to read-only file')
+            f.write(b"hi")
+            self.assertTrue(False, "no exception on write to read-only file")
         except:
             pass
         f.close()
 
-        f = LoopbackFile('w')
+        f = LoopbackFile("w")
         try:
             f.read(1)
-            self.assertTrue(False, 'no exception to read from write-only file')
+            self.assertTrue(False, "no exception to read from write-only file")
         except:
             pass
         f.close()
 
     def test_2_readline(self):
-        f = LoopbackFile('r+U')
-        f.write(b'First line.\nSecond line.\r\nThird line.\n' +
-                b'Fourth line.\nFinal line non-terminated.')
+        f = LoopbackFile("r+U")
+        f.write(
+            b"First line.\nSecond line.\r\nThird line.\n"
+            + b"Fourth line.\nFinal line non-terminated."
+        )
 
-        self.assertEqual(f.readline(), 'First line.\n')
+        self.assertEqual(f.readline(), "First line.\n")
         # universal newline mode should convert this linefeed:
-        self.assertEqual(f.readline(), 'Second line.\n')
+        self.assertEqual(f.readline(), "Second line.\n")
         # truncated line:
-        self.assertEqual(f.readline(7), 'Third l')
-        self.assertEqual(f.readline(), 'ine.\n')
+        self.assertEqual(f.readline(7), "Third l")
+        self.assertEqual(f.readline(), "ine.\n")
         # newline should be detected and only the fourth line returned
-        self.assertEqual(f.readline(39), 'Fourth line.\n')
-        self.assertEqual(f.readline(), 'Final line non-terminated.')
-        self.assertEqual(f.readline(), '')
+        self.assertEqual(f.readline(39), "Fourth line.\n")
+        self.assertEqual(f.readline(), "Final line non-terminated.")
+        self.assertEqual(f.readline(), "")
         f.close()
         try:
             f.readline()
-            self.assertTrue(False, 'no exception on readline of closed file')
+            self.assertTrue(False, "no exception on readline of closed file")
         except IOError:
             pass
         self.assertTrue(linefeed_byte in f.newlines)
@@ -98,11 +101,11 @@ class BufferedFileTest (unittest.TestCase):
         """
         try to trick the linefeed detector.
         """
-        f = LoopbackFile('r+U')
-        f.write(b'First line.\r')
-        self.assertEqual(f.readline(), 'First line.\n')
-        f.write(b'\nSecond.\r\n')
-        self.assertEqual(f.readline(), 'Second.\n')
+        f = LoopbackFile("r+U")
+        f.write(b"First line.\r")
+        self.assertEqual(f.readline(), "First line.\n")
+        f.write(b"\nSecond.\r\n")
+        self.assertEqual(f.readline(), "Second.\n")
         f.close()
         self.assertEqual(f.newlines, crlf)
 
@@ -110,51 +113,54 @@ class BufferedFileTest (unittest.TestCase):
         """
         verify that write buffering is on.
         """
-        f = LoopbackFile('r+', 1)
-        f.write(b'Complete line.\nIncomplete line.')
-        self.assertEqual(f.readline(), 'Complete line.\n')
-        self.assertEqual(f.readline(), '')
-        f.write('..\n')
-        self.assertEqual(f.readline(), 'Incomplete line...\n')
+        f = LoopbackFile("r+", 1)
+        f.write(b"Complete line.\nIncomplete line.")
+        self.assertEqual(f.readline(), "Complete line.\n")
+        self.assertEqual(f.readline(), "")
+        f.write("..\n")
+        self.assertEqual(f.readline(), "Incomplete line...\n")
         f.close()
 
     def test_5_flush(self):
         """
         verify that flush will force a write.
         """
-        f = LoopbackFile('r+', 512)
-        f.write('Not\nquite\n512 bytes.\n')
-        self.assertEqual(f.read(1), b'')
+        f = LoopbackFile("r+", 512)
+        f.write("Not\nquite\n512 bytes.\n")
+        self.assertEqual(f.read(1), b"")
         f.flush()
-        self.assertEqual(f.read(5), b'Not\nq')
-        self.assertEqual(f.read(10), b'uite\n512 b')
-        self.assertEqual(f.read(9), b'ytes.\n')
-        self.assertEqual(f.read(3), b'')
+        self.assertEqual(f.read(5), b"Not\nq")
+        self.assertEqual(f.read(10), b"uite\n512 b")
+        self.assertEqual(f.read(9), b"ytes.\n")
+        self.assertEqual(f.read(3), b"")
         f.close()
 
     def test_6_buffering(self):
         """
         verify that flushing happens automatically on buffer crossing.
         """
-        f = LoopbackFile('r+', 16)
-        f.write(b'Too small.')
-        self.assertEqual(f.read(4), b'')
-        f.write(b'  ')
-        self.assertEqual(f.read(4), b'')
-        f.write(b'Enough.')
-        self.assertEqual(f.read(20), b'Too small.  Enough.')
+        f = LoopbackFile("r+", 16)
+        f.write(b"Too small.")
+        self.assertEqual(f.read(4), b"")
+        f.write(b"  ")
+        self.assertEqual(f.read(4), b"")
+        f.write(b"Enough.")
+        self.assertEqual(f.read(20), b"Too small.  Enough.")
         f.close()
 
     def test_7_read_all(self):
         """
         verify that read(-1) returns everything left in the file.
         """
-        f = LoopbackFile('r+', 16)
-        f.write(b'The first thing you need to do is open your eyes. ')
-        f.write(b'Then, you need to close them again.\n')
+        f = LoopbackFile("r+", 16)
+        f.write(b"The first thing you need to do is open your eyes. ")
+        f.write(b"Then, you need to close them again.\n")
         s = f.read(-1)
-        self.assertEqual(s, b'The first thing you need to do is open your eyes. Then, you ' +
-                            b'need to close them again.\n')
+        self.assertEqual(
+            s,
+            b"The first thing you need to do is open your eyes. Then, you "
+            + b"need to close them again.\n",
+        )
         f.close()
 
     def test_8_buffering(self):
@@ -162,19 +168,19 @@ class BufferedFileTest (unittest.TestCase):
         verify that buffered objects can be written
         """
         if sys.version_info[0] == 2:
-            f = LoopbackFile('r+', 16)
-            f.write(buffer(b'Too small.'))
+            f = LoopbackFile("r+", 16)
+            f.write(buffer(b"Too small."))
             f.close()
 
     def test_9_readable(self):
-        f = LoopbackFile('r')
+        f = LoopbackFile("r")
         self.assertTrue(f.readable())
         self.assertFalse(f.writable())
         self.assertFalse(f.seekable())
         f.close()
 
     def test_A_writable(self):
-        f = LoopbackFile('w')
+        f = LoopbackFile("w")
         self.assertTrue(f.writable())
         self.assertFalse(f.readable())
         self.assertFalse(f.seekable())
@@ -182,48 +188,49 @@ class BufferedFileTest (unittest.TestCase):
 
     def test_B_readinto(self):
         data = bytearray(5)
-        f = LoopbackFile('r+')
+        f = LoopbackFile("r+")
         f._write(b"hello")
         f.readinto(data)
-        self.assertEqual(data, b'hello')
+        self.assertEqual(data, b"hello")
         f.close()
 
     def test_write_bad_type(self):
-        with LoopbackFile('wb') as f:
+        with LoopbackFile("wb") as f:
             self.assertRaises(TypeError, f.write, object())
 
     def test_write_unicode_as_binary(self):
         text = u"\xa7 why is writing text to a binary file allowed?\n"
-        with LoopbackFile('rb+') as f:
+        with LoopbackFile("rb+") as f:
             f.write(text)
             self.assertEqual(f.read(), text.encode("utf-8"))
 
-    @needs_builtin('memoryview')
+    @needs_builtin("memoryview")
     def test_write_bytearray(self):
-        with LoopbackFile('rb+') as f:
+        with LoopbackFile("rb+") as f:
             f.write(bytearray(12))
             self.assertEqual(f.read(), 12 * b"\0")
 
-    @needs_builtin('buffer')
+    @needs_builtin("buffer")
     def test_write_buffer(self):
         data = 3 * b"pretend giant block of data\n"
         offsets = range(0, len(data), 8)
-        with LoopbackFile('rb+') as f:
+        with LoopbackFile("rb+") as f:
             for offset in offsets:
                 f.write(buffer(data, offset, 8))
             self.assertEqual(f.read(), data)
 
-    @needs_builtin('memoryview')
+    @needs_builtin("memoryview")
     def test_write_memoryview(self):
         data = 3 * b"pretend giant block of data\n"
         offsets = range(0, len(data), 8)
-        with LoopbackFile('rb+') as f:
+        with LoopbackFile("rb+") as f:
             view = memoryview(data)
             for offset in offsets:
-                f.write(view[offset:offset+8])
+                f.write(view[offset : offset + 8])
             self.assertEqual(f.read(), data)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     from unittest import main
+
     main()