summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Sassoulas <pierre.sassoulas@gmail.com>2019-03-09 11:22:36 +0100
committerClaudiu Popa <pcmanticore@gmail.com>2019-03-20 09:07:35 +0100
commit5ab140ac3b3dda6f32e0f73aeec09abf015ea30f (patch)
treee0f633c7e63f7e0183c676c4d9e94d7986309b88
parenta422e9750843f3b41a6919b9a5fa2c7d54593394 (diff)
downloadpylint-git-5ab140ac3b3dda6f32e0f73aeec09abf015ea30f.tar.gz
Style - Apply isort on all apllicable files
-rwxr-xr-xbin/epylint1
-rwxr-xr-xbin/pylint1
-rwxr-xr-xbin/pyreverse1
-rwxr-xr-xbin/symilar1
-rw-r--r--doc/conf.py15
-rwxr-xr-xdoc/exts/pylint_extensions.py1
-rwxr-xr-xdoc/exts/pylint_features.py1
-rw-r--r--examples/custom.py2
-rw-r--r--examples/custom_raw.py4
-rw-r--r--pylint/checkers/__init__.py2
-rw-r--r--pylint/checkers/async.py7
-rw-r--r--pylint/checkers/base.py9
-rw-r--r--pylint/checkers/classes.py31
-rw-r--r--pylint/checkers/design_analysis.py10
-rw-r--r--pylint/checkers/exceptions.py3
-rw-r--r--pylint/checkers/format.py4
-rw-r--r--pylint/checkers/imports.py18
-rw-r--r--pylint/checkers/logging.py4
-rw-r--r--pylint/checkers/misc.py7
-rw-r--r--pylint/checkers/newstyle.py4
-rw-r--r--pylint/checkers/python3.py9
-rw-r--r--pylint/checkers/raw_metrics.py4
-rw-r--r--pylint/checkers/refactoring.py7
-rw-r--r--pylint/checkers/similar.py5
-rw-r--r--pylint/checkers/spelling.py9
-rw-r--r--pylint/checkers/stdlib.py5
-rw-r--r--pylint/checkers/strings.py8
-rw-r--r--pylint/checkers/typecheck.py29
-rw-r--r--pylint/checkers/utils.py10
-rw-r--r--pylint/checkers/variables.py16
-rw-r--r--pylint/config.py22
-rwxr-xr-xpylint/epylint.py4
-rw-r--r--pylint/extensions/bad_builtin.py2
-rw-r--r--pylint/extensions/check_elif.py3
-rw-r--r--pylint/extensions/comparetozero.py3
-rw-r--r--pylint/extensions/docparams.py6
-rw-r--r--pylint/extensions/docstyle.py2
-rw-r--r--pylint/extensions/emptystring.py3
-rw-r--r--pylint/extensions/mccabe.py7
-rw-r--r--pylint/extensions/overlapping_exceptions.py4
-rw-r--r--pylint/extensions/redefined_variable_type.py2
-rw-r--r--pylint/graph.py4
-rw-r--r--pylint/lint.py26
-rw-r--r--pylint/message/__init__.py4
-rw-r--r--pylint/message/message_handler_mix_in.py4
-rw-r--r--pylint/pyreverse/diadefslib.py2
-rw-r--r--pylint/pyreverse/diagrams.py3
-rw-r--r--pylint/pyreverse/inspector.py7
-rw-r--r--pylint/pyreverse/main.py4
-rw-r--r--pylint/pyreverse/writer.py2
-rw-r--r--pylint/reporters/__init__.py3
-rw-r--r--pylint/reporters/text.py5
-rw-r--r--pylint/reporters/ureports/__init__.py1
-rw-r--r--pylint/reporters/ureports/text_writer.py1
-rw-r--r--pylint/test/conftest.py2
-rw-r--r--pylint/test/extensions/data/docstring.py1
-rw-r--r--pylint/test/extensions/test_bad_builtin.py1
-rw-r--r--pylint/test/extensions/test_check_docs.py7
-rw-r--r--pylint/test/extensions/test_check_docs_utils.py5
-rw-r--r--pylint/test/extensions/test_check_raise_docs.py4
-rw-r--r--pylint/test/extensions/test_check_return_docs.py4
-rw-r--r--pylint/test/extensions/test_check_yields_docs.py4
-rw-r--r--pylint/test/extensions/test_docstyle.py1
-rw-r--r--pylint/test/extensions/test_emptystring.py1
-rw-r--r--pylint/test/extensions/test_overlapping_exceptions.py6
-rw-r--r--pylint/test/extensions/test_redefined.py1
-rw-r--r--pylint/test/test_func.py4
-rw-r--r--pylint/test/test_functional.py11
-rw-r--r--pylint/test/test_import_graph.py5
-rw-r--r--pylint/test/test_regr.py5
-rw-r--r--pylint/test/test_self.py15
-rw-r--r--pylint/test/unittest_checker_base.py1
-rw-r--r--pylint/test/unittest_checker_classes.py1
-rw-r--r--pylint/test/unittest_checker_format.py9
-rw-r--r--pylint/test/unittest_checker_imports.py3
-rw-r--r--pylint/test/unittest_checker_misc.py2
-rw-r--r--pylint/test/unittest_checker_python3.py6
-rw-r--r--pylint/test/unittest_checker_similar.py4
-rw-r--r--pylint/test/unittest_checker_spelling.py5
-rw-r--r--pylint/test/unittest_checker_stdlib.py2
-rw-r--r--pylint/test/unittest_checker_strings.py1
-rw-r--r--pylint/test/unittest_checker_typecheck.py3
-rw-r--r--pylint/test/unittest_checker_variables.py4
-rw-r--r--pylint/test/unittest_checkers_utils.py2
-rw-r--r--pylint/test/unittest_config.py2
-rw-r--r--pylint/test/unittest_pyreverse_diadefs.py6
-rw-r--r--pylint/test/unittest_pyreverse_inspector.py6
-rw-r--r--pylint/test/unittest_pyreverse_writer.py7
-rw-r--r--pylint/test/unittest_reporters_json.py3
-rw-r--r--pylint/test/unittest_reporting.py8
-rw-r--r--pylint/test/utils/unittest_utils.py2
-rw-r--r--pylint/testutils.py12
-rw-r--r--pylint/utils/__init__.py2
-rw-r--r--pylint/utils/file_state.py1
-rw-r--r--pylint/utils/utils.py3
-rw-r--r--setup.py10
96 files changed, 245 insertions, 289 deletions
diff --git a/bin/epylint b/bin/epylint
index 4aad65703..a55adf4c3 100755
--- a/bin/epylint
+++ b/bin/epylint
@@ -1,3 +1,4 @@
#!/usr/bin/env python
from pylint import epylint
+
epylint.Run()
diff --git a/bin/pylint b/bin/pylint
index e3e520f0c..162e96d40 100755
--- a/bin/pylint
+++ b/bin/pylint
@@ -1,3 +1,4 @@
#!/usr/bin/env python
from pylint import run_pylint
+
run_pylint()
diff --git a/bin/pyreverse b/bin/pyreverse
index 71269e769..d0b080dfc 100755
--- a/bin/pyreverse
+++ b/bin/pyreverse
@@ -1,3 +1,4 @@
#!/usr/bin/env python
from pylint import run_pyreverse
+
run_pyreverse()
diff --git a/bin/symilar b/bin/symilar
index ef9446247..7125d1f91 100755
--- a/bin/symilar
+++ b/bin/symilar
@@ -1,3 +1,4 @@
#!/usr/bin/env python
from pylint import run_symilar
+
run_symilar()
diff --git a/doc/conf.py b/doc/conf.py
index ada9ec493..16bfb7eb9 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -11,10 +11,17 @@
# All configuration values have a default; values that are commented out
# serve to show the default.
-import sys
import os
+import sys
from datetime import datetime
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+from pylint.__pkginfo__ import version
+
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -51,12 +58,6 @@ project = 'Pylint'
current_year = datetime.utcnow().year
copyright = '2003-{year}, Logilab, PyCQA and contributors'.format(year=current_year)
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-from pylint.__pkginfo__ import version
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/doc/exts/pylint_extensions.py b/doc/exts/pylint_extensions.py
index e6b1eb46f..2e1d82163 100755
--- a/doc/exts/pylint_extensions.py
+++ b/doc/exts/pylint_extensions.py
@@ -13,7 +13,6 @@ import sphinx
from pylint.lint import PyLinter
-
# Some modules have been renamed and deprecated under their old names.
# Skip documenting these modules since:
# 1) They are deprecated, why document them moving forward?
diff --git a/doc/exts/pylint_features.py b/doc/exts/pylint_features.py
index fcb2d10e1..2ff0e52a7 100755
--- a/doc/exts/pylint_features.py
+++ b/doc/exts/pylint_features.py
@@ -11,6 +11,7 @@ import sphinx
from pylint.lint import PyLinter
+
def builder_inited(app):
# PACKAGE/docs/exts/pylint_extensions.py --> PACKAGE/
base_path = os.path.dirname(
diff --git a/examples/custom.py b/examples/custom.py
index 54c2937b1..039b018b8 100644
--- a/examples/custom.py
+++ b/examples/custom.py
@@ -1,7 +1,7 @@
import astroid
-from pylint.interfaces import IAstroidChecker
from pylint.checkers import BaseChecker
+from pylint.interfaces import IAstroidChecker
# This is our checker class.
diff --git a/examples/custom_raw.py b/examples/custom_raw.py
index a86666724..fb28d4931 100644
--- a/examples/custom_raw.py
+++ b/examples/custom_raw.py
@@ -1,5 +1,6 @@
-from pylint.interfaces import IRawChecker
from pylint.checkers import BaseChecker
+from pylint.interfaces import IRawChecker
+
class MyRawChecker(BaseChecker):
"""check for line continuations with '\' instead of using triple
@@ -31,4 +32,3 @@ class MyRawChecker(BaseChecker):
def register(linter):
"""required method to auto register this checker"""
linter.register_checker(MyRawChecker(linter))
-
diff --git a/pylint/checkers/__init__.py b/pylint/checkers/__init__.py
index 1a4c0009f..f745037bc 100644
--- a/pylint/checkers/__init__.py
+++ b/pylint/checkers/__init__.py
@@ -45,9 +45,9 @@ import warnings
from typing import Any
from pylint.config import OptionsProviderMixIn
+from pylint.interfaces import UNDEFINED
from pylint.reporters import diff_string
from pylint.utils import register_plugins
-from pylint.interfaces import UNDEFINED
def table_lines_from_stats(stats, old_stats, columns):
diff --git a/pylint/checkers/async.py b/pylint/checkers/async.py
index 21feba035..c33071e84 100644
--- a/pylint/checkers/async.py
+++ b/pylint/checkers/async.py
@@ -9,13 +9,10 @@
import sys
import astroid
-from astroid import bases
-from astroid import exceptions
+from astroid import bases, exceptions
-from pylint import checkers
+from pylint import checkers, interfaces, utils
from pylint.checkers import utils as checker_utils
-from pylint import interfaces
-from pylint import utils
from pylint.checkers.utils import decorated_with
diff --git a/pylint/checkers/base.py b/pylint/checkers/base.py
index e2e35f3dd..bce4ae7fd 100644
--- a/pylint/checkers/base.py
+++ b/pylint/checkers/base.py
@@ -40,22 +40,19 @@
import builtins
import collections
import itertools
-import sys
import re
+import sys
from typing import Pattern
import astroid
import astroid.bases
import astroid.scoped_nodes
-from pylint import checkers
-from pylint import exceptions
-from pylint import interfaces
+import pylint.utils as lint_utils
+from pylint import checkers, exceptions, interfaces, reporters
from pylint.checkers import utils
-from pylint import reporters
from pylint.checkers.utils import get_node_last_lineno
from pylint.reporters.ureports import nodes as reporter_nodes
-import pylint.utils as lint_utils
class NamingStyle:
diff --git a/pylint/checkers/classes.py b/pylint/checkers/classes.py
index 543b27ecf..d75107136 100644
--- a/pylint/checkers/classes.py
+++ b/pylint/checkers/classes.py
@@ -32,38 +32,37 @@
from __future__ import generators
import collections
-from itertools import chain, zip_longest
import sys
+from itertools import chain, zip_longest
import astroid
-from astroid.bases import Generator, BUILTINS
-from astroid.exceptions import InconsistentMroError, DuplicateBasesError
-from astroid import decorators
-from astroid import objects
+from astroid import decorators, objects
+from astroid.bases import BUILTINS, Generator
+from astroid.exceptions import DuplicateBasesError, InconsistentMroError
from astroid.scoped_nodes import function_to_method
-from pylint.interfaces import IAstroidChecker
+
from pylint.checkers import BaseChecker
from pylint.checkers.utils import (
PYMETHODS,
SPECIAL_METHODS_PARAMS,
- overrides_a_method,
check_messages,
+ class_is_abstract,
+ decorated_with,
+ decorated_with_property,
+ has_known_bases,
is_attr_private,
is_attr_protected,
- node_frame_class,
is_builtin_object,
- decorated_with_property,
- unimplemented_abstract_methods,
- decorated_with,
- class_is_abstract,
- safe_infer,
- has_known_bases,
- is_iterable,
is_comprehension,
+ is_iterable,
+ node_frame_class,
+ overrides_a_method,
+ safe_infer,
+ unimplemented_abstract_methods,
)
+from pylint.interfaces import IAstroidChecker
from pylint.utils import get_global_option
-
if sys.version_info >= (3, 0):
NEXT_METHOD = "__next__"
else:
diff --git a/pylint/checkers/design_analysis.py b/pylint/checkers/design_analysis.py
index e9f0a0470..b6fd9913c 100644
--- a/pylint/checkers/design_analysis.py
+++ b/pylint/checkers/design_analysis.py
@@ -17,18 +17,16 @@
"""check for signs of poor design"""
-from collections import defaultdict
import re
+from collections import defaultdict
import astroid
-from astroid import If, BoolOp
-from astroid import decorators
+from astroid import BoolOp, If, decorators
-from pylint.interfaces import IAstroidChecker
+from pylint import utils
from pylint.checkers import BaseChecker
from pylint.checkers.utils import check_messages
-from pylint import utils
-
+from pylint.interfaces import IAstroidChecker
MSGS = {
"R0901": (
diff --git a/pylint/checkers/exceptions.py b/pylint/checkers/exceptions.py
index c43af53af..6521a5bd5 100644
--- a/pylint/checkers/exceptions.py
+++ b/pylint/checkers/exceptions.py
@@ -29,9 +29,8 @@ import typing
import astroid
-from pylint import checkers
+from pylint import checkers, interfaces
from pylint.checkers import utils
-from pylint import interfaces
def _builtin_exceptions():
diff --git a/pylint/checkers/format.py b/pylint/checkers/format.py
index d1aa8e91b..84b6b273e 100644
--- a/pylint/checkers/format.py
+++ b/pylint/checkers/format.py
@@ -50,10 +50,10 @@ from functools import reduce # pylint: disable=redefined-builtin
from astroid import nodes
-from pylint.interfaces import ITokenChecker, IAstroidChecker, IRawChecker
from pylint.checkers import BaseTokenChecker
from pylint.checkers.utils import check_messages
-from pylint.utils import WarningScope, OPTION_RGX
+from pylint.interfaces import IAstroidChecker, IRawChecker, ITokenChecker
+from pylint.utils import OPTION_RGX, WarningScope
_ASYNC_TOKEN = "async"
_CONTINUATION_BLOCK_OPENERS = [
diff --git a/pylint/checkers/imports.py b/pylint/checkers/imports.py
index 07ae01fec..82ef94a07 100644
--- a/pylint/checkers/imports.py
+++ b/pylint/checkers/imports.py
@@ -30,27 +30,27 @@
"""imports checkers for Python code"""
import collections
-from distutils import sysconfig
+import copy
import os
import sys
-import copy
+from distutils import sysconfig
import astroid
+import isort
from astroid import are_exclusive, decorators
from astroid.modutils import get_module_part, is_standard_module
-import isort
-from pylint.interfaces import IAstroidChecker
-from pylint.utils import get_global_option
-from pylint.exceptions import EmptyReportError
from pylint.checkers import BaseChecker
from pylint.checkers.utils import (
check_messages,
- node_ignores_exception,
is_from_fallback_block,
+ node_ignores_exception,
)
-from pylint.graph import get_cycles, DotBackend
-from pylint.reporters.ureports.nodes import VerbatimText, Paragraph
+from pylint.exceptions import EmptyReportError
+from pylint.graph import DotBackend, get_cycles
+from pylint.interfaces import IAstroidChecker
+from pylint.reporters.ureports.nodes import Paragraph, VerbatimText
+from pylint.utils import get_global_option
def _qualified_names(modname):
diff --git a/pylint/checkers/logging.py b/pylint/checkers/logging.py
index 13646cdce..7d8dd5b69 100644
--- a/pylint/checkers/logging.py
+++ b/pylint/checkers/logging.py
@@ -21,12 +21,10 @@ import string
import astroid
-from pylint import checkers
-from pylint import interfaces
+from pylint import checkers, interfaces
from pylint.checkers import utils
from pylint.checkers.utils import check_messages
-
MSGS = {
"W1201": (
"Specify string format arguments as logging function parameters",
diff --git a/pylint/checkers/misc.py b/pylint/checkers/misc.py
index 26dc0a3df..d12c2639e 100644
--- a/pylint/checkers/misc.py
+++ b/pylint/checkers/misc.py
@@ -20,14 +20,13 @@
# pylint: disable=W0511
-import tokenize
-
import re
+import tokenize
-from pylint.interfaces import IRawChecker, ITokenChecker
from pylint.checkers import BaseChecker
-from pylint.utils import OPTION_RGX
+from pylint.interfaces import IRawChecker, ITokenChecker
from pylint.message import MessagesHandlerMixIn
+from pylint.utils import OPTION_RGX
class ByIdManagedMessagesChecker(BaseChecker):
diff --git a/pylint/checkers/newstyle.py b/pylint/checkers/newstyle.py
index 89d31653b..97e2fcb65 100644
--- a/pylint/checkers/newstyle.py
+++ b/pylint/checkers/newstyle.py
@@ -17,9 +17,9 @@ import sys
import astroid
-from pylint.interfaces import IAstroidChecker
from pylint.checkers import BaseChecker
-from pylint.checkers.utils import check_messages, node_frame_class, has_known_bases
+from pylint.checkers.utils import check_messages, has_known_bases, node_frame_class
+from pylint.interfaces import IAstroidChecker
MSGS = {
"E1003": (
diff --git a/pylint/checkers/python3.py b/pylint/checkers/python3.py
index d577c918c..43025d0c8 100644
--- a/pylint/checkers/python3.py
+++ b/pylint/checkers/python3.py
@@ -26,21 +26,20 @@
"""Check Python 2 code for Python 2/3 source-compatible issues."""
from __future__ import absolute_import, print_function
-from collections import namedtuple
import re
import sys
import tokenize
+from collections import namedtuple
from typing import FrozenSet
import astroid
from astroid import bases
from pylint import checkers, interfaces
-from pylint.checkers.utils import node_ignores_exception, find_try_except_wrapper_node
-from pylint.interfaces import INFERENCE_FAILURE, INFERENCE
-from pylint.utils import WarningScope
from pylint.checkers import utils
-
+from pylint.checkers.utils import find_try_except_wrapper_node, node_ignores_exception
+from pylint.interfaces import INFERENCE, INFERENCE_FAILURE
+from pylint.utils import WarningScope
_ZERO = re.compile("^0+$")
diff --git a/pylint/checkers/raw_metrics.py b/pylint/checkers/raw_metrics.py
index 7ab165675..49ee2fa2f 100644
--- a/pylint/checkers/raw_metrics.py
+++ b/pylint/checkers/raw_metrics.py
@@ -18,9 +18,9 @@ Raw metrics checker
import tokenize
from typing import Any
-from pylint.interfaces import ITokenChecker
-from pylint.exceptions import EmptyReportError
from pylint.checkers import BaseTokenChecker
+from pylint.exceptions import EmptyReportError
+from pylint.interfaces import ITokenChecker
from pylint.reporters import diff_string
from pylint.reporters.ureports.nodes import Table
diff --git a/pylint/checkers/refactoring.py b/pylint/checkers/refactoring.py
index 6a349c067..cab521aaa 100644
--- a/pylint/checkers/refactoring.py
+++ b/pylint/checkers/refactoring.py
@@ -22,21 +22,18 @@
"""Looks for code which can be refactored."""
import builtins
-from functools import reduce
-
import collections
import itertools
import tokenize
+from functools import reduce
import astroid
from astroid import decorators
-from pylint import interfaces
-from pylint import checkers
+from pylint import checkers, interfaces
from pylint import utils as lint_utils
from pylint.checkers import utils
-
KNOWN_INFINITE_ITERATORS = {"itertools.count"}
diff --git a/pylint/checkers/similar.py b/pylint/checkers/similar.py
index 2e45ce9c6..d79785d66 100644
--- a/pylint/checkers/similar.py
+++ b/pylint/checkers/similar.py
@@ -18,16 +18,17 @@
"""
from __future__ import print_function
+
import sys
from collections import defaultdict
from itertools import groupby
import astroid
-from pylint.utils import decoding_stream
-from pylint.interfaces import IRawChecker
from pylint.checkers import BaseChecker, table_lines_from_stats
+from pylint.interfaces import IRawChecker
from pylint.reporters.ureports.nodes import Table
+from pylint.utils import decoding_stream
class Similar:
diff --git a/pylint/checkers/spelling.py b/pylint/checkers/spelling.py
index df99f6b3e..f1952e89f 100644
--- a/pylint/checkers/spelling.py
+++ b/pylint/checkers/spelling.py
@@ -19,8 +19,12 @@
"""
import os
-import tokenize
import re
+import tokenize
+
+from pylint.checkers import BaseTokenChecker
+from pylint.checkers.utils import check_messages
+from pylint.interfaces import IAstroidChecker, ITokenChecker
try:
import enchant
@@ -43,9 +47,6 @@ except ImportError:
pass
-from pylint.interfaces import ITokenChecker, IAstroidChecker
-from pylint.checkers import BaseTokenChecker
-from pylint.checkers.utils import check_messages
if enchant is not None:
br = enchant.Broker()
diff --git a/pylint/checkers/stdlib.py b/pylint/checkers/stdlib.py
index 7dad31d28..778ea98df 100644
--- a/pylint/checkers/stdlib.py
+++ b/pylint/checkers/stdlib.py
@@ -26,10 +26,9 @@ import sys
import astroid
from astroid.bases import Instance
from astroid.node_classes import Const
-from pylint.interfaces import IAstroidChecker
-from pylint.checkers import BaseChecker
-from pylint.checkers import utils
+from pylint.checkers import BaseChecker, utils
+from pylint.interfaces import IAstroidChecker
OPEN_FILES = {"open", "file"}
UNITTEST_CASE = "unittest.case"
diff --git a/pylint/checkers/strings.py b/pylint/checkers/strings.py
index d7caf85a1..9b22e5244 100644
--- a/pylint/checkers/strings.py
+++ b/pylint/checkers/strings.py
@@ -23,18 +23,18 @@
"""
import builtins
+import numbers
import sys
import tokenize
-import numbers
from collections import Counter
import astroid
from astroid.arguments import CallSite
from astroid.node_classes import Const
-from pylint.interfaces import ITokenChecker, IAstroidChecker, IRawChecker
-from pylint.checkers import BaseChecker, BaseTokenChecker
-from pylint.checkers import utils
+
+from pylint.checkers import BaseChecker, BaseTokenChecker, utils
from pylint.checkers.utils import check_messages
+from pylint.interfaces import IAstroidChecker, IRawChecker, ITokenChecker
_AST_NODE_STR_TYPES = ("__builtin__.unicode", "__builtin__.str", "builtins.str")
diff --git a/pylint/checkers/typecheck.py b/pylint/checkers/typecheck.py
index 417662b87..fa95d7cc4 100644
--- a/pylint/checkers/typecheck.py
+++ b/pylint/checkers/typecheck.py
@@ -47,35 +47,32 @@ import types
from functools import singledispatch
import astroid
-import astroid.context
import astroid.arguments
+import astroid.context
import astroid.nodes
-from astroid import exceptions, decorators
+from astroid import bases, decorators, exceptions, modutils, objects
from astroid.interpreter import dunder_lookup
-from astroid import objects
-from astroid import bases
-from astroid import modutils
-from pylint.interfaces import IAstroidChecker, INFERENCE
from pylint.checkers import BaseChecker
from pylint.checkers.utils import (
- is_super,
check_messages,
- decorated_with_property,
decorated_with,
- node_ignores_exception,
- is_iterable,
- is_mapping,
- supports_membership_test,
+ decorated_with_property,
+ has_known_bases,
+ is_builtin_object,
is_comprehension,
is_inside_abstract_class,
+ is_iterable,
+ is_mapping,
+ is_super,
+ node_ignores_exception,
+ safe_infer,
+ supports_delitem,
supports_getitem,
+ supports_membership_test,
supports_setitem,
- supports_delitem,
- safe_infer,
- has_known_bases,
- is_builtin_object,
)
+from pylint.interfaces import INFERENCE, IAstroidChecker
from pylint.utils import get_global_option
BUILTINS = builtins.__name__
diff --git a/pylint/checkers/utils.py b/pylint/checkers/utils.py
index dbbba49b0..38dca2a38 100644
--- a/pylint/checkers/utils.py
+++ b/pylint/checkers/utils.py
@@ -30,20 +30,20 @@
"""some functions that may be useful for various checkers
"""
import builtins
-from functools import lru_cache, partial
import itertools
import numbers
import re
-import sys
import string
-from typing import Optional, Iterable, Tuple, Callable, Set, Union, Match, Dict, List
-import _string # pylint: disable=wrong-import-position, wrong-import-order
+import sys
+from functools import lru_cache, partial
+from typing import Callable, Dict, Iterable, List, Match, Optional, Set, Tuple, Union
import astroid
-from astroid.exceptions import _NonDeducibleTypeHierarchy
from astroid import bases as _bases
from astroid import scoped_nodes
+from astroid.exceptions import _NonDeducibleTypeHierarchy
+import _string # pylint: disable=wrong-import-position, wrong-import-order
BUILTINS_NAME = builtins.__name__
COMP_NODE_TYPES = (
diff --git a/pylint/checkers/variables.py b/pylint/checkers/variables.py
index 85de92aaa..02974a19a 100644
--- a/pylint/checkers/variables.py
+++ b/pylint/checkers/variables.py
@@ -34,26 +34,22 @@
"""variables checkers for Python code
"""
+import collections
import copy
-from functools import lru_cache
import itertools
-import collections
import os
-import sys
import re
+import sys
+from functools import lru_cache
import astroid
-from astroid import decorators
-from astroid import modutils
-from astroid import objects
+from astroid import decorators, modutils, objects
from astroid.context import InferenceContext
+from pylint.checkers import BaseChecker, utils
from pylint.checkers.utils import is_postponed_evaluation_enabled
-from pylint.interfaces import IAstroidChecker, INFERENCE, INFERENCE_FAILURE, HIGH
+from pylint.interfaces import HIGH, INFERENCE, INFERENCE_FAILURE, IAstroidChecker
from pylint.utils import get_global_option
-from pylint.checkers import BaseChecker
-from pylint.checkers import utils
-
SPECIAL_OBJ = re.compile("^_{2}[a-z]+_{2}$")
FUTURE = "__future__"
diff --git a/pylint/config.py b/pylint/config.py
index 0477c7914..a913f8619 100644
--- a/pylint/config.py
+++ b/pylint/config.py
@@ -35,15 +35,9 @@
"""
from __future__ import print_function
-# TODO(cpopa): this module contains the logic for the
-# configuration parser and for the command line parser,
-# but it's really coupled to optparse's internals.
-# The code was copied almost verbatim from logilab.common,
-# in order to not depend on it anymore and it will definitely
-# need a cleanup. It could be completely reengineered as well.
-
-import contextlib
import collections
+import configparser
+import contextlib
import copy
import io
import optparse
@@ -53,10 +47,18 @@ import re
import sys
import time
-import configparser
-
from pylint import utils
+# TODO(cpopa): this module contains the logic for the
+# configuration parser and for the command line parser,
+# but it's really coupled to optparse's internals.
+# The code was copied almost verbatim from logilab.common,
+# in order to not depend on it anymore and it will definitely
+# need a cleanup. It could be completely reengineered as well.
+
+
+
+
USER_HOME = os.path.expanduser("~")
if "PYLINTHOME" in os.environ:
diff --git a/pylint/epylint.py b/pylint/epylint.py
index 50c3a99f9..c2d4a21d8 100755
--- a/pylint/epylint.py
+++ b/pylint/epylint.py
@@ -56,10 +56,10 @@ from __future__ import print_function
import os
import os.path as osp
-import sys
import shlex
-from subprocess import Popen, PIPE
+import sys
from io import StringIO
+from subprocess import PIPE, Popen
def _get_env():
diff --git a/pylint/extensions/bad_builtin.py b/pylint/extensions/bad_builtin.py
index 2609d3168..f5533b836 100644
--- a/pylint/extensions/bad_builtin.py
+++ b/pylint/extensions/bad_builtin.py
@@ -7,11 +7,11 @@
import sys
import astroid
+
from pylint.checkers import BaseChecker
from pylint.checkers.utils import check_messages
from pylint.interfaces import IAstroidChecker
-
BAD_FUNCTIONS = ["map", "filter"]
if sys.version_info < (3, 0):
BAD_FUNCTIONS.append("input")
diff --git a/pylint/extensions/check_elif.py b/pylint/extensions/check_elif.py
index 9ef0b3fa3..67555b16a 100644
--- a/pylint/extensions/check_elif.py
+++ b/pylint/extensions/check_elif.py
@@ -8,9 +8,10 @@
# For details: https://github.com/PyCQA/pylint/blob/master/COPYING
import astroid
+
from pylint.checkers import BaseTokenChecker
from pylint.checkers.utils import check_messages
-from pylint.interfaces import ITokenChecker, IAstroidChecker
+from pylint.interfaces import IAstroidChecker, ITokenChecker
class ElseifUsedChecker(BaseTokenChecker):
diff --git a/pylint/extensions/comparetozero.py b/pylint/extensions/comparetozero.py
index 92063ab18..e31f48875 100644
--- a/pylint/extensions/comparetozero.py
+++ b/pylint/extensions/comparetozero.py
@@ -11,8 +11,7 @@ import itertools
import astroid
-from pylint import interfaces
-from pylint import checkers
+from pylint import checkers, interfaces
from pylint.checkers import utils
diff --git a/pylint/extensions/docparams.py b/pylint/extensions/docparams.py
index 771d64c04..939e2a3fa 100644
--- a/pylint/extensions/docparams.py
+++ b/pylint/extensions/docparams.py
@@ -16,14 +16,14 @@
"""Pylint plugin for checking in Sphinx, Google, or Numpy style docstrings
"""
-from __future__ import print_function, division, absolute_import
+from __future__ import absolute_import, division, print_function
import astroid
-from pylint.interfaces import IAstroidChecker
+import pylint.extensions._check_docs_utils as utils
from pylint.checkers import BaseChecker
from pylint.checkers import utils as checker_utils
-import pylint.extensions._check_docs_utils as utils
+from pylint.interfaces import IAstroidChecker
class DocstringParameterChecker(BaseChecker):
diff --git a/pylint/extensions/docstyle.py b/pylint/extensions/docstyle.py
index 1f50a414e..36f506fcf 100644
--- a/pylint/extensions/docstyle.py
+++ b/pylint/extensions/docstyle.py
@@ -9,8 +9,8 @@
import linecache
from pylint import checkers
-from pylint.interfaces import IAstroidChecker, HIGH
from pylint.checkers.utils import check_messages
+from pylint.interfaces import HIGH, IAstroidChecker
class DocStringStyleChecker(checkers.BaseChecker):
diff --git a/pylint/extensions/emptystring.py b/pylint/extensions/emptystring.py
index ddca8f7d5..04021d504 100644
--- a/pylint/extensions/emptystring.py
+++ b/pylint/extensions/emptystring.py
@@ -11,8 +11,7 @@ import itertools
import astroid
-from pylint import interfaces
-from pylint import checkers
+from pylint import checkers, interfaces
from pylint.checkers import utils
diff --git a/pylint/extensions/mccabe.py b/pylint/extensions/mccabe.py
index 41eca280f..69bc1775b 100644
--- a/pylint/extensions/mccabe.py
+++ b/pylint/extensions/mccabe.py
@@ -9,10 +9,9 @@
from __future__ import absolute_import
-from mccabe import (
- PathGraph as Mccabe_PathGraph,
- PathGraphingAstVisitor as Mccabe_PathGraphingAstVisitor,
-)
+from mccabe import PathGraph as Mccabe_PathGraph
+from mccabe import PathGraphingAstVisitor as Mccabe_PathGraphingAstVisitor
+
from pylint import checkers
from pylint.checkers.utils import check_messages
from pylint.interfaces import HIGH, IAstroidChecker
diff --git a/pylint/extensions/overlapping_exceptions.py b/pylint/extensions/overlapping_exceptions.py
index 3b1454cae..be2208c9b 100644
--- a/pylint/extensions/overlapping_exceptions.py
+++ b/pylint/extensions/overlapping_exceptions.py
@@ -7,10 +7,8 @@
import astroid
-from pylint import interfaces
-from pylint import checkers
+from pylint import checkers, interfaces
from pylint.checkers import utils
-
from pylint.checkers.exceptions import _annotated_unpack_infer
diff --git a/pylint/extensions/redefined_variable_type.py b/pylint/extensions/redefined_variable_type.py
index a58f04e2d..cfe4754c9 100644
--- a/pylint/extensions/redefined_variable_type.py
+++ b/pylint/extensions/redefined_variable_type.py
@@ -8,11 +8,11 @@
# For details: https://github.com/PyCQA/pylint/blob/master/COPYING
import astroid
+
from pylint.checkers import BaseChecker
from pylint.checkers.utils import check_messages, is_none, node_type
from pylint.interfaces import IAstroidChecker
-
BUILTINS = "builtins"
diff --git a/pylint/graph.py b/pylint/graph.py
index f7790dae8..3eb480227 100644
--- a/pylint/graph.py
+++ b/pylint/graph.py
@@ -11,11 +11,11 @@
(dot generation adapted from pypy/translator/tool/make_dot.py)
"""
-import os.path as osp
+import codecs
import os
+import os.path as osp
import sys
import tempfile
-import codecs
def target_info_from_filename(filename):
diff --git a/pylint/lint.py b/pylint/lint.py
index c012c0b29..d02410fa0 100644
--- a/pylint/lint.py
+++ b/pylint/lint.py
@@ -62,31 +62,29 @@ from __future__ import print_function
import collections
import contextlib
-from io import TextIOWrapper
import operator
import os
-
-try:
- import multiprocessing
-except ImportError:
- multiprocessing = None # type: ignore
import sys
import tokenize
import warnings
+from io import TextIOWrapper
import astroid
+from astroid import modutils
from astroid.__pkginfo__ import version as astroid_version
from astroid.builder import AstroidBuilder
-from astroid import modutils
-from pylint import checkers
-from pylint import interfaces
-from pylint import reporters
-from pylint.message import MessagesStore, Message, MSG_TYPES, MessagesHandlerMixIn
-from pylint.utils import FileState, ASTWalker, ReportsHandlerMixIn, OPTION_RGX, utils
-from pylint import exceptions
-from pylint import config
+
+from pylint import checkers, config, exceptions, interfaces, reporters
from pylint.__pkginfo__ import version
+from pylint.message import MSG_TYPES, Message, MessagesHandlerMixIn, MessagesStore
from pylint.reporters.ureports import nodes as report_nodes
+from pylint.utils import OPTION_RGX, ASTWalker, FileState, ReportsHandlerMixIn, utils
+
+try:
+ import multiprocessing
+except ImportError:
+ multiprocessing = None # type: ignore
+
MANAGER = astroid.MANAGER
diff --git a/pylint/message/__init__.py b/pylint/message/__init__.py
index 694e2eb13..4b71f57b9 100644
--- a/pylint/message/__init__.py
+++ b/pylint/message/__init__.py
@@ -39,16 +39,16 @@
"""All the classes related to Message handling."""
+from pylint.message.build_message_definition import build_message_def
from pylint.message.constants import (
- MSG_STATE_CONFIDENCE,
_SCOPE_EXEMPT,
+ MSG_STATE_CONFIDENCE,
MSG_STATE_SCOPE_CONFIG,
MSG_STATE_SCOPE_MODULE,
MSG_TYPES,
MSG_TYPES_LONG,
MSG_TYPES_STATUS,
)
-from pylint.message.build_message_definition import build_message_def
from pylint.message.message import Message
from pylint.message.message_definition import MessageDefinition
from pylint.message.message_handler_mix_in import MessagesHandlerMixIn
diff --git a/pylint/message/message_handler_mix_in.py b/pylint/message/message_handler_mix_in.py
index d01be8ff3..7336979c2 100644
--- a/pylint/message/message_handler_mix_in.py
+++ b/pylint/message/message_handler_mix_in.py
@@ -10,6 +10,7 @@ from inspect import cleandoc
from pylint.exceptions import InvalidMessageError, UnknownMessageError
from pylint.interfaces import UNDEFINED
+from pylint.message.build_message_definition import build_message_def
from pylint.message.constants import (
_MSG_ORDER,
_SCOPE_EXEMPT,
@@ -20,14 +21,13 @@ from pylint.message.constants import (
MSG_TYPES_STATUS,
)
from pylint.message.message import Message
-from pylint.utils.warning_scope import WarningScope
-from pylint.message.build_message_definition import build_message_def
from pylint.utils.utils import (
_format_option_value,
category_id,
get_module_and_frameid,
normalize_text,
)
+from pylint.utils.warning_scope import WarningScope
def _rest_format_section(stream, section, options, doc=None):
diff --git a/pylint/pyreverse/diadefslib.py b/pylint/pyreverse/diadefslib.py
index e64614fc7..de4e9fd4a 100644
--- a/pylint/pyreverse/diadefslib.py
+++ b/pylint/pyreverse/diadefslib.py
@@ -19,7 +19,7 @@
import astroid
-from pylint.pyreverse.diagrams import PackageDiagram, ClassDiagram
+from pylint.pyreverse.diagrams import ClassDiagram, PackageDiagram
from pylint.pyreverse.utils import LocalsVisitor
BUILTINS_NAME = "builtins"
diff --git a/pylint/pyreverse/diagrams.py b/pylint/pyreverse/diagrams.py
index afd7ffee4..b53b845c2 100644
--- a/pylint/pyreverse/diagrams.py
+++ b/pylint/pyreverse/diagrams.py
@@ -12,8 +12,9 @@
"""
import astroid
-from pylint.pyreverse.utils import is_interface, FilterMixIn
+
from pylint.checkers.utils import decorated_with_property
+from pylint.pyreverse.utils import FilterMixIn, is_interface
class Figure:
diff --git a/pylint/pyreverse/inspector.py b/pylint/pyreverse/inspector.py
index eca4b67aa..b4df388be 100644
--- a/pylint/pyreverse/inspector.py
+++ b/pylint/pyreverse/inspector.py
@@ -18,12 +18,7 @@ import os
import traceback
import astroid
-from astroid import bases
-from astroid import exceptions
-from astroid import manager
-from astroid import modutils
-from astroid import node_classes
-
+from astroid import bases, exceptions, manager, modutils, node_classes
from pylint.pyreverse import utils
diff --git a/pylint/pyreverse/main.py b/pylint/pyreverse/main.py
index 2be7c486d..8d30eacba 100644
--- a/pylint/pyreverse/main.py
+++ b/pylint/pyreverse/main.py
@@ -20,9 +20,9 @@ import subprocess
import sys
from pylint.config import ConfigurationMixIn
-from pylint.pyreverse.inspector import Linker, project_from_files
-from pylint.pyreverse.diadefslib import DiadefsHandler
from pylint.pyreverse import writer
+from pylint.pyreverse.diadefslib import DiadefsHandler
+from pylint.pyreverse.inspector import Linker, project_from_files
from pylint.pyreverse.utils import insert_default_options
OPTIONS = (
diff --git a/pylint/pyreverse/writer.py b/pylint/pyreverse/writer.py
index c97ba9bf5..609b1efcd 100644
--- a/pylint/pyreverse/writer.py
+++ b/pylint/pyreverse/writer.py
@@ -13,9 +13,9 @@
"""Utilities for creating VCG and Dot diagrams"""
+from pylint.graph import DotBackend
from pylint.pyreverse.utils import is_exception
from pylint.pyreverse.vcgutils import VCGPrinter
-from pylint.graph import DotBackend
class DiagramWriter:
diff --git a/pylint/reporters/__init__.py b/pylint/reporters/__init__.py
index c09ebdd0c..98b0364a2 100644
--- a/pylint/reporters/__init__.py
+++ b/pylint/reporters/__init__.py
@@ -19,12 +19,11 @@
"""utilities methods and classes for reporters"""
from __future__ import print_function
-import sys
import locale
import os
+import sys
import warnings
-
CMPS = ["=", "-", "+"]
# py3k has no more cmp builtin
diff --git a/pylint/reporters/text.py b/pylint/reporters/text.py
index 4c682ae05..6af8706d0 100644
--- a/pylint/reporters/text.py
+++ b/pylint/reporters/text.py
@@ -21,15 +21,14 @@
from __future__ import print_function
import os
-import warnings
import sys
+import warnings
+from pylint import utils
from pylint.interfaces import IReporter
from pylint.reporters import BaseReporter
-from pylint import utils
from pylint.reporters.ureports.text_writer import TextWriter
-
TITLE_UNDERLINES = ["", "=", "-", "."]
ANSI_PREFIX = "\033["
diff --git a/pylint/reporters/ureports/__init__.py b/pylint/reporters/ureports/__init__.py
index 56a829fac..361552be7 100644
--- a/pylint/reporters/ureports/__init__.py
+++ b/pylint/reporters/ureports/__init__.py
@@ -13,7 +13,6 @@ formatted as text and html.
"""
import os
import sys
-
from io import StringIO
diff --git a/pylint/reporters/ureports/text_writer.py b/pylint/reporters/ureports/text_writer.py
index 9d9e1ad34..acb6a9ac8 100644
--- a/pylint/reporters/ureports/text_writer.py
+++ b/pylint/reporters/ureports/text_writer.py
@@ -10,7 +10,6 @@ from __future__ import print_function
from pylint.reporters.ureports import BaseWriter
-
TITLE_UNDERLINES = ["", "=", "-", "`", ".", "~", "^"]
BULLETS = ["*", "-"]
diff --git a/pylint/test/conftest.py b/pylint/test/conftest.py
index d75522bed..985866893 100644
--- a/pylint/test/conftest.py
+++ b/pylint/test/conftest.py
@@ -1,10 +1,10 @@
# pylint: disable=redefined-outer-name
import os
+
import pytest
from pylint import checkers
from pylint.lint import PyLinter
-
# pylint: disable=no-name-in-module
from pylint.testutils import MinimalTestReporter
diff --git a/pylint/test/extensions/data/docstring.py b/pylint/test/extensions/data/docstring.py
index 5410a9bb4..5a2c3fe63 100644
--- a/pylint/test/extensions/data/docstring.py
+++ b/pylint/test/extensions/data/docstring.py
@@ -38,3 +38,4 @@ class FFFF:
def method7(self):
u"""Test OK 3 with unicode string"""
+
diff --git a/pylint/test/extensions/test_bad_builtin.py b/pylint/test/extensions/test_bad_builtin.py
index 7d5d7f304..2fd8a95e6 100644
--- a/pylint/test/extensions/test_bad_builtin.py
+++ b/pylint/test/extensions/test_bad_builtin.py
@@ -14,7 +14,6 @@ import pytest
from pylint.extensions.bad_builtin import BadBuiltinChecker
from pylint.lint import fix_import_path
-
EXPECTED = [
"Used builtin function 'map'. Using a list comprehension can be clearer.",
"Used builtin function 'filter'. Using a list comprehension can be clearer.",
diff --git a/pylint/test/extensions/test_check_docs.py b/pylint/test/extensions/test_check_docs.py
index bad6baf07..63825c415 100644
--- a/pylint/test/extensions/test_check_docs.py
+++ b/pylint/test/extensions/test_check_docs.py
@@ -16,16 +16,15 @@
"""Unit tests for the pylint checkers in :mod:`pylint.extensions.check_docs`,
in particular the parameter documentation checker `DocstringChecker`
"""
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import, division, print_function
import sys
-import pytest
-
import astroid
-from pylint.testutils import CheckerTestCase, Message, set_config
+import pytest
from pylint.extensions.docparams import DocstringParameterChecker
+from pylint.testutils import CheckerTestCase, Message, set_config
class TestParamDocChecker(CheckerTestCase):
diff --git a/pylint/test/extensions/test_check_docs_utils.py b/pylint/test/extensions/test_check_docs_utils.py
index 28c9a0591..26af9db9d 100644
--- a/pylint/test/extensions/test_check_docs_utils.py
+++ b/pylint/test/extensions/test_check_docs_utils.py
@@ -9,11 +9,10 @@
"""Unit tests for the pylint checkers in :mod:`pylint.extensions.check_docs`,
in particular the parameter documentation checker `DocstringChecker`
"""
-from __future__ import division, print_function, absolute_import
-
-import pytest
+from __future__ import absolute_import, division, print_function
import astroid
+import pytest
import pylint.extensions._check_docs_utils as utils
diff --git a/pylint/test/extensions/test_check_raise_docs.py b/pylint/test/extensions/test_check_raise_docs.py
index 64ffe5b26..c51a1fdaa 100644
--- a/pylint/test/extensions/test_check_raise_docs.py
+++ b/pylint/test/extensions/test_check_raise_docs.py
@@ -10,12 +10,12 @@
"""Unit tests for the raised exception documentation checking in the
`DocstringChecker` in :mod:`pylint.extensions.check_docs`
"""
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import, division, print_function
import astroid
-from pylint.testutils import CheckerTestCase, Message, set_config
from pylint.extensions.docparams import DocstringParameterChecker
+from pylint.testutils import CheckerTestCase, Message, set_config
class TestDocstringCheckerRaise(CheckerTestCase):
diff --git a/pylint/test/extensions/test_check_return_docs.py b/pylint/test/extensions/test_check_return_docs.py
index db44886ef..29de72310 100644
--- a/pylint/test/extensions/test_check_return_docs.py
+++ b/pylint/test/extensions/test_check_return_docs.py
@@ -12,12 +12,12 @@
"""Unit tests for the return documentation checking in the
`DocstringChecker` in :mod:`pylint.extensions.check_docs`
"""
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import, division, print_function
import astroid
-from pylint.testutils import CheckerTestCase, Message, set_config
from pylint.extensions.docparams import DocstringParameterChecker
+from pylint.testutils import CheckerTestCase, Message, set_config
class TestDocstringCheckerReturn(CheckerTestCase):
diff --git a/pylint/test/extensions/test_check_yields_docs.py b/pylint/test/extensions/test_check_yields_docs.py
index 0d800b7e7..85c75c02d 100644
--- a/pylint/test/extensions/test_check_yields_docs.py
+++ b/pylint/test/extensions/test_check_yields_docs.py
@@ -9,12 +9,12 @@
"""Unit tests for the yield documentation checking in the
`DocstringChecker` in :mod:`pylint.extensions.check_docs`
"""
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import, division, print_function
import astroid
-from pylint.testutils import CheckerTestCase, Message, set_config
from pylint.extensions.docparams import DocstringParameterChecker
+from pylint.testutils import CheckerTestCase, Message, set_config
class TestDocstringCheckerYield(CheckerTestCase):
diff --git a/pylint/test/extensions/test_docstyle.py b/pylint/test/extensions/test_docstyle.py
index 7ced9a15e..c4d3d881c 100644
--- a/pylint/test/extensions/test_docstyle.py
+++ b/pylint/test/extensions/test_docstyle.py
@@ -14,7 +14,6 @@ import pytest
from pylint.extensions.docstyle import DocStringStyleChecker
-
EXPECTED_MSGS = [
'First line empty in function docstring',
'First line empty in class docstring',
diff --git a/pylint/test/extensions/test_emptystring.py b/pylint/test/extensions/test_emptystring.py
index c935b3bb8..c7ff30b50 100644
--- a/pylint/test/extensions/test_emptystring.py
+++ b/pylint/test/extensions/test_emptystring.py
@@ -11,6 +11,7 @@
"""
import os.path as osp
+
import pytest
from pylint.extensions.emptystring import CompareToEmptyStringChecker
diff --git a/pylint/test/extensions/test_overlapping_exceptions.py b/pylint/test/extensions/test_overlapping_exceptions.py
index 44b98515a..d001b2053 100644
--- a/pylint/test/extensions/test_overlapping_exceptions.py
+++ b/pylint/test/extensions/test_overlapping_exceptions.py
@@ -4,13 +4,13 @@
"""Tests for the pylint checker in :mod:`pylint.extensions.overlapping_exceptions
"""
+from os.path import dirname, join
from sys import version_info
-from os.path import join, dirname
-
-from pylint.extensions.overlapping_exceptions import OverlappingExceptionsChecker
import pytest
+from pylint.extensions.overlapping_exceptions import OverlappingExceptionsChecker
+
@pytest.fixture(scope='module')
def checker(checker):
diff --git a/pylint/test/extensions/test_redefined.py b/pylint/test/extensions/test_redefined.py
index f4e2c79d6..85871b064 100644
--- a/pylint/test/extensions/test_redefined.py
+++ b/pylint/test/extensions/test_redefined.py
@@ -14,7 +14,6 @@ import pytest
from pylint.extensions.redefined_variable_type import MultipleTypesChecker
from pylint.lint import fix_import_path
-
EXPECTED = [
'Redefinition of self.var1 type from int to float',
'Redefinition of var type from int to str',
diff --git a/pylint/test/test_func.py b/pylint/test/test_func.py
index 0d9694545..1566df992 100644
--- a/pylint/test/test_func.py
+++ b/pylint/test/test_func.py
@@ -13,11 +13,11 @@
"""functional/non regression tests for pylint"""
-import sys
import re
+import sys
+from os.path import abspath, dirname, join
import pytest
-from os.path import abspath, dirname, join
from pylint.testutils import _get_tests_info, linter
diff --git a/pylint/test/test_functional.py b/pylint/test/test_functional.py
index 576cd0d56..ae673bd13 100644
--- a/pylint/test/test_functional.py
+++ b/pylint/test/test_functional.py
@@ -12,24 +12,21 @@
# For details: https://github.com/PyCQA/pylint/blob/master/COPYING
"""Functional full-module tests for PyLint."""
-import csv
import collections
+import csv
import io
import operator
import os
+import platform
import re
import sys
-import platform
+import pytest
import six
from six.moves import configparser
-import pytest
+from pylint import checkers, interfaces, lint, reporters
-from pylint import checkers
-from pylint import interfaces
-from pylint import lint
-from pylint import reporters
class test_dialect(csv.excel):
if sys.version_info[0] < 3:
diff --git a/pylint/test/test_import_graph.py b/pylint/test/test_import_graph.py
index 218164565..d7b009693 100644
--- a/pylint/test/test_import_graph.py
+++ b/pylint/test/test_import_graph.py
@@ -14,10 +14,9 @@ from os.path import exists
import pytest
-from pylint.checkers import initialize, imports
-from pylint.lint import PyLinter
-
import pylint.testutils as testutils
+from pylint.checkers import imports, initialize
+from pylint.lint import PyLinter
@pytest.fixture
diff --git a/pylint/test/test_regr.py b/pylint/test/test_regr.py
index c3e026015..65e66eb20 100644
--- a/pylint/test/test_regr.py
+++ b/pylint/test/test_regr.py
@@ -14,17 +14,16 @@
to be incorporated in the automatic functional test framework
"""
-import sys
import os
+import sys
from os.path import abspath, dirname, join
+import astroid
import pytest
-import astroid
import pylint.testutils as testutils
from pylint import epylint
-
REGR_DATA = join(dirname(abspath(__file__)), "regrtest_data")
sys.path.insert(1, REGR_DATA)
diff --git a/pylint/test/test_self.py b/pylint/test/test_self.py
index 8fa262f17..1ef4d2f9b 100644
--- a/pylint/test/test_self.py
+++ b/pylint/test/test_self.py
@@ -20,25 +20,26 @@
# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
# For details: https://github.com/PyCQA/pylint/blob/master/COPYING
+import configparser
import contextlib
import json
+import os
import re
+import subprocess
import sys
-import os
-from os.path import join, dirname, abspath
import tempfile
import textwrap
-import configparser
from io import StringIO
-import subprocess
+from os.path import abspath, dirname, join
from unittest import mock
+import pytest
+
+from pylint import utils
from pylint.lint import Run
from pylint.reporters import BaseReporter
-from pylint.reporters.text import *
from pylint.reporters.json import JSONReporter
-import pytest
-from pylint import utils
+from pylint.reporters.text import *
HERE = abspath(dirname(__file__))
diff --git a/pylint/test/unittest_checker_base.py b/pylint/test/unittest_checker_base.py
index a1607cf8d..1feae5b7a 100644
--- a/pylint/test/unittest_checker_base.py
+++ b/pylint/test/unittest_checker_base.py
@@ -22,6 +22,7 @@ import sys
import unittest
import astroid
+
from pylint.checkers import base
from pylint.testutils import CheckerTestCase, Message, set_config
diff --git a/pylint/test/unittest_checker_classes.py b/pylint/test/unittest_checker_classes.py
index 1bf929b71..3925cc36d 100644
--- a/pylint/test/unittest_checker_classes.py
+++ b/pylint/test/unittest_checker_classes.py
@@ -10,6 +10,7 @@
"""Unit tests for the variables checker."""
import astroid
+
from pylint.checkers import classes
from pylint.testutils import CheckerTestCase, Message, set_config
diff --git a/pylint/test/unittest_checker_format.py b/pylint/test/unittest_checker_format.py
index 8811b0822..c47b4e54b 100644
--- a/pylint/test/unittest_checker_format.py
+++ b/pylint/test/unittest_checker_format.py
@@ -24,18 +24,15 @@
from __future__ import unicode_literals
-import tokenize
import os
import tempfile
+import tokenize
import astroid
+from pylint import lint, reporters
from pylint.checkers.format import *
-from pylint import reporters
-from pylint import lint
-
-
-from pylint.testutils import CheckerTestCase, Message, set_config, _tokenize_str
+from pylint.testutils import CheckerTestCase, Message, _tokenize_str, set_config
class TestMultiStatementLine(CheckerTestCase):
diff --git a/pylint/test/unittest_checker_imports.py b/pylint/test/unittest_checker_imports.py
index b5961b26d..898be4ef5 100644
--- a/pylint/test/unittest_checker_imports.py
+++ b/pylint/test/unittest_checker_imports.py
@@ -14,9 +14,10 @@
import os
import astroid
+
from pylint.checkers import imports
-from pylint.testutils import CheckerTestCase, Message, set_config
from pylint.interfaces import UNDEFINED
+from pylint.testutils import CheckerTestCase, Message, set_config
REGR_DATA = os.path.join(os.path.dirname(__file__), "regrtest_data", "")
diff --git a/pylint/test/unittest_checker_misc.py b/pylint/test/unittest_checker_misc.py
index 3fe49628d..b72b7acaa 100644
--- a/pylint/test/unittest_checker_misc.py
+++ b/pylint/test/unittest_checker_misc.py
@@ -13,7 +13,7 @@
"""Tests for the misc checker."""
from pylint.checkers import misc
-from pylint.testutils import CheckerTestCase, Message, set_config, _tokenize_str
+from pylint.testutils import CheckerTestCase, Message, _tokenize_str, set_config
class TestFixme(CheckerTestCase):
diff --git a/pylint/test/unittest_checker_python3.py b/pylint/test/unittest_checker_python3.py
index bc4c346b7..417bc2bb6 100644
--- a/pylint/test/unittest_checker_python3.py
+++ b/pylint/test/unittest_checker_python3.py
@@ -20,14 +20,12 @@ from __future__ import absolute_import
import sys
import textwrap
-import pytest
-
import astroid
+import pytest
from pylint import testutils
from pylint.checkers import python3 as checker
-from pylint.interfaces import INFERENCE_FAILURE, INFERENCE
-
+from pylint.interfaces import INFERENCE, INFERENCE_FAILURE
# Decorator for any tests that will fail under Python 3
python2_only = pytest.mark.skipif(sys.version_info[0] > 2, reason="Python 2 only")
diff --git a/pylint/test/unittest_checker_similar.py b/pylint/test/unittest_checker_similar.py
index f2cd901a8..a84883372 100644
--- a/pylint/test/unittest_checker_similar.py
+++ b/pylint/test/unittest_checker_similar.py
@@ -10,10 +10,10 @@
# For details: https://github.com/PyCQA/pylint/blob/master/COPYING
import sys
-from os.path import join, dirname, abspath
from contextlib import redirect_stdout
-
from io import StringIO
+from os.path import abspath, dirname, join
+
import pytest
from pylint.checkers import similar
diff --git a/pylint/test/unittest_checker_spelling.py b/pylint/test/unittest_checker_spelling.py
index f6b5ec2ed..8abd85577 100644
--- a/pylint/test/unittest_checker_spelling.py
+++ b/pylint/test/unittest_checker_spelling.py
@@ -12,12 +12,11 @@
"""Unittest for the spelling checker."""
-import pytest
-
import astroid
+import pytest
from pylint.checkers import spelling
-from pylint.testutils import CheckerTestCase, Message, set_config, _tokenize_str
+from pylint.testutils import CheckerTestCase, Message, _tokenize_str, set_config
# try to create enchant dictionary
try:
diff --git a/pylint/test/unittest_checker_stdlib.py b/pylint/test/unittest_checker_stdlib.py
index f425b0f99..55c3dc8dc 100644
--- a/pylint/test/unittest_checker_stdlib.py
+++ b/pylint/test/unittest_checker_stdlib.py
@@ -11,8 +11,8 @@ import contextlib
import astroid
from pylint.checkers import stdlib
-from pylint.testutils import CheckerTestCase, Message
from pylint.interfaces import UNDEFINED
+from pylint.testutils import CheckerTestCase, Message
@contextlib.contextmanager
diff --git a/pylint/test/unittest_checker_strings.py b/pylint/test/unittest_checker_strings.py
index 4cac73747..bc4fce6f9 100644
--- a/pylint/test/unittest_checker_strings.py
+++ b/pylint/test/unittest_checker_strings.py
@@ -9,7 +9,6 @@ import astroid
from pylint.checkers import strings
from pylint.testutils import CheckerTestCase, Message
-
TEST_TOKENS = (
'"X"',
"'X'",
diff --git a/pylint/test/unittest_checker_typecheck.py b/pylint/test/unittest_checker_typecheck.py
index 71fa7e82b..a418087c2 100644
--- a/pylint/test/unittest_checker_typecheck.py
+++ b/pylint/test/unittest_checker_typecheck.py
@@ -16,9 +16,8 @@
"""Unittest for the type checker."""
import sys
-import pytest
-
import astroid
+import pytest
from pylint.checkers import typecheck
from pylint.testutils import CheckerTestCase, Message, set_config
diff --git a/pylint/test/unittest_checker_variables.py b/pylint/test/unittest_checker_variables.py
index a9b590a0a..299a550d2 100644
--- a/pylint/test/unittest_checker_variables.py
+++ b/pylint/test/unittest_checker_variables.py
@@ -13,15 +13,15 @@
# For details: https://github.com/PyCQA/pylint/blob/master/COPYING
"""Unit tests for the variables checker."""
-import sys
import os
import re
+import sys
import astroid
from pylint.checkers import variables
-from pylint.testutils import CheckerTestCase, linter, set_config, Message
from pylint.interfaces import UNDEFINED
+from pylint.testutils import CheckerTestCase, Message, linter, set_config
class TestVariablesChecker(CheckerTestCase):
diff --git a/pylint/test/unittest_checkers_utils.py b/pylint/test/unittest_checkers_utils.py
index 3471912c3..7552d8c7c 100644
--- a/pylint/test/unittest_checkers_utils.py
+++ b/pylint/test/unittest_checkers_utils.py
@@ -12,9 +12,9 @@
"""Tests for the pylint.checkers.utils module."""
import astroid
+import pytest
from pylint.checkers import utils
-import pytest
@pytest.mark.parametrize(
diff --git a/pylint/test/unittest_config.py b/pylint/test/unittest_config.py
index 17e48d5a8..ca36c00eb 100644
--- a/pylint/test/unittest_config.py
+++ b/pylint/test/unittest_config.py
@@ -12,9 +12,9 @@
import re
import sre_constants
-from pylint import config
import pytest
+from pylint import config
RE_PATTERN_TYPE = getattr(re, "Pattern", getattr(re, "_pattern_type", None))
diff --git a/pylint/test/unittest_pyreverse_diadefs.py b/pylint/test/unittest_pyreverse_diadefs.py
index 641497905..0659a5b11 100644
--- a/pylint/test/unittest_pyreverse_diadefs.py
+++ b/pylint/test/unittest_pyreverse_diadefs.py
@@ -13,13 +13,11 @@
unit test for the extensions.diadefslib modules
"""
-import pytest
-
import astroid
+import pytest
-from pylint.pyreverse.inspector import Linker
from pylint.pyreverse.diadefslib import *
-
+from pylint.pyreverse.inspector import Linker
from unittest_pyreverse_writer import Config, get_project
diff --git a/pylint/test/unittest_pyreverse_inspector.py b/pylint/test/unittest_pyreverse_inspector.py
index f87bddbfd..c4433ba51 100644
--- a/pylint/test/unittest_pyreverse_inspector.py
+++ b/pylint/test/unittest_pyreverse_inspector.py
@@ -9,11 +9,9 @@
"""
import os
-import pytest
-
import astroid
-from astroid import nodes
-from astroid import bases
+import pytest
+from astroid import bases, nodes
from pylint.pyreverse import inspector
from unittest_pyreverse_writer import get_project
diff --git a/pylint/test/unittest_pyreverse_writer.py b/pylint/test/unittest_pyreverse_writer.py
index cf2e915b0..01654024a 100644
--- a/pylint/test/unittest_pyreverse_writer.py
+++ b/pylint/test/unittest_pyreverse_writer.py
@@ -15,17 +15,16 @@ unit test for visitors.diadefs and extensions.diadefslib modules
"""
-import os
import codecs
+import os
from difflib import unified_diff
import pytest
-from pylint.pyreverse.inspector import Linker, project_from_files
from pylint.pyreverse.diadefslib import DefaultDiadefGenerator, DiadefsHandler
-from pylint.pyreverse.writer import DotWriter
+from pylint.pyreverse.inspector import Linker, project_from_files
from pylint.pyreverse.utils import get_visibility
-
+from pylint.pyreverse.writer import DotWriter
_DEFAULTS = {
"all_ancestors": None,
diff --git a/pylint/test/unittest_reporters_json.py b/pylint/test/unittest_reporters_json.py
index ba7853887..f3424ab66 100644
--- a/pylint/test/unittest_reporters_json.py
+++ b/pylint/test/unittest_reporters_json.py
@@ -11,11 +11,10 @@
"""Test for the JSON reporter."""
import json
-
from io import StringIO
-from pylint.lint import PyLinter
from pylint import checkers
+from pylint.lint import PyLinter
from pylint.reporters.json import JSONReporter
diff --git a/pylint/test/unittest_reporting.py b/pylint/test/unittest_reporting.py
index 88f2ce4d5..a374e1e3e 100644
--- a/pylint/test/unittest_reporting.py
+++ b/pylint/test/unittest_reporting.py
@@ -11,14 +11,14 @@
# For details: https://github.com/PyCQA/pylint/blob/master/COPYING
import warnings
-
from io import StringIO
-from pylint.lint import PyLinter
-from pylint import checkers
-from pylint.reporters.text import TextReporter, ParseableTextReporter
import pytest
+from pylint import checkers
+from pylint.lint import PyLinter
+from pylint.reporters.text import ParseableTextReporter, TextReporter
+
@pytest.fixture(scope="module")
def reporter(reporter):
diff --git a/pylint/test/utils/unittest_utils.py b/pylint/test/utils/unittest_utils.py
index 6ad932dc6..8ed2f26c9 100644
--- a/pylint/test/utils/unittest_utils.py
+++ b/pylint/test/utils/unittest_utils.py
@@ -22,8 +22,8 @@ import warnings
import astroid
-from pylint.utils import utils, ASTWalker
from pylint.checkers.utils import check_messages, get_node_last_lineno
+from pylint.utils import ASTWalker, utils
class TestASTWalker(object):
diff --git a/pylint/testutils.py b/pylint/testutils.py
index 17ded416a..d47f67dd0 100644
--- a/pylint/testutils.py
+++ b/pylint/testutils.py
@@ -25,22 +25,22 @@ from __future__ import print_function
import collections
import contextlib
import functools
-from glob import glob
import os
-from os import linesep, getcwd, sep
-from os.path import abspath, basename, dirname, join, splitext
import sys
import tempfile
import tokenize
-
+from glob import glob
from io import StringIO
+from os import getcwd, linesep, sep
+from os.path import abspath, basename, dirname, join, splitext
import astroid
+
from pylint import checkers
-from pylint.utils import ASTWalker
-from pylint.reporters import BaseReporter
from pylint.interfaces import IReporter
from pylint.lint import PyLinter
+from pylint.reporters import BaseReporter
+from pylint.utils import ASTWalker
# Utils
diff --git a/pylint/utils/__init__.py b/pylint/utils/__init__.py
index 1b2954078..51b12f75d 100644
--- a/pylint/utils/__init__.py
+++ b/pylint/utils/__init__.py
@@ -41,10 +41,10 @@
main pylint class
"""
+from pylint.utils.ast_walker import ASTWalker
from pylint.utils.constants import OPTION_RGX, PY_EXTS
from pylint.utils.file_state import FileState
from pylint.utils.normalize_text import normalize_text
-from pylint.utils.ast_walker import ASTWalker
from pylint.utils.reports_handler_mix_in import ReportsHandlerMixIn
from pylint.utils.utils import (
_basename_in_blacklist_re,
diff --git a/pylint/utils/file_state.py b/pylint/utils/file_state.py
index 46180833a..2bc1662aa 100644
--- a/pylint/utils/file_state.py
+++ b/pylint/utils/file_state.py
@@ -6,6 +6,7 @@
import collections
from astroid import nodes
+
from pylint.message.constants import MSG_STATE_SCOPE_MODULE
from pylint.utils.warning_scope import WarningScope
diff --git a/pylint/utils/utils.py b/pylint/utils/utils.py
index fb8e1ef10..3147ac847 100644
--- a/pylint/utils/utils.py
+++ b/pylint/utils/utils.py
@@ -13,8 +13,9 @@ from os import linesep, listdir
from os.path import basename, dirname, exists, isdir, join, normpath, splitext
from astroid import Module, modutils
-from pylint.utils.constants import PY_EXTS
+
from pylint.message.constants import MSG_TYPES, MSG_TYPES_LONG
+from pylint.utils.constants import PY_EXTS
from pylint.utils.normalize_text import normalize_text
diff --git a/setup.py b/setup.py
index a7b5e4138..77e0e2fff 100644
--- a/setup.py
+++ b/setup.py
@@ -21,12 +21,15 @@
"""Generic Setup script, takes package info from __pkginfo__.py file.
"""
from __future__ import absolute_import, print_function
-__docformat__ = "restructuredtext en"
import os
-import sys
import shutil
-from os.path import isdir, exists, join
+import sys
+from distutils.command.build_py import build_py
+from os.path import exists, isdir, join
+
+__docformat__ = "restructuredtext en"
+
try:
from setuptools import setup
@@ -39,7 +42,6 @@ except ImportError:
USE_SETUPTOOLS = 0
easy_install_lib = None
-from distutils.command.build_py import build_py
base_dir = os.path.dirname(__file__)