Fix several pylint warnings

PeterFeicht · PeterFeicht · commit d4a0f2ad8ce7 · 2018-09-23T18:54:52.000+02:00
This fixes some pylint warnings such as unused variables or imports, and
suppresses a few others (unused imports in test scripts).
diff --git a/commands/preprocess.py b/commands/preprocess.py
@@ -116,7 +116,7 @@ def find_files_to_be_renamed(root):
                                 # consistent and short file names because we
                                 # modify some of them later in the pipeline
 
-    for dir, dirnames, filenames in os.walk(root):
+    for dir, _, filenames in os.walk(root):
         filenames_loader = set(fnmatch.filter(filenames, 'load.php[?]*'))
         # match any filenames with '?"*' characters
         filenames_rename = set(fnmatch.filter(filenames, '*[?"*]*'))
@@ -129,15 +129,15 @@ def find_files_to_be_renamed(root):
         for fn in filenames_rename:
             files_rename.append((dir, fn))
 
-    for dir,orig_fn in files_rename:
+    for dir, orig_fn in files_rename:
         fn = orig_fn
         fn = re.sub(r'\?.*', '', fn)
         fn = fn.replace('"', '_q_')
         fn = fn.replace('*', '_star_')
         add_file_to_rename_map(rename_map, dir, orig_fn, fn)
 
     # map loader names to more recognizable names
-    for dir,fn in files_loader:
+    for dir, fn in files_loader:
         new_fn = convert_loader_name(fn)
         add_file_to_rename_map(rename_map, dir, fn, new_fn)
 
@@ -157,7 +157,7 @@ def rename_files(rename_map):
 def find_html_files(root):
     # find files that need to be preprocessed
     html_files = []
-    for dir, dirnames, filenames in os.walk(root):
+    for dir, _, filenames in os.walk(root):
         for filename in fnmatch.filter(filenames, '*.html'):
             html_files.append(os.path.join(dir, filename))
     return html_files
@@ -210,7 +210,7 @@ def is_external_link(target):
 
 def trasform_relative_link(rename_map, target):
     target = urllib.parse.unquote(target)
-    for dir,fn,new_fn in rename_map:
+    for _, fn, new_fn in rename_map:
         target = target.replace(fn, new_fn)
     target = target.replace('../../upload.cppreference.com/mwiki/','../common/')
     target = target.replace('../mwiki/','../common/')
diff --git a/preprocess.py b/preprocess.py
@@ -17,7 +17,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see http://www.gnu.org/licenses/.
 
-from commands.preprocess import *
+from commands import preprocess
 import argparse
 import os
 import shutil
@@ -32,17 +32,17 @@ def main():
     src = args.src
 
     # copy the source tree
-    rmtree_if_exists(root)
+    preprocess.rmtree_if_exists(root)
     shutil.copytree(src, root)
 
-    rearrange_archive(root)
+    preprocess.rearrange_archive(root)
 
-    rename_map = find_files_to_be_renamed(root)
-    rename_files(rename_map)
+    rename_map = preprocess.find_files_to_be_renamed(root)
+    preprocess.rename_files(rename_map)
 
     # clean the html files
-    for fn in find_html_files(root):
-        preprocess_html_file(root, fn, rename_map)
+    for fn in preprocess.find_html_files(root):
+        preprocess.preprocess_html_file(root, fn, rename_map)
 
     # append css modifications
     with open(os.path.join(root, 'common/site_modules.css'), "a") as out:
@@ -53,7 +53,7 @@ def main():
 
     for fn in [ os.path.join(root, 'common/site_modules.css'),
                 os.path.join(root, 'common/ext.css') ]:
-        preprocess_css_file(fn)
+        preprocess.preprocess_css_file(fn)
 
 if __name__ == "__main__":
     main()
diff --git a/preprocess_qch.py b/preprocess_qch.py
@@ -17,7 +17,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see http://www.gnu.org/licenses/.
 
-from commands.preprocess_cssless import *
+from commands import preprocess_cssless
 import argparse
 import concurrent.futures
 import os
@@ -41,7 +41,7 @@ def main():
         shutil.rmtree(dest_root)
 
     paths_list = []
-    for root, dirs, files in os.walk(source_root):
+    for root, _, files in os.walk(source_root):
         for file in files:
             if file.endswith(".html"):
                 src_path = os.path.join(root, file)
@@ -51,13 +51,11 @@ def main():
                 paths_list.append(tuple)
 
     with concurrent.futures.ProcessPoolExecutor() as executor:
-        futures = [ (executor.submit(preprocess_html_merge_cssless,
-                                     src_path, dst_path), i)
+        futures = [ (executor.submit(preprocess_cssless.preprocess_html_merge_cssless, src_path, dst_path), i)
                     for i, (src_path, dst_path) in enumerate(paths_list) ]
 
         for future, i in futures:
-            print('Processing file: {}/{}: {}'.format(i, len(paths_list),
-                                                      paths_list[i][1]))
+            print('Processing file: {}/{}: {}'.format(i, len(paths_list), paths_list[i][1]))
             output = future.result()
             if verbose:
                 print(output)
diff --git a/tests/test_devhelp.py b/tests/test_devhelp.py
@@ -16,7 +16,7 @@
 #   along with this program.  If not, see http://www.gnu.org/licenses/.
 
 import os
-from index_transform.devhelp import *
+from index_transform.devhelp import * #pylint: disable=unused-wildcard-import
 import unittest
 
 class TestTransformDevhelp(unittest.TestCase):
diff --git a/tests/test_devhelp_qch.py b/tests/test_devhelp_qch.py
@@ -18,7 +18,7 @@
 from lxml import etree
 import os
 import unittest
-from index_transform.devhelp_qch import *
+from index_transform.devhelp_qch import * #pylint: disable=unused-wildcard-import
 
 class TestConvertDevhelpToQch(unittest.TestCase):
     def test_convert_devhelp_to_qch(self):
diff --git a/tests/test_preprocess.py b/tests/test_preprocess.py
@@ -18,7 +18,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see http://www.gnu.org/licenses/.
 
-from commands.preprocess import *
+from commands.preprocess import * #pylint: disable=unused-wildcard-import
 import io
 import os
 import unittest
diff --git a/tests/test_preprocess_cssless.py b/tests/test_preprocess_cssless.py
@@ -17,7 +17,7 @@
 
 import os
 import unittest
-from commands.preprocess_cssless import *
+from commands.preprocess_cssless import * #pylint: disable=unused-wildcard-import
 
 class TestPreprocessHtmlMergeCss(unittest.TestCase):
     def test_preprocess_html_merge_cssless(self):
