Automatically sort imports (isort CLI tool) (#2033)

15 files changed, 45 insertions, 15 deletions

diff --git a/scripts/internal/bench_oneshot.py b/scripts/internal/bench_oneshot.py
index 436bdd6b..60595876 100755
--- a/scripts/internal/bench_oneshot.py
+++ b/scripts/internal/bench_oneshot.py
@@ -10,10 +10,12 @@ Process.oneshot() ctx manager.
 See: https://github.com/giampaolo/psutil/issues/799
 """
 
-from __future__ import print_function, division
+from __future__ import division
+from __future__ import print_function
+
 import sys
-import timeit
 import textwrap
+import timeit
 
 import psutil
 
diff --git a/scripts/internal/bench_oneshot_2.py b/scripts/internal/bench_oneshot_2.py
index 3867391b..051d0036 100755
--- a/scripts/internal/bench_oneshot_2.py
+++ b/scripts/internal/bench_oneshot_2.py
@@ -12,9 +12,9 @@ supposed to be more precise.
 import sys
 
 import pyperf  # requires "pip install pyperf"
+from bench_oneshot import names
 
 import psutil
-from bench_oneshot import names
 
 
 p = psutil.Process()
diff --git a/scripts/internal/check_broken_links.py b/scripts/internal/check_broken_links.py
index e66448fd..1a076116 100755
--- a/scripts/internal/check_broken_links.py
+++ b/scripts/internal/check_broken_links.py
@@ -40,6 +40,7 @@ Author: Himanshu Shekhar <https://github.com/himanshub16> (2017)
 """
 
 from __future__ import print_function
+
 import concurrent.futures
 import functools
 import os
diff --git a/scripts/internal/clinter.py b/scripts/internal/clinter.py
index fde1a3f2..384951da 100755
--- a/scripts/internal/clinter.py
+++ b/scripts/internal/clinter.py
@@ -7,6 +7,7 @@
 """A super simple linter to check C syntax."""
 
 from __future__ import print_function
+
 import argparse
 import sys
 
diff --git a/scripts/internal/convert_readme.py b/scripts/internal/convert_readme.py
index d6cae918..cca7dcb0 100755
--- a/scripts/internal/convert_readme.py
+++ b/scripts/internal/convert_readme.py
@@ -11,6 +11,7 @@ Convert README.rst format to make it compatible with PyPI (no raw html).
 import re
 import sys
 
+
 summary = """\
 Quick links
 ===========
diff --git a/scripts/internal/download_wheels_appveyor.py b/scripts/internal/download_wheels_appveyor.py
index 5e633d52..e4d6ffc0 100755
--- a/scripts/internal/download_wheels_appveyor.py
+++ b/scripts/internal/download_wheels_appveyor.py
@@ -13,11 +13,13 @@ http://code.saghul.net/index.php/2015/09/09/
 """
 
 from __future__ import print_function
+
 import concurrent.futures
 import os
-import requests
 import sys
 
+import requests
+
 from psutil import __version__ as PSUTIL_VERSION
 from psutil._common import bytes2human
 from psutil._common import print_color
diff --git a/scripts/internal/download_wheels_github.py b/scripts/internal/download_wheels_github.py
index a344ec49..00f57116 100755
--- a/scripts/internal/download_wheels_github.py
+++ b/scripts/internal/download_wheels_github.py
@@ -18,10 +18,11 @@ https://developer.github.com/v3/actions/artifacts/
 import argparse
 import json
 import os
-import requests
 import sys
 import zipfile
 
+import requests
+
 from psutil import __version__ as PSUTIL_VERSION
 from psutil._common import bytes2human
 from psutil.tests import safe_rmpath
diff --git a/scripts/internal/fix_flake8.py b/scripts/internal/fix_flake8.py
index 7cde608b..14fbb4d2 100755
--- a/scripts/internal/fix_flake8.py
+++ b/scripts/internal/fix_flake8.py
@@ -11,9 +11,9 @@ an error/warning. Usage (from the root dir):
     $ python3 -m flake8 --exit-zero | python3 scripts/fix_flake8.py
 """
 
+import shutil
 import sys
 import tempfile
-import shutil
 from collections import defaultdict
 from collections import namedtuple
 from pprint import pprint as pp  # NOQA
diff --git a/scripts/internal/git_pre_commit.py b/scripts/internal/git_pre_commit.py
index 2ec4303d..92bc0f0a 100755
--- a/scripts/internal/git_pre_commit.py
+++ b/scripts/internal/git_pre_commit.py
@@ -20,6 +20,7 @@ Install this with "make install-git-hooks".
 """
 
 from __future__ import print_function
+
 import os
 import subprocess
 import sys
@@ -115,14 +116,26 @@ def main():
                 print("%s:%s %s" % (path, lineno, line))
                 return exit("bare except clause")
 
-    # Python linter
+    # Python linters
     if py_files:
+        # Flake8
         assert os.path.exists('.flake8')
         # XXX: we should escape spaces and possibly other amenities here
         cmd = "%s -m flake8 --config=.flake8 %s" % (PYTHON, " ".join(py_files))
         ret = subprocess.call(cmd, shell=True)
         if ret != 0:
-            return exit("python code is not flake8 compliant")
+            return exit("python code is not flake8 compliant; "
+                        "try running 'make fix-flake8'")
+
+        # isort
+        assert os.path.exists('.isort.cfg')
+        cmd = "%s -m isort --settings=.isort.cfg --check-only %s" % (
+            PYTHON, " ".join(py_files))
+        ret = subprocess.call(cmd, shell=True)
+        if ret != 0:
+            return exit("python code is not flake8 compliant; "
+                        "try running 'make fix-imports'")
+
     # C linter
     if c_files:
         # XXX: we should escape spaces and possibly other amenities here
diff --git a/scripts/internal/print_access_denied.py b/scripts/internal/print_access_denied.py
index 81d192f0..f3d0166e 100755
--- a/scripts/internal/print_access_denied.py
+++ b/scripts/internal/print_access_denied.py
@@ -45,9 +45,11 @@ open_files           238     71.3%   ACCESS DENIED
 Totals: access-denied=1744, calls=10020, processes=334
 """
 
-from __future__ import print_function, division
-from collections import defaultdict
+from __future__ import division
+from __future__ import print_function
+
 import time
+from collections import defaultdict
 
 import psutil
 from psutil._common import print_color
diff --git a/scripts/internal/print_api_speed.py b/scripts/internal/print_api_speed.py
index e39a1baa..ee2e3254 100755
--- a/scripts/internal/print_api_speed.py
+++ b/scripts/internal/print_api_speed.py
@@ -25,10 +25,12 @@ ionice                    0.000013
 ...
 """
 
-from __future__ import print_function, division
-from timeit import default_timer as timer
+from __future__ import division
+from __future__ import print_function
+
 import inspect
 import os
+from timeit import default_timer as timer
 
 import psutil
 from psutil._common import print_color
diff --git a/scripts/internal/print_downloads.py b/scripts/internal/print_downloads.py
index 7e5c4631..b6df3b38 100755
--- a/scripts/internal/print_downloads.py
+++ b/scripts/internal/print_downloads.py
@@ -13,6 +13,7 @@ Useful sites:
 """
 
 from __future__ import print_function
+
 import json
 import os
 import subprocess
diff --git a/scripts/internal/print_wheels.py b/scripts/internal/print_wheels.py
index d13a6aa7..5e5faccd 100755
--- a/scripts/internal/print_wheels.py
+++ b/scripts/internal/print_wheels.py
@@ -10,8 +10,8 @@ import collections
 import glob
 import os
 
-from psutil._common import print_color
 from psutil._common import bytes2human
+from psutil._common import print_color
 
 
 class Wheel:
diff --git a/scripts/internal/tidelift.py b/scripts/internal/tidelift.py
index fcba3e61..9470fc85 100755
--- a/scripts/internal/tidelift.py
+++ b/scripts/internal/tidelift.py
@@ -10,8 +10,11 @@ Put your Tidelift API token in a file first:
 """
 
 from __future__ import print_function
+
 import os
+
 import requests
+
 import psutil
 from psutil.tests import import_module_by_path
 
diff --git a/scripts/internal/winmake.py b/scripts/internal/winmake.py
index 933951a2..4452ef09 100755
--- a/scripts/internal/winmake.py
+++ b/scripts/internal/winmake.py
@@ -12,6 +12,7 @@ that they should be deemed illegal!
 """
 
 from __future__ import print_function
+
 import argparse
 import atexit
 import ctypes
@@ -378,7 +379,7 @@ def setup_dev_env():
     sh("%s -m pip install -U %s" % (PYTHON, " ".join(DEPS)))
 
 
-def lint():
+def check_flake8():
     """Run flake8 against all py files"""
     py_files = subprocess.check_output("git ls-files")
     if PY3:
@@ -560,7 +561,7 @@ def main():
     sp.add_parser('install', help="build + install in develop/edit mode")
     sp.add_parser('install-git-hooks', help="install GIT pre-commit hook")
     sp.add_parser('install-pip', help="install pip")
-    sp.add_parser('lint', help="run flake8 against all py files")
+    sp.add_parser('check_flake8', help="run flake8 against all py files")
     sp.add_parser('print-access-denied', help="print AD exceptions")
     sp.add_parser('print-api-speed', help="benchmark all API calls")
     sp.add_parser('setup-dev-env', help="install deps")