Fix lint errors

Author: rhpvorderman

tests/test_gzip_compliance.py

@@ -32,8 +32,6 @@
 
 from isal import igzip
 
-import pytest
-
 data1 = b"""  int length=DEFAULTALLOC, err = Z_OK;
   PyObject *RetVal;
   int flushmode = Z_FINISH;
@@ -46,7 +44,6 @@
 /* See http://www.winimage.com/zLibDll for Windows */
 """
 
-
 TEMPDIR = os.path.abspath(tempfile.mkdtemp(suffix='-gzdir'))
 
 
@@ -76,10 +73,10 @@ def tearDown(self):
 class TestGzip(BaseTest):
     def write_and_read_back(self, data, mode='b'):
         b_data = bytes(data)
-        with igzip.IGzipFile(self.filename, 'w'+mode) as f:
-            l = f.write(data)
-        self.assertEqual(l, len(b_data))
-        with igzip.IGzipFile(self.filename, 'r'+mode) as f:
+        with igzip.IGzipFile(self.filename, 'w' + mode) as f:
+            length = f.write(data)
+        self.assertEqual(length, len(b_data))
+        with igzip.IGzipFile(self.filename, 'r' + mode) as f:
             self.assertEqual(f.read(), b_data)
 
     def test_write(self):
@@ -114,7 +111,7 @@ def test_write_read_with_pathlike_file(self):
     def test_write_memoryview(self):
         self.write_and_read_back(memoryview(data1 * 50))
         m = memoryview(bytes(range(256)))
-        data = m.cast('B', shape=[8,8,4])
+        data = m.cast('B', shape=[8, 8, 4])
         self.write_and_read_back(data)
 
     def test_write_bytearray(self):
@@ -141,7 +138,7 @@ def test_read(self):
         # Try reading.
         with igzip.IGzipFile(self.filename, 'r') as f:
             d = f.read()
-        self.assertEqual(d, data1*50)
+        self.assertEqual(d, data1 * 50)
 
     def test_read1(self):
         self.test_write()
@@ -202,7 +199,7 @@ def test_append(self):
 
         with igzip.IGzipFile(self.filename, 'rb') as f:
             d = f.read()
-        self.assertEqual(d, (data1*50) + (data2*15))
+        self.assertEqual(d, (data1 * 50) + (data2 * 15))
 
     def test_many_append(self):
         # Bug #1074261 was triggered when reading a file that contained
@@ -211,7 +208,7 @@ def test_many_append(self):
         with igzip.IGzipFile(self.filename, 'wb') as f:
             f.write(b'a')
         for i in range(0, 200):
-            with igzip.IGzipFile(self.filename, "ab") as f: # append
+            with igzip.IGzipFile(self.filename, "ab") as f:  # append
                 f.write(b'a')
 
         # Try reading the file
@@ -220,8 +217,9 @@ def test_many_append(self):
             while 1:
                 ztxt = zgfile.read(8192)
                 contents += ztxt
-                if not ztxt: break
-        self.assertEqual(contents, b'a'*201)
+                if not ztxt:
+                    break
+        self.assertEqual(contents, b'a' * 201)
 
     def test_exclusive_write(self):
         with igzip.IGzipFile(self.filename, 'xb') as f:
@@ -250,7 +248,8 @@ def test_readline(self):
             line_length = 0
             while 1:
                 L = f.readline(line_length)
-                if not L and line_length != 0: break
+                if not L and line_length != 0:
+                    break
                 self.assertTrue(len(L) <= line_length)
                 line_length = (line_length + 1) % 50
 
@@ -264,7 +263,8 @@ def test_readlines(self):
         with igzip.IGzipFile(self.filename, 'rb') as f:
             while 1:
                 L = f.readlines(150)
-                if L == []: break
+                if L == []:
+                    break
 
     def test_seek_read(self):
         self.test_write()
@@ -274,10 +274,11 @@ def test_seek_read(self):
             while 1:
                 oldpos = f.tell()
                 line1 = f.readline()
-                if not line1: break
+                if not line1:
+                    break
                 newpos = f.tell()
                 f.seek(oldpos)  # negative seek
-                if len(line1)>10:
+                if len(line1) > 10:
                     amount = 10
                 else:
                     amount = len(line1)
@@ -324,7 +325,7 @@ def test_paddedfile_getattr(self):
 
     def test_mtime(self):
         mtime = 123456789
-        with igzip.IGzipFile(self.filename, 'w', mtime = mtime) as fWrite:
+        with igzip.IGzipFile(self.filename, 'w', mtime=mtime) as fWrite:
             fWrite.write(data1)
         with igzip.IGzipFile(self.filename) as fRead:
             self.assertTrue(hasattr(fRead, 'mtime'))
@@ -336,22 +337,22 @@ def test_mtime(self):
     def test_metadata(self):
         mtime = 123456789
 
-        with igzip.IGzipFile(self.filename, 'w', mtime = mtime) as fWrite:
+        with igzip.IGzipFile(self.filename, 'w', mtime=mtime) as fWrite:
             fWrite.write(data1)
 
         with open(self.filename, 'rb') as fRead:
             # see RFC 1952: http://www.faqs.org/rfcs/rfc1952.html
 
             idBytes = fRead.read(2)
-            self.assertEqual(idBytes, b'\x1f\x8b') # igzip ID
+            self.assertEqual(idBytes, b'\x1f\x8b')  # igzip ID
 
             cmByte = fRead.read(1)
-            self.assertEqual(cmByte, b'\x08') # deflate
+            self.assertEqual(cmByte, b'\x08')  # deflate
 
             try:
                 expectedname = os.path.basename(self.filename).encode(
                     'Latin-1') + b'\x00'
-                expectedflags = b'\x08' # only the FNAME flag is set
+                expectedflags = b'\x08'  # only the FNAME flag is set
             except UnicodeEncodeError:
                 expectedname = b''
                 expectedflags = b'\x00'
@@ -360,26 +361,28 @@ def test_metadata(self):
             self.assertEqual(flagsByte, expectedflags)
 
             mtimeBytes = fRead.read(4)
-            self.assertEqual(mtimeBytes, struct.pack('<i', mtime)) # little-endian
+            self.assertEqual(mtimeBytes,
+                             struct.pack('<i', mtime))  # little-endian
 
             xflByte = fRead.read(1)
-            self.assertEqual(xflByte, b'\x02') # maximum compression
+            self.assertEqual(xflByte, b'\x02')  # maximum compression
 
             osByte = fRead.read(1)
-            self.assertEqual(osByte, b'\xff') # OS "unknown" (OS-independent)
+            self.assertEqual(osByte, b'\xff')  # OS "unknown" (OS-independent)
 
-            # Since the FNAME flag is set, the zero-terminated filename follows.
-            # RFC 1952 specifies that this is the name of the input file, if any.
-            # However, the igzip module defaults to storing the name of the output
-            # file in this field.
+            # Since the FNAME flag is set, the zero-terminated filename
+            # follows. RFC 1952 specifies that this is the name of the input
+            # file, if any. However, the gzip module defaults to storing the
+            # name of the output file in this field.
             nameBytes = fRead.read(len(expectedname))
             self.assertEqual(nameBytes, expectedname)
 
             # Since no other flags were set, the header ends here.
-            # Rather than process the compressed data, let's seek to the trailer.
+            # Rather than process the compressed data, let's seek to the
+            # trailer.
             fRead.seek(os.stat(self.filename).st_size - 8)
 
-            crc32Bytes = fRead.read(4) # CRC32 of uncompressed data [data1]
+            crc32Bytes = fRead.read(4)  # CRC32 of uncompressed data [data1]
             self.assertEqual(crc32Bytes, b'\xaf\xd7d\x83')
 
             isizeBytes = fRead.read(4)
@@ -401,11 +404,12 @@ def test_compresslevel_metadata(self):
 
         for (name, level, expectedXflByte) in cases:
             major, minor, _, _, _ = sys.version_info
-            if major == 3 and minor <=7 or major < 3:
+            if major == 3 and minor <= 7 or major < 3:
                 # Specific xfl bytes introduced in 3.7
                 expectedXflByte = b'\x02'
             with self.subTest(name):
-                fWrite = igzip.IGzipFile(self.filename, 'w', compresslevel=level)
+                fWrite = igzip.IGzipFile(self.filename, 'w',
+                                         compresslevel=level)
                 with fWrite:
                     fWrite.write(data1)
                 with open(self.filename, 'rb') as fRead:
@@ -428,7 +432,7 @@ def test_with_open(self):
             self.fail("__enter__ on a closed file didn't raise an exception")
         try:
             with igzip.IGzipFile(self.filename, "wb") as f:
-                1/0
+                1 / 0
         except ZeroDivisionError:
             pass
         else:
@@ -510,7 +514,7 @@ def test_fileobj_from_fdopen(self):
         # fileobj created with os.fdopen().
         fd = os.open(self.filename, os.O_WRONLY | os.O_CREAT)
         with os.fdopen(fd, "wb") as f:
-            with igzip.IGzipFile(fileobj=f, mode="w") as g:
+            with igzip.IGzipFile(fileobj=f, mode="w"):
                 pass
 
     def test_fileobj_mode(self):
@@ -567,7 +571,7 @@ def test_decompress_limited(self):
         self.assertEqual(decomp.read(1), b'\0')
         max_decomp = 1 + io.DEFAULT_BUFFER_SIZE
         self.assertLessEqual(decomp._buffer.raw.tell(), max_decomp,
-            "Excessive amount of data was decompressed")
+                             "Excessive amount of data was decompressed")
 
     # Testing compress/decompress shortcut functions
 
@@ -576,7 +580,8 @@ def test_compress(self):
             for args in [(), (1,), (2,), (3,), (0,)]:
                 datac = igzip.compress(data, *args)
                 self.assertEqual(type(datac), bytes)
-                with igzip.IGzipFile(fileobj=io.BytesIO(datac), mode="rb") as f:
+                with igzip.IGzipFile(fileobj=io.BytesIO(datac),
+                                     mode="rb") as f:
                     self.assertEqual(f.read(), data)
 
     def test_compress_mtime(self):
@@ -586,8 +591,9 @@ def test_compress_mtime(self):
                 with self.subTest(data=data, args=args):
                     datac = igzip.compress(data, *args, mtime=mtime)
                     self.assertEqual(type(datac), bytes)
-                    with igzip.IGzipFile(fileobj=io.BytesIO(datac), mode="rb") as f:
-                        f.read(1) # to set mtime attribute
+                    with igzip.IGzipFile(fileobj=io.BytesIO(datac),
+                                         mode="rb") as f:
+                        f.read(1)  # to set mtime attribute
                         self.assertEqual(f.mtime, mtime)
 
     def test_decompress(self):
@@ -601,7 +607,7 @@ def test_decompress(self):
             self.assertEqual(igzip.decompress(datac), data)
 
     def test_read_truncated(self):
-        data = data1*50
+        data = data1 * 50
         # Drop the CRC (4 bytes) and file size (4 bytes).
         truncated = igzip.compress(data)[:-8]
         with igzip.IGzipFile(fileobj=io.BytesIO(truncated)) as f:
@@ -629,6 +635,7 @@ def test_prepend_error(self):
         with igzip.open(self.filename, "rb") as f:
             f._buffer.raw._fp.prepend()
 
+
 class TestOpen(BaseTest):
     def test_binary_modes(self):
         uncompressed = data1 * 50
@@ -752,8 +759,8 @@ def test_encoding_error_handler(self):
         # Test with non-default encoding error handler.
         with igzip.open(self.filename, "wb") as f:
             f.write(b"foo\xffbar")
-        with igzip.open(self.filename, "rt", encoding="ascii", errors="ignore") \
-                as f:
+        with igzip.open(self.filename, "rt", encoding="ascii",
+                        errors="ignore") as f:
             self.assertEqual(f.read(), "foobar")
 
     def test_newline(self):
@@ -774,7 +781,9 @@ def wrapper(*args, **kwargs):
                 return function(*args, **kwargs)
             finally:
                 shutil.rmtree(directory)
+
         return wrapper
+
     return decorator
 
 
@@ -811,7 +820,8 @@ def test_decompress_infile_outfile(self):
         self.assertEqual(err, b'')
 
     def test_decompress_infile_outfile_error(self):
-        rc, out, err = assert_python_ok('-m', 'isal.igzip', '-d', 'thisisatest.out')
+        rc, out, err = assert_python_ok('-m', 'isal.igzip', '-d',
+                                        'thisisatest.out')
         self.assertIn(b"filename doesn't end in .gz:", out)
         self.assertEqual(rc, 0)
         self.assertEqual(err, b'')
@@ -851,7 +861,9 @@ def test_compress_infile_outfile(self):
                 with open(local_testigzip, 'wb') as fp:
                     fp.write(self.data)
 
-                rc, out, err = assert_python_ok('-m', 'isal.igzip', compress_level, local_testigzip)
+                rc, out, err = assert_python_ok('-m', 'isal.igzip',
+                                                compress_level,
+                                                local_testigzip)
 
                 self.assertTrue(os.path.exists(igzipname))
                 self.assertEqual(out, b'')
@@ -860,13 +872,20 @@ def test_compress_infile_outfile(self):
                 self.assertFalse(os.path.exists(igzipname))
 
     def test_compress_fast_best_are_exclusive(self):
-        rc, out, err = assert_python_failure('-m', 'isal.igzip', '--fast', '--best')
-        self.assertIn(b"error: argument -3/--best: not allowed with argument -0/--fast", err)
+        rc, out, err = assert_python_failure('-m', 'isal.igzip', '--fast',
+                                             '--best')
+        self.assertIn(
+            b"error: argument -3/--best: not allowed with argument -0/--fast",
+            err)
         self.assertEqual(out, b'')
 
     def test_decompress_cannot_have_flags_compression(self):
-        rc, out, err = assert_python_failure('-m', 'isal.igzip', '--fast', '-d')
-        self.assertIn(b'error: argument -d/--decompress: not allowed with argument -0/--fast', err)
+        rc, out, err = assert_python_failure('-m', 'isal.igzip', '--fast',
+                                             '-d')
+        self.assertIn(
+            b'error: argument -d/--decompress: not allowed with argument '
+            b'-0/--fast',
+            err)
         self.assertEqual(out, b'')