Pylint cleanup.

Signed-off-by: Chris Lalancette <[email protected]>

Author: clalancette

pycdlib/dr.py

@@ -31,7 +31,7 @@
 if False:  # pylint: disable=using-constant-test
     from typing import Any, IO, List, Optional, Tuple, Union  # NOQA pylint: disable=unused-import
     # NOTE: these imports have to be here to avoid circular deps
-    from pycdlib import headervd  # NOQA pylint: disable=unused-import
+    from pycdlib import headervd  # NOQA pylint: disable=unused-import,cyclic-import
     from pycdlib import path_table_record  # NOQA pylint: disable=unused-import
 
 

pycdlib/facade.py

@@ -25,7 +25,7 @@
 if False:  # pylint: disable=using-constant-test
     from typing import BinaryIO, Generator, Optional, Tuple  # NOQA pylint: disable=unused-import
     # NOTE: these imports have to be here to avoid circular deps
-    from pycdlib import pycdlib  # NOQA pylint: disable=unused-import
+    from pycdlib import pycdlib  # NOQA pylint: disable=unused-import,cyclic-import
     from pycdlib import pycdlibio  # NOQA pylint: disable=unused-import
 
 

pycdlib/inode.py

@@ -22,9 +22,9 @@
 if False:  # pylint: disable=using-constant-test
     from typing import Any, BinaryIO, IO, List, Optional, Tuple, Union  # NOQA pylint: disable=unused-import
     # NOTE: this import has to be here to avoid circular deps
-    from pycdlib import dr  # NOQA pylint: disable=unused-import
-    from pycdlib import eltorito  # NOQA pylint: disable=unused-import
-    from pycdlib import udf  # NOQA pylint: disable=unused-import
+    from pycdlib import dr  # NOQA pylint: disable=unused-import,cyclic-import
+    from pycdlib import eltorito  # NOQA pylint: disable=unused-import,cyclic-import
+    from pycdlib import udf  # NOQA pylint: disable=unused-import,cyclic-import
 
 
 class Inode:

pycdlib/pycdlib.py

@@ -2564,7 +2564,7 @@ def _output_file_data(self, outfp, blocksize, ino):
         outfp.seek(ino.extent_location() * self.logical_block_size)
         start_offset = outfp.tell()
         with inode.InodeOpenData(ino, self.logical_block_size) as (data_fp, data_len):
-            for len_copied in utils.copy_data_yield(data_len, blocksize, data_fp, outfp):
+            for len_copied in utils.copy_data_yield(data_len, blocksize, data_fp, outfp):  # pylint: disable=use-yield-from
                 yield len_copied
             yield utils.zero_pad(outfp, data_len, self.logical_block_size)
 
@@ -5436,7 +5436,7 @@ def list_dir(self, iso_path, joliet=False):
                 rec = self._get_rr_entry(normpath)
                 use_rr = True
 
-        for c in _yield_children(rec, use_rr):
+        for c in _yield_children(rec, use_rr):  # pylint: disable=use-yield-from
             yield c
 
     def list_children(self, **kwargs):
@@ -5487,7 +5487,7 @@ def list_children(self, **kwargs):
             else:
                 rec = self._get_iso_entry(utils.normpath(kwargs['iso_path']))
 
-            for c in _yield_children(rec, use_rr):
+            for c in _yield_children(rec, use_rr):  # pylint: disable=use-yield-from
                 yield c
 
     def get_entry(self, iso_path, joliet=False):

pycdlib/rockridge.py

@@ -27,7 +27,7 @@
 if False:  # pylint: disable=using-constant-test
     from typing import Dict, List, Optional  # NOQA pylint: disable=unused-import
     # NOTE: this has to be here to avoid circular deps
-    from pycdlib import dr  # NOQA pylint: disable=unused-import
+    from pycdlib import dr  # NOQA pylint: disable=unused-import,cyclic-import
 
 SU_ENTRY_VERSION = 1
 ALLOWED_DR_SIZE = 254

pycdlib/utils.py

@@ -26,8 +26,8 @@
 
 from pycdlib import pycdlibexception
 
+win32_has_pywin32 = False
 if sys.platform == "win32":
-    win32_has_pywin32 = False
     try:
         import win32con  # pylint: disable=import-error
         import win32file  # pylint: disable=import-error