Fix pylint warnings / cleanup (#2218)

7 files changed, 30 insertions, 24 deletions

diff --git a/scripts/internal/download_wheels_appveyor.py b/scripts/internal/download_wheels_appveyor.py
index d69ace62..dcded559 100755
--- a/scripts/internal/download_wheels_appveyor.py
+++ b/scripts/internal/download_wheels_appveyor.py
@@ -101,9 +101,9 @@ def run():
     # 2 wheels (32 and 64 bit) per supported python version
     expected = len(PY_VERSIONS) * 2
     if expected != completed:
-        return exit("expected %s files, got %s" % (expected, completed))
+        return sys.exit("expected %s files, got %s" % (expected, completed))
     if exc:
-        return exit()
+        return sys.exit()
     rename_win27_wheels()
 
 
diff --git a/scripts/internal/git_pre_commit.py b/scripts/internal/git_pre_commit.py
index 87783627..dad0066b 100755
--- a/scripts/internal/git_pre_commit.py
+++ b/scripts/internal/git_pre_commit.py
@@ -107,16 +107,16 @@ def main():
             # space at end of line
             if line.endswith(' '):
                 print("%s:%s %r" % (path, lineno, line))
-                return exit("space at end of line")
+                return sys.exit("space at end of line")
             line = line.rstrip()
             # # pdb (now provided by flake8-debugger plugin)
             # if "pdb.set_trace" in line:
             #     print("%s:%s %s" % (path, lineno, line))
-            #     return exit("you forgot a pdb in your python code")
+            #     return sys.exit("you forgot a pdb in your python code")
             # # bare except clause (now provided by flake8-blind-except plugin)
             # if "except:" in line and not line.endswith("# NOQA"):
             #     print("%s:%s %s" % (path, lineno, line))
-            #     return exit("bare except clause")
+            #     return sys.exit("bare except clause")
 
     # Python linters
     if py_files:
@@ -125,28 +125,28 @@ def main():
         cmd = "%s -m flake8 --config=.flake8 %s" % (PYTHON, " ".join(py_files))
         ret = subprocess.call(shlex.split(cmd))
         if ret != 0:
-            return exit("python code didn't pass 'flake8' style check; "
-                        "try running 'make fix-flake8'")
+            return sys.exit("python code didn't pass 'flake8' style check; "
+                            "try running 'make fix-flake8'")
         # isort
         cmd = "%s -m isort --check-only %s" % (
             PYTHON, " ".join(py_files))
         ret = subprocess.call(shlex.split(cmd))
         if ret != 0:
-            return exit("python code didn't pass 'isort' style check; "
-                        "try running 'make fix-imports'")
+            return sys.exit("python code didn't pass 'isort' style check; "
+                            "try running 'make fix-imports'")
     # C linter
     if c_files:
         # XXX: we should escape spaces and possibly other amenities here
         cmd = "%s scripts/internal/clinter.py %s" % (PYTHON, " ".join(c_files))
         ret = subprocess.call(cmd, shell=True)
         if ret != 0:
-            return exit("C code didn't pass style check")
+            return sys.exit("C code didn't pass style check")
     if new_rm_mv:
         out = sh("%s scripts/internal/generate_manifest.py" % PYTHON)
         with open_text('MANIFEST.in') as f:
             if out.strip() != f.read().strip():
-                exit("some files were added, deleted or renamed; "
-                     "run 'make generate-manifest' and commit again")
+                sys.exit("some files were added, deleted or renamed; "
+                         "run 'make generate-manifest' and commit again")
 
 
 main()
diff --git a/scripts/internal/print_announce.py b/scripts/internal/print_announce.py
index c2113f36..510dc15f 100755
--- a/scripts/internal/print_announce.py
+++ b/scripts/internal/print_announce.py
@@ -89,7 +89,7 @@ def get_changes():
             break
     lines.pop(0)
 
-    for i, line in enumerate(lines):
+    for line in lines:
         line = lines.pop(0)
         line = line.rstrip()
         if re.match(r"^- \d+_", line):
diff --git a/scripts/internal/print_dist.py b/scripts/internal/print_dist.py
index 492bed1c..978e50e2 100755
--- a/scripts/internal/print_dist.py
+++ b/scripts/internal/print_dist.py
@@ -98,7 +98,7 @@ def main():
         elif path.endswith(".tar.gz"):
             pkg = Tarball(path)
         else:
-            raise ValueError("invalid package %r", path)
+            raise ValueError("invalid package %r" % path)
         groups[pkg.platform()].append(pkg)
 
     tot_files = 0
diff --git a/scripts/internal/winmake.py b/scripts/internal/winmake.py
index 466887c2..16de3908 100755
--- a/scripts/internal/winmake.py
+++ b/scripts/internal/winmake.py
@@ -82,7 +82,7 @@ DEFAULT_COLOR = 7
 # ===================================================================
 
 
-def safe_print(text, file=sys.stdout, flush=False):
+def safe_print(text, file=sys.stdout):
     """Prints a (unicode) string to the console, encoded depending on
     the stdout/file encoding (eg. cp437 on Windows). This is to avoid
     encoding errors in case of funky path names.
@@ -228,7 +228,7 @@ def build():
     # order to allow "import psutil" when using the interactive interpreter
     # from within psutil root directory.
     cmd = [PYTHON, "setup.py", "build_ext", "-i"]
-    if sys.version_info[:2] >= (3, 6) and os.cpu_count() or 1 > 1:
+    if sys.version_info[:2] >= (3, 6) and (os.cpu_count() or 1) > 1:
         cmd += ['--parallel', str(os.cpu_count())]
     # Print coloured warnings in real time.
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
@@ -547,8 +547,7 @@ def get_python(path):
             return pypath
 
 
-def main():
-    global PYTHON
+def parse_args():
     parser = argparse.ArgumentParser()
     # option shared by all commands
     parser.add_argument(
@@ -587,8 +586,19 @@ def main():
 
     for p in (test, test_by_name):
         p.add_argument('arg', type=str, nargs='?', default="", help="arg")
+
     args = parser.parse_args()
 
+    if not args.command or args.command == 'help':
+        parser.print_help(sys.stderr)
+        sys.exit(1)
+
+    return args
+
+
+def main():
+    global PYTHON
+    args = parse_args()
     # set python exe
     PYTHON = get_python(args.python)
     if not PYTHON:
@@ -597,10 +607,6 @@ def main():
     os.putenv('PYTHON', PYTHON)
     win_colorprint("using " + PYTHON)
 
-    if not args.command or args.command == 'help':
-        parser.print_help(sys.stderr)
-        sys.exit(1)
-
     fname = args.command.replace('-', '_')
     fun = getattr(sys.modules[__name__], fname)  # err if fun not defined
     funargs = []
diff --git a/scripts/iotop.py b/scripts/iotop.py
index f4d62d46..07ae2fa3 100755
--- a/scripts/iotop.py
+++ b/scripts/iotop.py
@@ -71,7 +71,7 @@ def poll(interval):
     sorted by IO activity and total disks I/O activity.
     """
     # first get a list of all processes and disk io counters
-    procs = [p for p in psutil.process_iter()]
+    procs = list(psutil.process_iter())
     for p in procs[:]:
         try:
             p._before = p.io_counters()
diff --git a/scripts/procinfo.py b/scripts/procinfo.py
index 743a1777..fd44c83e 100755
--- a/scripts/procinfo.py
+++ b/scripts/procinfo.py
@@ -316,7 +316,7 @@ def run(pid, verbose=False):
             print_("", template % (bytes2human(region.rss), region.path))
 
 
-def main(argv=None):
+def main():
     parser = argparse.ArgumentParser(
         description="print information about a process")
     parser.add_argument("pid", type=int, help="process pid", nargs='?')