use autopep8 to automatically fix (some) flake8 failures; get rid of …

…old handmade script

Signed-off-by: Giampaolo Rodola <[email protected]>

MANIFEST.in

@@ -137,7 +137,6 @@ include scripts/internal/clinter.py
 include scripts/internal/convert_readme.py
 include scripts/internal/download_wheels_appveyor.py
 include scripts/internal/download_wheels_github.py
-include scripts/internal/fix_flake8.py
 include scripts/internal/generate_manifest.py
 include scripts/internal/git_pre_commit.py
 include scripts/internal/print_access_denied.py

Makefile

@@ -10,6 +10,7 @@ TSCRIPT = psutil/tests/runner.py
 # Internal.
 DEPS = \
 	argparse \
+	autopep8 \
 	check-manifest \
 	concurrencytest \
 	coverage \
@@ -206,8 +207,8 @@ lint:  ## Run all linters
 # Fixers
 # ===================================================================
 
-fix-flake8:  ## Attempt to automatically fix some Python flake8 issues.
-	@git ls-files | grep \\.py$ | xargs $(PYTHON) -m flake8 --exit-zero | $(PYTHON) scripts/internal/fix_flake8.py
+fix-flake8:  ## Run autopep8, fix some Python flake8 / pep8 issues.
+	@git ls-files | grep \\.py$ | xargs $(PYTHON) -m autopep8 --in-place --jobs 0 --global-config=.flake8
 
 fix-imports:  ## Fix imports with isort.
 	@git ls-files '*.py' | xargs $(PYTHON) -m isort --settings=.isort.cfg

psutil/tests/test_linux.py

@@ -119,8 +119,8 @@ def get_ipv6_addresses(ifname):
             fields = line.split()
             if fields[-1] == ifname:
                 all_fields.append(fields)
-                
-        if len(all_fields) ==0:
+
+        if len(all_fields) == 0:
             raise ValueError("could not find interface %r" % ifname)
 
     for i in range(0, len(all_fields)):
@@ -956,7 +956,7 @@ def test_ips(self):
                     # of the network interface.
                     address = addr.address.split('%')[0]
                     self.assertIn(address, get_ipv6_addresses(name))
-                    
+
     # XXX - not reliable when having virtual NICs installed by Docker.
     # @unittest.skipIf(not which('ip'), "'ip' utility not available")
     # def test_net_if_names(self):