Stopped installing tests with package

1068 files changed, 36 insertions, 60 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index dc97c4ece..d9c9f63e5 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,11 +1,13 @@
 include ChangeLog
+include CONTRIBUTORS.txt
 include COPYING
 include DEPENDS
-include README README.Python3
+include README.rst
 include bin/*
 include examples/*.py examples/pylintrc examples/pylintrc_camelcase
 include elisp/startup elisp/*.el
 include man/*.1
 include pytest.ini
-recursive-include doc *.rst *.jpeg Makefile *.html *.py *.bat
-graft pylint/test
+recursive-include doc *.bat *.png *.py *.svg *.rst *.txt Makefile
+graft tests
+recursive-exclude tests *.pyc
diff --git a/pylint/__pkginfo__.py b/pylint/__pkginfo__.py
index a6752a178..0cd830308 100644
--- a/pylint/__pkginfo__.py
+++ b/pylint/__pkginfo__.py
@@ -85,5 +85,3 @@ long_desc = """\
 scripts = [
     join("bin", filename) for filename in ("pylint", "symilar", "epylint", "pyreverse")
 ]
-
-include_dirs = [join("pylint", "test")]
diff --git a/setup.cfg b/setup.cfg
index 78cfd7693..0e5b56ccb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,9 @@
 [bdist_rpm]
 packager = Sylvain Thenault  <sylvain.thenault@logilab.fr>
 provides = pylint 
+
+[aliases]
+test = pytest
+
+[tool:pytest]
+testpaths = tests
diff --git a/setup.py b/setup.py
index 7d9f88342..bc0619d33 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,6 @@ with open(os.path.join(base_dir, "pylint", "__pkginfo__.py")) as f:
     exec(f.read(), __pkginfo__)
 scripts = __pkginfo__.get("scripts", [])
 data_files = __pkginfo__.get("data_files", None)
-include_dirs = __pkginfo__.get("include_dirs", [])
 ext_modules = __pkginfo__.get("ext_modules", None)
 install_requires = __pkginfo__.get("install_requires", None)
 dependency_links = __pkginfo__.get("dependency_links", [])
@@ -97,35 +96,6 @@ def _filter_tests(files):
     return [f for f in files if testdir not in f]
 
 
-class MyInstallLib(install_lib.install_lib):
-    """extend install_lib command to handle package __init__.py and
-    include_dirs variable if necessary
-    """
-
-    def run(self):
-        """overridden from install_lib class"""
-        install_lib.install_lib.run(self)
-        # manually install included directories if any
-        if include_dirs:
-            for directory in include_dirs:
-                dest = join(self.install_dir, directory)
-                if sys.version_info >= (3, 0):
-                    exclude = {"invalid_encoded_data*", "unknown_encoding*"}
-                else:
-                    exclude = set()
-                shutil.rmtree(dest, ignore_errors=True)
-                shutil.copytree(
-                    directory, dest, ignore=shutil.ignore_patterns(*exclude)
-                )
-
-    # override this since pip/easy_install attempt to byte compile test data
-    # files, some of them being syntactically wrong by design, and this scares
-    # the end-user
-    def byte_compile(self, files):
-        files = _filter_tests(files)
-        install_lib.install_lib.byte_compile(self, files)
-
-
 if easy_install_lib:
 
     class easy_install(easy_install_lib.easy_install):
@@ -156,7 +126,7 @@ def install(**kwargs):
             ]
         }
     kwargs["packages"] = packages
-    cmdclass = {"install_lib": MyInstallLib, "build_py": build_py}
+    cmdclass = {"build_py": build_py}
     if easy_install_lib:
         cmdclass["easy_install"] = easy_install
     return setup(
diff --git a/pylint/test/acceptance/test_stdlib.py b/tests/acceptance/test_stdlib.py
index 1b97fd2ea..1b97fd2ea 100644
--- a/pylint/test/acceptance/test_stdlib.py
+++ b/tests/acceptance/test_stdlib.py
diff --git a/pylint/test/conftest.py b/tests/conftest.py
index e2762091d..e2762091d 100644
--- a/pylint/test/conftest.py
+++ b/tests/conftest.py
diff --git a/pylint/test/data/__init__.py b/tests/data/__init__.py
index e69de29bb..e69de29bb 100644
--- a/pylint/test/data/__init__.py
+++ b/tests/data/__init__.py
diff --git a/pylint/test/data/ascript b/tests/data/ascript
index f401ebc4b..f401ebc4b 100755
--- a/pylint/test/data/ascript
+++ b/tests/data/ascript
diff --git a/pylint/test/data/classes_No_Name.dot b/tests/data/classes_No_Name.dot
index 8867b4e41..8867b4e41 100644
--- a/pylint/test/data/classes_No_Name.dot
+++ b/tests/data/classes_No_Name.dot
diff --git a/pylint/test/data/clientmodule_test.py b/tests/data/clientmodule_test.py
index 40db2e77e..40db2e77e 100644
--- a/pylint/test/data/clientmodule_test.py
+++ b/tests/data/clientmodule_test.py
diff --git a/pylint/test/data/packages_No_Name.dot b/tests/data/packages_No_Name.dot
index 1ceeb7242..1ceeb7242 100644
--- a/pylint/test/data/packages_No_Name.dot
+++ b/tests/data/packages_No_Name.dot
diff --git a/pylint/test/data/suppliermodule_test.py b/tests/data/suppliermodule_test.py
index 24dc9a02f..24dc9a02f 100644
--- a/pylint/test/data/suppliermodule_test.py
+++ b/tests/data/suppliermodule_test.py
diff --git a/pylint/test/extensions/__init__.py b/tests/extensions/__init__.py
index e69de29bb..e69de29bb 100644
--- a/pylint/test/extensions/__init__.py
+++ b/tests/extensions/__init__.py
diff --git a/pylint/test/extensions/data/bad_builtin.py b/tests/extensions/data/bad_builtin.py
index fd3e5c054..fd3e5c054 100644
--- a/pylint/test/extensions/data/bad_builtin.py
+++ b/tests/extensions/data/bad_builtin.py
diff --git a/pylint/test/extensions/data/broad_try_clause.py b/tests/extensions/data/broad_try_clause.py
index 4d65302c8..4d65302c8 100644
--- a/pylint/test/extensions/data/broad_try_clause.py
+++ b/tests/extensions/data/broad_try_clause.py
diff --git a/pylint/test/extensions/data/compare_to_zero.py b/tests/extensions/data/compare_to_zero.py
index dfe6bbcb5..dfe6bbcb5 100644
--- a/pylint/test/extensions/data/compare_to_zero.py
+++ b/tests/extensions/data/compare_to_zero.py
diff --git a/pylint/test/extensions/data/docstring.py b/tests/extensions/data/docstring.py
index 8f34c657f..8f34c657f 100644
--- a/pylint/test/extensions/data/docstring.py
+++ b/tests/extensions/data/docstring.py
diff --git a/pylint/test/extensions/data/elif.py b/tests/extensions/data/elif.py
index 22e79c1db..22e79c1db 100644
--- a/pylint/test/extensions/data/elif.py
+++ b/tests/extensions/data/elif.py
diff --git a/pylint/test/extensions/data/empty_string_comparison.py b/tests/extensions/data/empty_string_comparison.py
index c6dcf8ea8..c6dcf8ea8 100644
--- a/pylint/test/extensions/data/empty_string_comparison.py
+++ b/tests/extensions/data/empty_string_comparison.py
diff --git a/pylint/test/extensions/data/mccabe.py b/tests/extensions/data/mccabe.py
index fdbdb5f0c..fdbdb5f0c 100644
--- a/pylint/test/extensions/data/mccabe.py
+++ b/tests/extensions/data/mccabe.py
diff --git a/pylint/test/extensions/data/overlapping_exceptions.py b/tests/extensions/data/overlapping_exceptions.py
index 5ee50f314..5ee50f314 100644
--- a/pylint/test/extensions/data/overlapping_exceptions.py
+++ b/tests/extensions/data/overlapping_exceptions.py
diff --git a/pylint/test/extensions/data/overlapping_exceptions_py33.py b/tests/extensions/data/overlapping_exceptions_py33.py
index 16d5c30d1..16d5c30d1 100644
--- a/pylint/test/extensions/data/overlapping_exceptions_py33.py
+++ b/tests/extensions/data/overlapping_exceptions_py33.py
diff --git a/pylint/test/extensions/data/redefined.py b/tests/extensions/data/redefined.py
index 8829c4383..8829c4383 100644
--- a/pylint/test/extensions/data/redefined.py
+++ b/tests/extensions/data/redefined.py
diff --git a/pylint/test/extensions/test_bad_builtin.py b/tests/extensions/test_bad_builtin.py
index 2fd8a95e6..2fd8a95e6 100644
--- a/pylint/test/extensions/test_bad_builtin.py
+++ b/tests/extensions/test_bad_builtin.py
diff --git a/pylint/test/extensions/test_broad_try_clause.py b/tests/extensions/test_broad_try_clause.py
index 21b591dc1..21b591dc1 100644
--- a/pylint/test/extensions/test_broad_try_clause.py
+++ b/tests/extensions/test_broad_try_clause.py
diff --git a/pylint/test/extensions/test_check_docs.py b/tests/extensions/test_check_docs.py
index 1eacc9387..1eacc9387 100644
--- a/pylint/test/extensions/test_check_docs.py
+++ b/tests/extensions/test_check_docs.py
diff --git a/pylint/test/extensions/test_check_docs_utils.py b/tests/extensions/test_check_docs_utils.py
index 26af9db9d..26af9db9d 100644
--- a/pylint/test/extensions/test_check_docs_utils.py
+++ b/tests/extensions/test_check_docs_utils.py
diff --git a/pylint/test/extensions/test_check_mccabe.py b/tests/extensions/test_check_mccabe.py
index 8ae42f5fd..8ae42f5fd 100644
--- a/pylint/test/extensions/test_check_mccabe.py
+++ b/tests/extensions/test_check_mccabe.py
diff --git a/pylint/test/extensions/test_check_raise_docs.py b/tests/extensions/test_check_raise_docs.py
index c51a1fdaa..c51a1fdaa 100644
--- a/pylint/test/extensions/test_check_raise_docs.py
+++ b/tests/extensions/test_check_raise_docs.py
diff --git a/pylint/test/extensions/test_check_return_docs.py b/tests/extensions/test_check_return_docs.py
index a6d12e501..a6d12e501 100644
--- a/pylint/test/extensions/test_check_return_docs.py
+++ b/tests/extensions/test_check_return_docs.py
diff --git a/pylint/test/extensions/test_check_yields_docs.py b/tests/extensions/test_check_yields_docs.py
index 85c75c02d..85c75c02d 100644
--- a/pylint/test/extensions/test_check_yields_docs.py
+++ b/tests/extensions/test_check_yields_docs.py
diff --git a/pylint/test/extensions/test_comparetozero.py b/tests/extensions/test_comparetozero.py
index ebe4a466a..ebe4a466a 100644
--- a/pylint/test/extensions/test_comparetozero.py
+++ b/tests/extensions/test_comparetozero.py
diff --git a/pylint/test/extensions/test_docstyle.py b/tests/extensions/test_docstyle.py
index cad929d31..cad929d31 100644
--- a/pylint/test/extensions/test_docstyle.py
+++ b/tests/extensions/test_docstyle.py
diff --git a/pylint/test/extensions/test_elseif_used.py b/tests/extensions/test_elseif_used.py
index 44926689d..44926689d 100644
--- a/pylint/test/extensions/test_elseif_used.py
+++ b/tests/extensions/test_elseif_used.py
diff --git a/pylint/test/extensions/test_emptystring.py b/tests/extensions/test_emptystring.py
index c7ff30b50..c7ff30b50 100644
--- a/pylint/test/extensions/test_emptystring.py
+++ b/tests/extensions/test_emptystring.py
diff --git a/pylint/test/extensions/test_overlapping_exceptions.py b/tests/extensions/test_overlapping_exceptions.py
index d001b2053..d001b2053 100644
--- a/pylint/test/extensions/test_overlapping_exceptions.py
+++ b/tests/extensions/test_overlapping_exceptions.py
diff --git a/pylint/test/extensions/test_redefined.py b/tests/extensions/test_redefined.py
index da35b0625..da35b0625 100644
--- a/pylint/test/extensions/test_redefined.py
+++ b/tests/extensions/test_redefined.py
diff --git a/pylint/test/functional/__init__.py b/tests/functional/__init__.py
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/__init__.py
+++ b/tests/functional/__init__.py
diff --git a/pylint/test/functional/abstract_abc_methods.py b/tests/functional/abstract_abc_methods.py
index d174669a5..d174669a5 100644
--- a/pylint/test/functional/abstract_abc_methods.py
+++ b/tests/functional/abstract_abc_methods.py
diff --git a/pylint/test/functional/abstract_class_instantiated_in_class.py b/tests/functional/abstract_class_instantiated_in_class.py
index a91fde579..a91fde579 100644
--- a/pylint/test/functional/abstract_class_instantiated_in_class.py
+++ b/tests/functional/abstract_class_instantiated_in_class.py
diff --git a/pylint/test/functional/abstract_class_instantiated_py2.py b/tests/functional/abstract_class_instantiated_py2.py
index ba34d2641..ba34d2641 100644
--- a/pylint/test/functional/abstract_class_instantiated_py2.py
+++ b/tests/functional/abstract_class_instantiated_py2.py
diff --git a/pylint/test/functional/abstract_class_instantiated_py2.rc b/tests/functional/abstract_class_instantiated_py2.rc
index b11e16d54..b11e16d54 100644
--- a/pylint/test/functional/abstract_class_instantiated_py2.rc
+++ b/tests/functional/abstract_class_instantiated_py2.rc
diff --git a/pylint/test/functional/abstract_class_instantiated_py2.txt b/tests/functional/abstract_class_instantiated_py2.txt
index 1e4a72d09..1e4a72d09 100644
--- a/pylint/test/functional/abstract_class_instantiated_py2.txt
+++ b/tests/functional/abstract_class_instantiated_py2.txt
diff --git a/pylint/test/functional/abstract_class_instantiated_py3.py b/tests/functional/abstract_class_instantiated_py3.py
index c027833e7..c027833e7 100644
--- a/pylint/test/functional/abstract_class_instantiated_py3.py
+++ b/tests/functional/abstract_class_instantiated_py3.py
diff --git a/pylint/test/functional/abstract_class_instantiated_py3.rc b/tests/functional/abstract_class_instantiated_py3.rc
index a2ab06c50..a2ab06c50 100644
--- a/pylint/test/functional/abstract_class_instantiated_py3.rc
+++ b/tests/functional/abstract_class_instantiated_py3.rc
diff --git a/pylint/test/functional/abstract_class_instantiated_py3.txt b/tests/functional/abstract_class_instantiated_py3.txt
index 585409091..585409091 100644
--- a/pylint/test/functional/abstract_class_instantiated_py3.txt
+++ b/tests/functional/abstract_class_instantiated_py3.txt
diff --git a/pylint/test/functional/abstract_class_instantiated_py34.py b/tests/functional/abstract_class_instantiated_py34.py
index e24ad28f1..e24ad28f1 100644
--- a/pylint/test/functional/abstract_class_instantiated_py34.py
+++ b/tests/functional/abstract_class_instantiated_py34.py
diff --git a/pylint/test/functional/abstract_class_instantiated_py34.rc b/tests/functional/abstract_class_instantiated_py34.rc
index 1fb7b8710..1fb7b8710 100644
--- a/pylint/test/functional/abstract_class_instantiated_py34.rc
+++ b/tests/functional/abstract_class_instantiated_py34.rc
diff --git a/pylint/test/functional/abstract_class_instantiated_py34.txt b/tests/functional/abstract_class_instantiated_py34.txt
index afee9756e..afee9756e 100644
--- a/pylint/test/functional/abstract_class_instantiated_py34.txt
+++ b/tests/functional/abstract_class_instantiated_py34.txt
diff --git a/pylint/test/functional/abstract_method_py2.py b/tests/functional/abstract_method_py2.py
index 54fd1f952..54fd1f952 100644
--- a/pylint/test/functional/abstract_method_py2.py
+++ b/tests/functional/abstract_method_py2.py
diff --git a/pylint/test/functional/abstract_method_py2.rc b/tests/functional/abstract_method_py2.rc
index b11e16d54..b11e16d54 100644
--- a/pylint/test/functional/abstract_method_py2.rc
+++ b/tests/functional/abstract_method_py2.rc
diff --git a/pylint/test/functional/abstract_method_py2.txt b/tests/functional/abstract_method_py2.txt
index 3f9d207e6..3f9d207e6 100644
--- a/pylint/test/functional/abstract_method_py2.txt
+++ b/tests/functional/abstract_method_py2.txt
diff --git a/pylint/test/functional/abstract_method_py3.py b/tests/functional/abstract_method_py3.py
index f4e3dd568..f4e3dd568 100644
--- a/pylint/test/functional/abstract_method_py3.py
+++ b/tests/functional/abstract_method_py3.py
diff --git a/pylint/test/functional/abstract_method_py3.rc b/tests/functional/abstract_method_py3.rc
index a2ab06c50..a2ab06c50 100644
--- a/pylint/test/functional/abstract_method_py3.rc
+++ b/tests/functional/abstract_method_py3.rc
diff --git a/pylint/test/functional/abstract_method_py3.txt b/tests/functional/abstract_method_py3.txt
index 17f8abf4e..17f8abf4e 100644
--- a/pylint/test/functional/abstract_method_py3.txt
+++ b/tests/functional/abstract_method_py3.txt
diff --git a/pylint/test/functional/access_member_before_definition.py b/tests/functional/access_member_before_definition.py
index d8a97b4c7..d8a97b4c7 100644
--- a/pylint/test/functional/access_member_before_definition.py
+++ b/tests/functional/access_member_before_definition.py
diff --git a/pylint/test/functional/access_member_before_definition.txt b/tests/functional/access_member_before_definition.txt
index 9b3ae697d..9b3ae697d 100644
--- a/pylint/test/functional/access_member_before_definition.txt
+++ b/tests/functional/access_member_before_definition.txt
diff --git a/pylint/test/functional/access_to__name__.py b/tests/functional/access_to__name__.py
index 82dcdbe78..82dcdbe78 100644
--- a/pylint/test/functional/access_to__name__.py
+++ b/tests/functional/access_to__name__.py
diff --git a/pylint/test/functional/access_to__name__.txt b/tests/functional/access_to__name__.txt
index 29ec889fb..29ec889fb 100644
--- a/pylint/test/functional/access_to__name__.txt
+++ b/tests/functional/access_to__name__.txt
diff --git a/pylint/test/functional/access_to_protected_members.py b/tests/functional/access_to_protected_members.py
index 1c97a3b50..1c97a3b50 100644
--- a/pylint/test/functional/access_to_protected_members.py
+++ b/tests/functional/access_to_protected_members.py
diff --git a/pylint/test/functional/access_to_protected_members.txt b/tests/functional/access_to_protected_members.txt
index fb5c152e6..fb5c152e6 100644
--- a/pylint/test/functional/access_to_protected_members.txt
+++ b/tests/functional/access_to_protected_members.txt
diff --git a/pylint/test/functional/anomalous_unicode_escape_py2.py b/tests/functional/anomalous_unicode_escape_py2.py
index 8f304fa47..8f304fa47 100644
--- a/pylint/test/functional/anomalous_unicode_escape_py2.py
+++ b/tests/functional/anomalous_unicode_escape_py2.py
diff --git a/pylint/test/functional/anomalous_unicode_escape_py2.rc b/tests/functional/anomalous_unicode_escape_py2.rc
index a2328edb7..a2328edb7 100644
--- a/pylint/test/functional/anomalous_unicode_escape_py2.rc
+++ b/tests/functional/anomalous_unicode_escape_py2.rc
diff --git a/pylint/test/functional/anomalous_unicode_escape_py2.txt b/tests/functional/anomalous_unicode_escape_py2.txt
index c242cb98f..c242cb98f 100644
--- a/pylint/test/functional/anomalous_unicode_escape_py2.txt
+++ b/tests/functional/anomalous_unicode_escape_py2.txt
diff --git a/pylint/test/functional/anomalous_unicode_escape_py3.py b/tests/functional/anomalous_unicode_escape_py3.py
index b8bfd0a96..b8bfd0a96 100644
--- a/pylint/test/functional/anomalous_unicode_escape_py3.py
+++ b/tests/functional/anomalous_unicode_escape_py3.py
diff --git a/pylint/test/functional/anomalous_unicode_escape_py3.rc b/tests/functional/anomalous_unicode_escape_py3.rc
index 8c6eb56c4..8c6eb56c4 100644
--- a/pylint/test/functional/anomalous_unicode_escape_py3.rc
+++ b/tests/functional/anomalous_unicode_escape_py3.rc
diff --git a/pylint/test/functional/anomalous_unicode_escape_py3.txt b/tests/functional/anomalous_unicode_escape_py3.txt
index d2c5d10ed..d2c5d10ed 100644
--- a/pylint/test/functional/anomalous_unicode_escape_py3.txt
+++ b/tests/functional/anomalous_unicode_escape_py3.txt
diff --git a/pylint/test/functional/arguments.py b/tests/functional/arguments.py
index d023244d6..d023244d6 100644
--- a/pylint/test/functional/arguments.py
+++ b/tests/functional/arguments.py
diff --git a/pylint/test/functional/arguments.rc b/tests/functional/arguments.rc
index bb6bf0e37..bb6bf0e37 100644
--- a/pylint/test/functional/arguments.rc
+++ b/tests/functional/arguments.rc
diff --git a/pylint/test/functional/arguments.txt b/tests/functional/arguments.txt
index 03132ef9c..03132ef9c 100644
--- a/pylint/test/functional/arguments.txt
+++ b/tests/functional/arguments.txt
diff --git a/pylint/test/functional/arguments_differ.py b/tests/functional/arguments_differ.py
index 61959fd22..61959fd22 100644
--- a/pylint/test/functional/arguments_differ.py
+++ b/tests/functional/arguments_differ.py
diff --git a/pylint/test/functional/arguments_differ.txt b/tests/functional/arguments_differ.txt
index 1fc0e8421..1fc0e8421 100644
--- a/pylint/test/functional/arguments_differ.txt
+++ b/tests/functional/arguments_differ.txt
diff --git a/pylint/test/functional/arguments_differ_py3.py b/tests/functional/arguments_differ_py3.py
index 0e07131cc..0e07131cc 100644
--- a/pylint/test/functional/arguments_differ_py3.py
+++ b/tests/functional/arguments_differ_py3.py
diff --git a/pylint/test/functional/arguments_differ_py3.rc b/tests/functional/arguments_differ_py3.rc
index a2ab06c50..a2ab06c50 100644
--- a/pylint/test/functional/arguments_differ_py3.rc
+++ b/tests/functional/arguments_differ_py3.rc
diff --git a/pylint/test/functional/arguments_differ_py3.txt b/tests/functional/arguments_differ_py3.txt
index d494a5058..d494a5058 100644
--- a/pylint/test/functional/arguments_differ_py3.txt
+++ b/tests/functional/arguments_differ_py3.txt
diff --git a/pylint/test/functional/assert_on_tuple.py b/tests/functional/assert_on_tuple.py
index e360737e6..e360737e6 100644
--- a/pylint/test/functional/assert_on_tuple.py
+++ b/tests/functional/assert_on_tuple.py
diff --git a/pylint/test/functional/assert_on_tuple.txt b/tests/functional/assert_on_tuple.txt
index 52d1ca5da..52d1ca5da 100644
--- a/pylint/test/functional/assert_on_tuple.txt
+++ b/tests/functional/assert_on_tuple.txt
diff --git a/pylint/test/functional/assigning_non_slot.py b/tests/functional/assigning_non_slot.py
index 6fd299f37..6fd299f37 100644
--- a/pylint/test/functional/assigning_non_slot.py
+++ b/tests/functional/assigning_non_slot.py
diff --git a/pylint/test/functional/assigning_non_slot.txt b/tests/functional/assigning_non_slot.txt
index 9d24a92eb..9d24a92eb 100644
--- a/pylint/test/functional/assigning_non_slot.txt
+++ b/tests/functional/assigning_non_slot.txt
diff --git a/pylint/test/functional/assignment_from_no_return.py b/tests/functional/assignment_from_no_return.py
index 6991fe561..6991fe561 100644
--- a/pylint/test/functional/assignment_from_no_return.py
+++ b/tests/functional/assignment_from_no_return.py
diff --git a/pylint/test/functional/assignment_from_no_return.txt b/tests/functional/assignment_from_no_return.txt
index 1972103a8..1972103a8 100644
--- a/pylint/test/functional/assignment_from_no_return.txt
+++ b/tests/functional/assignment_from_no_return.txt
diff --git a/pylint/test/functional/assignment_from_no_return_py3.py b/tests/functional/assignment_from_no_return_py3.py
index 7b1abd59f..7b1abd59f 100644
--- a/pylint/test/functional/assignment_from_no_return_py3.py
+++ b/tests/functional/assignment_from_no_return_py3.py
diff --git a/pylint/test/functional/assignment_from_no_return_py3.rc b/tests/functional/assignment_from_no_return_py3.rc
index 1450ccc64..1450ccc64 100644
--- a/pylint/test/functional/assignment_from_no_return_py3.rc
+++ b/tests/functional/assignment_from_no_return_py3.rc
diff --git a/pylint/test/functional/assignment_from_no_return_py3.txt b/tests/functional/assignment_from_no_return_py3.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/assignment_from_no_return_py3.txt
+++ b/tests/functional/assignment_from_no_return_py3.txt
diff --git a/pylint/test/functional/async_functions.py b/tests/functional/async_functions.py
index 2f2252de8..2f2252de8 100644
--- a/pylint/test/functional/async_functions.py
+++ b/tests/functional/async_functions.py
diff --git a/pylint/test/functional/async_functions.rc b/tests/functional/async_functions.rc
index 03004f2c2..03004f2c2 100644
--- a/pylint/test/functional/async_functions.rc
+++ b/tests/functional/async_functions.rc
diff --git a/pylint/test/functional/async_functions.txt b/tests/functional/async_functions.txt
index e00c5bbfa..e00c5bbfa 100644
--- a/pylint/test/functional/async_functions.txt
+++ b/tests/functional/async_functions.txt
diff --git a/pylint/test/functional/attribute_defined_outside_init.py b/tests/functional/attribute_defined_outside_init.py
index ff31e955d..ff31e955d 100644
--- a/pylint/test/functional/attribute_defined_outside_init.py
+++ b/tests/functional/attribute_defined_outside_init.py
diff --git a/pylint/test/functional/attribute_defined_outside_init.txt b/tests/functional/attribute_defined_outside_init.txt
index 51456e30c..51456e30c 100644
--- a/pylint/test/functional/attribute_defined_outside_init.txt
+++ b/tests/functional/attribute_defined_outside_init.txt
diff --git a/pylint/test/functional/bad_continuation.py b/tests/functional/bad_continuation.py
index 1c73a1122..1c73a1122 100644
--- a/pylint/test/functional/bad_continuation.py
+++ b/tests/functional/bad_continuation.py
diff --git a/pylint/test/functional/bad_continuation.txt b/tests/functional/bad_continuation.txt
index 672f0afd4..672f0afd4 100644
--- a/pylint/test/functional/bad_continuation.txt
+++ b/tests/functional/bad_continuation.txt
diff --git a/pylint/test/functional/bad_continuation_py36.py b/tests/functional/bad_continuation_py36.py
index 172a9c5a6..172a9c5a6 100644
--- a/pylint/test/functional/bad_continuation_py36.py
+++ b/tests/functional/bad_continuation_py36.py
diff --git a/pylint/test/functional/bad_continuation_py36.rc b/tests/functional/bad_continuation_py36.rc
index 1450ccc64..1450ccc64 100644
--- a/pylint/test/functional/bad_continuation_py36.rc
+++ b/tests/functional/bad_continuation_py36.rc
diff --git a/pylint/test/functional/bad_continuation_tabs.py b/tests/functional/bad_continuation_tabs.py
index a668dc704..a668dc704 100644
--- a/pylint/test/functional/bad_continuation_tabs.py
+++ b/tests/functional/bad_continuation_tabs.py
diff --git a/pylint/test/functional/bad_continuation_tabs.rc b/tests/functional/bad_continuation_tabs.rc
index bebda3809..bebda3809 100644
--- a/pylint/test/functional/bad_continuation_tabs.rc
+++ b/tests/functional/bad_continuation_tabs.rc
diff --git a/pylint/test/functional/bad_continuation_tabs.txt b/tests/functional/bad_continuation_tabs.txt
index 8fff7bbfb..8fff7bbfb 100644
--- a/pylint/test/functional/bad_continuation_tabs.txt
+++ b/tests/functional/bad_continuation_tabs.txt
diff --git a/pylint/test/functional/bad_except_order.py b/tests/functional/bad_except_order.py
index 4f2fa3ea8..4f2fa3ea8 100644
--- a/pylint/test/functional/bad_except_order.py
+++ b/tests/functional/bad_except_order.py
diff --git a/pylint/test/functional/bad_except_order.txt b/tests/functional/bad_except_order.txt
index 1199d6790..1199d6790 100644
--- a/pylint/test/functional/bad_except_order.txt
+++ b/tests/functional/bad_except_order.txt
diff --git a/pylint/test/functional/bad_exception_context.py b/tests/functional/bad_exception_context.py
index af3e4fb9f..af3e4fb9f 100644
--- a/pylint/test/functional/bad_exception_context.py
+++ b/tests/functional/bad_exception_context.py
diff --git a/pylint/test/functional/bad_exception_context.rc b/tests/functional/bad_exception_context.rc
index 8c6eb56c4..8c6eb56c4 100644
--- a/pylint/test/functional/bad_exception_context.rc
+++ b/tests/functional/bad_exception_context.rc
diff --git a/pylint/test/functional/bad_exception_context.txt b/tests/functional/bad_exception_context.txt
index f403a39b2..f403a39b2 100644
--- a/pylint/test/functional/bad_exception_context.txt
+++ b/tests/functional/bad_exception_context.txt
diff --git a/pylint/test/functional/bad_indentation.py b/tests/functional/bad_indentation.py
index 4c50eae0b..4c50eae0b 100644
--- a/pylint/test/functional/bad_indentation.py
+++ b/tests/functional/bad_indentation.py
diff --git a/pylint/test/functional/bad_indentation.txt b/tests/functional/bad_indentation.txt
index c5c00bb12..c5c00bb12 100644
--- a/pylint/test/functional/bad_indentation.txt
+++ b/tests/functional/bad_indentation.txt
diff --git a/pylint/test/functional/bad_inline_option.py b/tests/functional/bad_inline_option.py
index be6e24081..be6e24081 100644
--- a/pylint/test/functional/bad_inline_option.py
+++ b/tests/functional/bad_inline_option.py
diff --git a/pylint/test/functional/bad_inline_option.rc b/tests/functional/bad_inline_option.rc
index b211d7254..b211d7254 100644
--- a/pylint/test/functional/bad_inline_option.rc
+++ b/tests/functional/bad_inline_option.rc
diff --git a/pylint/test/functional/bad_inline_option.txt b/tests/functional/bad_inline_option.txt
index 91ac1af35..91ac1af35 100644
--- a/pylint/test/functional/bad_inline_option.txt
+++ b/tests/functional/bad_inline_option.txt
diff --git a/pylint/test/functional/bad_open_mode.py b/tests/functional/bad_open_mode.py
index 6b749de03..6b749de03 100644
--- a/pylint/test/functional/bad_open_mode.py
+++ b/tests/functional/bad_open_mode.py
diff --git a/pylint/test/functional/bad_open_mode.rc b/tests/functional/bad_open_mode.rc
index b9ab97702..b9ab97702 100644
--- a/pylint/test/functional/bad_open_mode.rc
+++ b/tests/functional/bad_open_mode.rc
diff --git a/pylint/test/functional/bad_open_mode.txt b/tests/functional/bad_open_mode.txt
index b0222863e..b0222863e 100644
--- a/pylint/test/functional/bad_open_mode.txt
+++ b/tests/functional/bad_open_mode.txt
diff --git a/pylint/test/functional/bad_open_mode_py3.py b/tests/functional/bad_open_mode_py3.py
index 0812f5a21..0812f5a21 100644
--- a/pylint/test/functional/bad_open_mode_py3.py
+++ b/tests/functional/bad_open_mode_py3.py
diff --git a/pylint/test/functional/bad_open_mode_py3.rc b/tests/functional/bad_open_mode_py3.rc
index 55bbcdde3..55bbcdde3 100644
--- a/pylint/test/functional/bad_open_mode_py3.rc
+++ b/tests/functional/bad_open_mode_py3.rc
diff --git a/pylint/test/functional/bad_open_mode_py3.txt b/tests/functional/bad_open_mode_py3.txt
index 0be0ea84e..0be0ea84e 100644
--- a/pylint/test/functional/bad_open_mode_py3.txt
+++ b/tests/functional/bad_open_mode_py3.txt
diff --git a/pylint/test/functional/bad_reversed_sequence.py b/tests/functional/bad_reversed_sequence.py
index 6cfac5bed..6cfac5bed 100644
--- a/pylint/test/functional/bad_reversed_sequence.py
+++ b/tests/functional/bad_reversed_sequence.py
diff --git a/pylint/test/functional/bad_reversed_sequence.txt b/tests/functional/bad_reversed_sequence.txt
index dd0c6f96d..dd0c6f96d 100644
--- a/pylint/test/functional/bad_reversed_sequence.txt
+++ b/tests/functional/bad_reversed_sequence.txt
diff --git a/pylint/test/functional/bad_staticmethod_argument.py b/tests/functional/bad_staticmethod_argument.py
index e73bf3dcd..e73bf3dcd 100644
--- a/pylint/test/functional/bad_staticmethod_argument.py
+++ b/tests/functional/bad_staticmethod_argument.py
diff --git a/pylint/test/functional/bad_staticmethod_argument.txt b/tests/functional/bad_staticmethod_argument.txt
index a9d5b468e..a9d5b468e 100644
--- a/pylint/test/functional/bad_staticmethod_argument.txt
+++ b/tests/functional/bad_staticmethod_argument.txt
diff --git a/pylint/test/functional/bad_thread_instantiation.py b/tests/functional/bad_thread_instantiation.py
index e7e02eaed..e7e02eaed 100644
--- a/pylint/test/functional/bad_thread_instantiation.py
+++ b/tests/functional/bad_thread_instantiation.py
diff --git a/pylint/test/functional/bad_thread_instantiation.txt b/tests/functional/bad_thread_instantiation.txt
index 81fb8405b..81fb8405b 100644
--- a/pylint/test/functional/bad_thread_instantiation.txt
+++ b/tests/functional/bad_thread_instantiation.txt
diff --git a/pylint/test/functional/bad_whitespace.py b/tests/functional/bad_whitespace.py
index 9b32087e2..9b32087e2 100644
--- a/pylint/test/functional/bad_whitespace.py
+++ b/tests/functional/bad_whitespace.py
diff --git a/pylint/test/functional/bad_whitespace.txt b/tests/functional/bad_whitespace.txt
index 14431c04c..14431c04c 100644
--- a/pylint/test/functional/bad_whitespace.txt
+++ b/tests/functional/bad_whitespace.txt
diff --git a/pylint/test/functional/bare_except.py b/tests/functional/bare_except.py
index 47a207920..47a207920 100644
--- a/pylint/test/functional/bare_except.py
+++ b/tests/functional/bare_except.py
diff --git a/pylint/test/functional/bare_except.txt b/tests/functional/bare_except.txt
index ccb7ba90d..ccb7ba90d 100644
--- a/pylint/test/functional/bare_except.txt
+++ b/tests/functional/bare_except.txt
diff --git a/pylint/test/functional/blacklisted_name.py b/tests/functional/blacklisted_name.py
index b62c6d276..b62c6d276 100644
--- a/pylint/test/functional/blacklisted_name.py
+++ b/tests/functional/blacklisted_name.py
diff --git a/pylint/test/functional/blacklisted_name.txt b/tests/functional/blacklisted_name.txt
index f0fc9c20c..f0fc9c20c 100644
--- a/pylint/test/functional/blacklisted_name.txt
+++ b/tests/functional/blacklisted_name.txt
diff --git a/pylint/test/functional/boolean_datetime.py b/tests/functional/boolean_datetime.py
index 5afc5a42e..5afc5a42e 100644
--- a/pylint/test/functional/boolean_datetime.py
+++ b/tests/functional/boolean_datetime.py
diff --git a/pylint/test/functional/boolean_datetime.rc b/tests/functional/boolean_datetime.rc
index abe8fdf16..abe8fdf16 100644
--- a/pylint/test/functional/boolean_datetime.rc
+++ b/tests/functional/boolean_datetime.rc
diff --git a/pylint/test/functional/boolean_datetime.txt b/tests/functional/boolean_datetime.txt
index f3287d4f7..f3287d4f7 100644
--- a/pylint/test/functional/boolean_datetime.txt
+++ b/tests/functional/boolean_datetime.txt
diff --git a/pylint/test/functional/broad_except.py b/tests/functional/broad_except.py
index 24c839951..24c839951 100644
--- a/pylint/test/functional/broad_except.py
+++ b/tests/functional/broad_except.py
diff --git a/pylint/test/functional/broad_except.txt b/tests/functional/broad_except.txt
index 5a46b03be..5a46b03be 100644
--- a/pylint/test/functional/broad_except.txt
+++ b/tests/functional/broad_except.txt
diff --git a/pylint/test/functional/bugfix_local_scope_metaclass_1177.py b/tests/functional/bugfix_local_scope_metaclass_1177.py
index 8904f6fb2..8904f6fb2 100644
--- a/pylint/test/functional/bugfix_local_scope_metaclass_1177.py
+++ b/tests/functional/bugfix_local_scope_metaclass_1177.py
diff --git a/pylint/test/functional/bugfix_local_scope_metaclass_1177.rc b/tests/functional/bugfix_local_scope_metaclass_1177.rc
index c093be204..c093be204 100644
--- a/pylint/test/functional/bugfix_local_scope_metaclass_1177.rc
+++ b/tests/functional/bugfix_local_scope_metaclass_1177.rc
diff --git a/pylint/test/functional/cellvar_escaping_loop.py b/tests/functional/cellvar_escaping_loop.py
index 23c6b4b2e..23c6b4b2e 100644
--- a/pylint/test/functional/cellvar_escaping_loop.py
+++ b/tests/functional/cellvar_escaping_loop.py
diff --git a/pylint/test/functional/cellvar_escaping_loop.txt b/tests/functional/cellvar_escaping_loop.txt
index 2ac0b58ef..2ac0b58ef 100644
--- a/pylint/test/functional/cellvar_escaping_loop.txt
+++ b/tests/functional/cellvar_escaping_loop.txt
diff --git a/pylint/test/functional/class_members_py27.py b/tests/functional/class_members_py27.py
index 584faa5e8..584faa5e8 100644
--- a/pylint/test/functional/class_members_py27.py
+++ b/tests/functional/class_members_py27.py
diff --git a/pylint/test/functional/class_members_py27.rc b/tests/functional/class_members_py27.rc
index 80170b777..80170b777 100644
--- a/pylint/test/functional/class_members_py27.rc
+++ b/tests/functional/class_members_py27.rc
diff --git a/pylint/test/functional/class_members_py27.txt b/tests/functional/class_members_py27.txt
index 3a3be0ede..3a3be0ede 100644
--- a/pylint/test/functional/class_members_py27.txt
+++ b/tests/functional/class_members_py27.txt
diff --git a/pylint/test/functional/class_members_py30.py b/tests/functional/class_members_py30.py
index 49eb93a2a..49eb93a2a 100644
--- a/pylint/test/functional/class_members_py30.py
+++ b/tests/functional/class_members_py30.py
diff --git a/pylint/test/functional/class_members_py30.rc b/tests/functional/class_members_py30.rc
index 8c6eb56c4..8c6eb56c4 100644
--- a/pylint/test/functional/class_members_py30.rc
+++ b/tests/functional/class_members_py30.rc
diff --git a/pylint/test/functional/class_members_py30.txt b/tests/functional/class_members_py30.txt
index d9163ec73..d9163ec73 100644
--- a/pylint/test/functional/class_members_py30.txt
+++ b/tests/functional/class_members_py30.txt
diff --git a/pylint/test/functional/class_scope.py b/tests/functional/class_scope.py
index 309ebd6da..309ebd6da 100644
--- a/pylint/test/functional/class_scope.py
+++ b/tests/functional/class_scope.py
diff --git a/pylint/test/functional/class_scope.txt b/tests/functional/class_scope.txt
index ea6c45abf..ea6c45abf 100644
--- a/pylint/test/functional/class_scope.txt
+++ b/tests/functional/class_scope.txt
diff --git a/pylint/test/functional/comparison_with_callable.py b/tests/functional/comparison_with_callable.py
index ea7024c1b..ea7024c1b 100644
--- a/pylint/test/functional/comparison_with_callable.py
+++ b/tests/functional/comparison_with_callable.py
diff --git a/pylint/test/functional/comparison_with_callable.txt b/tests/functional/comparison_with_callable.txt
index 87eefb181..87eefb181 100644
--- a/pylint/test/functional/comparison_with_callable.txt
+++ b/tests/functional/comparison_with_callable.txt
diff --git a/pylint/test/functional/confidence_filter.py b/tests/functional/confidence_filter.py
index 42351998d..42351998d 100644
--- a/pylint/test/functional/confidence_filter.py
+++ b/tests/functional/confidence_filter.py
diff --git a/pylint/test/functional/confidence_filter.rc b/tests/functional/confidence_filter.rc
index 74953b686..74953b686 100644
--- a/pylint/test/functional/confidence_filter.rc
+++ b/tests/functional/confidence_filter.rc
diff --git a/pylint/test/functional/confidence_filter.txt b/tests/functional/confidence_filter.txt
index 3dbb2eaf2..3dbb2eaf2 100644
--- a/pylint/test/functional/confidence_filter.txt
+++ b/tests/functional/confidence_filter.txt
diff --git a/pylint/test/functional/confusing_with_statement.py b/tests/functional/confusing_with_statement.py
index 7b8d494e4..7b8d494e4 100644
--- a/pylint/test/functional/confusing_with_statement.py
+++ b/tests/functional/confusing_with_statement.py
diff --git a/pylint/test/functional/confusing_with_statement.txt b/tests/functional/confusing_with_statement.txt
index 750ad714f..750ad714f 100644
--- a/pylint/test/functional/confusing_with_statement.txt
+++ b/tests/functional/confusing_with_statement.txt
diff --git a/pylint/test/functional/consider_iterating_dictionary.py b/tests/functional/consider_iterating_dictionary.py
index 180ee3bd3..180ee3bd3 100644
--- a/pylint/test/functional/consider_iterating_dictionary.py
+++ b/tests/functional/consider_iterating_dictionary.py
diff --git a/pylint/test/functional/consider_iterating_dictionary.txt b/tests/functional/consider_iterating_dictionary.txt
index bd596eb6b..bd596eb6b 100644
--- a/pylint/test/functional/consider_iterating_dictionary.txt
+++ b/tests/functional/consider_iterating_dictionary.txt
diff --git a/pylint/test/functional/consider_join.py b/tests/functional/consider_join.py
index 24cd6dd49..24cd6dd49 100644
--- a/pylint/test/functional/consider_join.py
+++ b/tests/functional/consider_join.py
diff --git a/pylint/test/functional/consider_join.txt b/tests/functional/consider_join.txt
index e550b2b0d..e550b2b0d 100644
--- a/pylint/test/functional/consider_join.txt
+++ b/tests/functional/consider_join.txt
diff --git a/pylint/test/functional/consider_merging_isinstance.py b/tests/functional/consider_merging_isinstance.py
index 34068d9b7..34068d9b7 100644
--- a/pylint/test/functional/consider_merging_isinstance.py
+++ b/tests/functional/consider_merging_isinstance.py
diff --git a/pylint/test/functional/consider_merging_isinstance.txt b/tests/functional/consider_merging_isinstance.txt
index a2c5338f7..a2c5338f7 100644
--- a/pylint/test/functional/consider_merging_isinstance.txt
+++ b/tests/functional/consider_merging_isinstance.txt
diff --git a/pylint/test/functional/consider_swap_variables.py b/tests/functional/consider_swap_variables.py
index e3320773f..e3320773f 100644
--- a/pylint/test/functional/consider_swap_variables.py
+++ b/tests/functional/consider_swap_variables.py
diff --git a/pylint/test/functional/consider_swap_variables.txt b/tests/functional/consider_swap_variables.txt
index 3a232fdd0..3a232fdd0 100644
--- a/pylint/test/functional/consider_swap_variables.txt
+++ b/tests/functional/consider_swap_variables.txt
diff --git a/pylint/test/functional/consider_using_dict_comprehension.py b/tests/functional/consider_using_dict_comprehension.py
index da0be6d5a..da0be6d5a 100644
--- a/pylint/test/functional/consider_using_dict_comprehension.py
+++ b/tests/functional/consider_using_dict_comprehension.py
diff --git a/pylint/test/functional/consider_using_dict_comprehension.txt b/tests/functional/consider_using_dict_comprehension.txt
index 206351e6e..206351e6e 100644
--- a/pylint/test/functional/consider_using_dict_comprehension.txt
+++ b/tests/functional/consider_using_dict_comprehension.txt
diff --git a/pylint/test/functional/consider_using_enumerate.py b/tests/functional/consider_using_enumerate.py
index 758375c37..758375c37 100644
--- a/pylint/test/functional/consider_using_enumerate.py
+++ b/tests/functional/consider_using_enumerate.py
diff --git a/pylint/test/functional/consider_using_enumerate.txt b/tests/functional/consider_using_enumerate.txt
index 9cbf330fb..9cbf330fb 100644
--- a/pylint/test/functional/consider_using_enumerate.txt
+++ b/tests/functional/consider_using_enumerate.txt
diff --git a/pylint/test/functional/consider_using_get.py b/tests/functional/consider_using_get.py
index 8c5c68901..8c5c68901 100644
--- a/pylint/test/functional/consider_using_get.py
+++ b/tests/functional/consider_using_get.py
diff --git a/pylint/test/functional/consider_using_get.txt b/tests/functional/consider_using_get.txt
index 012ba0a77..012ba0a77 100644
--- a/pylint/test/functional/consider_using_get.txt
+++ b/tests/functional/consider_using_get.txt
diff --git a/pylint/test/functional/consider_using_in.py b/tests/functional/consider_using_in.py
index fb68ac5e6..fb68ac5e6 100644
--- a/pylint/test/functional/consider_using_in.py
+++ b/tests/functional/consider_using_in.py
diff --git a/pylint/test/functional/consider_using_in.txt b/tests/functional/consider_using_in.txt
index 1093ea25a..1093ea25a 100644
--- a/pylint/test/functional/consider_using_in.txt
+++ b/tests/functional/consider_using_in.txt
diff --git a/pylint/test/functional/consider_using_set_comprehension.py b/tests/functional/consider_using_set_comprehension.py
index 2c42ef2fd..2c42ef2fd 100644
--- a/pylint/test/functional/consider_using_set_comprehension.py
+++ b/tests/functional/consider_using_set_comprehension.py
diff --git a/pylint/test/functional/consider_using_set_comprehension.txt b/tests/functional/consider_using_set_comprehension.txt
index 225d37ae8..225d37ae8 100644
--- a/pylint/test/functional/consider_using_set_comprehension.txt
+++ b/tests/functional/consider_using_set_comprehension.txt
diff --git a/pylint/test/functional/continue_in_finally.py b/tests/functional/continue_in_finally.py
index 89e1affb1..89e1affb1 100644
--- a/pylint/test/functional/continue_in_finally.py
+++ b/tests/functional/continue_in_finally.py
diff --git a/pylint/test/functional/continue_in_finally.txt b/tests/functional/continue_in_finally.txt
index cb2ee168b..cb2ee168b 100644
--- a/pylint/test/functional/continue_in_finally.txt
+++ b/tests/functional/continue_in_finally.txt
diff --git a/pylint/test/functional/control_pragmas.py b/tests/functional/control_pragmas.py
index 993f9a5dd..993f9a5dd 100644
--- a/pylint/test/functional/control_pragmas.py
+++ b/tests/functional/control_pragmas.py
diff --git a/pylint/test/functional/control_pragmas.txt b/tests/functional/control_pragmas.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/control_pragmas.txt
+++ b/tests/functional/control_pragmas.txt
diff --git a/pylint/test/functional/crash_missing_module_type.py b/tests/functional/crash_missing_module_type.py
index 308606ff4..308606ff4 100644
--- a/pylint/test/functional/crash_missing_module_type.py
+++ b/tests/functional/crash_missing_module_type.py
diff --git a/pylint/test/functional/crash_missing_module_type.txt b/tests/functional/crash_missing_module_type.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/crash_missing_module_type.txt
+++ b/tests/functional/crash_missing_module_type.txt
diff --git a/pylint/test/functional/ctor_arguments.py b/tests/functional/ctor_arguments.py
index d9a9944a6..d9a9944a6 100644
--- a/pylint/test/functional/ctor_arguments.py
+++ b/tests/functional/ctor_arguments.py
diff --git a/pylint/test/functional/ctor_arguments.txt b/tests/functional/ctor_arguments.txt
index 639e92ce1..639e92ce1 100644
--- a/pylint/test/functional/ctor_arguments.txt
+++ b/tests/functional/ctor_arguments.txt
diff --git a/pylint/test/functional/dangerous_default_value.py b/tests/functional/dangerous_default_value.py
index 58a22f443..58a22f443 100644
--- a/pylint/test/functional/dangerous_default_value.py
+++ b/tests/functional/dangerous_default_value.py
diff --git a/pylint/test/functional/dangerous_default_value.rc b/tests/functional/dangerous_default_value.rc
index a2328edb7..a2328edb7 100644
--- a/pylint/test/functional/dangerous_default_value.rc
+++ b/tests/functional/dangerous_default_value.rc
diff --git a/pylint/test/functional/dangerous_default_value.txt b/tests/functional/dangerous_default_value.txt
index 92180e90f..92180e90f 100644
--- a/pylint/test/functional/dangerous_default_value.txt
+++ b/tests/functional/dangerous_default_value.txt
diff --git a/pylint/test/functional/dangerous_default_value_py30.py b/tests/functional/dangerous_default_value_py30.py
index 58a22f443..58a22f443 100644
--- a/pylint/test/functional/dangerous_default_value_py30.py
+++ b/tests/functional/dangerous_default_value_py30.py
diff --git a/pylint/test/functional/dangerous_default_value_py30.rc b/tests/functional/dangerous_default_value_py30.rc
index 8c6eb56c4..8c6eb56c4 100644
--- a/pylint/test/functional/dangerous_default_value_py30.rc
+++ b/tests/functional/dangerous_default_value_py30.rc
diff --git a/pylint/test/functional/dangerous_default_value_py30.txt b/tests/functional/dangerous_default_value_py30.txt
index 7571c00f7..7571c00f7 100644
--- a/pylint/test/functional/dangerous_default_value_py30.txt
+++ b/tests/functional/dangerous_default_value_py30.txt
diff --git a/pylint/test/functional/defined_and_used_on_same_line.py b/tests/functional/defined_and_used_on_same_line.py
index a61bcd760..a61bcd760 100644
--- a/pylint/test/functional/defined_and_used_on_same_line.py
+++ b/tests/functional/defined_and_used_on_same_line.py
diff --git a/pylint/test/functional/deprecated_lambda.py b/tests/functional/deprecated_lambda.py
index 92a2e84ab..92a2e84ab 100644
--- a/pylint/test/functional/deprecated_lambda.py
+++ b/tests/functional/deprecated_lambda.py
diff --git a/pylint/test/functional/deprecated_lambda.rc b/tests/functional/deprecated_lambda.rc
index a65023393..a65023393 100644
--- a/pylint/test/functional/deprecated_lambda.rc
+++ b/tests/functional/deprecated_lambda.rc
diff --git a/pylint/test/functional/deprecated_lambda.txt b/tests/functional/deprecated_lambda.txt
index 78cd9fbfb..78cd9fbfb 100644
--- a/pylint/test/functional/deprecated_lambda.txt
+++ b/tests/functional/deprecated_lambda.txt
diff --git a/pylint/test/functional/deprecated_method_getmoduleinfo.py b/tests/functional/deprecated_method_getmoduleinfo.py
index 3338c2456..3338c2456 100644
--- a/pylint/test/functional/deprecated_method_getmoduleinfo.py
+++ b/tests/functional/deprecated_method_getmoduleinfo.py
diff --git a/pylint/test/functional/deprecated_method_getmoduleinfo.rc b/tests/functional/deprecated_method_getmoduleinfo.rc
index a444ca6b8..a444ca6b8 100644
--- a/pylint/test/functional/deprecated_method_getmoduleinfo.rc
+++ b/tests/functional/deprecated_method_getmoduleinfo.rc
diff --git a/pylint/test/functional/deprecated_method_getmoduleinfo.txt b/tests/functional/deprecated_method_getmoduleinfo.txt
index 9009bbf4c..9009bbf4c 100644
--- a/pylint/test/functional/deprecated_method_getmoduleinfo.txt
+++ b/tests/functional/deprecated_method_getmoduleinfo.txt
diff --git a/pylint/test/functional/deprecated_methods_py2.py b/tests/functional/deprecated_methods_py2.py
index ceba1e4f9..ceba1e4f9 100644
--- a/pylint/test/functional/deprecated_methods_py2.py
+++ b/tests/functional/deprecated_methods_py2.py
diff --git a/pylint/test/functional/deprecated_methods_py2.rc b/tests/functional/deprecated_methods_py2.rc
index a65023393..a65023393 100644
--- a/pylint/test/functional/deprecated_methods_py2.rc
+++ b/tests/functional/deprecated_methods_py2.rc
diff --git a/pylint/test/functional/deprecated_methods_py2.txt b/tests/functional/deprecated_methods_py2.txt
index e1038185c..e1038185c 100644
--- a/pylint/test/functional/deprecated_methods_py2.txt
+++ b/tests/functional/deprecated_methods_py2.txt
diff --git a/pylint/test/functional/deprecated_methods_py3.py b/tests/functional/deprecated_methods_py3.py
index d390c8d79..d390c8d79 100644
--- a/pylint/test/functional/deprecated_methods_py3.py
+++ b/tests/functional/deprecated_methods_py3.py
diff --git a/pylint/test/functional/deprecated_methods_py3.rc b/tests/functional/deprecated_methods_py3.rc
index 6c3e72704..6c3e72704 100644
--- a/pylint/test/functional/deprecated_methods_py3.rc
+++ b/tests/functional/deprecated_methods_py3.rc
diff --git a/pylint/test/functional/deprecated_methods_py3.txt b/tests/functional/deprecated_methods_py3.txt
index ad588341d..ad588341d 100644
--- a/pylint/test/functional/deprecated_methods_py3.txt
+++ b/tests/functional/deprecated_methods_py3.txt
diff --git a/pylint/test/functional/deprecated_methods_py36.py b/tests/functional/deprecated_methods_py36.py
index f416a144c..f416a144c 100644
--- a/pylint/test/functional/deprecated_methods_py36.py
+++ b/tests/functional/deprecated_methods_py36.py
diff --git a/pylint/test/functional/deprecated_methods_py36.rc b/tests/functional/deprecated_methods_py36.rc
index 0ba2b6333..0ba2b6333 100644
--- a/pylint/test/functional/deprecated_methods_py36.rc
+++ b/tests/functional/deprecated_methods_py36.rc
diff --git a/pylint/test/functional/deprecated_methods_py36.txt b/tests/functional/deprecated_methods_py36.txt
index e5ae124ac..e5ae124ac 100644
--- a/pylint/test/functional/deprecated_methods_py36.txt
+++ b/tests/functional/deprecated_methods_py36.txt
diff --git a/pylint/test/functional/deprecated_methods_py38.py b/tests/functional/deprecated_methods_py38.py
index 4ca5e5197..4ca5e5197 100644
--- a/pylint/test/functional/deprecated_methods_py38.py
+++ b/tests/functional/deprecated_methods_py38.py
diff --git a/pylint/test/functional/deprecated_methods_py38.rc b/tests/functional/deprecated_methods_py38.rc
index 85fc502b3..85fc502b3 100644
--- a/pylint/test/functional/deprecated_methods_py38.rc
+++ b/tests/functional/deprecated_methods_py38.rc
diff --git a/pylint/test/functional/deprecated_methods_py38.txt b/tests/functional/deprecated_methods_py38.txt
index 819d4420b..819d4420b 100644
--- a/pylint/test/functional/deprecated_methods_py38.txt
+++ b/tests/functional/deprecated_methods_py38.txt
diff --git a/pylint/test/functional/deprecated_module_py2.py b/tests/functional/deprecated_module_py2.py
index b0d186540..b0d186540 100644
--- a/pylint/test/functional/deprecated_module_py2.py
+++ b/tests/functional/deprecated_module_py2.py
diff --git a/pylint/test/functional/deprecated_module_py2.rc b/tests/functional/deprecated_module_py2.rc
index a65023393..a65023393 100644
--- a/pylint/test/functional/deprecated_module_py2.rc
+++ b/tests/functional/deprecated_module_py2.rc
diff --git a/pylint/test/functional/deprecated_module_py2.txt b/tests/functional/deprecated_module_py2.txt
index 54f555505..54f555505 100644
--- a/pylint/test/functional/deprecated_module_py2.txt
+++ b/tests/functional/deprecated_module_py2.txt
diff --git a/pylint/test/functional/deprecated_module_py3.py b/tests/functional/deprecated_module_py3.py
index 308d400e7..308d400e7 100644
--- a/pylint/test/functional/deprecated_module_py3.py
+++ b/tests/functional/deprecated_module_py3.py
diff --git a/pylint/test/functional/deprecated_module_py3.rc b/tests/functional/deprecated_module_py3.rc
index 46343d2f1..46343d2f1 100644
--- a/pylint/test/functional/deprecated_module_py3.rc
+++ b/tests/functional/deprecated_module_py3.rc
diff --git a/pylint/test/functional/deprecated_module_py3.txt b/tests/functional/deprecated_module_py3.txt
index c41bf3b61..c41bf3b61 100644
--- a/pylint/test/functional/deprecated_module_py3.txt
+++ b/tests/functional/deprecated_module_py3.txt
diff --git a/pylint/test/functional/deprecated_module_py36.py b/tests/functional/deprecated_module_py36.py
index c49f9f0bc..c49f9f0bc 100644
--- a/pylint/test/functional/deprecated_module_py36.py
+++ b/tests/functional/deprecated_module_py36.py
diff --git a/pylint/test/functional/deprecated_module_py36.rc b/tests/functional/deprecated_module_py36.rc
index 0ba2b6333..0ba2b6333 100644
--- a/pylint/test/functional/deprecated_module_py36.rc
+++ b/tests/functional/deprecated_module_py36.rc
diff --git a/pylint/test/functional/deprecated_module_py36.txt b/tests/functional/deprecated_module_py36.txt
index c41bf3b61..c41bf3b61 100644
--- a/pylint/test/functional/deprecated_module_py36.txt
+++ b/tests/functional/deprecated_module_py36.txt
diff --git a/pylint/test/functional/deprecated_module_py4.py b/tests/functional/deprecated_module_py4.py
index 3cad959e7..3cad959e7 100644
--- a/pylint/test/functional/deprecated_module_py4.py
+++ b/tests/functional/deprecated_module_py4.py
diff --git a/pylint/test/functional/deprecated_module_py4.rc b/tests/functional/deprecated_module_py4.rc
index 6fbd3407e..6fbd3407e 100644
--- a/pylint/test/functional/deprecated_module_py4.rc
+++ b/tests/functional/deprecated_module_py4.rc
diff --git a/pylint/test/functional/deprecated_module_py4.txt b/tests/functional/deprecated_module_py4.txt
index 74062f7b5..74062f7b5 100644
--- a/pylint/test/functional/deprecated_module_py4.txt
+++ b/tests/functional/deprecated_module_py4.txt
diff --git a/pylint/test/functional/deprecated_module_uninstalled.py b/tests/functional/deprecated_module_uninstalled.py
index 52d55fa84..52d55fa84 100644
--- a/pylint/test/functional/deprecated_module_uninstalled.py
+++ b/tests/functional/deprecated_module_uninstalled.py
diff --git a/pylint/test/functional/deprecated_module_uninstalled.rc b/tests/functional/deprecated_module_uninstalled.rc
index 05973daa7..05973daa7 100644
--- a/pylint/test/functional/deprecated_module_uninstalled.rc
+++ b/tests/functional/deprecated_module_uninstalled.rc
diff --git a/pylint/test/functional/deprecated_module_uninstalled.txt b/tests/functional/deprecated_module_uninstalled.txt
index 6f14ddd24..6f14ddd24 100644
--- a/pylint/test/functional/deprecated_module_uninstalled.txt
+++ b/tests/functional/deprecated_module_uninstalled.txt
diff --git a/pylint/test/functional/dict_iter_missing_items.py b/tests/functional/dict_iter_missing_items.py
index 333f58990..333f58990 100644
--- a/pylint/test/functional/dict_iter_missing_items.py
+++ b/tests/functional/dict_iter_missing_items.py
diff --git a/pylint/test/functional/dict_iter_missing_items.txt b/tests/functional/dict_iter_missing_items.txt
index 0e939ee33..0e939ee33 100644
--- a/pylint/test/functional/dict_iter_missing_items.txt
+++ b/tests/functional/dict_iter_missing_items.txt
diff --git a/pylint/test/functional/disable_msg_github_issue_1389.py b/tests/functional/disable_msg_github_issue_1389.py
index 5c7ad1e5d..5c7ad1e5d 100644
--- a/pylint/test/functional/disable_msg_github_issue_1389.py
+++ b/tests/functional/disable_msg_github_issue_1389.py
diff --git a/pylint/test/functional/disable_msg_github_issue_1389.rc b/tests/functional/disable_msg_github_issue_1389.rc
index 1450ccc64..1450ccc64 100644
--- a/pylint/test/functional/disable_msg_github_issue_1389.rc
+++ b/tests/functional/disable_msg_github_issue_1389.rc
diff --git a/pylint/test/functional/disable_ungrouped_imports.py b/tests/functional/disable_ungrouped_imports.py
index 836c76d1a..836c76d1a 100644
--- a/pylint/test/functional/disable_ungrouped_imports.py
+++ b/tests/functional/disable_ungrouped_imports.py
diff --git a/pylint/test/functional/disable_ungrouped_imports.txt b/tests/functional/disable_ungrouped_imports.txt
index 9f2fa443f..9f2fa443f 100644
--- a/pylint/test/functional/disable_ungrouped_imports.txt
+++ b/tests/functional/disable_ungrouped_imports.txt
diff --git a/pylint/test/functional/disable_wrong_import_order.py b/tests/functional/disable_wrong_import_order.py
index 1fdf83fb1..1fdf83fb1 100644
--- a/pylint/test/functional/disable_wrong_import_order.py
+++ b/tests/functional/disable_wrong_import_order.py
diff --git a/pylint/test/functional/disable_wrong_import_order.txt b/tests/functional/disable_wrong_import_order.txt
index df71711fc..df71711fc 100644
--- a/pylint/test/functional/disable_wrong_import_order.txt
+++ b/tests/functional/disable_wrong_import_order.txt
diff --git a/pylint/test/functional/disable_wrong_import_position.py b/tests/functional/disable_wrong_import_position.py
index 0703325a9..0703325a9 100644
--- a/pylint/test/functional/disable_wrong_import_position.py
+++ b/tests/functional/disable_wrong_import_position.py
diff --git a/pylint/test/functional/docstrings.py b/tests/functional/docstrings.py
index 8168167c5..8168167c5 100644
--- a/pylint/test/functional/docstrings.py
+++ b/tests/functional/docstrings.py
diff --git a/pylint/test/functional/docstrings.txt b/tests/functional/docstrings.txt
index e30e4629c..e30e4629c 100644
--- a/pylint/test/functional/docstrings.txt
+++ b/tests/functional/docstrings.txt
diff --git a/pylint/test/functional/duplicate_argument_name.py b/tests/functional/duplicate_argument_name.py
index c60b11784..c60b11784 100644
--- a/pylint/test/functional/duplicate_argument_name.py
+++ b/tests/functional/duplicate_argument_name.py
diff --git a/pylint/test/functional/duplicate_argument_name.txt b/tests/functional/duplicate_argument_name.txt
index d60d1eb28..d60d1eb28 100644
--- a/pylint/test/functional/duplicate_argument_name.txt
+++ b/tests/functional/duplicate_argument_name.txt
diff --git a/pylint/test/functional/duplicate_argument_name_py3.py b/tests/functional/duplicate_argument_name_py3.py
index c7fbe3478..c7fbe3478 100644
--- a/pylint/test/functional/duplicate_argument_name_py3.py
+++ b/tests/functional/duplicate_argument_name_py3.py
diff --git a/pylint/test/functional/duplicate_argument_name_py3.rc b/tests/functional/duplicate_argument_name_py3.rc
index a2ab06c50..a2ab06c50 100644
--- a/pylint/test/functional/duplicate_argument_name_py3.rc
+++ b/tests/functional/duplicate_argument_name_py3.rc
diff --git a/pylint/test/functional/duplicate_argument_name_py3.txt b/tests/functional/duplicate_argument_name_py3.txt
index d86631746..d86631746 100644
--- a/pylint/test/functional/duplicate_argument_name_py3.txt
+++ b/tests/functional/duplicate_argument_name_py3.txt
diff --git a/pylint/test/functional/duplicate_bases.py b/tests/functional/duplicate_bases.py
index 974f97584..974f97584 100644
--- a/pylint/test/functional/duplicate_bases.py
+++ b/tests/functional/duplicate_bases.py
diff --git a/pylint/test/functional/duplicate_bases.txt b/tests/functional/duplicate_bases.txt
index beb91b53f..beb91b53f 100644
--- a/pylint/test/functional/duplicate_bases.txt
+++ b/tests/functional/duplicate_bases.txt
diff --git a/pylint/test/functional/duplicate_dict_literal_key.py b/tests/functional/duplicate_dict_literal_key.py
index 726a2591e..726a2591e 100644
--- a/pylint/test/functional/duplicate_dict_literal_key.py
+++ b/tests/functional/duplicate_dict_literal_key.py
diff --git a/pylint/test/functional/duplicate_dict_literal_key.txt b/tests/functional/duplicate_dict_literal_key.txt
index 060d9dc63..060d9dc63 100644
--- a/pylint/test/functional/duplicate_dict_literal_key.txt
+++ b/tests/functional/duplicate_dict_literal_key.txt
diff --git a/pylint/test/functional/duplicate_except.py b/tests/functional/duplicate_except.py
index c68cf7a24..c68cf7a24 100644
--- a/pylint/test/functional/duplicate_except.py
+++ b/tests/functional/duplicate_except.py
diff --git a/pylint/test/functional/duplicate_except.txt b/tests/functional/duplicate_except.txt
index a037948e9..a037948e9 100644
--- a/pylint/test/functional/duplicate_except.txt
+++ b/tests/functional/duplicate_except.txt
diff --git a/pylint/test/functional/duplicate_string_formatting_argument.py b/tests/functional/duplicate_string_formatting_argument.py
index b012f98e0..b012f98e0 100644
--- a/pylint/test/functional/duplicate_string_formatting_argument.py
+++ b/tests/functional/duplicate_string_formatting_argument.py
diff --git a/pylint/test/functional/duplicate_string_formatting_argument.txt b/tests/functional/duplicate_string_formatting_argument.txt
index 6d352eb2e..6d352eb2e 100644
--- a/pylint/test/functional/duplicate_string_formatting_argument.txt
+++ b/tests/functional/duplicate_string_formatting_argument.txt
diff --git a/pylint/test/functional/eval_used.py b/tests/functional/eval_used.py
index d03dad7ca..d03dad7ca 100644
--- a/pylint/test/functional/eval_used.py
+++ b/tests/functional/eval_used.py
diff --git a/pylint/test/functional/eval_used.txt b/tests/functional/eval_used.txt
index 7f0e04143..7f0e04143 100644
--- a/pylint/test/functional/eval_used.txt
+++ b/tests/functional/eval_used.txt
diff --git a/pylint/test/functional/exception_is_binary_op.py b/tests/functional/exception_is_binary_op.py
index f71163d1f..f71163d1f 100644
--- a/pylint/test/functional/exception_is_binary_op.py
+++ b/tests/functional/exception_is_binary_op.py
diff --git a/pylint/test/functional/exception_is_binary_op.txt b/tests/functional/exception_is_binary_op.txt
index e6512c968..e6512c968 100644
--- a/pylint/test/functional/exception_is_binary_op.txt
+++ b/tests/functional/exception_is_binary_op.txt
diff --git a/pylint/test/functional/exception_message.py b/tests/functional/exception_message.py
index da95c78f7..da95c78f7 100644
--- a/pylint/test/functional/exception_message.py
+++ b/tests/functional/exception_message.py
diff --git a/pylint/test/functional/exception_message.rc b/tests/functional/exception_message.rc
index 9540bc95e..9540bc95e 100644
--- a/pylint/test/functional/exception_message.rc
+++ b/tests/functional/exception_message.rc
diff --git a/pylint/test/functional/exception_message.txt b/tests/functional/exception_message.txt
index b2a993bdf..b2a993bdf 100644
--- a/pylint/test/functional/exception_message.txt
+++ b/tests/functional/exception_message.txt
diff --git a/pylint/test/functional/exec_used_py2.py b/tests/functional/exec_used_py2.py
index 8f7f07d90..8f7f07d90 100644
--- a/pylint/test/functional/exec_used_py2.py
+++ b/tests/functional/exec_used_py2.py
diff --git a/pylint/test/functional/exec_used_py2.rc b/tests/functional/exec_used_py2.rc
index a65023393..a65023393 100644
--- a/pylint/test/functional/exec_used_py2.rc
+++ b/tests/functional/exec_used_py2.rc
diff --git a/pylint/test/functional/exec_used_py2.txt b/tests/functional/exec_used_py2.txt
index 6b0e7d1a2..6b0e7d1a2 100644
--- a/pylint/test/functional/exec_used_py2.txt
+++ b/tests/functional/exec_used_py2.txt
diff --git a/pylint/test/functional/exec_used_py3.py b/tests/functional/exec_used_py3.py
index 5f849480e..5f849480e 100644
--- a/pylint/test/functional/exec_used_py3.py
+++ b/tests/functional/exec_used_py3.py
diff --git a/pylint/test/functional/exec_used_py3.rc b/tests/functional/exec_used_py3.rc
index c093be204..c093be204 100644
--- a/pylint/test/functional/exec_used_py3.rc
+++ b/tests/functional/exec_used_py3.rc
diff --git a/pylint/test/functional/exec_used_py3.txt b/tests/functional/exec_used_py3.txt
index 67885745a..67885745a 100644
--- a/pylint/test/functional/exec_used_py3.txt
+++ b/tests/functional/exec_used_py3.txt
diff --git a/pylint/test/functional/fallback_import_disabled.py b/tests/functional/fallback_import_disabled.py
index 321eb1158..321eb1158 100644
--- a/pylint/test/functional/fallback_import_disabled.py
+++ b/tests/functional/fallback_import_disabled.py
diff --git a/pylint/test/functional/fallback_import_disabled.txt b/tests/functional/fallback_import_disabled.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/fallback_import_disabled.txt
+++ b/tests/functional/fallback_import_disabled.txt
diff --git a/pylint/test/functional/fallback_import_enabled.py b/tests/functional/fallback_import_enabled.py
index 9420830ff..9420830ff 100644
--- a/pylint/test/functional/fallback_import_enabled.py
+++ b/tests/functional/fallback_import_enabled.py
diff --git a/pylint/test/functional/fallback_import_enabled.rc b/tests/functional/fallback_import_enabled.rc
index 204ce11b6..204ce11b6 100644
--- a/pylint/test/functional/fallback_import_enabled.rc
+++ b/tests/functional/fallback_import_enabled.rc
diff --git a/pylint/test/functional/fallback_import_enabled.txt b/tests/functional/fallback_import_enabled.txt
index e795b82c0..e795b82c0 100644
--- a/pylint/test/functional/fallback_import_enabled.txt
+++ b/tests/functional/fallback_import_enabled.txt
diff --git a/pylint/test/functional/fixme.py b/tests/functional/fixme.py
index 298355d4a..298355d4a 100644
--- a/pylint/test/functional/fixme.py
+++ b/tests/functional/fixme.py
diff --git a/pylint/test/functional/fixme.txt b/tests/functional/fixme.txt
index d281646e6..d281646e6 100644
--- a/pylint/test/functional/fixme.txt
+++ b/tests/functional/fixme.txt
diff --git a/pylint/test/functional/fixme_bad_formatting_1139.py b/tests/functional/fixme_bad_formatting_1139.py
index 33030ed4c..33030ed4c 100644
--- a/pylint/test/functional/fixme_bad_formatting_1139.py
+++ b/tests/functional/fixme_bad_formatting_1139.py
diff --git a/pylint/test/functional/fixme_bad_formatting_1139.rc b/tests/functional/fixme_bad_formatting_1139.rc
index 554bb3013..554bb3013 100644
--- a/pylint/test/functional/fixme_bad_formatting_1139.rc
+++ b/tests/functional/fixme_bad_formatting_1139.rc
diff --git a/pylint/test/functional/fixme_bad_formatting_1139.txt b/tests/functional/fixme_bad_formatting_1139.txt
index 62ea8b887..62ea8b887 100644
--- a/pylint/test/functional/fixme_bad_formatting_1139.txt
+++ b/tests/functional/fixme_bad_formatting_1139.txt
diff --git a/pylint/test/functional/formatted_string_literal_with_if_py36.py b/tests/functional/formatted_string_literal_with_if_py36.py
index 8feb4e293..8feb4e293 100644
--- a/pylint/test/functional/formatted_string_literal_with_if_py36.py
+++ b/tests/functional/formatted_string_literal_with_if_py36.py
diff --git a/pylint/test/functional/formatted_string_literal_with_if_py36.rc b/tests/functional/formatted_string_literal_with_if_py36.rc
index 0ba2b6333..0ba2b6333 100644
--- a/pylint/test/functional/formatted_string_literal_with_if_py36.rc
+++ b/tests/functional/formatted_string_literal_with_if_py36.rc
diff --git a/pylint/test/functional/formatting.txt b/tests/functional/formatting.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/formatting.txt
+++ b/tests/functional/formatting.txt
diff --git a/pylint/test/functional/function_redefined.py b/tests/functional/function_redefined.py
index ba2832894..ba2832894 100644
--- a/pylint/test/functional/function_redefined.py
+++ b/tests/functional/function_redefined.py
diff --git a/pylint/test/functional/function_redefined.txt b/tests/functional/function_redefined.txt
index fcd3c0ef2..fcd3c0ef2 100644
--- a/pylint/test/functional/function_redefined.txt
+++ b/tests/functional/function_redefined.txt
diff --git a/pylint/test/functional/future_import.py b/tests/functional/future_import.py
index e4d3785a1..e4d3785a1 100644
--- a/pylint/test/functional/future_import.py
+++ b/tests/functional/future_import.py
diff --git a/pylint/test/functional/future_unicode_literals.py b/tests/functional/future_unicode_literals.py
index 30c2bd6b3..30c2bd6b3 100644
--- a/pylint/test/functional/future_unicode_literals.py
+++ b/tests/functional/future_unicode_literals.py
diff --git a/pylint/test/functional/future_unicode_literals.rc b/tests/functional/future_unicode_literals.rc
index 58b5a9413..58b5a9413 100644
--- a/pylint/test/functional/future_unicode_literals.rc
+++ b/tests/functional/future_unicode_literals.rc
diff --git a/pylint/test/functional/future_unicode_literals.txt b/tests/functional/future_unicode_literals.txt
index 60d291e72..60d291e72 100644
--- a/pylint/test/functional/future_unicode_literals.txt
+++ b/tests/functional/future_unicode_literals.txt
diff --git a/pylint/test/functional/generated_members.py b/tests/functional/generated_members.py
index 802ebaf8f..802ebaf8f 100644
--- a/pylint/test/functional/generated_members.py
+++ b/tests/functional/generated_members.py
diff --git a/pylint/test/functional/generated_members.rc b/tests/functional/generated_members.rc
index 177eca955..177eca955 100644
--- a/pylint/test/functional/generated_members.rc
+++ b/tests/functional/generated_members.rc
diff --git a/pylint/test/functional/genexp_in_class_scope.py b/tests/functional/genexp_in_class_scope.py
index 868cf6b79..868cf6b79 100644
--- a/pylint/test/functional/genexp_in_class_scope.py
+++ b/tests/functional/genexp_in_class_scope.py
diff --git a/pylint/test/functional/genexp_in_class_scope.txt b/tests/functional/genexp_in_class_scope.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/genexp_in_class_scope.txt
+++ b/tests/functional/genexp_in_class_scope.txt
diff --git a/pylint/test/functional/genexpr_variable_scope.py b/tests/functional/genexpr_variable_scope.py
index a00d72d32..a00d72d32 100644
--- a/pylint/test/functional/genexpr_variable_scope.py
+++ b/tests/functional/genexpr_variable_scope.py
diff --git a/pylint/test/functional/genexpr_variable_scope.txt b/tests/functional/genexpr_variable_scope.txt
index 3cfa6c5e0..3cfa6c5e0 100644
--- a/pylint/test/functional/genexpr_variable_scope.txt
+++ b/tests/functional/genexpr_variable_scope.txt
diff --git a/pylint/test/functional/globals.py b/tests/functional/globals.py
index 1a24ff736..1a24ff736 100644
--- a/pylint/test/functional/globals.py
+++ b/tests/functional/globals.py
diff --git a/pylint/test/functional/globals.txt b/tests/functional/globals.txt
index 0ce528daf..0ce528daf 100644
--- a/pylint/test/functional/globals.txt
+++ b/tests/functional/globals.txt
diff --git a/pylint/test/functional/implicit_str_concat_in_sequence.py b/tests/functional/implicit_str_concat_in_sequence.py
index 8c4b5cb46..8c4b5cb46 100644
--- a/pylint/test/functional/implicit_str_concat_in_sequence.py
+++ b/tests/functional/implicit_str_concat_in_sequence.py
diff --git a/pylint/test/functional/implicit_str_concat_in_sequence.txt b/tests/functional/implicit_str_concat_in_sequence.txt
index b9e1cbba9..b9e1cbba9 100644
--- a/pylint/test/functional/implicit_str_concat_in_sequence.txt
+++ b/tests/functional/implicit_str_concat_in_sequence.txt
diff --git a/pylint/test/functional/implicit_str_concat_in_sequence_latin1.py b/tests/functional/implicit_str_concat_in_sequence_latin1.py
index 44a2a94cb..44a2a94cb 100644
--- a/pylint/test/functional/implicit_str_concat_in_sequence_latin1.py
+++ b/tests/functional/implicit_str_concat_in_sequence_latin1.py
diff --git a/pylint/test/functional/implicit_str_concat_in_sequence_latin1.txt b/tests/functional/implicit_str_concat_in_sequence_latin1.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/implicit_str_concat_in_sequence_latin1.txt
+++ b/tests/functional/implicit_str_concat_in_sequence_latin1.txt
diff --git a/pylint/test/functional/implicit_str_concat_in_sequence_multiline.py b/tests/functional/implicit_str_concat_in_sequence_multiline.py
index 0f8d1fcdf..0f8d1fcdf 100755
--- a/pylint/test/functional/implicit_str_concat_in_sequence_multiline.py
+++ b/tests/functional/implicit_str_concat_in_sequence_multiline.py
diff --git a/pylint/test/functional/implicit_str_concat_in_sequence_multiline.rc b/tests/functional/implicit_str_concat_in_sequence_multiline.rc
index e5b344774..e5b344774 100755
--- a/pylint/test/functional/implicit_str_concat_in_sequence_multiline.rc
+++ b/tests/functional/implicit_str_concat_in_sequence_multiline.rc
diff --git a/pylint/test/functional/implicit_str_concat_in_sequence_multiline.txt b/tests/functional/implicit_str_concat_in_sequence_multiline.txt
index b37cf624b..b37cf624b 100755
--- a/pylint/test/functional/implicit_str_concat_in_sequence_multiline.txt
+++ b/tests/functional/implicit_str_concat_in_sequence_multiline.txt
diff --git a/pylint/test/functional/implicit_str_concat_in_sequence_utf8.py b/tests/functional/implicit_str_concat_in_sequence_utf8.py
index fa996e90c..fa996e90c 100644
--- a/pylint/test/functional/implicit_str_concat_in_sequence_utf8.py
+++ b/tests/functional/implicit_str_concat_in_sequence_utf8.py
diff --git a/pylint/test/functional/implicit_str_concat_in_sequence_utf8.txt b/tests/functional/implicit_str_concat_in_sequence_utf8.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/implicit_str_concat_in_sequence_utf8.txt
+++ b/tests/functional/implicit_str_concat_in_sequence_utf8.txt
diff --git a/pylint/test/functional/import_error.py b/tests/functional/import_error.py
index 69fd15be1..69fd15be1 100644
--- a/pylint/test/functional/import_error.py
+++ b/tests/functional/import_error.py
diff --git a/pylint/test/functional/import_error.rc b/tests/functional/import_error.rc
index de78a17ce..de78a17ce 100644
--- a/pylint/test/functional/import_error.rc
+++ b/tests/functional/import_error.rc
diff --git a/pylint/test/functional/import_error.txt b/tests/functional/import_error.txt
index 493e79a01..493e79a01 100644
--- a/pylint/test/functional/import_error.txt
+++ b/tests/functional/import_error.txt
diff --git a/pylint/test/functional/inconsistent_mro.py b/tests/functional/inconsistent_mro.py
index 0b65068d7..0b65068d7 100644
--- a/pylint/test/functional/inconsistent_mro.py
+++ b/tests/functional/inconsistent_mro.py
diff --git a/pylint/test/functional/inconsistent_mro.txt b/tests/functional/inconsistent_mro.txt
index 1ae9687d5..1ae9687d5 100644
--- a/pylint/test/functional/inconsistent_mro.txt
+++ b/tests/functional/inconsistent_mro.txt
diff --git a/pylint/test/functional/inconsistent_returns.py b/tests/functional/inconsistent_returns.py
index 619165611..619165611 100644
--- a/pylint/test/functional/inconsistent_returns.py
+++ b/tests/functional/inconsistent_returns.py
diff --git a/pylint/test/functional/inconsistent_returns.rc b/tests/functional/inconsistent_returns.rc
index dd6cbb598..dd6cbb598 100644
--- a/pylint/test/functional/inconsistent_returns.rc
+++ b/tests/functional/inconsistent_returns.rc
diff --git a/pylint/test/functional/inconsistent_returns.txt b/tests/functional/inconsistent_returns.txt
index d2d70e653..d2d70e653 100644
--- a/pylint/test/functional/inconsistent_returns.txt
+++ b/tests/functional/inconsistent_returns.txt
diff --git a/pylint/test/functional/indexing_exception.py b/tests/functional/indexing_exception.py
index 9ac1a7c68..9ac1a7c68 100644
--- a/pylint/test/functional/indexing_exception.py
+++ b/tests/functional/indexing_exception.py
diff --git a/pylint/test/functional/indexing_exception.rc b/tests/functional/indexing_exception.rc
index 9540bc95e..9540bc95e 100644
--- a/pylint/test/functional/indexing_exception.rc
+++ b/tests/functional/indexing_exception.rc
diff --git a/pylint/test/functional/indexing_exception.txt b/tests/functional/indexing_exception.txt
index 9f3067803..9f3067803 100644
--- a/pylint/test/functional/indexing_exception.txt
+++ b/tests/functional/indexing_exception.txt
diff --git a/pylint/test/functional/inherit_non_class.py b/tests/functional/inherit_non_class.py
index ee9ef508c..ee9ef508c 100644
--- a/pylint/test/functional/inherit_non_class.py
+++ b/tests/functional/inherit_non_class.py
diff --git a/pylint/test/functional/inherit_non_class.txt b/tests/functional/inherit_non_class.txt
index 3be70cb9d..3be70cb9d 100644
--- a/pylint/test/functional/inherit_non_class.txt
+++ b/tests/functional/inherit_non_class.txt
diff --git a/pylint/test/functional/init_is_generator.py b/tests/functional/init_is_generator.py
index 17f96db30..17f96db30 100644
--- a/pylint/test/functional/init_is_generator.py
+++ b/tests/functional/init_is_generator.py
diff --git a/pylint/test/functional/init_is_generator.txt b/tests/functional/init_is_generator.txt
index 5d2132a1f..5d2132a1f 100644
--- a/pylint/test/functional/init_is_generator.txt
+++ b/tests/functional/init_is_generator.txt
diff --git a/pylint/test/functional/init_not_called.py b/tests/functional/init_not_called.py
index 282306489..282306489 100644
--- a/pylint/test/functional/init_not_called.py
+++ b/tests/functional/init_not_called.py
diff --git a/pylint/test/functional/init_not_called.txt b/tests/functional/init_not_called.txt
index 955d4181b..955d4181b 100644
--- a/pylint/test/functional/init_not_called.txt
+++ b/tests/functional/init_not_called.txt
diff --git a/pylint/test/functional/init_subclass_classmethod_py36.py b/tests/functional/init_subclass_classmethod_py36.py
index ad379705d..ad379705d 100644
--- a/pylint/test/functional/init_subclass_classmethod_py36.py
+++ b/tests/functional/init_subclass_classmethod_py36.py
diff --git a/pylint/test/functional/init_subclass_classmethod_py36.rc b/tests/functional/init_subclass_classmethod_py36.rc
index 1450ccc64..1450ccc64 100644
--- a/pylint/test/functional/init_subclass_classmethod_py36.rc
+++ b/tests/functional/init_subclass_classmethod_py36.rc
diff --git a/pylint/test/functional/invalid_all_object.py b/tests/functional/invalid_all_object.py
index 4468c987b..4468c987b 100644
--- a/pylint/test/functional/invalid_all_object.py
+++ b/tests/functional/invalid_all_object.py
diff --git a/pylint/test/functional/invalid_all_object.txt b/tests/functional/invalid_all_object.txt
index b25efc8f6..b25efc8f6 100644
--- a/pylint/test/functional/invalid_all_object.txt
+++ b/tests/functional/invalid_all_object.txt
diff --git a/pylint/test/functional/invalid_encoded_data.py b/tests/functional/invalid_encoded_data.py
index 743031cef..743031cef 100644
--- a/pylint/test/functional/invalid_encoded_data.py
+++ b/tests/functional/invalid_encoded_data.py
diff --git a/pylint/test/functional/invalid_encoded_data.rc b/tests/functional/invalid_encoded_data.rc
index a65023393..a65023393 100644
--- a/pylint/test/functional/invalid_encoded_data.rc
+++ b/tests/functional/invalid_encoded_data.rc
diff --git a/pylint/test/functional/invalid_encoded_data.txt b/tests/functional/invalid_encoded_data.txt
index c6e69dc1f..c6e69dc1f 100644
--- a/pylint/test/functional/invalid_encoded_data.txt
+++ b/tests/functional/invalid_encoded_data.txt
diff --git a/pylint/test/functional/invalid_encoding_py27.py b/tests/functional/invalid_encoding_py27.py
index fb6b2de16..fb6b2de16 100644
--- a/pylint/test/functional/invalid_encoding_py27.py
+++ b/tests/functional/invalid_encoding_py27.py
diff --git a/pylint/test/functional/invalid_encoding_py27.rc b/tests/functional/invalid_encoding_py27.rc
index eca2dd95a..eca2dd95a 100644
--- a/pylint/test/functional/invalid_encoding_py27.rc
+++ b/tests/functional/invalid_encoding_py27.rc
diff --git a/pylint/test/functional/invalid_encoding_py27.txt b/tests/functional/invalid_encoding_py27.txt
index 856a1a1db..856a1a1db 100644
--- a/pylint/test/functional/invalid_encoding_py27.txt
+++ b/tests/functional/invalid_encoding_py27.txt
diff --git a/pylint/test/functional/invalid_envvar_value.py b/tests/functional/invalid_envvar_value.py
index 3c1a8882b..3c1a8882b 100644
--- a/pylint/test/functional/invalid_envvar_value.py
+++ b/tests/functional/invalid_envvar_value.py
diff --git a/pylint/test/functional/invalid_envvar_value.txt b/tests/functional/invalid_envvar_value.txt
index 824d20e3f..824d20e3f 100644
--- a/pylint/test/functional/invalid_envvar_value.txt
+++ b/tests/functional/invalid_envvar_value.txt
diff --git a/pylint/test/functional/invalid_exceptions_caught.py b/tests/functional/invalid_exceptions_caught.py
index 252643446..252643446 100644
--- a/pylint/test/functional/invalid_exceptions_caught.py
+++ b/tests/functional/invalid_exceptions_caught.py
diff --git a/pylint/test/functional/invalid_exceptions_caught.txt b/tests/functional/invalid_exceptions_caught.txt
index e51030b69..e51030b69 100644
--- a/pylint/test/functional/invalid_exceptions_caught.txt
+++ b/tests/functional/invalid_exceptions_caught.txt
diff --git a/pylint/test/functional/invalid_exceptions_raised.py b/tests/functional/invalid_exceptions_raised.py
index 78e6b65a0..78e6b65a0 100644
--- a/pylint/test/functional/invalid_exceptions_raised.py
+++ b/tests/functional/invalid_exceptions_raised.py
diff --git a/pylint/test/functional/invalid_exceptions_raised.txt b/tests/functional/invalid_exceptions_raised.txt
index 47eb0fec2..47eb0fec2 100644
--- a/pylint/test/functional/invalid_exceptions_raised.txt
+++ b/tests/functional/invalid_exceptions_raised.txt
diff --git a/pylint/test/functional/invalid_length_returned.py b/tests/functional/invalid_length_returned.py
index e57db5290..e57db5290 100644
--- a/pylint/test/functional/invalid_length_returned.py
+++ b/tests/functional/invalid_length_returned.py
diff --git a/pylint/test/functional/invalid_length_returned.txt b/tests/functional/invalid_length_returned.txt
index 6febeb612..6febeb612 100644
--- a/pylint/test/functional/invalid_length_returned.txt
+++ b/tests/functional/invalid_length_returned.txt
diff --git a/pylint/test/functional/invalid_metaclass.py b/tests/functional/invalid_metaclass.py
index c0e9d74be..c0e9d74be 100644
--- a/pylint/test/functional/invalid_metaclass.py
+++ b/tests/functional/invalid_metaclass.py
diff --git a/pylint/test/functional/invalid_metaclass.txt b/tests/functional/invalid_metaclass.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/invalid_metaclass.txt
+++ b/tests/functional/invalid_metaclass.txt
diff --git a/pylint/test/functional/invalid_metaclass_py3.py b/tests/functional/invalid_metaclass_py3.py
index 2fc458f5c..2fc458f5c 100644
--- a/pylint/test/functional/invalid_metaclass_py3.py
+++ b/tests/functional/invalid_metaclass_py3.py
diff --git a/pylint/test/functional/invalid_metaclass_py3.rc b/tests/functional/invalid_metaclass_py3.rc
index c093be204..c093be204 100644
--- a/pylint/test/functional/invalid_metaclass_py3.rc
+++ b/tests/functional/invalid_metaclass_py3.rc
diff --git a/pylint/test/functional/invalid_metaclass_py3.txt b/tests/functional/invalid_metaclass_py3.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/invalid_metaclass_py3.txt
+++ b/tests/functional/invalid_metaclass_py3.txt
diff --git a/pylint/test/functional/invalid_name.py b/tests/functional/invalid_name.py
index 1a949904e..1a949904e 100644
--- a/pylint/test/functional/invalid_name.py
+++ b/tests/functional/invalid_name.py
diff --git a/pylint/test/functional/invalid_name.txt b/tests/functional/invalid_name.txt
index 25d3a56f0..25d3a56f0 100644
--- a/pylint/test/functional/invalid_name.txt
+++ b/tests/functional/invalid_name.txt
diff --git a/pylint/test/functional/invalid_sequence_index.py b/tests/functional/invalid_sequence_index.py
index d11155c02..d11155c02 100644
--- a/pylint/test/functional/invalid_sequence_index.py
+++ b/tests/functional/invalid_sequence_index.py
diff --git a/pylint/test/functional/invalid_sequence_index.txt b/tests/functional/invalid_sequence_index.txt
index 204aebc9f..204aebc9f 100644
--- a/pylint/test/functional/invalid_sequence_index.txt
+++ b/tests/functional/invalid_sequence_index.txt
diff --git a/pylint/test/functional/invalid_slice_index.py b/tests/functional/invalid_slice_index.py
index 1eb2fda9c..1eb2fda9c 100644
--- a/pylint/test/functional/invalid_slice_index.py
+++ b/tests/functional/invalid_slice_index.py
diff --git a/pylint/test/functional/invalid_slice_index.txt b/tests/functional/invalid_slice_index.txt
index cd4dc6e9c..cd4dc6e9c 100644
--- a/pylint/test/functional/invalid_slice_index.txt
+++ b/tests/functional/invalid_slice_index.txt
diff --git a/pylint/test/functional/invalid_star_assignment_target.py b/tests/functional/invalid_star_assignment_target.py
index 452f9a728..452f9a728 100644
--- a/pylint/test/functional/invalid_star_assignment_target.py
+++ b/tests/functional/invalid_star_assignment_target.py
diff --git a/pylint/test/functional/invalid_star_assignment_target.rc b/tests/functional/invalid_star_assignment_target.rc
index c093be204..c093be204 100644
--- a/pylint/test/functional/invalid_star_assignment_target.rc
+++ b/tests/functional/invalid_star_assignment_target.rc
diff --git a/pylint/test/functional/invalid_star_assignment_target.txt b/tests/functional/invalid_star_assignment_target.txt
index 7a4c232f1..7a4c232f1 100644
--- a/pylint/test/functional/invalid_star_assignment_target.txt
+++ b/tests/functional/invalid_star_assignment_target.txt
diff --git a/pylint/test/functional/invalid_unary_operand_type.py b/tests/functional/invalid_unary_operand_type.py
index f2a0124f6..f2a0124f6 100644
--- a/pylint/test/functional/invalid_unary_operand_type.py
+++ b/tests/functional/invalid_unary_operand_type.py
diff --git a/pylint/test/functional/invalid_unary_operand_type.txt b/tests/functional/invalid_unary_operand_type.txt
index 22fa72711..22fa72711 100644
--- a/pylint/test/functional/invalid_unary_operand_type.txt
+++ b/tests/functional/invalid_unary_operand_type.txt
diff --git a/pylint/test/functional/iterable_context.py b/tests/functional/iterable_context.py
index abe5cc6f3..abe5cc6f3 100644
--- a/pylint/test/functional/iterable_context.py
+++ b/tests/functional/iterable_context.py
diff --git a/pylint/test/functional/iterable_context.txt b/tests/functional/iterable_context.txt
index fbe143327..fbe143327 100644
--- a/pylint/test/functional/iterable_context.txt
+++ b/tests/functional/iterable_context.txt
diff --git a/pylint/test/functional/iterable_context_py2.py b/tests/functional/iterable_context_py2.py
index 22c60c174..22c60c174 100644
--- a/pylint/test/functional/iterable_context_py2.py
+++ b/tests/functional/iterable_context_py2.py
diff --git a/pylint/test/functional/iterable_context_py2.rc b/tests/functional/iterable_context_py2.rc
index a65023393..a65023393 100644
--- a/pylint/test/functional/iterable_context_py2.rc
+++ b/tests/functional/iterable_context_py2.rc
diff --git a/pylint/test/functional/iterable_context_py2.txt b/tests/functional/iterable_context_py2.txt
index 8de579a3f..8de579a3f 100644
--- a/pylint/test/functional/iterable_context_py2.txt
+++ b/tests/functional/iterable_context_py2.txt
diff --git a/pylint/test/functional/iterable_context_py3.py b/tests/functional/iterable_context_py3.py
index 34047eda0..34047eda0 100644
--- a/pylint/test/functional/iterable_context_py3.py
+++ b/tests/functional/iterable_context_py3.py
diff --git a/pylint/test/functional/iterable_context_py3.rc b/tests/functional/iterable_context_py3.rc
index 9bf6df0ed..9bf6df0ed 100644
--- a/pylint/test/functional/iterable_context_py3.rc
+++ b/tests/functional/iterable_context_py3.rc
diff --git a/pylint/test/functional/iterable_context_py3.txt b/tests/functional/iterable_context_py3.txt
index 8de579a3f..8de579a3f 100644
--- a/pylint/test/functional/iterable_context_py3.txt
+++ b/tests/functional/iterable_context_py3.txt
diff --git a/pylint/test/functional/iterable_context_py36.py b/tests/functional/iterable_context_py36.py
index cc2e8e7df..cc2e8e7df 100644
--- a/pylint/test/functional/iterable_context_py36.py
+++ b/tests/functional/iterable_context_py36.py
diff --git a/pylint/test/functional/iterable_context_py36.rc b/tests/functional/iterable_context_py36.rc
index 1450ccc64..1450ccc64 100644
--- a/pylint/test/functional/iterable_context_py36.rc
+++ b/tests/functional/iterable_context_py36.rc
diff --git a/pylint/test/functional/iterable_context_py36.txt b/tests/functional/iterable_context_py36.txt
index 877323cb2..877323cb2 100644
--- a/pylint/test/functional/iterable_context_py36.txt
+++ b/tests/functional/iterable_context_py36.txt
diff --git a/pylint/test/functional/keyword_arg_before_vararg.py b/tests/functional/keyword_arg_before_vararg.py
index 119287410..119287410 100644
--- a/pylint/test/functional/keyword_arg_before_vararg.py
+++ b/tests/functional/keyword_arg_before_vararg.py
diff --git a/pylint/test/functional/keyword_arg_before_vararg.txt b/tests/functional/keyword_arg_before_vararg.txt
index c83ff733d..c83ff733d 100644
--- a/pylint/test/functional/keyword_arg_before_vararg.txt
+++ b/tests/functional/keyword_arg_before_vararg.txt
diff --git a/pylint/test/functional/len_checks.py b/tests/functional/len_checks.py
index e8e61afad..e8e61afad 100644
--- a/pylint/test/functional/len_checks.py
+++ b/tests/functional/len_checks.py
diff --git a/pylint/test/functional/len_checks.txt b/tests/functional/len_checks.txt
index 9dc2969f6..9dc2969f6 100644
--- a/pylint/test/functional/len_checks.txt
+++ b/tests/functional/len_checks.txt
diff --git a/pylint/test/functional/line_endings.py b/tests/functional/line_endings.py
index 0b6e795e3..0b6e795e3 100644
--- a/pylint/test/functional/line_endings.py
+++ b/tests/functional/line_endings.py
diff --git a/pylint/test/functional/line_endings.rc b/tests/functional/line_endings.rc
index 95532ea80..95532ea80 100644
--- a/pylint/test/functional/line_endings.rc
+++ b/tests/functional/line_endings.rc
diff --git a/pylint/test/functional/line_endings.txt b/tests/functional/line_endings.txt
index a18a87237..a18a87237 100644
--- a/pylint/test/functional/line_endings.txt
+++ b/tests/functional/line_endings.txt
diff --git a/pylint/test/functional/line_too_long.py b/tests/functional/line_too_long.py
index e2affd609..e2affd609 100644
--- a/pylint/test/functional/line_too_long.py
+++ b/tests/functional/line_too_long.py
diff --git a/pylint/test/functional/line_too_long.txt b/tests/functional/line_too_long.txt
index 22c218117..22c218117 100644
--- a/pylint/test/functional/line_too_long.txt
+++ b/tests/functional/line_too_long.txt
diff --git a/pylint/test/functional/line_too_long_end_of_module.py b/tests/functional/line_too_long_end_of_module.py
index 21cb75655..21cb75655 100644
--- a/pylint/test/functional/line_too_long_end_of_module.py
+++ b/tests/functional/line_too_long_end_of_module.py
diff --git a/pylint/test/functional/literal_comparison.py b/tests/functional/literal_comparison.py
index 646e57eec..646e57eec 100644
--- a/pylint/test/functional/literal_comparison.py
+++ b/tests/functional/literal_comparison.py
diff --git a/pylint/test/functional/literal_comparison.txt b/tests/functional/literal_comparison.txt
index 5026deceb..5026deceb 100644
--- a/pylint/test/functional/literal_comparison.txt
+++ b/tests/functional/literal_comparison.txt
diff --git a/pylint/test/functional/logging_format_interpolation.py b/tests/functional/logging_format_interpolation.py
index 5f61d6baf..5f61d6baf 100644
--- a/pylint/test/functional/logging_format_interpolation.py
+++ b/tests/functional/logging_format_interpolation.py
diff --git a/pylint/test/functional/logging_format_interpolation.txt b/tests/functional/logging_format_interpolation.txt
index 36051253c..36051253c 100644
--- a/pylint/test/functional/logging_format_interpolation.txt
+++ b/tests/functional/logging_format_interpolation.txt
diff --git a/pylint/test/functional/logging_format_interpolation_py36.py b/tests/functional/logging_format_interpolation_py36.py
index f6af9f563..f6af9f563 100644
--- a/pylint/test/functional/logging_format_interpolation_py36.py
+++ b/tests/functional/logging_format_interpolation_py36.py
diff --git a/pylint/test/functional/logging_format_interpolation_py36.rc b/tests/functional/logging_format_interpolation_py36.rc
index 0ba2b6333..0ba2b6333 100644
--- a/pylint/test/functional/logging_format_interpolation_py36.rc
+++ b/tests/functional/logging_format_interpolation_py36.rc
diff --git a/pylint/test/functional/logging_format_interpolation_py36.txt b/tests/functional/logging_format_interpolation_py36.txt
index ec7e5b90f..ec7e5b90f 100644
--- a/pylint/test/functional/logging_format_interpolation_py36.txt
+++ b/tests/functional/logging_format_interpolation_py36.txt
diff --git a/pylint/test/functional/logging_fstring_interpolation_py36.py b/tests/functional/logging_fstring_interpolation_py36.py
index 5aebb7dd2..5aebb7dd2 100644
--- a/pylint/test/functional/logging_fstring_interpolation_py36.py
+++ b/tests/functional/logging_fstring_interpolation_py36.py
diff --git a/pylint/test/functional/logging_fstring_interpolation_py36.rc b/tests/functional/logging_fstring_interpolation_py36.rc
index 0ba2b6333..0ba2b6333 100644
--- a/pylint/test/functional/logging_fstring_interpolation_py36.rc
+++ b/tests/functional/logging_fstring_interpolation_py36.rc
diff --git a/pylint/test/functional/logging_fstring_interpolation_py36.txt b/tests/functional/logging_fstring_interpolation_py36.txt
index e2469d665..e2469d665 100644
--- a/pylint/test/functional/logging_fstring_interpolation_py36.txt
+++ b/tests/functional/logging_fstring_interpolation_py36.txt
diff --git a/pylint/test/functional/logging_not_lazy.py b/tests/functional/logging_not_lazy.py
index c0634327f..c0634327f 100644
--- a/pylint/test/functional/logging_not_lazy.py
+++ b/tests/functional/logging_not_lazy.py
diff --git a/pylint/test/functional/logging_not_lazy.txt b/tests/functional/logging_not_lazy.txt
index 31e7cc448..31e7cc448 100644
--- a/pylint/test/functional/logging_not_lazy.txt
+++ b/tests/functional/logging_not_lazy.txt
diff --git a/pylint/test/functional/logical_tautology.py b/tests/functional/logical_tautology.py
index ca7ebb0cc..ca7ebb0cc 100644
--- a/pylint/test/functional/logical_tautology.py
+++ b/tests/functional/logical_tautology.py
diff --git a/pylint/test/functional/logical_tautology.txt b/tests/functional/logical_tautology.txt
index 4422c8559..4422c8559 100644
--- a/pylint/test/functional/logical_tautology.txt
+++ b/tests/functional/logical_tautology.txt
diff --git a/pylint/test/functional/long_lines_with_utf8.py b/tests/functional/long_lines_with_utf8.py
index a1d90edcc..a1d90edcc 100644
--- a/pylint/test/functional/long_lines_with_utf8.py
+++ b/tests/functional/long_lines_with_utf8.py
diff --git a/pylint/test/functional/long_lines_with_utf8.txt b/tests/functional/long_lines_with_utf8.txt
index 42a7976a7..42a7976a7 100644
--- a/pylint/test/functional/long_lines_with_utf8.txt
+++ b/tests/functional/long_lines_with_utf8.txt
diff --git a/pylint/test/functional/long_utf8_lines.py b/tests/functional/long_utf8_lines.py
index 815759fe5..815759fe5 100644
--- a/pylint/test/functional/long_utf8_lines.py
+++ b/tests/functional/long_utf8_lines.py
diff --git a/pylint/test/functional/long_utf8_lines.txt b/tests/functional/long_utf8_lines.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/long_utf8_lines.txt
+++ b/tests/functional/long_utf8_lines.txt
diff --git a/pylint/test/functional/lost_exception.py b/tests/functional/lost_exception.py
index fe7deddb7..fe7deddb7 100644
--- a/pylint/test/functional/lost_exception.py
+++ b/tests/functional/lost_exception.py
diff --git a/pylint/test/functional/lost_exception.txt b/tests/functional/lost_exception.txt
index 4fb37ec84..4fb37ec84 100644
--- a/pylint/test/functional/lost_exception.txt
+++ b/tests/functional/lost_exception.txt
diff --git a/pylint/test/functional/mapping_context.py b/tests/functional/mapping_context.py
index 6b3a13573..6b3a13573 100644
--- a/pylint/test/functional/mapping_context.py
+++ b/tests/functional/mapping_context.py
diff --git a/pylint/test/functional/mapping_context.txt b/tests/functional/mapping_context.txt
index 201da1a6e..201da1a6e 100644
--- a/pylint/test/functional/mapping_context.txt
+++ b/tests/functional/mapping_context.txt
diff --git a/pylint/test/functional/mapping_context_py2.py b/tests/functional/mapping_context_py2.py
index f5cdc753d..f5cdc753d 100644
--- a/pylint/test/functional/mapping_context_py2.py
+++ b/tests/functional/mapping_context_py2.py
diff --git a/pylint/test/functional/mapping_context_py2.rc b/tests/functional/mapping_context_py2.rc
index a65023393..a65023393 100644
--- a/pylint/test/functional/mapping_context_py2.rc
+++ b/tests/functional/mapping_context_py2.rc
diff --git a/pylint/test/functional/mapping_context_py2.txt b/tests/functional/mapping_context_py2.txt
index 59cca6c42..59cca6c42 100644
--- a/pylint/test/functional/mapping_context_py2.txt
+++ b/tests/functional/mapping_context_py2.txt
diff --git a/pylint/test/functional/mapping_context_py3.py b/tests/functional/mapping_context_py3.py
index 042d4d02d..042d4d02d 100644
--- a/pylint/test/functional/mapping_context_py3.py
+++ b/tests/functional/mapping_context_py3.py
diff --git a/pylint/test/functional/mapping_context_py3.rc b/tests/functional/mapping_context_py3.rc
index 9bf6df0ed..9bf6df0ed 100644
--- a/pylint/test/functional/mapping_context_py3.rc
+++ b/tests/functional/mapping_context_py3.rc
diff --git a/pylint/test/functional/mapping_context_py3.txt b/tests/functional/mapping_context_py3.txt
index 59cca6c42..59cca6c42 100644
--- a/pylint/test/functional/mapping_context_py3.txt
+++ b/tests/functional/mapping_context_py3.txt
diff --git a/pylint/test/functional/member_checks.py b/tests/functional/member_checks.py
index cb6062676..cb6062676 100644
--- a/pylint/test/functional/member_checks.py
+++ b/tests/functional/member_checks.py
diff --git a/pylint/test/functional/member_checks.txt b/tests/functional/member_checks.txt
index dd2c927b9..dd2c927b9 100644
--- a/pylint/test/functional/member_checks.txt
+++ b/tests/functional/member_checks.txt
diff --git a/pylint/test/functional/member_checks_hints.py b/tests/functional/member_checks_hints.py
index 407c522b5..407c522b5 100644
--- a/pylint/test/functional/member_checks_hints.py
+++ b/tests/functional/member_checks_hints.py
diff --git a/pylint/test/functional/member_checks_hints.rc b/tests/functional/member_checks_hints.rc
index 311e05184..311e05184 100644
--- a/pylint/test/functional/member_checks_hints.rc
+++ b/tests/functional/member_checks_hints.rc
diff --git a/pylint/test/functional/member_checks_hints.txt b/tests/functional/member_checks_hints.txt
index 27f1e3d11..27f1e3d11 100644
--- a/pylint/test/functional/member_checks_hints.txt
+++ b/tests/functional/member_checks_hints.txt
diff --git a/pylint/test/functional/member_checks_ignore_none.py b/tests/functional/member_checks_ignore_none.py
index 06f01cb6a..06f01cb6a 100644
--- a/pylint/test/functional/member_checks_ignore_none.py
+++ b/tests/functional/member_checks_ignore_none.py
diff --git a/pylint/test/functional/member_checks_ignore_none.rc b/tests/functional/member_checks_ignore_none.rc
index dd365acd5..dd365acd5 100644
--- a/pylint/test/functional/member_checks_ignore_none.rc
+++ b/tests/functional/member_checks_ignore_none.rc
diff --git a/pylint/test/functional/member_checks_ignore_none.txt b/tests/functional/member_checks_ignore_none.txt
index 61ef7e86e..61ef7e86e 100644
--- a/pylint/test/functional/member_checks_ignore_none.txt
+++ b/tests/functional/member_checks_ignore_none.txt
diff --git a/pylint/test/functional/member_checks_inference_improvements.py b/tests/functional/member_checks_inference_improvements.py
index 6eefa7958..6eefa7958 100644
--- a/pylint/test/functional/member_checks_inference_improvements.py
+++ b/tests/functional/member_checks_inference_improvements.py
diff --git a/pylint/test/functional/member_checks_no_hints.py b/tests/functional/member_checks_no_hints.py
index 407c522b5..407c522b5 100644
--- a/pylint/test/functional/member_checks_no_hints.py
+++ b/tests/functional/member_checks_no_hints.py
diff --git a/pylint/test/functional/member_checks_no_hints.rc b/tests/functional/member_checks_no_hints.rc
index 780950df6..780950df6 100644
--- a/pylint/test/functional/member_checks_no_hints.rc
+++ b/tests/functional/member_checks_no_hints.rc
diff --git a/pylint/test/functional/member_checks_no_hints.txt b/tests/functional/member_checks_no_hints.txt
index eea748d29..eea748d29 100644
--- a/pylint/test/functional/member_checks_no_hints.txt
+++ b/tests/functional/member_checks_no_hints.txt
diff --git a/pylint/test/functional/member_checks_opaque.py b/tests/functional/member_checks_opaque.py
index 9b592af64..9b592af64 100644
--- a/pylint/test/functional/member_checks_opaque.py
+++ b/tests/functional/member_checks_opaque.py
diff --git a/pylint/test/functional/member_checks_opaque.rc b/tests/functional/member_checks_opaque.rc
index 025cd2a0f..025cd2a0f 100644
--- a/pylint/test/functional/member_checks_opaque.rc
+++ b/tests/functional/member_checks_opaque.rc
diff --git a/pylint/test/functional/member_checks_opaque.txt b/tests/functional/member_checks_opaque.txt
index dae295353..dae295353 100644
--- a/pylint/test/functional/member_checks_opaque.txt
+++ b/tests/functional/member_checks_opaque.txt
diff --git a/pylint/test/functional/member_checks_py37.py b/tests/functional/member_checks_py37.py
index 8d59b7d80..8d59b7d80 100644
--- a/pylint/test/functional/member_checks_py37.py
+++ b/tests/functional/member_checks_py37.py
diff --git a/pylint/test/functional/member_checks_py37.rc b/tests/functional/member_checks_py37.rc
index 5d0572448..5d0572448 100644
--- a/pylint/test/functional/member_checks_py37.rc
+++ b/tests/functional/member_checks_py37.rc
diff --git a/pylint/test/functional/member_checks_py37.txt b/tests/functional/member_checks_py37.txt
index 82a339d23..82a339d23 100644
--- a/pylint/test/functional/member_checks_py37.txt
+++ b/tests/functional/member_checks_py37.txt
diff --git a/pylint/test/functional/membership_protocol.py b/tests/functional/membership_protocol.py
index 3401f4bb4..3401f4bb4 100644
--- a/pylint/test/functional/membership_protocol.py
+++ b/tests/functional/membership_protocol.py
diff --git a/pylint/test/functional/membership_protocol.txt b/tests/functional/membership_protocol.txt
index edb2227aa..edb2227aa 100644
--- a/pylint/test/functional/membership_protocol.txt
+++ b/tests/functional/membership_protocol.txt
diff --git a/pylint/test/functional/membership_protocol_py2.py b/tests/functional/membership_protocol_py2.py
index 8a569c36b..8a569c36b 100644
--- a/pylint/test/functional/membership_protocol_py2.py
+++ b/tests/functional/membership_protocol_py2.py
diff --git a/pylint/test/functional/membership_protocol_py2.rc b/tests/functional/membership_protocol_py2.rc
index c78f32fa0..c78f32fa0 100644
--- a/pylint/test/functional/membership_protocol_py2.rc
+++ b/tests/functional/membership_protocol_py2.rc
diff --git a/pylint/test/functional/membership_protocol_py2.txt b/tests/functional/membership_protocol_py2.txt
index 4ba757550..4ba757550 100644
--- a/pylint/test/functional/membership_protocol_py2.txt
+++ b/tests/functional/membership_protocol_py2.txt
diff --git a/pylint/test/functional/membership_protocol_py3.py b/tests/functional/membership_protocol_py3.py
index 678072354..678072354 100644
--- a/pylint/test/functional/membership_protocol_py3.py
+++ b/tests/functional/membership_protocol_py3.py
diff --git a/pylint/test/functional/membership_protocol_py3.rc b/tests/functional/membership_protocol_py3.rc
index 9bf6df0ed..9bf6df0ed 100644
--- a/pylint/test/functional/membership_protocol_py3.rc
+++ b/tests/functional/membership_protocol_py3.rc
diff --git a/pylint/test/functional/membership_protocol_py3.txt b/tests/functional/membership_protocol_py3.txt
index 4ba757550..4ba757550 100644
--- a/pylint/test/functional/membership_protocol_py3.txt
+++ b/tests/functional/membership_protocol_py3.txt
diff --git a/pylint/test/functional/messages_managed_by_id.py b/tests/functional/messages_managed_by_id.py
index a96ac5cc5..a96ac5cc5 100644
--- a/pylint/test/functional/messages_managed_by_id.py
+++ b/tests/functional/messages_managed_by_id.py
diff --git a/pylint/test/functional/messages_managed_by_id.txt b/tests/functional/messages_managed_by_id.txt
index e766ab0b3..e766ab0b3 100644
--- a/pylint/test/functional/messages_managed_by_id.txt
+++ b/tests/functional/messages_managed_by_id.txt
diff --git a/pylint/test/functional/method_hidden.py b/tests/functional/method_hidden.py
index 428869666..428869666 100644
--- a/pylint/test/functional/method_hidden.py
+++ b/tests/functional/method_hidden.py
diff --git a/pylint/test/functional/method_hidden.txt b/tests/functional/method_hidden.txt
index 7dfb8d3e0..7dfb8d3e0 100644
--- a/pylint/test/functional/method_hidden.txt
+++ b/tests/functional/method_hidden.txt
diff --git a/pylint/test/functional/misplaced_bare_raise.py b/tests/functional/misplaced_bare_raise.py
index 3a11aaee8..3a11aaee8 100644
--- a/pylint/test/functional/misplaced_bare_raise.py
+++ b/tests/functional/misplaced_bare_raise.py
diff --git a/pylint/test/functional/misplaced_bare_raise.txt b/tests/functional/misplaced_bare_raise.txt
index fb39640a1..fb39640a1 100644
--- a/pylint/test/functional/misplaced_bare_raise.txt
+++ b/tests/functional/misplaced_bare_raise.txt
diff --git a/pylint/test/functional/misplaced_comparison_constant.py b/tests/functional/misplaced_comparison_constant.py
index 29f2b1ed8..29f2b1ed8 100644
--- a/pylint/test/functional/misplaced_comparison_constant.py
+++ b/tests/functional/misplaced_comparison_constant.py
diff --git a/pylint/test/functional/misplaced_comparison_constant.txt b/tests/functional/misplaced_comparison_constant.txt
index a7f0d956d..a7f0d956d 100644
--- a/pylint/test/functional/misplaced_comparison_constant.txt
+++ b/tests/functional/misplaced_comparison_constant.txt
diff --git a/pylint/test/functional/misplaced_format_function.py b/tests/functional/misplaced_format_function.py
index 3520dc70b..3520dc70b 100644
--- a/pylint/test/functional/misplaced_format_function.py
+++ b/tests/functional/misplaced_format_function.py
diff --git a/pylint/test/functional/misplaced_format_function.txt b/tests/functional/misplaced_format_function.txt
index 91a1874aa..91a1874aa 100644
--- a/pylint/test/functional/misplaced_format_function.txt
+++ b/tests/functional/misplaced_format_function.txt
diff --git a/pylint/test/functional/misplaced_future.py b/tests/functional/misplaced_future.py
index b4317d96f..b4317d96f 100644
--- a/pylint/test/functional/misplaced_future.py
+++ b/tests/functional/misplaced_future.py
diff --git a/pylint/test/functional/misplaced_future.txt b/tests/functional/misplaced_future.txt
index bc874cf15..bc874cf15 100644
--- a/pylint/test/functional/misplaced_future.txt
+++ b/tests/functional/misplaced_future.txt
diff --git a/pylint/test/functional/missing_docstring.py b/tests/functional/missing_docstring.py
index 657af5c7e..657af5c7e 100644
--- a/pylint/test/functional/missing_docstring.py
+++ b/tests/functional/missing_docstring.py
diff --git a/pylint/test/functional/missing_docstring.txt b/tests/functional/missing_docstring.txt
index 2680319b6..2680319b6 100644
--- a/pylint/test/functional/missing_docstring.txt
+++ b/tests/functional/missing_docstring.txt
diff --git a/pylint/test/functional/missing_final_newline.py b/tests/functional/missing_final_newline.py
index 370f902b7..370f902b7 100644
--- a/pylint/test/functional/missing_final_newline.py
+++ b/tests/functional/missing_final_newline.py
diff --git a/pylint/test/functional/missing_final_newline.txt b/tests/functional/missing_final_newline.txt
index b53c980a3..b53c980a3 100644
--- a/pylint/test/functional/missing_final_newline.txt
+++ b/tests/functional/missing_final_newline.txt
diff --git a/pylint/test/functional/missing_kwoa_py3.py b/tests/functional/missing_kwoa_py3.py
index 3b6e1c0d8..3b6e1c0d8 100644
--- a/pylint/test/functional/missing_kwoa_py3.py
+++ b/tests/functional/missing_kwoa_py3.py
diff --git a/pylint/test/functional/missing_kwoa_py3.rc b/tests/functional/missing_kwoa_py3.rc
index a2ab06c50..a2ab06c50 100644
--- a/pylint/test/functional/missing_kwoa_py3.rc
+++ b/tests/functional/missing_kwoa_py3.rc
diff --git a/pylint/test/functional/missing_kwoa_py3.txt b/tests/functional/missing_kwoa_py3.txt
index 734208ac3..734208ac3 100644
--- a/pylint/test/functional/missing_kwoa_py3.txt
+++ b/tests/functional/missing_kwoa_py3.txt
diff --git a/pylint/test/functional/missing_parentheses_for_call_in_test.py b/tests/functional/missing_parentheses_for_call_in_test.py
index cd1d76a8d..cd1d76a8d 100644
--- a/pylint/test/functional/missing_parentheses_for_call_in_test.py
+++ b/tests/functional/missing_parentheses_for_call_in_test.py
diff --git a/pylint/test/functional/missing_parentheses_for_call_in_test.txt b/tests/functional/missing_parentheses_for_call_in_test.txt
index 872c7c3df..872c7c3df 100644
--- a/pylint/test/functional/missing_parentheses_for_call_in_test.txt
+++ b/tests/functional/missing_parentheses_for_call_in_test.txt
diff --git a/pylint/test/functional/missing_self_argument.py b/tests/functional/missing_self_argument.py
index 79ae34879..79ae34879 100644
--- a/pylint/test/functional/missing_self_argument.py
+++ b/tests/functional/missing_self_argument.py
diff --git a/pylint/test/functional/missing_self_argument.txt b/tests/functional/missing_self_argument.txt
index 9a47c8914..9a47c8914 100644
--- a/pylint/test/functional/missing_self_argument.txt
+++ b/tests/functional/missing_self_argument.txt
diff --git a/pylint/test/functional/mixed_indentation.py b/tests/functional/mixed_indentation.py
index 724ecff7a..724ecff7a 100644
--- a/pylint/test/functional/mixed_indentation.py
+++ b/tests/functional/mixed_indentation.py
diff --git a/pylint/test/functional/mixed_indentation.txt b/tests/functional/mixed_indentation.txt
index d4857e666..d4857e666 100644
--- a/pylint/test/functional/mixed_indentation.txt
+++ b/tests/functional/mixed_indentation.txt
diff --git a/pylint/test/functional/monkeypatch_method.py b/tests/functional/monkeypatch_method.py
index e8bd03aa7..e8bd03aa7 100644
--- a/pylint/test/functional/monkeypatch_method.py
+++ b/tests/functional/monkeypatch_method.py
diff --git a/pylint/test/functional/monkeypatch_method.txt b/tests/functional/monkeypatch_method.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/monkeypatch_method.txt
+++ b/tests/functional/monkeypatch_method.txt
diff --git a/pylint/test/functional/multiple_imports.py b/tests/functional/multiple_imports.py
index 9008dcc52..9008dcc52 100644
--- a/pylint/test/functional/multiple_imports.py
+++ b/tests/functional/multiple_imports.py
diff --git a/pylint/test/functional/multiple_imports.txt b/tests/functional/multiple_imports.txt
index a5df51e60..a5df51e60 100644
--- a/pylint/test/functional/multiple_imports.txt
+++ b/tests/functional/multiple_imports.txt
diff --git a/pylint/test/functional/namePresetCamelCase.py b/tests/functional/namePresetCamelCase.py
index e048ec4d8..e048ec4d8 100644
--- a/pylint/test/functional/namePresetCamelCase.py
+++ b/tests/functional/namePresetCamelCase.py
diff --git a/pylint/test/functional/namePresetCamelCase.rc b/tests/functional/namePresetCamelCase.rc
index 29f44504a..29f44504a 100644
--- a/pylint/test/functional/namePresetCamelCase.rc
+++ b/tests/functional/namePresetCamelCase.rc
diff --git a/pylint/test/functional/namePresetCamelCase.txt b/tests/functional/namePresetCamelCase.txt
index 3c31bbcb0..3c31bbcb0 100644
--- a/pylint/test/functional/namePresetCamelCase.txt
+++ b/tests/functional/namePresetCamelCase.txt
diff --git a/pylint/test/functional/name_preset_snake_case.py b/tests/functional/name_preset_snake_case.py
index 549888715..549888715 100644
--- a/pylint/test/functional/name_preset_snake_case.py
+++ b/tests/functional/name_preset_snake_case.py
diff --git a/pylint/test/functional/name_preset_snake_case.rc b/tests/functional/name_preset_snake_case.rc
index 0424cdcfb..0424cdcfb 100644
--- a/pylint/test/functional/name_preset_snake_case.rc
+++ b/tests/functional/name_preset_snake_case.rc
diff --git a/pylint/test/functional/name_preset_snake_case.txt b/tests/functional/name_preset_snake_case.txt
index 14a3d6530..14a3d6530 100644
--- a/pylint/test/functional/name_preset_snake_case.txt
+++ b/tests/functional/name_preset_snake_case.txt
diff --git a/pylint/test/functional/name_styles.py b/tests/functional/name_styles.py
index 87b87d926..87b87d926 100644
--- a/pylint/test/functional/name_styles.py
+++ b/tests/functional/name_styles.py
diff --git a/pylint/test/functional/name_styles.rc b/tests/functional/name_styles.rc
index 1a63e671b..1a63e671b 100644
--- a/pylint/test/functional/name_styles.rc
+++ b/tests/functional/name_styles.rc
diff --git a/pylint/test/functional/name_styles.txt b/tests/functional/name_styles.txt
index 74d4fb801..74d4fb801 100644
--- a/pylint/test/functional/name_styles.txt
+++ b/tests/functional/name_styles.txt
diff --git a/pylint/test/functional/namedtuple_member_inference.py b/tests/functional/namedtuple_member_inference.py
index 4488ceb0a..4488ceb0a 100644
--- a/pylint/test/functional/namedtuple_member_inference.py
+++ b/tests/functional/namedtuple_member_inference.py
diff --git a/pylint/test/functional/namedtuple_member_inference.txt b/tests/functional/namedtuple_member_inference.txt
index 1532814c5..1532814c5 100644
--- a/pylint/test/functional/namedtuple_member_inference.txt
+++ b/tests/functional/namedtuple_member_inference.txt
diff --git a/pylint/test/functional/names_in__all__.py b/tests/functional/names_in__all__.py
index 9b2840acc..9b2840acc 100644
--- a/pylint/test/functional/names_in__all__.py
+++ b/tests/functional/names_in__all__.py
diff --git a/pylint/test/functional/names_in__all__.txt b/tests/functional/names_in__all__.txt
index 94873296c..94873296c 100644
--- a/pylint/test/functional/names_in__all__.txt
+++ b/tests/functional/names_in__all__.txt
diff --git a/pylint/test/functional/nested_blocks_issue1088.py b/tests/functional/nested_blocks_issue1088.py
index d44a9f71f..d44a9f71f 100644
--- a/pylint/test/functional/nested_blocks_issue1088.py
+++ b/tests/functional/nested_blocks_issue1088.py
diff --git a/pylint/test/functional/nested_blocks_issue1088.txt b/tests/functional/nested_blocks_issue1088.txt
index cf226de78..cf226de78 100644
--- a/pylint/test/functional/nested_blocks_issue1088.txt
+++ b/tests/functional/nested_blocks_issue1088.txt
diff --git a/pylint/test/functional/nested_func_defined_in_loop.py b/tests/functional/nested_func_defined_in_loop.py
index af3479074..af3479074 100644
--- a/pylint/test/functional/nested_func_defined_in_loop.py
+++ b/tests/functional/nested_func_defined_in_loop.py
diff --git a/pylint/test/functional/no_classmethod_decorator.py b/tests/functional/no_classmethod_decorator.py
index 66cc0b3c0..66cc0b3c0 100644
--- a/pylint/test/functional/no_classmethod_decorator.py
+++ b/tests/functional/no_classmethod_decorator.py
diff --git a/pylint/test/functional/no_classmethod_decorator.txt b/tests/functional/no_classmethod_decorator.txt
index ba51f0be4..ba51f0be4 100644
--- a/pylint/test/functional/no_classmethod_decorator.txt
+++ b/tests/functional/no_classmethod_decorator.txt
diff --git a/pylint/test/functional/no_else_raise.py b/tests/functional/no_else_raise.py
index b3f27a74e..b3f27a74e 100644
--- a/pylint/test/functional/no_else_raise.py
+++ b/tests/functional/no_else_raise.py
diff --git a/pylint/test/functional/no_else_raise.txt b/tests/functional/no_else_raise.txt
index aec1877c3..aec1877c3 100644
--- a/pylint/test/functional/no_else_raise.txt
+++ b/tests/functional/no_else_raise.txt
diff --git a/pylint/test/functional/no_else_return.py b/tests/functional/no_else_return.py
index 0f90c153a..0f90c153a 100644
--- a/pylint/test/functional/no_else_return.py
+++ b/tests/functional/no_else_return.py
diff --git a/pylint/test/functional/no_else_return.txt b/tests/functional/no_else_return.txt
index 72147e808..72147e808 100644
--- a/pylint/test/functional/no_else_return.txt
+++ b/tests/functional/no_else_return.txt
diff --git a/pylint/test/functional/no_name_in_module.py b/tests/functional/no_name_in_module.py
index 8b309fd0a..8b309fd0a 100644
--- a/pylint/test/functional/no_name_in_module.py
+++ b/tests/functional/no_name_in_module.py
diff --git a/pylint/test/functional/no_name_in_module.txt b/tests/functional/no_name_in_module.txt
index 7dbc11c6c..7dbc11c6c 100644
--- a/pylint/test/functional/no_name_in_module.txt
+++ b/tests/functional/no_name_in_module.txt
diff --git a/pylint/test/functional/no_self_argument_py37.py b/tests/functional/no_self_argument_py37.py
index 8e6d6fc34..8e6d6fc34 100644
--- a/pylint/test/functional/no_self_argument_py37.py
+++ b/tests/functional/no_self_argument_py37.py
diff --git a/pylint/test/functional/no_self_argument_py37.rc b/tests/functional/no_self_argument_py37.rc
index a17bb22da..a17bb22da 100644
--- a/pylint/test/functional/no_self_argument_py37.rc
+++ b/tests/functional/no_self_argument_py37.rc
diff --git a/pylint/test/functional/no_self_argument_py37.txt b/tests/functional/no_self_argument_py37.txt
index 812b8aa0c..812b8aa0c 100644
--- a/pylint/test/functional/no_self_argument_py37.txt
+++ b/tests/functional/no_self_argument_py37.txt
diff --git a/pylint/test/functional/no_self_use.py b/tests/functional/no_self_use.py
index 3d3cda1f2..3d3cda1f2 100644
--- a/pylint/test/functional/no_self_use.py
+++ b/tests/functional/no_self_use.py
diff --git a/pylint/test/functional/no_self_use.txt b/tests/functional/no_self_use.txt
index e68dcff9a..e68dcff9a 100644
--- a/pylint/test/functional/no_self_use.txt
+++ b/tests/functional/no_self_use.txt
diff --git a/pylint/test/functional/no_self_use_py3.py b/tests/functional/no_self_use_py3.py
index f40150835..f40150835 100644
--- a/pylint/test/functional/no_self_use_py3.py
+++ b/tests/functional/no_self_use_py3.py
diff --git a/pylint/test/functional/no_self_use_py3.rc b/tests/functional/no_self_use_py3.rc
index a2ab06c50..a2ab06c50 100644
--- a/pylint/test/functional/no_self_use_py3.rc
+++ b/tests/functional/no_self_use_py3.rc
diff --git a/pylint/test/functional/no_self_use_py3.txt b/tests/functional/no_self_use_py3.txt
index 8b1378917..8b1378917 100644
--- a/pylint/test/functional/no_self_use_py3.txt
+++ b/tests/functional/no_self_use_py3.txt
diff --git a/pylint/test/functional/no_staticmethod_decorator.py b/tests/functional/no_staticmethod_decorator.py
index d0e0effa4..d0e0effa4 100644
--- a/pylint/test/functional/no_staticmethod_decorator.py
+++ b/tests/functional/no_staticmethod_decorator.py
diff --git a/pylint/test/functional/no_staticmethod_decorator.txt b/tests/functional/no_staticmethod_decorator.txt
index c0aea0eaa..c0aea0eaa 100644
--- a/pylint/test/functional/no_staticmethod_decorator.txt
+++ b/tests/functional/no_staticmethod_decorator.txt
diff --git a/pylint/test/functional/non_iterator_returned.py b/tests/functional/non_iterator_returned.py
index 32486f722..32486f722 100644
--- a/pylint/test/functional/non_iterator_returned.py
+++ b/tests/functional/non_iterator_returned.py
diff --git a/pylint/test/functional/non_iterator_returned.txt b/tests/functional/non_iterator_returned.txt
index fa1d5bec5..fa1d5bec5 100644
--- a/pylint/test/functional/non_iterator_returned.txt
+++ b/tests/functional/non_iterator_returned.txt
diff --git a/pylint/test/functional/none_dunder_protocols_py36.py b/tests/functional/none_dunder_protocols_py36.py
index 5573ceeb4..5573ceeb4 100644
--- a/pylint/test/functional/none_dunder_protocols_py36.py
+++ b/tests/functional/none_dunder_protocols_py36.py
diff --git a/pylint/test/functional/none_dunder_protocols_py36.rc b/tests/functional/none_dunder_protocols_py36.rc
index a2ab06c50..a2ab06c50 100644
--- a/pylint/test/functional/none_dunder_protocols_py36.rc
+++ b/tests/functional/none_dunder_protocols_py36.rc
diff --git a/pylint/test/functional/none_dunder_protocols_py36.txt b/tests/functional/none_dunder_protocols_py36.txt
index 0775b4ac3..0775b4ac3 100644
--- a/pylint/test/functional/none_dunder_protocols_py36.txt
+++ b/tests/functional/none_dunder_protocols_py36.txt
diff --git a/pylint/test/functional/nonexistent_operator.py b/tests/functional/nonexistent_operator.py
index f05a64947..f05a64947 100644
--- a/pylint/test/functional/nonexistent_operator.py
+++ b/tests/functional/nonexistent_operator.py
diff --git a/pylint/test/functional/nonexistent_operator.txt b/tests/functional/nonexistent_operator.txt
index da59f4147..da59f4147 100644
--- a/pylint/test/functional/nonexistent_operator.txt
+++ b/tests/functional/nonexistent_operator.txt
diff --git a/pylint/test/functional/nonlocal_and_global.py b/tests/functional/nonlocal_and_global.py
index 940052436..940052436 100644
--- a/pylint/test/functional/nonlocal_and_global.py
+++ b/tests/functional/nonlocal_and_global.py
diff --git a/pylint/test/functional/nonlocal_and_global.rc b/tests/functional/nonlocal_and_global.rc
index c093be204..c093be204 100644
--- a/pylint/test/functional/nonlocal_and_global.rc
+++ b/tests/functional/nonlocal_and_global.rc
diff --git a/pylint/test/functional/nonlocal_and_global.txt b/tests/functional/nonlocal_and_global.txt
index 46f0d0feb..46f0d0feb 100644
--- a/pylint/test/functional/nonlocal_and_global.txt
+++ b/tests/functional/nonlocal_and_global.txt
diff --git a/pylint/test/functional/nonlocal_without_binding.py b/tests/functional/nonlocal_without_binding.py
index be3c00371..be3c00371 100644
--- a/pylint/test/functional/nonlocal_without_binding.py
+++ b/tests/functional/nonlocal_without_binding.py
diff --git a/pylint/test/functional/nonlocal_without_binding.rc b/tests/functional/nonlocal_without_binding.rc
index a2ab06c50..a2ab06c50 100644
--- a/pylint/test/functional/nonlocal_without_binding.rc
+++ b/tests/functional/nonlocal_without_binding.rc
diff --git a/pylint/test/functional/nonlocal_without_binding.txt b/tests/functional/nonlocal_without_binding.txt
index 05a1105c1..05a1105c1 100644
--- a/pylint/test/functional/nonlocal_without_binding.txt
+++ b/tests/functional/nonlocal_without_binding.txt
diff --git a/pylint/test/functional/not_async_context_manager.py b/tests/functional/not_async_context_manager.py
index 138d76dfa..138d76dfa 100644
--- a/pylint/test/functional/not_async_context_manager.py
+++ b/tests/functional/not_async_context_manager.py
diff --git a/pylint/test/functional/not_async_context_manager.rc b/tests/functional/not_async_context_manager.rc
index 03004f2c2..03004f2c2 100644
--- a/pylint/test/functional/not_async_context_manager.rc
+++ b/tests/functional/not_async_context_manager.rc
diff --git a/pylint/test/functional/not_async_context_manager.txt b/tests/functional/not_async_context_manager.txt
index ae9fad79b..ae9fad79b 100644
--- a/pylint/test/functional/not_async_context_manager.txt
+++ b/tests/functional/not_async_context_manager.txt
diff --git a/pylint/test/functional/not_async_context_manager_py37.py b/tests/functional/not_async_context_manager_py37.py
index 705e5afc9..705e5afc9 100644
--- a/pylint/test/functional/not_async_context_manager_py37.py
+++ b/tests/functional/not_async_context_manager_py37.py
diff --git a/pylint/test/functional/not_async_context_manager_py37.rc b/tests/functional/not_async_context_manager_py37.rc
index a17bb22da..a17bb22da 100644
--- a/pylint/test/functional/not_async_context_manager_py37.rc
+++ b/tests/functional/not_async_context_manager_py37.rc
diff --git a/pylint/test/functional/not_async_context_manager_py37.txt b/tests/functional/not_async_context_manager_py37.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/not_async_context_manager_py37.txt
+++ b/tests/functional/not_async_context_manager_py37.txt
diff --git a/pylint/test/functional/not_callable.py b/tests/functional/not_callable.py
index 8d5b000c5..8d5b000c5 100644
--- a/pylint/test/functional/not_callable.py
+++ b/tests/functional/not_callable.py
diff --git a/pylint/test/functional/not_callable.txt b/tests/functional/not_callable.txt
index 4928c8c8b..4928c8c8b 100644
--- a/pylint/test/functional/not_callable.txt
+++ b/tests/functional/not_callable.txt
diff --git a/pylint/test/functional/not_context_manager.py b/tests/functional/not_context_manager.py
index a59f5a200..a59f5a200 100644
--- a/pylint/test/functional/not_context_manager.py
+++ b/tests/functional/not_context_manager.py
diff --git a/pylint/test/functional/not_context_manager.txt b/tests/functional/not_context_manager.txt
index 7fad3af0d..7fad3af0d 100644
--- a/pylint/test/functional/not_context_manager.txt
+++ b/tests/functional/not_context_manager.txt
diff --git a/pylint/test/functional/not_in_loop.py b/tests/functional/not_in_loop.py
index 3ea7573d2..3ea7573d2 100644
--- a/pylint/test/functional/not_in_loop.py
+++ b/tests/functional/not_in_loop.py
diff --git a/pylint/test/functional/not_in_loop.txt b/tests/functional/not_in_loop.txt
index 6730bfccd..6730bfccd 100644
--- a/pylint/test/functional/not_in_loop.txt
+++ b/tests/functional/not_in_loop.txt
diff --git a/pylint/test/functional/old_division_manually.py b/tests/functional/old_division_manually.py
index aab4bd4fe..aab4bd4fe 100644
--- a/pylint/test/functional/old_division_manually.py
+++ b/tests/functional/old_division_manually.py
diff --git a/pylint/test/functional/old_division_manually.rc b/tests/functional/old_division_manually.rc
index 11dbb8d01..11dbb8d01 100644
--- a/pylint/test/functional/old_division_manually.rc
+++ b/tests/functional/old_division_manually.rc
diff --git a/pylint/test/functional/postponed_evaluation_activated.py b/tests/functional/postponed_evaluation_activated.py
index 3cc694d47..3cc694d47 100644
--- a/pylint/test/functional/postponed_evaluation_activated.py
+++ b/tests/functional/postponed_evaluation_activated.py
diff --git a/pylint/test/functional/postponed_evaluation_activated.rc b/tests/functional/postponed_evaluation_activated.rc
index a17bb22da..a17bb22da 100644
--- a/pylint/test/functional/postponed_evaluation_activated.rc
+++ b/tests/functional/postponed_evaluation_activated.rc
diff --git a/pylint/test/functional/postponed_evaluation_activated.txt b/tests/functional/postponed_evaluation_activated.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/postponed_evaluation_activated.txt
+++ b/tests/functional/postponed_evaluation_activated.txt
diff --git a/pylint/test/functional/postponed_evaluation_not_activated.py b/tests/functional/postponed_evaluation_not_activated.py
index f892414f0..f892414f0 100644
--- a/pylint/test/functional/postponed_evaluation_not_activated.py
+++ b/tests/functional/postponed_evaluation_not_activated.py
diff --git a/pylint/test/functional/postponed_evaluation_not_activated.rc b/tests/functional/postponed_evaluation_not_activated.rc
index a17bb22da..a17bb22da 100644
--- a/pylint/test/functional/postponed_evaluation_not_activated.rc
+++ b/tests/functional/postponed_evaluation_not_activated.rc
diff --git a/pylint/test/functional/postponed_evaluation_not_activated.txt b/tests/functional/postponed_evaluation_not_activated.txt
index cae433c42..cae433c42 100644
--- a/pylint/test/functional/postponed_evaluation_not_activated.txt
+++ b/tests/functional/postponed_evaluation_not_activated.txt
diff --git a/pylint/test/functional/pragma_after_backslash.py b/tests/functional/pragma_after_backslash.py
index c506f6c9d..c506f6c9d 100644
--- a/pylint/test/functional/pragma_after_backslash.py
+++ b/tests/functional/pragma_after_backslash.py
diff --git a/pylint/test/functional/preferred_module.py b/tests/functional/preferred_module.py
index ce1f1c2c8..ce1f1c2c8 100644
--- a/pylint/test/functional/preferred_module.py
+++ b/tests/functional/preferred_module.py
diff --git a/pylint/test/functional/preferred_module.rc b/tests/functional/preferred_module.rc
index e0982e030..e0982e030 100644
--- a/pylint/test/functional/preferred_module.rc
+++ b/tests/functional/preferred_module.rc
diff --git a/pylint/test/functional/preferred_module.txt b/tests/functional/preferred_module.txt
index 7d327cac4..7d327cac4 100644
--- a/pylint/test/functional/preferred_module.txt
+++ b/tests/functional/preferred_module.txt
diff --git a/pylint/test/functional/print_always_warns.py b/tests/functional/print_always_warns.py
index 8b7f2fc9c..8b7f2fc9c 100644
--- a/pylint/test/functional/print_always_warns.py
+++ b/tests/functional/print_always_warns.py
diff --git a/pylint/test/functional/print_always_warns.rc b/tests/functional/print_always_warns.rc
index 4a0e47a21..4a0e47a21 100644
--- a/pylint/test/functional/print_always_warns.rc
+++ b/tests/functional/print_always_warns.rc
diff --git a/pylint/test/functional/print_always_warns.txt b/tests/functional/print_always_warns.txt
index c35e118d4..c35e118d4 100644
--- a/pylint/test/functional/print_always_warns.txt
+++ b/tests/functional/print_always_warns.txt
diff --git a/pylint/test/functional/protected_access_access_different_scopes.py b/tests/functional/protected_access_access_different_scopes.py
index dc09aa52b..dc09aa52b 100644
--- a/pylint/test/functional/protected_access_access_different_scopes.py
+++ b/tests/functional/protected_access_access_different_scopes.py
diff --git a/pylint/test/functional/protected_access_access_different_scopes.rc b/tests/functional/protected_access_access_different_scopes.rc
index 71de8b630..71de8b630 100644
--- a/pylint/test/functional/protected_access_access_different_scopes.rc
+++ b/tests/functional/protected_access_access_different_scopes.rc
diff --git a/pylint/test/functional/protected_access_access_different_scopes.txt b/tests/functional/protected_access_access_different_scopes.txt
index ab8b5be11..ab8b5be11 100644
--- a/pylint/test/functional/protected_access_access_different_scopes.txt
+++ b/tests/functional/protected_access_access_different_scopes.txt
diff --git a/pylint/test/functional/raising_format_tuple.py b/tests/functional/raising_format_tuple.py
index cfdda1023..cfdda1023 100644
--- a/pylint/test/functional/raising_format_tuple.py
+++ b/tests/functional/raising_format_tuple.py
diff --git a/pylint/test/functional/raising_format_tuple.txt b/tests/functional/raising_format_tuple.txt
index 126971551..126971551 100644
--- a/pylint/test/functional/raising_format_tuple.txt
+++ b/tests/functional/raising_format_tuple.txt
diff --git a/pylint/test/functional/raising_non_exception_py3.py b/tests/functional/raising_non_exception_py3.py
index 7961c5220..7961c5220 100644
--- a/pylint/test/functional/raising_non_exception_py3.py
+++ b/tests/functional/raising_non_exception_py3.py
diff --git a/pylint/test/functional/raising_non_exception_py3.rc b/tests/functional/raising_non_exception_py3.rc
index c093be204..c093be204 100644
--- a/pylint/test/functional/raising_non_exception_py3.rc
+++ b/tests/functional/raising_non_exception_py3.rc
diff --git a/pylint/test/functional/raising_non_exception_py3.txt b/tests/functional/raising_non_exception_py3.txt
index 12c886288..12c886288 100644
--- a/pylint/test/functional/raising_non_exception_py3.txt
+++ b/tests/functional/raising_non_exception_py3.txt
diff --git a/pylint/test/functional/raising_self.py b/tests/functional/raising_self.py
index 16f244ba5..16f244ba5 100644
--- a/pylint/test/functional/raising_self.py
+++ b/tests/functional/raising_self.py
diff --git a/pylint/test/functional/raising_self.txt b/tests/functional/raising_self.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/raising_self.txt
+++ b/tests/functional/raising_self.txt
diff --git a/pylint/test/functional/recursion_error_2667.py b/tests/functional/recursion_error_2667.py
index 585cf7f2f..585cf7f2f 100644
--- a/pylint/test/functional/recursion_error_2667.py
+++ b/tests/functional/recursion_error_2667.py
diff --git a/pylint/test/functional/recursion_error_2667.txt b/tests/functional/recursion_error_2667.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/recursion_error_2667.txt
+++ b/tests/functional/recursion_error_2667.txt
diff --git a/pylint/test/functional/recursion_error_2906.py b/tests/functional/recursion_error_2906.py
index 062109672..062109672 100644
--- a/pylint/test/functional/recursion_error_2906.py
+++ b/tests/functional/recursion_error_2906.py
diff --git a/pylint/test/functional/recursion_error_940.py b/tests/functional/recursion_error_940.py
index 4a9f346cb..4a9f346cb 100644
--- a/pylint/test/functional/recursion_error_940.py
+++ b/tests/functional/recursion_error_940.py
diff --git a/pylint/test/functional/recursion_error_crash.py b/tests/functional/recursion_error_crash.py
index 208bc2e7a..208bc2e7a 100644
--- a/pylint/test/functional/recursion_error_crash.py
+++ b/tests/functional/recursion_error_crash.py
diff --git a/pylint/test/functional/recursion_error_crash.txt b/tests/functional/recursion_error_crash.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/recursion_error_crash.txt
+++ b/tests/functional/recursion_error_crash.txt
diff --git a/pylint/test/functional/recursion_error_crash_2683.py b/tests/functional/recursion_error_crash_2683.py
index 05978a355..05978a355 100644
--- a/pylint/test/functional/recursion_error_crash_2683.py
+++ b/tests/functional/recursion_error_crash_2683.py
diff --git a/pylint/test/functional/recursion_error_crash_2683.txt b/tests/functional/recursion_error_crash_2683.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/recursion_error_crash_2683.txt
+++ b/tests/functional/recursion_error_crash_2683.txt
diff --git a/pylint/test/functional/recursion_error_crash_astroid_623.py b/tests/functional/recursion_error_crash_astroid_623.py
index 662da6145..662da6145 100644
--- a/pylint/test/functional/recursion_error_crash_astroid_623.py
+++ b/tests/functional/recursion_error_crash_astroid_623.py
diff --git a/pylint/test/functional/recursion_error_crash_astroid_623.txt b/tests/functional/recursion_error_crash_astroid_623.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/recursion_error_crash_astroid_623.txt
+++ b/tests/functional/recursion_error_crash_astroid_623.txt
diff --git a/pylint/test/functional/redefine_in_handler.py b/tests/functional/redefine_in_handler.py
index 9f56cfbea..9f56cfbea 100644
--- a/pylint/test/functional/redefine_in_handler.py
+++ b/tests/functional/redefine_in_handler.py
diff --git a/pylint/test/functional/redefine_in_handler.rc b/tests/functional/redefine_in_handler.rc
index a65023393..a65023393 100644
--- a/pylint/test/functional/redefine_in_handler.rc
+++ b/tests/functional/redefine_in_handler.rc
diff --git a/pylint/test/functional/redefine_in_handler.txt b/tests/functional/redefine_in_handler.txt
index 48674a19b..48674a19b 100644
--- a/pylint/test/functional/redefine_in_handler.txt
+++ b/tests/functional/redefine_in_handler.txt
diff --git a/pylint/test/functional/redefined_argument_from_local.py b/tests/functional/redefined_argument_from_local.py
index b1735e9c0..b1735e9c0 100644
--- a/pylint/test/functional/redefined_argument_from_local.py
+++ b/tests/functional/redefined_argument_from_local.py
diff --git a/pylint/test/functional/redefined_argument_from_local.txt b/tests/functional/redefined_argument_from_local.txt
index c3c026b7d..c3c026b7d 100644
--- a/pylint/test/functional/redefined_argument_from_local.txt
+++ b/tests/functional/redefined_argument_from_local.txt
diff --git a/pylint/test/functional/redefined_builtin.py b/tests/functional/redefined_builtin.py
index c840f8dd5..c840f8dd5 100644
--- a/pylint/test/functional/redefined_builtin.py
+++ b/tests/functional/redefined_builtin.py
diff --git a/pylint/test/functional/redefined_builtin.txt b/tests/functional/redefined_builtin.txt
index fb11cd3ab..fb11cd3ab 100644
--- a/pylint/test/functional/redefined_builtin.txt
+++ b/tests/functional/redefined_builtin.txt
diff --git a/pylint/test/functional/redundant_unittest_assert.py b/tests/functional/redundant_unittest_assert.py
index 2eb73e3d4..2eb73e3d4 100644
--- a/pylint/test/functional/redundant_unittest_assert.py
+++ b/tests/functional/redundant_unittest_assert.py
diff --git a/pylint/test/functional/redundant_unittest_assert.txt b/tests/functional/redundant_unittest_assert.txt
index 889d395c0..889d395c0 100644
--- a/pylint/test/functional/redundant_unittest_assert.txt
+++ b/tests/functional/redundant_unittest_assert.txt
diff --git a/pylint/test/functional/regression_1326_crash_uninferable.py b/tests/functional/regression_1326_crash_uninferable.py
index a42d44ac3..a42d44ac3 100644
--- a/pylint/test/functional/regression_1326_crash_uninferable.py
+++ b/tests/functional/regression_1326_crash_uninferable.py
diff --git a/pylint/test/functional/regression_2443_duplicate_bases.py b/tests/functional/regression_2443_duplicate_bases.py
index f32490c44..f32490c44 100644
--- a/pylint/test/functional/regression_2443_duplicate_bases.py
+++ b/tests/functional/regression_2443_duplicate_bases.py
diff --git a/pylint/test/functional/regression_2443_duplicate_bases.rc b/tests/functional/regression_2443_duplicate_bases.rc
index 0ba2b6333..0ba2b6333 100644
--- a/pylint/test/functional/regression_2443_duplicate_bases.rc
+++ b/tests/functional/regression_2443_duplicate_bases.rc
diff --git a/pylint/test/functional/regression_2937_ifexp.py b/tests/functional/regression_2937_ifexp.py
index 55b240440..55b240440 100644
--- a/pylint/test/functional/regression_2937_ifexp.py
+++ b/tests/functional/regression_2937_ifexp.py
diff --git a/pylint/test/functional/regression_no_value_for_parameter.py b/tests/functional/regression_no_value_for_parameter.py
index 30308e605..30308e605 100644
--- a/pylint/test/functional/regression_no_value_for_parameter.py
+++ b/tests/functional/regression_no_value_for_parameter.py
diff --git a/pylint/test/functional/regression_no_value_for_parameter.txt b/tests/functional/regression_no_value_for_parameter.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/regression_no_value_for_parameter.txt
+++ b/tests/functional/regression_no_value_for_parameter.txt
diff --git a/pylint/test/functional/reimported.py b/tests/functional/reimported.py
index b73f1ce08..b73f1ce08 100644
--- a/pylint/test/functional/reimported.py
+++ b/tests/functional/reimported.py
diff --git a/pylint/test/functional/reimported.txt b/tests/functional/reimported.txt
index b15625e2c..b15625e2c 100644
--- a/pylint/test/functional/reimported.txt
+++ b/tests/functional/reimported.txt
diff --git a/pylint/test/functional/repeated_keyword.py b/tests/functional/repeated_keyword.py
index 786c53bab..786c53bab 100644
--- a/pylint/test/functional/repeated_keyword.py
+++ b/tests/functional/repeated_keyword.py
diff --git a/pylint/test/functional/repeated_keyword.txt b/tests/functional/repeated_keyword.txt
index 1344b15bc..1344b15bc 100644
--- a/pylint/test/functional/repeated_keyword.txt
+++ b/tests/functional/repeated_keyword.txt
diff --git a/pylint/test/functional/return_in_init.py b/tests/functional/return_in_init.py
index bf0aa064f..bf0aa064f 100644
--- a/pylint/test/functional/return_in_init.py
+++ b/tests/functional/return_in_init.py
diff --git a/pylint/test/functional/return_in_init.txt b/tests/functional/return_in_init.txt
index 5e708d0d7..5e708d0d7 100644
--- a/pylint/test/functional/return_in_init.txt
+++ b/tests/functional/return_in_init.txt
diff --git a/pylint/test/functional/return_outside_function.py b/tests/functional/return_outside_function.py
index 449dafd68..449dafd68 100644
--- a/pylint/test/functional/return_outside_function.py
+++ b/tests/functional/return_outside_function.py
diff --git a/pylint/test/functional/return_outside_function.txt b/tests/functional/return_outside_function.txt
index 0c9aa5699..0c9aa5699 100644
--- a/pylint/test/functional/return_outside_function.txt
+++ b/tests/functional/return_outside_function.txt
diff --git a/pylint/test/functional/reused_outer_loop_variable.py b/tests/functional/reused_outer_loop_variable.py
index b244e99f5..b244e99f5 100644
--- a/pylint/test/functional/reused_outer_loop_variable.py
+++ b/tests/functional/reused_outer_loop_variable.py
diff --git a/pylint/test/functional/reused_outer_loop_variable.txt b/tests/functional/reused_outer_loop_variable.txt
index 1252ac9d6..1252ac9d6 100644
--- a/pylint/test/functional/reused_outer_loop_variable.txt
+++ b/tests/functional/reused_outer_loop_variable.txt
diff --git a/pylint/test/functional/reused_outer_loop_variable_py3.py b/tests/functional/reused_outer_loop_variable_py3.py
index 6eaa1f51c..6eaa1f51c 100644
--- a/pylint/test/functional/reused_outer_loop_variable_py3.py
+++ b/tests/functional/reused_outer_loop_variable_py3.py
diff --git a/pylint/test/functional/reused_outer_loop_variable_py3.rc b/tests/functional/reused_outer_loop_variable_py3.rc
index c093be204..c093be204 100644
--- a/pylint/test/functional/reused_outer_loop_variable_py3.rc
+++ b/tests/functional/reused_outer_loop_variable_py3.rc
diff --git a/pylint/test/functional/reused_outer_loop_variable_py3.txt b/tests/functional/reused_outer_loop_variable_py3.txt
index ac3a6ead2..ac3a6ead2 100644
--- a/pylint/test/functional/reused_outer_loop_variable_py3.txt
+++ b/tests/functional/reused_outer_loop_variable_py3.txt
diff --git a/pylint/test/functional/self_cls_assignment.py b/tests/functional/self_cls_assignment.py
index 4e63bb422..4e63bb422 100644
--- a/pylint/test/functional/self_cls_assignment.py
+++ b/tests/functional/self_cls_assignment.py
diff --git a/pylint/test/functional/self_cls_assignment.txt b/tests/functional/self_cls_assignment.txt
index 42a90340c..42a90340c 100644
--- a/pylint/test/functional/self_cls_assignment.txt
+++ b/tests/functional/self_cls_assignment.txt
diff --git a/pylint/test/functional/signature_differs.py b/tests/functional/signature_differs.py
index 920611fd0..920611fd0 100644
--- a/pylint/test/functional/signature_differs.py
+++ b/tests/functional/signature_differs.py
diff --git a/pylint/test/functional/signature_differs.txt b/tests/functional/signature_differs.txt
index a9985e5fc..a9985e5fc 100644
--- a/pylint/test/functional/signature_differs.txt
+++ b/tests/functional/signature_differs.txt
diff --git a/pylint/test/functional/simplifiable_if_expression.py b/tests/functional/simplifiable_if_expression.py
index bcfdf890b..bcfdf890b 100644
--- a/pylint/test/functional/simplifiable_if_expression.py
+++ b/tests/functional/simplifiable_if_expression.py
diff --git a/pylint/test/functional/simplifiable_if_expression.txt b/tests/functional/simplifiable_if_expression.txt
index b35e08462..b35e08462 100644
--- a/pylint/test/functional/simplifiable_if_expression.txt
+++ b/tests/functional/simplifiable_if_expression.txt
diff --git a/pylint/test/functional/simplifiable_if_statement.py b/tests/functional/simplifiable_if_statement.py
index 1e36e612c..1e36e612c 100644
--- a/pylint/test/functional/simplifiable_if_statement.py
+++ b/tests/functional/simplifiable_if_statement.py
diff --git a/pylint/test/functional/simplifiable_if_statement.txt b/tests/functional/simplifiable_if_statement.txt
index 1c5110908..1c5110908 100644
--- a/pylint/test/functional/simplifiable_if_statement.txt
+++ b/tests/functional/simplifiable_if_statement.txt
diff --git a/pylint/test/functional/simplify_chained_comparison.py b/tests/functional/simplify_chained_comparison.py
index 4be9fbe3d..4be9fbe3d 100644
--- a/pylint/test/functional/simplify_chained_comparison.py
+++ b/tests/functional/simplify_chained_comparison.py
diff --git a/pylint/test/functional/simplify_chained_comparison.txt b/tests/functional/simplify_chained_comparison.txt
index 3107e60cb..3107e60cb 100644
--- a/pylint/test/functional/simplify_chained_comparison.txt
+++ b/tests/functional/simplify_chained_comparison.txt
diff --git a/pylint/test/functional/singledispatch_functions.py b/tests/functional/singledispatch_functions.py
index cfd4d873c..cfd4d873c 100644
--- a/pylint/test/functional/singledispatch_functions.py
+++ b/tests/functional/singledispatch_functions.py
diff --git a/pylint/test/functional/singledispatch_functions.rc b/tests/functional/singledispatch_functions.rc
index fc795dc6d..fc795dc6d 100644
--- a/pylint/test/functional/singledispatch_functions.rc
+++ b/tests/functional/singledispatch_functions.rc
diff --git a/pylint/test/functional/singledispatch_functions.txt b/tests/functional/singledispatch_functions.txt
index 568f41b31..568f41b31 100644
--- a/pylint/test/functional/singledispatch_functions.txt
+++ b/tests/functional/singledispatch_functions.txt
diff --git a/pylint/test/functional/singledispatch_functions_py3.py b/tests/functional/singledispatch_functions_py3.py
index cfd4d873c..cfd4d873c 100644
--- a/pylint/test/functional/singledispatch_functions_py3.py
+++ b/tests/functional/singledispatch_functions_py3.py
diff --git a/pylint/test/functional/singledispatch_functions_py3.rc b/tests/functional/singledispatch_functions_py3.rc
index d43f6c339..d43f6c339 100644
--- a/pylint/test/functional/singledispatch_functions_py3.rc
+++ b/tests/functional/singledispatch_functions_py3.rc
diff --git a/pylint/test/functional/singledispatch_functions_py3.txt b/tests/functional/singledispatch_functions_py3.txt
index 568f41b31..568f41b31 100644
--- a/pylint/test/functional/singledispatch_functions_py3.txt
+++ b/tests/functional/singledispatch_functions_py3.txt
diff --git a/pylint/test/functional/singleton_comparison.py b/tests/functional/singleton_comparison.py
index 9a28c0e2e..9a28c0e2e 100644
--- a/pylint/test/functional/singleton_comparison.py
+++ b/tests/functional/singleton_comparison.py
diff --git a/pylint/test/functional/singleton_comparison.txt b/tests/functional/singleton_comparison.txt
index 533d71f63..533d71f63 100644
--- a/pylint/test/functional/singleton_comparison.txt
+++ b/tests/functional/singleton_comparison.txt
diff --git a/pylint/test/functional/slots_checks.py b/tests/functional/slots_checks.py
index 64a439f33..64a439f33 100644
--- a/pylint/test/functional/slots_checks.py
+++ b/tests/functional/slots_checks.py
diff --git a/pylint/test/functional/slots_checks.txt b/tests/functional/slots_checks.txt
index b3d71afcc..b3d71afcc 100644
--- a/pylint/test/functional/slots_checks.txt
+++ b/tests/functional/slots_checks.txt
diff --git a/pylint/test/functional/socketerror_import.py b/tests/functional/socketerror_import.py
index df5de2957..df5de2957 100644
--- a/pylint/test/functional/socketerror_import.py
+++ b/tests/functional/socketerror_import.py
diff --git a/pylint/test/functional/star_needs_assignment_target.py b/tests/functional/star_needs_assignment_target.py
index 5421c226b..5421c226b 100644
--- a/pylint/test/functional/star_needs_assignment_target.py
+++ b/tests/functional/star_needs_assignment_target.py
diff --git a/pylint/test/functional/star_needs_assignment_target.rc b/tests/functional/star_needs_assignment_target.rc
index c093be204..c093be204 100644
--- a/pylint/test/functional/star_needs_assignment_target.rc
+++ b/tests/functional/star_needs_assignment_target.rc
diff --git a/pylint/test/functional/star_needs_assignment_target.txt b/tests/functional/star_needs_assignment_target.txt
index b66975c97..b66975c97 100644
--- a/pylint/test/functional/star_needs_assignment_target.txt
+++ b/tests/functional/star_needs_assignment_target.txt
diff --git a/pylint/test/functional/star_needs_assignment_target_py35.py b/tests/functional/star_needs_assignment_target_py35.py
index 58e43dbac..58e43dbac 100644
--- a/pylint/test/functional/star_needs_assignment_target_py35.py
+++ b/tests/functional/star_needs_assignment_target_py35.py
diff --git a/pylint/test/functional/star_needs_assignment_target_py35.rc b/tests/functional/star_needs_assignment_target_py35.rc
index 71de8b630..71de8b630 100644
--- a/pylint/test/functional/star_needs_assignment_target_py35.rc
+++ b/tests/functional/star_needs_assignment_target_py35.rc
diff --git a/pylint/test/functional/star_needs_assignment_target_py35.txt b/tests/functional/star_needs_assignment_target_py35.txt
index 07770523b..07770523b 100644
--- a/pylint/test/functional/star_needs_assignment_target_py35.txt
+++ b/tests/functional/star_needs_assignment_target_py35.txt
diff --git a/pylint/test/functional/statement_without_effect.py b/tests/functional/statement_without_effect.py
index c8394b45e..c8394b45e 100644
--- a/pylint/test/functional/statement_without_effect.py
+++ b/tests/functional/statement_without_effect.py
diff --git a/pylint/test/functional/statement_without_effect.txt b/tests/functional/statement_without_effect.txt
index bda6eaea9..bda6eaea9 100644
--- a/pylint/test/functional/statement_without_effect.txt
+++ b/tests/functional/statement_without_effect.txt
diff --git a/pylint/test/functional/statement_without_effect_py36.py b/tests/functional/statement_without_effect_py36.py
index 59745ce2b..59745ce2b 100644
--- a/pylint/test/functional/statement_without_effect_py36.py
+++ b/tests/functional/statement_without_effect_py36.py
diff --git a/pylint/test/functional/statement_without_effect_py36.rc b/tests/functional/statement_without_effect_py36.rc
index 0ba2b6333..0ba2b6333 100644
--- a/pylint/test/functional/statement_without_effect_py36.rc
+++ b/tests/functional/statement_without_effect_py36.rc
diff --git a/pylint/test/functional/statement_without_effect_py36.txt b/tests/functional/statement_without_effect_py36.txt
index 6b782923b..6b782923b 100644
--- a/pylint/test/functional/statement_without_effect_py36.txt
+++ b/tests/functional/statement_without_effect_py36.txt
diff --git a/pylint/test/functional/stop_iteration_inside_generator.py b/tests/functional/stop_iteration_inside_generator.py
index a51f2d3e7..a51f2d3e7 100644
--- a/pylint/test/functional/stop_iteration_inside_generator.py
+++ b/tests/functional/stop_iteration_inside_generator.py
diff --git a/pylint/test/functional/stop_iteration_inside_generator.rc b/tests/functional/stop_iteration_inside_generator.rc
index c093be204..c093be204 100644
--- a/pylint/test/functional/stop_iteration_inside_generator.rc
+++ b/tests/functional/stop_iteration_inside_generator.rc
diff --git a/pylint/test/functional/stop_iteration_inside_generator.txt b/tests/functional/stop_iteration_inside_generator.txt
index 107d563b6..107d563b6 100644
--- a/pylint/test/functional/stop_iteration_inside_generator.txt
+++ b/tests/functional/stop_iteration_inside_generator.txt
diff --git a/pylint/test/functional/string_formatting.py b/tests/functional/string_formatting.py
index 7e60d9fd9..7e60d9fd9 100644
--- a/pylint/test/functional/string_formatting.py
+++ b/tests/functional/string_formatting.py
diff --git a/pylint/test/functional/string_formatting.txt b/tests/functional/string_formatting.txt
index 9801de1a7..9801de1a7 100644
--- a/pylint/test/functional/string_formatting.txt
+++ b/tests/functional/string_formatting.txt
diff --git a/pylint/test/functional/string_formatting_disable.py b/tests/functional/string_formatting_disable.py
index 096c84734..096c84734 100644
--- a/pylint/test/functional/string_formatting_disable.py
+++ b/tests/functional/string_formatting_disable.py
diff --git a/pylint/test/functional/string_formatting_disable.rc b/tests/functional/string_formatting_disable.rc
index 0193339de..0193339de 100644
--- a/pylint/test/functional/string_formatting_disable.rc
+++ b/tests/functional/string_formatting_disable.rc
diff --git a/pylint/test/functional/string_formatting_disable.txt b/tests/functional/string_formatting_disable.txt
index 2c8f6db59..2c8f6db59 100644
--- a/pylint/test/functional/string_formatting_disable.txt
+++ b/tests/functional/string_formatting_disable.txt
diff --git a/pylint/test/functional/string_formatting_failed_inference.py b/tests/functional/string_formatting_failed_inference.py
index c5add58c8..c5add58c8 100644
--- a/pylint/test/functional/string_formatting_failed_inference.py
+++ b/tests/functional/string_formatting_failed_inference.py
diff --git a/pylint/test/functional/string_formatting_failed_inference_py35.py b/tests/functional/string_formatting_failed_inference_py35.py
index a511ff80e..a511ff80e 100644
--- a/pylint/test/functional/string_formatting_failed_inference_py35.py
+++ b/tests/functional/string_formatting_failed_inference_py35.py
diff --git a/pylint/test/functional/string_formatting_failed_inference_py35.rc b/tests/functional/string_formatting_failed_inference_py35.rc
index 71de8b630..71de8b630 100644
--- a/pylint/test/functional/string_formatting_failed_inference_py35.rc
+++ b/tests/functional/string_formatting_failed_inference_py35.rc
diff --git a/pylint/test/functional/string_formatting_py27.py b/tests/functional/string_formatting_py27.py
index eab042c07..eab042c07 100644
--- a/pylint/test/functional/string_formatting_py27.py
+++ b/tests/functional/string_formatting_py27.py
diff --git a/pylint/test/functional/string_formatting_py27.rc b/tests/functional/string_formatting_py27.rc
index 80170b777..80170b777 100644
--- a/pylint/test/functional/string_formatting_py27.rc
+++ b/tests/functional/string_formatting_py27.rc
diff --git a/pylint/test/functional/string_formatting_py27.txt b/tests/functional/string_formatting_py27.txt
index 47f21ded0..47f21ded0 100644
--- a/pylint/test/functional/string_formatting_py27.txt
+++ b/tests/functional/string_formatting_py27.txt
diff --git a/pylint/test/functional/string_formatting_py3.py b/tests/functional/string_formatting_py3.py
index c27e9719e..c27e9719e 100644
--- a/pylint/test/functional/string_formatting_py3.py
+++ b/tests/functional/string_formatting_py3.py
diff --git a/pylint/test/functional/string_formatting_py3.rc b/tests/functional/string_formatting_py3.rc
index a2ab06c50..a2ab06c50 100644
--- a/pylint/test/functional/string_formatting_py3.rc
+++ b/tests/functional/string_formatting_py3.rc
diff --git a/pylint/test/functional/string_formatting_py3.txt b/tests/functional/string_formatting_py3.txt
index 45975899a..45975899a 100644
--- a/pylint/test/functional/string_formatting_py3.txt
+++ b/tests/functional/string_formatting_py3.txt
diff --git a/pylint/test/functional/subprocess_popen_preexec_fn.py b/tests/functional/subprocess_popen_preexec_fn.py
index e785abc76..e785abc76 100644
--- a/pylint/test/functional/subprocess_popen_preexec_fn.py
+++ b/tests/functional/subprocess_popen_preexec_fn.py
diff --git a/pylint/test/functional/subprocess_popen_preexec_fn.txt b/tests/functional/subprocess_popen_preexec_fn.txt
index cd237a442..cd237a442 100644
--- a/pylint/test/functional/subprocess_popen_preexec_fn.txt
+++ b/tests/functional/subprocess_popen_preexec_fn.txt
diff --git a/pylint/test/functional/subprocess_run_check35.py b/tests/functional/subprocess_run_check35.py
index f123fb20d..f123fb20d 100644
--- a/pylint/test/functional/subprocess_run_check35.py
+++ b/tests/functional/subprocess_run_check35.py
diff --git a/pylint/test/functional/subprocess_run_check35.rc b/tests/functional/subprocess_run_check35.rc
index 71de8b630..71de8b630 100644
--- a/pylint/test/functional/subprocess_run_check35.rc
+++ b/tests/functional/subprocess_run_check35.rc
diff --git a/pylint/test/functional/subprocess_run_check35.txt b/tests/functional/subprocess_run_check35.txt
index 31e5dbfc1..31e5dbfc1 100644
--- a/pylint/test/functional/subprocess_run_check35.txt
+++ b/tests/functional/subprocess_run_check35.txt
diff --git a/pylint/test/functional/super_checks.py b/tests/functional/super_checks.py
index 3888488fe..3888488fe 100644
--- a/pylint/test/functional/super_checks.py
+++ b/tests/functional/super_checks.py
diff --git a/pylint/test/functional/super_checks.txt b/tests/functional/super_checks.txt
index 4911a6c86..4911a6c86 100644
--- a/pylint/test/functional/super_checks.txt
+++ b/tests/functional/super_checks.txt
diff --git a/pylint/test/functional/superfluous_parens.py b/tests/functional/superfluous_parens.py
index 13418cd78..13418cd78 100644
--- a/pylint/test/functional/superfluous_parens.py
+++ b/tests/functional/superfluous_parens.py
diff --git a/pylint/test/functional/superfluous_parens.txt b/tests/functional/superfluous_parens.txt
index 57e1019c3..57e1019c3 100644
--- a/pylint/test/functional/superfluous_parens.txt
+++ b/tests/functional/superfluous_parens.txt
diff --git a/pylint/test/functional/suspicious_str_strip_call.py b/tests/functional/suspicious_str_strip_call.py
index bc3a27c27..bc3a27c27 100644
--- a/pylint/test/functional/suspicious_str_strip_call.py
+++ b/tests/functional/suspicious_str_strip_call.py
diff --git a/pylint/test/functional/suspicious_str_strip_call.rc b/tests/functional/suspicious_str_strip_call.rc
index a65023393..a65023393 100644
--- a/pylint/test/functional/suspicious_str_strip_call.rc
+++ b/tests/functional/suspicious_str_strip_call.rc
diff --git a/pylint/test/functional/suspicious_str_strip_call.txt b/tests/functional/suspicious_str_strip_call.txt
index ad714cc6b..ad714cc6b 100644
--- a/pylint/test/functional/suspicious_str_strip_call.txt
+++ b/tests/functional/suspicious_str_strip_call.txt
diff --git a/pylint/test/functional/suspicious_str_strip_call_py3.py b/tests/functional/suspicious_str_strip_call_py3.py
index e859f25f8..e859f25f8 100644
--- a/pylint/test/functional/suspicious_str_strip_call_py3.py
+++ b/tests/functional/suspicious_str_strip_call_py3.py
diff --git a/pylint/test/functional/suspicious_str_strip_call_py3.rc b/tests/functional/suspicious_str_strip_call_py3.rc
index c093be204..c093be204 100644
--- a/pylint/test/functional/suspicious_str_strip_call_py3.rc
+++ b/tests/functional/suspicious_str_strip_call_py3.rc
diff --git a/pylint/test/functional/suspicious_str_strip_call_py3.txt b/tests/functional/suspicious_str_strip_call_py3.txt
index 81f32cf4e..81f32cf4e 100644
--- a/pylint/test/functional/suspicious_str_strip_call_py3.txt
+++ b/tests/functional/suspicious_str_strip_call_py3.txt
diff --git a/pylint/test/functional/syntax_error.py b/tests/functional/syntax_error.py
index c93df6b05..c93df6b05 100644
--- a/pylint/test/functional/syntax_error.py
+++ b/tests/functional/syntax_error.py
diff --git a/pylint/test/functional/syntax_error.rc b/tests/functional/syntax_error.rc
index 58b5a9413..58b5a9413 100644
--- a/pylint/test/functional/syntax_error.rc
+++ b/tests/functional/syntax_error.rc
diff --git a/pylint/test/functional/syntax_error.txt b/tests/functional/syntax_error.txt
index f14ae39dd..f14ae39dd 100644
--- a/pylint/test/functional/syntax_error.txt
+++ b/tests/functional/syntax_error.txt
diff --git a/pylint/test/functional/syntax_error_jython.py b/tests/functional/syntax_error_jython.py
index c93df6b05..c93df6b05 100644
--- a/pylint/test/functional/syntax_error_jython.py
+++ b/tests/functional/syntax_error_jython.py
diff --git a/pylint/test/functional/syntax_error_jython.rc b/tests/functional/syntax_error_jython.rc
index 29bd3facf..29bd3facf 100644
--- a/pylint/test/functional/syntax_error_jython.rc
+++ b/tests/functional/syntax_error_jython.rc
diff --git a/pylint/test/functional/syntax_error_jython.txt b/tests/functional/syntax_error_jython.txt
index e532aece7..e532aece7 100644
--- a/pylint/test/functional/syntax_error_jython.txt
+++ b/tests/functional/syntax_error_jython.txt
diff --git a/pylint/test/functional/sys_stream_regression_1004.py b/tests/functional/sys_stream_regression_1004.py
index c0391859d..c0391859d 100644
--- a/pylint/test/functional/sys_stream_regression_1004.py
+++ b/tests/functional/sys_stream_regression_1004.py
diff --git a/pylint/test/functional/sys_stream_regression_1004.rc b/tests/functional/sys_stream_regression_1004.rc
index 182fae81c..182fae81c 100644
--- a/pylint/test/functional/sys_stream_regression_1004.rc
+++ b/tests/functional/sys_stream_regression_1004.rc
diff --git a/pylint/test/functional/sys_stream_regression_1004.txt b/tests/functional/sys_stream_regression_1004.txt
index b68af46fa..b68af46fa 100644
--- a/pylint/test/functional/sys_stream_regression_1004.txt
+++ b/tests/functional/sys_stream_regression_1004.txt
diff --git a/pylint/test/functional/ternary.py b/tests/functional/ternary.py
index 835eb73cf..835eb73cf 100644
--- a/pylint/test/functional/ternary.py
+++ b/tests/functional/ternary.py
diff --git a/pylint/test/functional/ternary.txt b/tests/functional/ternary.txt
index 0008e16b6..0008e16b6 100644
--- a/pylint/test/functional/ternary.txt
+++ b/tests/functional/ternary.txt
diff --git a/pylint/test/functional/test_compile.py b/tests/functional/test_compile.py
index d4a4ac2aa..d4a4ac2aa 100644
--- a/pylint/test/functional/test_compile.py
+++ b/tests/functional/test_compile.py
diff --git a/pylint/test/functional/tokenize_error.py b/tests/functional/tokenize_error.py
index 323950d91..323950d91 100644
--- a/pylint/test/functional/tokenize_error.py
+++ b/tests/functional/tokenize_error.py
diff --git a/pylint/test/functional/tokenize_error.rc b/tests/functional/tokenize_error.rc
index 58b5a9413..58b5a9413 100644
--- a/pylint/test/functional/tokenize_error.rc
+++ b/tests/functional/tokenize_error.rc
diff --git a/pylint/test/functional/tokenize_error.txt b/tests/functional/tokenize_error.txt
index 4e65f7127..4e65f7127 100644
--- a/pylint/test/functional/tokenize_error.txt
+++ b/tests/functional/tokenize_error.txt
diff --git a/pylint/test/functional/tokenize_error_jython.py b/tests/functional/tokenize_error_jython.py
index 205f5fc6b..205f5fc6b 100644
--- a/pylint/test/functional/tokenize_error_jython.py
+++ b/tests/functional/tokenize_error_jython.py
diff --git a/pylint/test/functional/tokenize_error_jython.rc b/tests/functional/tokenize_error_jython.rc
index 79ffac09c..79ffac09c 100644
--- a/pylint/test/functional/tokenize_error_jython.rc
+++ b/tests/functional/tokenize_error_jython.rc
diff --git a/pylint/test/functional/tokenize_error_jython.txt b/tests/functional/tokenize_error_jython.txt
index 82e662eb8..82e662eb8 100644
--- a/pylint/test/functional/tokenize_error_jython.txt
+++ b/tests/functional/tokenize_error_jython.txt
diff --git a/pylint/test/functional/too_few_public_methods.py b/tests/functional/too_few_public_methods.py
index 0b300351c..0b300351c 100644
--- a/pylint/test/functional/too_few_public_methods.py
+++ b/tests/functional/too_few_public_methods.py
diff --git a/pylint/test/functional/too_few_public_methods.txt b/tests/functional/too_few_public_methods.txt
index 79362d110..79362d110 100644
--- a/pylint/test/functional/too_few_public_methods.txt
+++ b/tests/functional/too_few_public_methods.txt
diff --git a/pylint/test/functional/too_few_public_methods_37.py b/tests/functional/too_few_public_methods_37.py
index 0bb3a3c16..0bb3a3c16 100644
--- a/pylint/test/functional/too_few_public_methods_37.py
+++ b/tests/functional/too_few_public_methods_37.py
diff --git a/pylint/test/functional/too_few_public_methods_37.rc b/tests/functional/too_few_public_methods_37.rc
index 5d0572448..5d0572448 100644
--- a/pylint/test/functional/too_few_public_methods_37.rc
+++ b/tests/functional/too_few_public_methods_37.rc
diff --git a/pylint/test/functional/too_few_public_methods_37.txt b/tests/functional/too_few_public_methods_37.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/too_few_public_methods_37.txt
+++ b/tests/functional/too_few_public_methods_37.txt
diff --git a/pylint/test/functional/too_many_ancestors.py b/tests/functional/too_many_ancestors.py
index a0ae18a02..a0ae18a02 100644
--- a/pylint/test/functional/too_many_ancestors.py
+++ b/tests/functional/too_many_ancestors.py
diff --git a/pylint/test/functional/too_many_ancestors.txt b/tests/functional/too_many_ancestors.txt
index e9f0841ca..e9f0841ca 100644
--- a/pylint/test/functional/too_many_ancestors.txt
+++ b/tests/functional/too_many_ancestors.txt
diff --git a/pylint/test/functional/too_many_arguments.py b/tests/functional/too_many_arguments.py
index 689745e27..689745e27 100644
--- a/pylint/test/functional/too_many_arguments.py
+++ b/tests/functional/too_many_arguments.py
diff --git a/pylint/test/functional/too_many_arguments.txt b/tests/functional/too_many_arguments.txt
index 8f99a462e..8f99a462e 100644
--- a/pylint/test/functional/too_many_arguments.txt
+++ b/tests/functional/too_many_arguments.txt
diff --git a/pylint/test/functional/too_many_arguments_issue_1045.py b/tests/functional/too_many_arguments_issue_1045.py
index e5aa76d75..e5aa76d75 100644
--- a/pylint/test/functional/too_many_arguments_issue_1045.py
+++ b/tests/functional/too_many_arguments_issue_1045.py
diff --git a/pylint/test/functional/too_many_arguments_issue_1045.rc b/tests/functional/too_many_arguments_issue_1045.rc
index 46032f660..46032f660 100644
--- a/pylint/test/functional/too_many_arguments_issue_1045.rc
+++ b/tests/functional/too_many_arguments_issue_1045.rc
diff --git a/pylint/test/functional/too_many_arguments_issue_1045.txt b/tests/functional/too_many_arguments_issue_1045.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/too_many_arguments_issue_1045.txt
+++ b/tests/functional/too_many_arguments_issue_1045.txt
diff --git a/pylint/test/functional/too_many_boolean_expressions.py b/tests/functional/too_many_boolean_expressions.py
index 68214ab8e..68214ab8e 100644
--- a/pylint/test/functional/too_many_boolean_expressions.py
+++ b/tests/functional/too_many_boolean_expressions.py
diff --git a/pylint/test/functional/too_many_boolean_expressions.txt b/tests/functional/too_many_boolean_expressions.txt
index 0bb0086c1..0bb0086c1 100644
--- a/pylint/test/functional/too_many_boolean_expressions.txt
+++ b/tests/functional/too_many_boolean_expressions.txt
diff --git a/pylint/test/functional/too_many_branches.py b/tests/functional/too_many_branches.py
index 7b0b068ad..7b0b068ad 100644
--- a/pylint/test/functional/too_many_branches.py
+++ b/tests/functional/too_many_branches.py
diff --git a/pylint/test/functional/too_many_branches.txt b/tests/functional/too_many_branches.txt
index fbc82ccca..fbc82ccca 100644
--- a/pylint/test/functional/too_many_branches.txt
+++ b/tests/functional/too_many_branches.txt
diff --git a/pylint/test/functional/too_many_instance_attributes.py b/tests/functional/too_many_instance_attributes.py
index f6703e0b7..f6703e0b7 100644
--- a/pylint/test/functional/too_many_instance_attributes.py
+++ b/tests/functional/too_many_instance_attributes.py
diff --git a/pylint/test/functional/too_many_instance_attributes.txt b/tests/functional/too_many_instance_attributes.txt
index 652ccea31..652ccea31 100644
--- a/pylint/test/functional/too_many_instance_attributes.txt
+++ b/tests/functional/too_many_instance_attributes.txt
diff --git a/pylint/test/functional/too_many_lines.py b/tests/functional/too_many_lines.py
index 78e568c23..78e568c23 100644
--- a/pylint/test/functional/too_many_lines.py
+++ b/tests/functional/too_many_lines.py
diff --git a/pylint/test/functional/too_many_lines.txt b/tests/functional/too_many_lines.txt
index 0374f0c0c..0374f0c0c 100644
--- a/pylint/test/functional/too_many_lines.txt
+++ b/tests/functional/too_many_lines.txt
diff --git a/pylint/test/functional/too_many_lines_disabled.py b/tests/functional/too_many_lines_disabled.py
index 1b0866db2..1b0866db2 100644
--- a/pylint/test/functional/too_many_lines_disabled.py
+++ b/tests/functional/too_many_lines_disabled.py
diff --git a/pylint/test/functional/too_many_locals.py b/tests/functional/too_many_locals.py
index ac38a9e01..ac38a9e01 100644
--- a/pylint/test/functional/too_many_locals.py
+++ b/tests/functional/too_many_locals.py
diff --git a/pylint/test/functional/too_many_locals.txt b/tests/functional/too_many_locals.txt
index 4a7d19d4f..4a7d19d4f 100644
--- a/pylint/test/functional/too_many_locals.txt
+++ b/tests/functional/too_many_locals.txt
diff --git a/pylint/test/functional/too_many_nested_blocks.py b/tests/functional/too_many_nested_blocks.py
index e7c007957..e7c007957 100644
--- a/pylint/test/functional/too_many_nested_blocks.py
+++ b/tests/functional/too_many_nested_blocks.py
diff --git a/pylint/test/functional/too_many_nested_blocks.txt b/tests/functional/too_many_nested_blocks.txt
index b2a30fd25..b2a30fd25 100644
--- a/pylint/test/functional/too_many_nested_blocks.txt
+++ b/tests/functional/too_many_nested_blocks.txt
diff --git a/pylint/test/functional/too_many_public_methods.py b/tests/functional/too_many_public_methods.py
index 11b4b367d..11b4b367d 100644
--- a/pylint/test/functional/too_many_public_methods.py
+++ b/tests/functional/too_many_public_methods.py
diff --git a/pylint/test/functional/too_many_public_methods.txt b/tests/functional/too_many_public_methods.txt
index 1b5a25016..1b5a25016 100644
--- a/pylint/test/functional/too_many_public_methods.txt
+++ b/tests/functional/too_many_public_methods.txt
diff --git a/pylint/test/functional/too_many_return_statements.py b/tests/functional/too_many_return_statements.py
index 66a85da40..66a85da40 100644
--- a/pylint/test/functional/too_many_return_statements.py
+++ b/tests/functional/too_many_return_statements.py
diff --git a/pylint/test/functional/too_many_return_statements.txt b/tests/functional/too_many_return_statements.txt
index 4f65db229..4f65db229 100644
--- a/pylint/test/functional/too_many_return_statements.txt
+++ b/tests/functional/too_many_return_statements.txt
diff --git a/pylint/test/functional/too_many_star_expressions.py b/tests/functional/too_many_star_expressions.py
index c1bbfb9d3..c1bbfb9d3 100644
--- a/pylint/test/functional/too_many_star_expressions.py
+++ b/tests/functional/too_many_star_expressions.py
diff --git a/pylint/test/functional/too_many_star_expressions.rc b/tests/functional/too_many_star_expressions.rc
index c093be204..c093be204 100644
--- a/pylint/test/functional/too_many_star_expressions.rc
+++ b/tests/functional/too_many_star_expressions.rc
diff --git a/pylint/test/functional/too_many_star_expressions.txt b/tests/functional/too_many_star_expressions.txt
index 97af35293..97af35293 100644
--- a/pylint/test/functional/too_many_star_expressions.txt
+++ b/tests/functional/too_many_star_expressions.txt
diff --git a/pylint/test/functional/too_many_statements.py b/tests/functional/too_many_statements.py
index b3e2fd796..b3e2fd796 100644
--- a/pylint/test/functional/too_many_statements.py
+++ b/tests/functional/too_many_statements.py
diff --git a/pylint/test/functional/too_many_statements.txt b/tests/functional/too_many_statements.txt
index 9a8abfc36..9a8abfc36 100644
--- a/pylint/test/functional/too_many_statements.txt
+++ b/tests/functional/too_many_statements.txt
diff --git a/pylint/test/functional/trailing_comma_tuple.py b/tests/functional/trailing_comma_tuple.py
index a832ccc28..a832ccc28 100644
--- a/pylint/test/functional/trailing_comma_tuple.py
+++ b/tests/functional/trailing_comma_tuple.py
diff --git a/pylint/test/functional/trailing_comma_tuple.rc b/tests/functional/trailing_comma_tuple.rc
index a2ab06c50..a2ab06c50 100644
--- a/pylint/test/functional/trailing_comma_tuple.rc
+++ b/tests/functional/trailing_comma_tuple.rc
diff --git a/pylint/test/functional/trailing_comma_tuple.txt b/tests/functional/trailing_comma_tuple.txt
index bdf53a255..bdf53a255 100644
--- a/pylint/test/functional/trailing_comma_tuple.txt
+++ b/tests/functional/trailing_comma_tuple.txt
diff --git a/pylint/test/functional/trailing_newlines.py b/tests/functional/trailing_newlines.py
index 8fbadbb3e..8fbadbb3e 100644
--- a/pylint/test/functional/trailing_newlines.py
+++ b/tests/functional/trailing_newlines.py
diff --git a/pylint/test/functional/trailing_newlines.txt b/tests/functional/trailing_newlines.txt
index 254f49d9d..254f49d9d 100644
--- a/pylint/test/functional/trailing_newlines.txt
+++ b/tests/functional/trailing_newlines.txt
diff --git a/pylint/test/functional/trailing_whitespaces.py b/tests/functional/trailing_whitespaces.py
index 48de809c6..48de809c6 100644
--- a/pylint/test/functional/trailing_whitespaces.py
+++ b/tests/functional/trailing_whitespaces.py
diff --git a/pylint/test/functional/trailing_whitespaces.txt b/tests/functional/trailing_whitespaces.txt
index 38fc2c322..38fc2c322 100644
--- a/pylint/test/functional/trailing_whitespaces.txt
+++ b/tests/functional/trailing_whitespaces.txt
diff --git a/pylint/test/functional/try_except_raise.py b/tests/functional/try_except_raise.py
index c78852b81..c78852b81 100644
--- a/pylint/test/functional/try_except_raise.py
+++ b/tests/functional/try_except_raise.py
diff --git a/pylint/test/functional/try_except_raise.txt b/tests/functional/try_except_raise.txt
index 882fd4007..882fd4007 100644
--- a/pylint/test/functional/try_except_raise.txt
+++ b/tests/functional/try_except_raise.txt
diff --git a/pylint/test/functional/try_except_raise_crash.py b/tests/functional/try_except_raise_crash.py
index 7a1f8d972..7a1f8d972 100644
--- a/pylint/test/functional/try_except_raise_crash.py
+++ b/tests/functional/try_except_raise_crash.py
diff --git a/pylint/test/functional/try_except_raise_crash.txt b/tests/functional/try_except_raise_crash.txt
index a99476ab9..a99476ab9 100644
--- a/pylint/test/functional/try_except_raise_crash.txt
+++ b/tests/functional/try_except_raise_crash.txt
diff --git a/pylint/test/functional/typing_use.py b/tests/functional/typing_use.py
index 3e2c48ba0..3e2c48ba0 100644
--- a/pylint/test/functional/typing_use.py
+++ b/tests/functional/typing_use.py
diff --git a/pylint/test/functional/typing_use.rc b/tests/functional/typing_use.rc
index 0ba2b6333..0ba2b6333 100644
--- a/pylint/test/functional/typing_use.rc
+++ b/tests/functional/typing_use.rc
diff --git a/pylint/test/functional/typing_use.txt b/tests/functional/typing_use.txt
index 1d0233c98..1d0233c98 100644
--- a/pylint/test/functional/typing_use.txt
+++ b/tests/functional/typing_use.txt
diff --git a/pylint/test/functional/unbalanced_tuple_unpacking.py b/tests/functional/unbalanced_tuple_unpacking.py
index afa217f40..afa217f40 100644
--- a/pylint/test/functional/unbalanced_tuple_unpacking.py
+++ b/tests/functional/unbalanced_tuple_unpacking.py
diff --git a/pylint/test/functional/unbalanced_tuple_unpacking.txt b/tests/functional/unbalanced_tuple_unpacking.txt
index e904209e5..e904209e5 100644
--- a/pylint/test/functional/unbalanced_tuple_unpacking.txt
+++ b/tests/functional/unbalanced_tuple_unpacking.txt
diff --git a/pylint/test/functional/unbalanced_tuple_unpacking_py30.py b/tests/functional/unbalanced_tuple_unpacking_py30.py
index 68f5fb79a..68f5fb79a 100644
--- a/pylint/test/functional/unbalanced_tuple_unpacking_py30.py
+++ b/tests/functional/unbalanced_tuple_unpacking_py30.py
diff --git a/pylint/test/functional/unbalanced_tuple_unpacking_py30.rc b/tests/functional/unbalanced_tuple_unpacking_py30.rc
index 8c6eb56c4..8c6eb56c4 100644
--- a/pylint/test/functional/unbalanced_tuple_unpacking_py30.rc
+++ b/tests/functional/unbalanced_tuple_unpacking_py30.rc
diff --git a/pylint/test/functional/undefined_loop_variable.py b/tests/functional/undefined_loop_variable.py
index a984898f8..a984898f8 100644
--- a/pylint/test/functional/undefined_loop_variable.py
+++ b/tests/functional/undefined_loop_variable.py
diff --git a/pylint/test/functional/undefined_loop_variable.txt b/tests/functional/undefined_loop_variable.txt
index 64cf6388b..64cf6388b 100644
--- a/pylint/test/functional/undefined_loop_variable.txt
+++ b/tests/functional/undefined_loop_variable.txt
diff --git a/pylint/test/functional/undefined_variable.py b/tests/functional/undefined_variable.py
index 59af47e19..59af47e19 100644
--- a/pylint/test/functional/undefined_variable.py
+++ b/tests/functional/undefined_variable.py
diff --git a/pylint/test/functional/undefined_variable.txt b/tests/functional/undefined_variable.txt
index bc935c12d..bc935c12d 100644
--- a/pylint/test/functional/undefined_variable.txt
+++ b/tests/functional/undefined_variable.txt
diff --git a/pylint/test/functional/undefined_variable_py30.py b/tests/functional/undefined_variable_py30.py
index 3ccdfa635..3ccdfa635 100644
--- a/pylint/test/functional/undefined_variable_py30.py
+++ b/tests/functional/undefined_variable_py30.py
diff --git a/pylint/test/functional/undefined_variable_py30.rc b/tests/functional/undefined_variable_py30.rc
index c093be204..c093be204 100644
--- a/pylint/test/functional/undefined_variable_py30.rc
+++ b/tests/functional/undefined_variable_py30.rc
diff --git a/pylint/test/functional/undefined_variable_py30.txt b/tests/functional/undefined_variable_py30.txt
index 28f67d354..28f67d354 100644
--- a/pylint/test/functional/undefined_variable_py30.txt
+++ b/tests/functional/undefined_variable_py30.txt
diff --git a/pylint/test/functional/unexpected_special_method_signature.py b/tests/functional/unexpected_special_method_signature.py
index aba6811b9..aba6811b9 100644
--- a/pylint/test/functional/unexpected_special_method_signature.py
+++ b/tests/functional/unexpected_special_method_signature.py
diff --git a/pylint/test/functional/unexpected_special_method_signature.txt b/tests/functional/unexpected_special_method_signature.txt
index 4fb52df64..4fb52df64 100644
--- a/pylint/test/functional/unexpected_special_method_signature.txt
+++ b/tests/functional/unexpected_special_method_signature.txt
diff --git a/pylint/test/functional/ungrouped_imports.py b/tests/functional/ungrouped_imports.py
index 2fcf18afc..2fcf18afc 100644
--- a/pylint/test/functional/ungrouped_imports.py
+++ b/tests/functional/ungrouped_imports.py
diff --git a/pylint/test/functional/ungrouped_imports.txt b/tests/functional/ungrouped_imports.txt
index c29bb1811..c29bb1811 100644
--- a/pylint/test/functional/ungrouped_imports.txt
+++ b/tests/functional/ungrouped_imports.txt
diff --git a/pylint/test/functional/ungrouped_imports_isort_compatible.py b/tests/functional/ungrouped_imports_isort_compatible.py
index 2e64ed402..2e64ed402 100644
--- a/pylint/test/functional/ungrouped_imports_isort_compatible.py
+++ b/tests/functional/ungrouped_imports_isort_compatible.py
diff --git a/pylint/test/functional/ungrouped_imports_isort_compatible.txt b/tests/functional/ungrouped_imports_isort_compatible.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/ungrouped_imports_isort_compatible.txt
+++ b/tests/functional/ungrouped_imports_isort_compatible.txt
diff --git a/pylint/test/functional/unhashable_dict_key.py b/tests/functional/unhashable_dict_key.py
index 1b469f3dd..1b469f3dd 100644
--- a/pylint/test/functional/unhashable_dict_key.py
+++ b/tests/functional/unhashable_dict_key.py
diff --git a/pylint/test/functional/unhashable_dict_key.txt b/tests/functional/unhashable_dict_key.txt
index 77c3b9287..77c3b9287 100644
--- a/pylint/test/functional/unhashable_dict_key.txt
+++ b/tests/functional/unhashable_dict_key.txt
diff --git a/pylint/test/functional/unidiomatic_typecheck.py b/tests/functional/unidiomatic_typecheck.py
index 008456b1e..008456b1e 100644
--- a/pylint/test/functional/unidiomatic_typecheck.py
+++ b/tests/functional/unidiomatic_typecheck.py
diff --git a/pylint/test/functional/unidiomatic_typecheck.txt b/tests/functional/unidiomatic_typecheck.txt
index 23c0f6f28..23c0f6f28 100644
--- a/pylint/test/functional/unidiomatic_typecheck.txt
+++ b/tests/functional/unidiomatic_typecheck.txt
diff --git a/pylint/test/functional/uninferable_all_object.py b/tests/functional/uninferable_all_object.py
index 3e565f9eb..3e565f9eb 100644
--- a/pylint/test/functional/uninferable_all_object.py
+++ b/tests/functional/uninferable_all_object.py
diff --git a/pylint/test/functional/unknown_encoding_jython.py b/tests/functional/unknown_encoding_jython.py
index a28cfed06..a28cfed06 100644
--- a/pylint/test/functional/unknown_encoding_jython.py
+++ b/tests/functional/unknown_encoding_jython.py
diff --git a/pylint/test/functional/unknown_encoding_jython.rc b/tests/functional/unknown_encoding_jython.rc
index 788d377ba..788d377ba 100644
--- a/pylint/test/functional/unknown_encoding_jython.rc
+++ b/tests/functional/unknown_encoding_jython.rc
diff --git a/pylint/test/functional/unknown_encoding_jython.txt b/tests/functional/unknown_encoding_jython.txt
index b7ff720d3..b7ff720d3 100644
--- a/pylint/test/functional/unknown_encoding_jython.txt
+++ b/tests/functional/unknown_encoding_jython.txt
diff --git a/pylint/test/functional/unknown_encoding_py29.py b/tests/functional/unknown_encoding_py29.py
index aeb2be607..aeb2be607 100644
--- a/pylint/test/functional/unknown_encoding_py29.py
+++ b/tests/functional/unknown_encoding_py29.py
diff --git a/pylint/test/functional/unknown_encoding_py29.rc b/tests/functional/unknown_encoding_py29.rc
index 1c066fbc5..1c066fbc5 100644
--- a/pylint/test/functional/unknown_encoding_py29.rc
+++ b/tests/functional/unknown_encoding_py29.rc
diff --git a/pylint/test/functional/unknown_encoding_py29.txt b/tests/functional/unknown_encoding_py29.txt
index 20e775752..20e775752 100644
--- a/pylint/test/functional/unknown_encoding_py29.txt
+++ b/tests/functional/unknown_encoding_py29.txt
diff --git a/pylint/test/functional/unknown_encoding_pypy.py b/tests/functional/unknown_encoding_pypy.py
index 2ee5f694c..2ee5f694c 100644
--- a/pylint/test/functional/unknown_encoding_pypy.py
+++ b/tests/functional/unknown_encoding_pypy.py
diff --git a/pylint/test/functional/unknown_encoding_pypy.rc b/tests/functional/unknown_encoding_pypy.rc
index 8c4cfd095..8c4cfd095 100644
--- a/pylint/test/functional/unknown_encoding_pypy.rc
+++ b/tests/functional/unknown_encoding_pypy.rc
diff --git a/pylint/test/functional/unknown_encoding_pypy.txt b/tests/functional/unknown_encoding_pypy.txt
index e4c18053c..e4c18053c 100644
--- a/pylint/test/functional/unknown_encoding_pypy.txt
+++ b/tests/functional/unknown_encoding_pypy.txt
diff --git a/pylint/test/functional/unnecessary_lambda.py b/tests/functional/unnecessary_lambda.py
index f0bd775f3..f0bd775f3 100644
--- a/pylint/test/functional/unnecessary_lambda.py
+++ b/tests/functional/unnecessary_lambda.py
diff --git a/pylint/test/functional/unnecessary_lambda.txt b/tests/functional/unnecessary_lambda.txt
index de13882ab..de13882ab 100644
--- a/pylint/test/functional/unnecessary_lambda.txt
+++ b/tests/functional/unnecessary_lambda.txt
diff --git a/pylint/test/functional/unnecessary_pass.py b/tests/functional/unnecessary_pass.py
index c2733096a..c2733096a 100644
--- a/pylint/test/functional/unnecessary_pass.py
+++ b/tests/functional/unnecessary_pass.py
diff --git a/pylint/test/functional/unnecessary_pass.txt b/tests/functional/unnecessary_pass.txt
index dbbc094d6..dbbc094d6 100644
--- a/pylint/test/functional/unnecessary_pass.txt
+++ b/tests/functional/unnecessary_pass.txt
diff --git a/pylint/test/functional/unneeded_not.py b/tests/functional/unneeded_not.py
index 97acecd73..97acecd73 100644
--- a/pylint/test/functional/unneeded_not.py
+++ b/tests/functional/unneeded_not.py
diff --git a/pylint/test/functional/unneeded_not.txt b/tests/functional/unneeded_not.txt
index 13b35129e..13b35129e 100644
--- a/pylint/test/functional/unneeded_not.txt
+++ b/tests/functional/unneeded_not.txt
diff --git a/pylint/test/functional/unpacked_exceptions.py b/tests/functional/unpacked_exceptions.py
index ec3599c3c..ec3599c3c 100644
--- a/pylint/test/functional/unpacked_exceptions.py
+++ b/tests/functional/unpacked_exceptions.py
diff --git a/pylint/test/functional/unpacked_exceptions.rc b/tests/functional/unpacked_exceptions.rc
index 9540bc95e..9540bc95e 100644
--- a/pylint/test/functional/unpacked_exceptions.rc
+++ b/tests/functional/unpacked_exceptions.rc
diff --git a/pylint/test/functional/unpacked_exceptions.txt b/tests/functional/unpacked_exceptions.txt
index 1a1b03423..1a1b03423 100644
--- a/pylint/test/functional/unpacked_exceptions.txt
+++ b/tests/functional/unpacked_exceptions.txt
diff --git a/pylint/test/functional/unpacking.py b/tests/functional/unpacking.py
index 59d9abbe4..59d9abbe4 100644
--- a/pylint/test/functional/unpacking.py
+++ b/tests/functional/unpacking.py
diff --git a/pylint/test/functional/unpacking_generalizations.py b/tests/functional/unpacking_generalizations.py
index 1c5fb16b8..1c5fb16b8 100644
--- a/pylint/test/functional/unpacking_generalizations.py
+++ b/tests/functional/unpacking_generalizations.py
diff --git a/pylint/test/functional/unpacking_generalizations.rc b/tests/functional/unpacking_generalizations.rc
index 03004f2c2..03004f2c2 100644
--- a/pylint/test/functional/unpacking_generalizations.rc
+++ b/tests/functional/unpacking_generalizations.rc
diff --git a/pylint/test/functional/unpacking_generalizations.txt b/tests/functional/unpacking_generalizations.txt
index d92fcc91e..d92fcc91e 100644
--- a/pylint/test/functional/unpacking_generalizations.txt
+++ b/tests/functional/unpacking_generalizations.txt
diff --git a/pylint/test/functional/unpacking_non_sequence.py b/tests/functional/unpacking_non_sequence.py
index 06a840b58..06a840b58 100644
--- a/pylint/test/functional/unpacking_non_sequence.py
+++ b/tests/functional/unpacking_non_sequence.py
diff --git a/pylint/test/functional/unpacking_non_sequence.txt b/tests/functional/unpacking_non_sequence.txt
index 0a21fab42..0a21fab42 100644
--- a/pylint/test/functional/unpacking_non_sequence.txt
+++ b/tests/functional/unpacking_non_sequence.txt
diff --git a/pylint/test/functional/unreachable.py b/tests/functional/unreachable.py
index b03dec88f..b03dec88f 100644
--- a/pylint/test/functional/unreachable.py
+++ b/tests/functional/unreachable.py
diff --git a/pylint/test/functional/unreachable.txt b/tests/functional/unreachable.txt
index adf05264f..adf05264f 100644
--- a/pylint/test/functional/unreachable.txt
+++ b/tests/functional/unreachable.txt
diff --git a/pylint/test/functional/unrecognized_inline_option.py b/tests/functional/unrecognized_inline_option.py
index 3163b1ea6..3163b1ea6 100644
--- a/pylint/test/functional/unrecognized_inline_option.py
+++ b/tests/functional/unrecognized_inline_option.py
diff --git a/pylint/test/functional/unrecognized_inline_option.txt b/tests/functional/unrecognized_inline_option.txt
index 922cc9273..922cc9273 100644
--- a/pylint/test/functional/unrecognized_inline_option.txt
+++ b/tests/functional/unrecognized_inline_option.txt
diff --git a/pylint/test/functional/unsubscriptable_value.py b/tests/functional/unsubscriptable_value.py
index eddb6211d..eddb6211d 100644
--- a/pylint/test/functional/unsubscriptable_value.py
+++ b/tests/functional/unsubscriptable_value.py
diff --git a/pylint/test/functional/unsubscriptable_value.txt b/tests/functional/unsubscriptable_value.txt
index d3243946d..d3243946d 100644
--- a/pylint/test/functional/unsubscriptable_value.txt
+++ b/tests/functional/unsubscriptable_value.txt
diff --git a/pylint/test/functional/unsubscriptable_value_py37.py b/tests/functional/unsubscriptable_value_py37.py
index c7b06cfb2..c7b06cfb2 100644
--- a/pylint/test/functional/unsubscriptable_value_py37.py
+++ b/tests/functional/unsubscriptable_value_py37.py
diff --git a/pylint/test/functional/unsubscriptable_value_py37.rc b/tests/functional/unsubscriptable_value_py37.rc
index a17bb22da..a17bb22da 100644
--- a/pylint/test/functional/unsubscriptable_value_py37.rc
+++ b/tests/functional/unsubscriptable_value_py37.rc
diff --git a/pylint/test/functional/unsubscriptable_value_py37.txt b/tests/functional/unsubscriptable_value_py37.txt
index b2ff0fff5..b2ff0fff5 100644
--- a/pylint/test/functional/unsubscriptable_value_py37.txt
+++ b/tests/functional/unsubscriptable_value_py37.txt
diff --git a/pylint/test/functional/unsupported_assignment_operation.py b/tests/functional/unsupported_assignment_operation.py
index ad2deabef..ad2deabef 100644
--- a/pylint/test/functional/unsupported_assignment_operation.py
+++ b/tests/functional/unsupported_assignment_operation.py
diff --git a/pylint/test/functional/unsupported_assignment_operation.txt b/tests/functional/unsupported_assignment_operation.txt
index 27a11e49d..27a11e49d 100644
--- a/pylint/test/functional/unsupported_assignment_operation.txt
+++ b/tests/functional/unsupported_assignment_operation.txt
diff --git a/pylint/test/functional/unsupported_binary_operation.py b/tests/functional/unsupported_binary_operation.py
index 0bfe1d16a..0bfe1d16a 100644
--- a/pylint/test/functional/unsupported_binary_operation.py
+++ b/tests/functional/unsupported_binary_operation.py
diff --git a/pylint/test/functional/unsupported_binary_operation.rc b/tests/functional/unsupported_binary_operation.rc
index 401ccfe27..401ccfe27 100644
--- a/pylint/test/functional/unsupported_binary_operation.rc
+++ b/tests/functional/unsupported_binary_operation.rc
diff --git a/pylint/test/functional/unsupported_binary_operation.txt b/tests/functional/unsupported_binary_operation.txt
index d94365d0a..d94365d0a 100644
--- a/pylint/test/functional/unsupported_binary_operation.txt
+++ b/tests/functional/unsupported_binary_operation.txt
diff --git a/pylint/test/functional/unsupported_delete_operation.py b/tests/functional/unsupported_delete_operation.py
index c9bab62ea..c9bab62ea 100644
--- a/pylint/test/functional/unsupported_delete_operation.py
+++ b/tests/functional/unsupported_delete_operation.py
diff --git a/pylint/test/functional/unsupported_delete_operation.txt b/tests/functional/unsupported_delete_operation.txt
index 6c3078ec8..6c3078ec8 100644
--- a/pylint/test/functional/unsupported_delete_operation.txt
+++ b/tests/functional/unsupported_delete_operation.txt
diff --git a/pylint/test/functional/unused_argument.py b/tests/functional/unused_argument.py
index 013d4b3e5..013d4b3e5 100644
--- a/pylint/test/functional/unused_argument.py
+++ b/tests/functional/unused_argument.py
diff --git a/pylint/test/functional/unused_argument.txt b/tests/functional/unused_argument.txt
index d5834389f..d5834389f 100644
--- a/pylint/test/functional/unused_argument.txt
+++ b/tests/functional/unused_argument.txt
diff --git a/pylint/test/functional/unused_argument_py3.py b/tests/functional/unused_argument_py3.py
index 65af3e729..65af3e729 100644
--- a/pylint/test/functional/unused_argument_py3.py
+++ b/tests/functional/unused_argument_py3.py
diff --git a/pylint/test/functional/unused_argument_py3.rc b/tests/functional/unused_argument_py3.rc
index c093be204..c093be204 100644
--- a/pylint/test/functional/unused_argument_py3.rc
+++ b/tests/functional/unused_argument_py3.rc
diff --git a/pylint/test/functional/unused_argument_py3.txt b/tests/functional/unused_argument_py3.txt
index f575e43f3..f575e43f3 100644
--- a/pylint/test/functional/unused_argument_py3.txt
+++ b/tests/functional/unused_argument_py3.txt
diff --git a/pylint/test/functional/unused_global_variable1.py b/tests/functional/unused_global_variable1.py
index e630c3337..e630c3337 100644
--- a/pylint/test/functional/unused_global_variable1.py
+++ b/tests/functional/unused_global_variable1.py
diff --git a/pylint/test/functional/unused_global_variable2.py b/tests/functional/unused_global_variable2.py
index 62224096e..62224096e 100644
--- a/pylint/test/functional/unused_global_variable2.py
+++ b/tests/functional/unused_global_variable2.py
diff --git a/pylint/test/functional/unused_global_variable2.rc b/tests/functional/unused_global_variable2.rc
index 5dcd4a84c..5dcd4a84c 100644
--- a/pylint/test/functional/unused_global_variable2.rc
+++ b/tests/functional/unused_global_variable2.rc
diff --git a/pylint/test/functional/unused_global_variable2.txt b/tests/functional/unused_global_variable2.txt
index 27019cbd7..27019cbd7 100644
--- a/pylint/test/functional/unused_global_variable2.txt
+++ b/tests/functional/unused_global_variable2.txt
diff --git a/pylint/test/functional/unused_global_variable3.py b/tests/functional/unused_global_variable3.py
index 896789eda..896789eda 100644
--- a/pylint/test/functional/unused_global_variable3.py
+++ b/tests/functional/unused_global_variable3.py
diff --git a/pylint/test/functional/unused_global_variable4.py b/tests/functional/unused_global_variable4.py
index aef49d68c..aef49d68c 100644
--- a/pylint/test/functional/unused_global_variable4.py
+++ b/tests/functional/unused_global_variable4.py
diff --git a/pylint/test/functional/unused_global_variable4.rc b/tests/functional/unused_global_variable4.rc
index 5dcd4a84c..5dcd4a84c 100644
--- a/pylint/test/functional/unused_global_variable4.rc
+++ b/tests/functional/unused_global_variable4.rc
diff --git a/pylint/test/functional/unused_global_variable4.txt b/tests/functional/unused_global_variable4.txt
index 61e3b286c..61e3b286c 100644
--- a/pylint/test/functional/unused_global_variable4.txt
+++ b/tests/functional/unused_global_variable4.txt
diff --git a/pylint/test/functional/unused_import.py b/tests/functional/unused_import.py
index 4f265277a..4f265277a 100644
--- a/pylint/test/functional/unused_import.py
+++ b/tests/functional/unused_import.py
diff --git a/pylint/test/functional/unused_import.txt b/tests/functional/unused_import.txt
index aa3c07726..aa3c07726 100644
--- a/pylint/test/functional/unused_import.txt
+++ b/tests/functional/unused_import.txt
diff --git a/pylint/test/functional/unused_import_assigned_to.py b/tests/functional/unused_import_assigned_to.py
index 81d3e2ce0..81d3e2ce0 100644
--- a/pylint/test/functional/unused_import_assigned_to.py
+++ b/tests/functional/unused_import_assigned_to.py
diff --git a/pylint/test/functional/unused_typing_imports.py b/tests/functional/unused_typing_imports.py
index 6edca7153..6edca7153 100644
--- a/pylint/test/functional/unused_typing_imports.py
+++ b/tests/functional/unused_typing_imports.py
diff --git a/pylint/test/functional/unused_typing_imports.rc b/tests/functional/unused_typing_imports.rc
index 0ba2b6333..0ba2b6333 100644
--- a/pylint/test/functional/unused_typing_imports.rc
+++ b/tests/functional/unused_typing_imports.rc
diff --git a/pylint/test/functional/unused_variable.py b/tests/functional/unused_variable.py
index e475a9038..e475a9038 100644
--- a/pylint/test/functional/unused_variable.py
+++ b/tests/functional/unused_variable.py
diff --git a/pylint/test/functional/unused_variable.txt b/tests/functional/unused_variable.txt
index e9f7ef022..e9f7ef022 100644
--- a/pylint/test/functional/unused_variable.txt
+++ b/tests/functional/unused_variable.txt
diff --git a/pylint/test/functional/unused_variable_py36.py b/tests/functional/unused_variable_py36.py
index 396d02805..396d02805 100644
--- a/pylint/test/functional/unused_variable_py36.py
+++ b/tests/functional/unused_variable_py36.py
diff --git a/pylint/test/functional/unused_variable_py36.rc b/tests/functional/unused_variable_py36.rc
index 0ba2b6333..0ba2b6333 100644
--- a/pylint/test/functional/unused_variable_py36.rc
+++ b/tests/functional/unused_variable_py36.rc
diff --git a/pylint/test/functional/unused_variable_py36.txt b/tests/functional/unused_variable_py36.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/unused_variable_py36.txt
+++ b/tests/functional/unused_variable_py36.txt
diff --git a/pylint/test/functional/used_before_assignment_488.py b/tests/functional/used_before_assignment_488.py
index efc133c2b..efc133c2b 100644
--- a/pylint/test/functional/used_before_assignment_488.py
+++ b/tests/functional/used_before_assignment_488.py
diff --git a/pylint/test/functional/used_before_assignment_issue1081.py b/tests/functional/used_before_assignment_issue1081.py
index 0c59ccebe..0c59ccebe 100644
--- a/pylint/test/functional/used_before_assignment_issue1081.py
+++ b/tests/functional/used_before_assignment_issue1081.py
diff --git a/pylint/test/functional/used_before_assignment_issue1081.txt b/tests/functional/used_before_assignment_issue1081.txt
index 9b05aac30..9b05aac30 100644
--- a/pylint/test/functional/used_before_assignment_issue1081.txt
+++ b/tests/functional/used_before_assignment_issue1081.txt
diff --git a/pylint/test/functional/used_before_assignment_issue853.py b/tests/functional/used_before_assignment_issue853.py
index f8b412252..f8b412252 100644
--- a/pylint/test/functional/used_before_assignment_issue853.py
+++ b/tests/functional/used_before_assignment_issue853.py
diff --git a/pylint/test/functional/used_before_assignment_nonlocal.py b/tests/functional/used_before_assignment_nonlocal.py
index 5cbdd510c..5cbdd510c 100644
--- a/pylint/test/functional/used_before_assignment_nonlocal.py
+++ b/tests/functional/used_before_assignment_nonlocal.py
diff --git a/pylint/test/functional/used_before_assignment_nonlocal.rc b/tests/functional/used_before_assignment_nonlocal.rc
index c093be204..c093be204 100644
--- a/pylint/test/functional/used_before_assignment_nonlocal.rc
+++ b/tests/functional/used_before_assignment_nonlocal.rc
diff --git a/pylint/test/functional/used_before_assignment_nonlocal.txt b/tests/functional/used_before_assignment_nonlocal.txt
index 36e635e0b..36e635e0b 100644
--- a/pylint/test/functional/used_before_assignment_nonlocal.txt
+++ b/tests/functional/used_before_assignment_nonlocal.txt
diff --git a/pylint/test/functional/used_prior_global_declaration.py b/tests/functional/used_prior_global_declaration.py
index 079501022..079501022 100644
--- a/pylint/test/functional/used_prior_global_declaration.py
+++ b/tests/functional/used_prior_global_declaration.py
diff --git a/pylint/test/functional/used_prior_global_declaration.rc b/tests/functional/used_prior_global_declaration.rc
index 0ba2b6333..0ba2b6333 100644
--- a/pylint/test/functional/used_prior_global_declaration.rc
+++ b/tests/functional/used_prior_global_declaration.rc
diff --git a/pylint/test/functional/used_prior_global_declaration.txt b/tests/functional/used_prior_global_declaration.txt
index 861ba17c1..861ba17c1 100644
--- a/pylint/test/functional/used_prior_global_declaration.txt
+++ b/tests/functional/used_prior_global_declaration.txt
diff --git a/pylint/test/functional/useless-import-alias.py b/tests/functional/useless-import-alias.py
index c8ef8374d..c8ef8374d 100644
--- a/pylint/test/functional/useless-import-alias.py
+++ b/tests/functional/useless-import-alias.py
diff --git a/pylint/test/functional/useless-import-alias.txt b/tests/functional/useless-import-alias.txt
index 6f90b1c95..6f90b1c95 100644
--- a/pylint/test/functional/useless-import-alias.txt
+++ b/tests/functional/useless-import-alias.txt
diff --git a/pylint/test/functional/useless_else_on_loop.py b/tests/functional/useless_else_on_loop.py
index d686f4658..d686f4658 100644
--- a/pylint/test/functional/useless_else_on_loop.py
+++ b/tests/functional/useless_else_on_loop.py
diff --git a/pylint/test/functional/useless_else_on_loop.txt b/tests/functional/useless_else_on_loop.txt
index efa1161ab..efa1161ab 100644
--- a/pylint/test/functional/useless_else_on_loop.txt
+++ b/tests/functional/useless_else_on_loop.txt
diff --git a/pylint/test/functional/useless_object_inheritance.py b/tests/functional/useless_object_inheritance.py
index 562c81f6a..562c81f6a 100644
--- a/pylint/test/functional/useless_object_inheritance.py
+++ b/tests/functional/useless_object_inheritance.py
diff --git a/pylint/test/functional/useless_object_inheritance.txt b/tests/functional/useless_object_inheritance.txt
index 2e0067367..2e0067367 100644
--- a/pylint/test/functional/useless_object_inheritance.txt
+++ b/tests/functional/useless_object_inheritance.txt
diff --git a/pylint/test/functional/useless_return.py b/tests/functional/useless_return.py
index 61aaebe7a..61aaebe7a 100644
--- a/pylint/test/functional/useless_return.py
+++ b/tests/functional/useless_return.py
diff --git a/pylint/test/functional/useless_return.txt b/tests/functional/useless_return.txt
index c28c6d494..c28c6d494 100644
--- a/pylint/test/functional/useless_return.txt
+++ b/tests/functional/useless_return.txt
diff --git a/pylint/test/functional/useless_super_delegation.py b/tests/functional/useless_super_delegation.py
index 421f667e3..421f667e3 100644
--- a/pylint/test/functional/useless_super_delegation.py
+++ b/tests/functional/useless_super_delegation.py
diff --git a/pylint/test/functional/useless_super_delegation.txt b/tests/functional/useless_super_delegation.txt
index 4426fd125..4426fd125 100644
--- a/pylint/test/functional/useless_super_delegation.txt
+++ b/tests/functional/useless_super_delegation.txt
diff --git a/pylint/test/functional/useless_super_delegation_py3.py b/tests/functional/useless_super_delegation_py3.py
index 09bc25b4c..09bc25b4c 100644
--- a/pylint/test/functional/useless_super_delegation_py3.py
+++ b/tests/functional/useless_super_delegation_py3.py
diff --git a/pylint/test/functional/useless_super_delegation_py3.rc b/tests/functional/useless_super_delegation_py3.rc
index c093be204..c093be204 100644
--- a/pylint/test/functional/useless_super_delegation_py3.rc
+++ b/tests/functional/useless_super_delegation_py3.rc
diff --git a/pylint/test/functional/useless_super_delegation_py3.txt b/tests/functional/useless_super_delegation_py3.txt
index 433c7a9bc..433c7a9bc 100644
--- a/pylint/test/functional/useless_super_delegation_py3.txt
+++ b/tests/functional/useless_super_delegation_py3.txt
diff --git a/pylint/test/functional/useless_super_delegation_py35.py b/tests/functional/useless_super_delegation_py35.py
index ffc3c6c74..ffc3c6c74 100644
--- a/pylint/test/functional/useless_super_delegation_py35.py
+++ b/tests/functional/useless_super_delegation_py35.py
diff --git a/pylint/test/functional/useless_super_delegation_py35.rc b/tests/functional/useless_super_delegation_py35.rc
index 71de8b630..71de8b630 100644
--- a/pylint/test/functional/useless_super_delegation_py35.rc
+++ b/tests/functional/useless_super_delegation_py35.rc
diff --git a/pylint/test/functional/useless_super_delegation_py35.txt b/tests/functional/useless_super_delegation_py35.txt
index 8d9cdaa77..8d9cdaa77 100644
--- a/pylint/test/functional/useless_super_delegation_py35.txt
+++ b/tests/functional/useless_super_delegation_py35.txt
diff --git a/pylint/test/functional/using_constant_test.py b/tests/functional/using_constant_test.py
index 732164ecd..732164ecd 100644
--- a/pylint/test/functional/using_constant_test.py
+++ b/tests/functional/using_constant_test.py
diff --git a/pylint/test/functional/using_constant_test.txt b/tests/functional/using_constant_test.txt
index e10b10cca..e10b10cca 100644
--- a/pylint/test/functional/using_constant_test.txt
+++ b/tests/functional/using_constant_test.txt
diff --git a/pylint/test/functional/wildcard_import.py b/tests/functional/wildcard_import.py
index 66ae63d9e..66ae63d9e 100644
--- a/pylint/test/functional/wildcard_import.py
+++ b/tests/functional/wildcard_import.py
diff --git a/pylint/test/functional/wildcard_import.txt b/tests/functional/wildcard_import.txt
index 643d818b2..643d818b2 100644
--- a/pylint/test/functional/wildcard_import.txt
+++ b/tests/functional/wildcard_import.txt
diff --git a/pylint/test/functional/wildcard_import_allowed.py b/tests/functional/wildcard_import_allowed.py
index 21fea4738..21fea4738 100644
--- a/pylint/test/functional/wildcard_import_allowed.py
+++ b/tests/functional/wildcard_import_allowed.py
diff --git a/pylint/test/functional/wildcard_import_allowed.rc b/tests/functional/wildcard_import_allowed.rc
index c46d828f6..c46d828f6 100644
--- a/pylint/test/functional/wildcard_import_allowed.rc
+++ b/tests/functional/wildcard_import_allowed.rc
diff --git a/pylint/test/functional/wildcard_import_allowed.txt b/tests/functional/wildcard_import_allowed.txt
index ef223fa82..ef223fa82 100644
--- a/pylint/test/functional/wildcard_import_allowed.txt
+++ b/tests/functional/wildcard_import_allowed.txt
diff --git a/pylint/test/functional/with_used_before_assign.py b/tests/functional/with_used_before_assign.py
index 64a475af1..64a475af1 100644
--- a/pylint/test/functional/with_used_before_assign.py
+++ b/tests/functional/with_used_before_assign.py
diff --git a/pylint/test/functional/with_used_before_assign.txt b/tests/functional/with_used_before_assign.txt
index 783ae732d..783ae732d 100644
--- a/pylint/test/functional/with_used_before_assign.txt
+++ b/tests/functional/with_used_before_assign.txt
diff --git a/pylint/test/functional/with_using_generator.py b/tests/functional/with_using_generator.py
index 187bdcfea..187bdcfea 100644
--- a/pylint/test/functional/with_using_generator.py
+++ b/tests/functional/with_using_generator.py
diff --git a/pylint/test/functional/with_using_generator.txt b/tests/functional/with_using_generator.txt
index 2b8103483..2b8103483 100644
--- a/pylint/test/functional/with_using_generator.txt
+++ b/tests/functional/with_using_generator.txt
diff --git a/pylint/test/functional/wrong_exception_operation.py b/tests/functional/wrong_exception_operation.py
index 1c3c4e380..1c3c4e380 100644
--- a/pylint/test/functional/wrong_exception_operation.py
+++ b/tests/functional/wrong_exception_operation.py
diff --git a/pylint/test/functional/wrong_exception_operation.txt b/tests/functional/wrong_exception_operation.txt
index 61a2e179f..61a2e179f 100644
--- a/pylint/test/functional/wrong_exception_operation.txt
+++ b/tests/functional/wrong_exception_operation.txt
diff --git a/pylint/test/functional/wrong_import_order.py b/tests/functional/wrong_import_order.py
index c2791d14a..c2791d14a 100644
--- a/pylint/test/functional/wrong_import_order.py
+++ b/tests/functional/wrong_import_order.py
diff --git a/pylint/test/functional/wrong_import_order.txt b/tests/functional/wrong_import_order.txt
index 13b601eb5..13b601eb5 100644
--- a/pylint/test/functional/wrong_import_order.txt
+++ b/tests/functional/wrong_import_order.txt
diff --git a/pylint/test/functional/wrong_import_order2.py b/tests/functional/wrong_import_order2.py
index 4f9a100b8..4f9a100b8 100644
--- a/pylint/test/functional/wrong_import_order2.py
+++ b/tests/functional/wrong_import_order2.py
diff --git a/pylint/test/functional/wrong_import_position.py b/tests/functional/wrong_import_position.py
index 88db33be1..88db33be1 100644
--- a/pylint/test/functional/wrong_import_position.py
+++ b/tests/functional/wrong_import_position.py
diff --git a/pylint/test/functional/wrong_import_position.txt b/tests/functional/wrong_import_position.txt
index e734ac5e5..e734ac5e5 100644
--- a/pylint/test/functional/wrong_import_position.txt
+++ b/tests/functional/wrong_import_position.txt
diff --git a/pylint/test/functional/wrong_import_position10.py b/tests/functional/wrong_import_position10.py
index f4a868039..f4a868039 100644
--- a/pylint/test/functional/wrong_import_position10.py
+++ b/tests/functional/wrong_import_position10.py
diff --git a/pylint/test/functional/wrong_import_position11.py b/tests/functional/wrong_import_position11.py
index 9af72c0e5..9af72c0e5 100644
--- a/pylint/test/functional/wrong_import_position11.py
+++ b/tests/functional/wrong_import_position11.py
diff --git a/pylint/test/functional/wrong_import_position11.txt b/tests/functional/wrong_import_position11.txt
index 01bb58421..01bb58421 100644
--- a/pylint/test/functional/wrong_import_position11.txt
+++ b/tests/functional/wrong_import_position11.txt
diff --git a/pylint/test/functional/wrong_import_position12.py b/tests/functional/wrong_import_position12.py
index 300968c40..300968c40 100644
--- a/pylint/test/functional/wrong_import_position12.py
+++ b/tests/functional/wrong_import_position12.py
diff --git a/pylint/test/functional/wrong_import_position12.txt b/tests/functional/wrong_import_position12.txt
index 6d560822b..6d560822b 100644
--- a/pylint/test/functional/wrong_import_position12.txt
+++ b/tests/functional/wrong_import_position12.txt
diff --git a/pylint/test/functional/wrong_import_position13.py b/tests/functional/wrong_import_position13.py
index 6b3d03463..6b3d03463 100644
--- a/pylint/test/functional/wrong_import_position13.py
+++ b/tests/functional/wrong_import_position13.py
diff --git a/pylint/test/functional/wrong_import_position13.txt b/tests/functional/wrong_import_position13.txt
index f3def1900..f3def1900 100644
--- a/pylint/test/functional/wrong_import_position13.txt
+++ b/tests/functional/wrong_import_position13.txt
diff --git a/pylint/test/functional/wrong_import_position14.py b/tests/functional/wrong_import_position14.py
index f5c9a03e5..f5c9a03e5 100644
--- a/pylint/test/functional/wrong_import_position14.py
+++ b/tests/functional/wrong_import_position14.py
diff --git a/pylint/test/functional/wrong_import_position14.txt b/tests/functional/wrong_import_position14.txt
index 9fcdac503..9fcdac503 100644
--- a/pylint/test/functional/wrong_import_position14.txt
+++ b/tests/functional/wrong_import_position14.txt
diff --git a/pylint/test/functional/wrong_import_position15.py b/tests/functional/wrong_import_position15.py
index 58a19b66c..58a19b66c 100644
--- a/pylint/test/functional/wrong_import_position15.py
+++ b/tests/functional/wrong_import_position15.py
diff --git a/pylint/test/functional/wrong_import_position2.py b/tests/functional/wrong_import_position2.py
index 65ad9e656..65ad9e656 100644
--- a/pylint/test/functional/wrong_import_position2.py
+++ b/tests/functional/wrong_import_position2.py
diff --git a/pylint/test/functional/wrong_import_position3.py b/tests/functional/wrong_import_position3.py
index d2cf68529..d2cf68529 100644
--- a/pylint/test/functional/wrong_import_position3.py
+++ b/tests/functional/wrong_import_position3.py
diff --git a/pylint/test/functional/wrong_import_position4.py b/tests/functional/wrong_import_position4.py
index 3f1174f9d..3f1174f9d 100644
--- a/pylint/test/functional/wrong_import_position4.py
+++ b/tests/functional/wrong_import_position4.py
diff --git a/pylint/test/functional/wrong_import_position5.py b/tests/functional/wrong_import_position5.py
index b96a8a0e4..b96a8a0e4 100644
--- a/pylint/test/functional/wrong_import_position5.py
+++ b/tests/functional/wrong_import_position5.py
diff --git a/pylint/test/functional/wrong_import_position6.py b/tests/functional/wrong_import_position6.py
index 694c109d1..694c109d1 100644
--- a/pylint/test/functional/wrong_import_position6.py
+++ b/tests/functional/wrong_import_position6.py
diff --git a/pylint/test/functional/wrong_import_position7.py b/tests/functional/wrong_import_position7.py
index bb5095603..bb5095603 100644
--- a/pylint/test/functional/wrong_import_position7.py
+++ b/tests/functional/wrong_import_position7.py
diff --git a/pylint/test/functional/wrong_import_position8.py b/tests/functional/wrong_import_position8.py
index cd1028a1b..cd1028a1b 100644
--- a/pylint/test/functional/wrong_import_position8.py
+++ b/tests/functional/wrong_import_position8.py
diff --git a/pylint/test/functional/wrong_import_position9.py b/tests/functional/wrong_import_position9.py
index a08880b8a..a08880b8a 100644
--- a/pylint/test/functional/wrong_import_position9.py
+++ b/tests/functional/wrong_import_position9.py
diff --git a/pylint/test/functional/wrong_import_position_exclude_dunder_main.py b/tests/functional/wrong_import_position_exclude_dunder_main.py
index 05f680377..05f680377 100644
--- a/pylint/test/functional/wrong_import_position_exclude_dunder_main.py
+++ b/tests/functional/wrong_import_position_exclude_dunder_main.py
diff --git a/pylint/test/functional/wrong_import_position_exclude_dunder_main.txt b/tests/functional/wrong_import_position_exclude_dunder_main.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/functional/wrong_import_position_exclude_dunder_main.txt
+++ b/tests/functional/wrong_import_position_exclude_dunder_main.txt
diff --git a/pylint/test/functional/yield_from_iterable_py33.py b/tests/functional/yield_from_iterable_py33.py
index 7803936d5..7803936d5 100644
--- a/pylint/test/functional/yield_from_iterable_py33.py
+++ b/tests/functional/yield_from_iterable_py33.py
diff --git a/pylint/test/functional/yield_from_iterable_py33.rc b/tests/functional/yield_from_iterable_py33.rc
index 3330edda5..3330edda5 100644
--- a/pylint/test/functional/yield_from_iterable_py33.rc
+++ b/tests/functional/yield_from_iterable_py33.rc
diff --git a/pylint/test/functional/yield_from_iterable_py33.txt b/tests/functional/yield_from_iterable_py33.txt
index 906ee93ae..906ee93ae 100644
--- a/pylint/test/functional/yield_from_iterable_py33.txt
+++ b/tests/functional/yield_from_iterable_py33.txt
diff --git a/pylint/test/functional/yield_from_outside_func.py b/tests/functional/yield_from_outside_func.py
index e2db90c94..e2db90c94 100644
--- a/pylint/test/functional/yield_from_outside_func.py
+++ b/tests/functional/yield_from_outside_func.py
diff --git a/pylint/test/functional/yield_from_outside_func.rc b/tests/functional/yield_from_outside_func.rc
index 28c99bc28..28c99bc28 100644
--- a/pylint/test/functional/yield_from_outside_func.rc
+++ b/tests/functional/yield_from_outside_func.rc
diff --git a/pylint/test/functional/yield_from_outside_func.txt b/tests/functional/yield_from_outside_func.txt
index fa3a7fc49..fa3a7fc49 100644
--- a/pylint/test/functional/yield_from_outside_func.txt
+++ b/tests/functional/yield_from_outside_func.txt
diff --git a/pylint/test/functional/yield_inside_async_function.py b/tests/functional/yield_inside_async_function.py
index 33585bf77..33585bf77 100644
--- a/pylint/test/functional/yield_inside_async_function.py
+++ b/tests/functional/yield_inside_async_function.py
diff --git a/pylint/test/functional/yield_inside_async_function.rc b/tests/functional/yield_inside_async_function.rc
index 0a040cbcf..0a040cbcf 100644
--- a/pylint/test/functional/yield_inside_async_function.rc
+++ b/tests/functional/yield_inside_async_function.rc
diff --git a/pylint/test/functional/yield_inside_async_function.txt b/tests/functional/yield_inside_async_function.txt
index ae97cae4b..ae97cae4b 100644
--- a/pylint/test/functional/yield_inside_async_function.txt
+++ b/tests/functional/yield_inside_async_function.txt
diff --git a/pylint/test/functional/yield_inside_async_function_py36.py b/tests/functional/yield_inside_async_function_py36.py
index a0f52e61f..a0f52e61f 100644
--- a/pylint/test/functional/yield_inside_async_function_py36.py
+++ b/tests/functional/yield_inside_async_function_py36.py
diff --git a/pylint/test/functional/yield_inside_async_function_py36.rc b/tests/functional/yield_inside_async_function_py36.rc
index 0ba2b6333..0ba2b6333 100644
--- a/pylint/test/functional/yield_inside_async_function_py36.rc
+++ b/tests/functional/yield_inside_async_function_py36.rc
diff --git a/pylint/test/functional/yield_inside_async_function_py36.txt b/tests/functional/yield_inside_async_function_py36.txt
index d6e68d0b5..d6e68d0b5 100644
--- a/pylint/test/functional/yield_inside_async_function_py36.txt
+++ b/tests/functional/yield_inside_async_function_py36.txt
diff --git a/pylint/test/functional/yield_outside_func.py b/tests/functional/yield_outside_func.py
index 5824bc0c7..5824bc0c7 100644
--- a/pylint/test/functional/yield_outside_func.py
+++ b/tests/functional/yield_outside_func.py
diff --git a/pylint/test/functional/yield_outside_func.txt b/tests/functional/yield_outside_func.txt
index fa3a7fc49..fa3a7fc49 100644
--- a/pylint/test/functional/yield_outside_func.txt
+++ b/tests/functional/yield_outside_func.txt
diff --git a/pylint/test/input/__init__.py b/tests/input/__init__.py
index 60e92b76c..60e92b76c 100644
--- a/pylint/test/input/__init__.py
+++ b/tests/input/__init__.py
diff --git a/pylint/test/input/func_3k_removed_stuff_py_30.py b/tests/input/func_3k_removed_stuff_py_30.py
index 54ad935bc..54ad935bc 100644
--- a/pylint/test/input/func_3k_removed_stuff_py_30.py
+++ b/tests/input/func_3k_removed_stuff_py_30.py
diff --git a/pylint/test/input/func_bad_cont_dictcomp_py27.py b/tests/input/func_bad_cont_dictcomp_py27.py
index a55271079..a55271079 100644
--- a/pylint/test/input/func_bad_cont_dictcomp_py27.py
+++ b/tests/input/func_bad_cont_dictcomp_py27.py
diff --git a/pylint/test/input/func_bug113231.py b/tests/input/func_bug113231.py
index 6334ff9c8..6334ff9c8 100644
--- a/pylint/test/input/func_bug113231.py
+++ b/tests/input/func_bug113231.py
diff --git a/pylint/test/input/func_disable_linebased.py b/tests/input/func_disable_linebased.py
index b94c2e315..b94c2e315 100644
--- a/pylint/test/input/func_disable_linebased.py
+++ b/tests/input/func_disable_linebased.py
diff --git a/pylint/test/input/func_dotted_ancestor.py b/tests/input/func_dotted_ancestor.py
index ff3285803..ff3285803 100644
--- a/pylint/test/input/func_dotted_ancestor.py
+++ b/tests/input/func_dotted_ancestor.py
diff --git a/pylint/test/input/func_e0012.py b/tests/input/func_e0012.py
index f4810ee7a..f4810ee7a 100644
--- a/pylint/test/input/func_e0012.py
+++ b/tests/input/func_e0012.py
diff --git a/pylint/test/input/func_e0204.py b/tests/input/func_e0204.py
index 9a0f708f0..9a0f708f0 100644
--- a/pylint/test/input/func_e0204.py
+++ b/tests/input/func_e0204.py
diff --git a/pylint/test/input/func_e12xx.py b/tests/input/func_e12xx.py
index 74984d998..74984d998 100644
--- a/pylint/test/input/func_e12xx.py
+++ b/tests/input/func_e12xx.py
diff --git a/pylint/test/input/func_e13xx.py b/tests/input/func_e13xx.py
index 227311cb6..227311cb6 100644
--- a/pylint/test/input/func_e13xx.py
+++ b/tests/input/func_e13xx.py
diff --git a/pylint/test/input/func_excess_escapes.py b/tests/input/func_excess_escapes.py
index 954202195..954202195 100644
--- a/pylint/test/input/func_excess_escapes.py
+++ b/tests/input/func_excess_escapes.py
diff --git a/pylint/test/input/func_first_arg.py b/tests/input/func_first_arg.py
index 7df2fd20c..7df2fd20c 100644
--- a/pylint/test/input/func_first_arg.py
+++ b/tests/input/func_first_arg.py
diff --git a/pylint/test/input/func_i0011.py b/tests/input/func_i0011.py
index a4ef215bc..a4ef215bc 100644
--- a/pylint/test/input/func_i0011.py
+++ b/tests/input/func_i0011.py
diff --git a/pylint/test/input/func_i0012.py b/tests/input/func_i0012.py
index 9b6fbe79f..9b6fbe79f 100644
--- a/pylint/test/input/func_i0012.py
+++ b/tests/input/func_i0012.py
diff --git a/pylint/test/input/func_i0013.py b/tests/input/func_i0013.py
index 0a3f83367..0a3f83367 100644
--- a/pylint/test/input/func_i0013.py
+++ b/tests/input/func_i0013.py
diff --git a/pylint/test/input/func_i0014.py b/tests/input/func_i0014.py
index 63ff37c9f..63ff37c9f 100644
--- a/pylint/test/input/func_i0014.py
+++ b/tests/input/func_i0014.py
diff --git a/pylint/test/input/func_i0020.py b/tests/input/func_i0020.py
index 8c0fe9f5c..8c0fe9f5c 100644
--- a/pylint/test/input/func_i0020.py
+++ b/tests/input/func_i0020.py
diff --git a/pylint/test/input/func_i0022.py b/tests/input/func_i0022.py
index f5b308f70..f5b308f70 100644
--- a/pylint/test/input/func_i0022.py
+++ b/tests/input/func_i0022.py
diff --git a/pylint/test/input/func_logging_not_lazy_with_logger.py b/tests/input/func_logging_not_lazy_with_logger.py
index 973a5c795..973a5c795 100644
--- a/pylint/test/input/func_logging_not_lazy_with_logger.py
+++ b/tests/input/func_logging_not_lazy_with_logger.py
diff --git a/pylint/test/input/func_loopvar_in_dict_comp_py27.py b/tests/input/func_loopvar_in_dict_comp_py27.py
index 312eee727..312eee727 100644
--- a/pylint/test/input/func_loopvar_in_dict_comp_py27.py
+++ b/tests/input/func_loopvar_in_dict_comp_py27.py
diff --git a/pylint/test/input/func_module___dict__.py b/tests/input/func_module___dict__.py
index 54514224a..54514224a 100644
--- a/pylint/test/input/func_module___dict__.py
+++ b/tests/input/func_module___dict__.py
diff --git a/pylint/test/input/func_nameerror_on_string_substitution.py b/tests/input/func_nameerror_on_string_substitution.py
index be7b5c82a..be7b5c82a 100644
--- a/pylint/test/input/func_nameerror_on_string_substitution.py
+++ b/tests/input/func_nameerror_on_string_substitution.py
diff --git a/pylint/test/input/func_no_dummy_redefined.py b/tests/input/func_no_dummy_redefined.py
index a5c0aea4a..a5c0aea4a 100644
--- a/pylint/test/input/func_no_dummy_redefined.py
+++ b/tests/input/func_no_dummy_redefined.py
diff --git a/pylint/test/input/func_noerror___init___return_from_inner_function.py b/tests/input/func_noerror___init___return_from_inner_function.py
index 769d5ac96..769d5ac96 100644
--- a/pylint/test/input/func_noerror___init___return_from_inner_function.py
+++ b/tests/input/func_noerror___init___return_from_inner_function.py
diff --git a/pylint/test/input/func_noerror_access_attr_before_def_false_positive.py b/tests/input/func_noerror_access_attr_before_def_false_positive.py
index 3884c9980..3884c9980 100644
--- a/pylint/test/input/func_noerror_access_attr_before_def_false_positive.py
+++ b/tests/input/func_noerror_access_attr_before_def_false_positive.py
diff --git a/pylint/test/input/func_noerror_base_init_vars.py b/tests/input/func_noerror_base_init_vars.py
index 152cbfd47..152cbfd47 100644
--- a/pylint/test/input/func_noerror_base_init_vars.py
+++ b/tests/input/func_noerror_base_init_vars.py
diff --git a/pylint/test/input/func_noerror_builtin_module_test.py b/tests/input/func_noerror_builtin_module_test.py
index 9b1e7ce8e..9b1e7ce8e 100644
--- a/pylint/test/input/func_noerror_builtin_module_test.py
+++ b/tests/input/func_noerror_builtin_module_test.py
diff --git a/pylint/test/input/func_noerror_class_attributes.py b/tests/input/func_noerror_class_attributes.py
index b6fd4601e..b6fd4601e 100644
--- a/pylint/test/input/func_noerror_class_attributes.py
+++ b/tests/input/func_noerror_class_attributes.py
diff --git a/pylint/test/input/func_noerror_classes_meth_could_be_a_function.py b/tests/input/func_noerror_classes_meth_could_be_a_function.py
index 05a6c40d7..05a6c40d7 100644
--- a/pylint/test/input/func_noerror_classes_meth_could_be_a_function.py
+++ b/tests/input/func_noerror_classes_meth_could_be_a_function.py
diff --git a/pylint/test/input/func_noerror_classes_protected_member_access.py b/tests/input/func_noerror_classes_protected_member_access.py
index 516efd7d4..516efd7d4 100644
--- a/pylint/test/input/func_noerror_classes_protected_member_access.py
+++ b/tests/input/func_noerror_classes_protected_member_access.py
diff --git a/pylint/test/input/func_noerror_decorator_scope.py b/tests/input/func_noerror_decorator_scope.py
index 8d35159e9..8d35159e9 100644
--- a/pylint/test/input/func_noerror_decorator_scope.py
+++ b/tests/input/func_noerror_decorator_scope.py
diff --git a/pylint/test/input/func_noerror_e1101_9588_base_attr_aug_assign.py b/tests/input/func_noerror_e1101_9588_base_attr_aug_assign.py
index 14be39853..14be39853 100644
--- a/pylint/test/input/func_noerror_e1101_9588_base_attr_aug_assign.py
+++ b/tests/input/func_noerror_e1101_9588_base_attr_aug_assign.py
diff --git a/pylint/test/input/func_noerror_external_classmethod_crash.py b/tests/input/func_noerror_external_classmethod_crash.py
index e9842a5e5..e9842a5e5 100644
--- a/pylint/test/input/func_noerror_external_classmethod_crash.py
+++ b/tests/input/func_noerror_external_classmethod_crash.py
diff --git a/pylint/test/input/func_noerror_inner_classes.py b/tests/input/func_noerror_inner_classes.py
index 24a2edb80..24a2edb80 100644
--- a/pylint/test/input/func_noerror_inner_classes.py
+++ b/tests/input/func_noerror_inner_classes.py
diff --git a/pylint/test/input/func_noerror_lambda_use_before_assign.py b/tests/input/func_noerror_lambda_use_before_assign.py
index af2775cae..af2775cae 100644
--- a/pylint/test/input/func_noerror_lambda_use_before_assign.py
+++ b/tests/input/func_noerror_lambda_use_before_assign.py
diff --git a/pylint/test/input/func_noerror_mcs_attr_access.py b/tests/input/func_noerror_mcs_attr_access.py
index 149e07812..149e07812 100644
--- a/pylint/test/input/func_noerror_mcs_attr_access.py
+++ b/tests/input/func_noerror_mcs_attr_access.py
diff --git a/pylint/test/input/func_noerror_new_style_class_py_30.py b/tests/input/func_noerror_new_style_class_py_30.py
index a33ae19f4..a33ae19f4 100644
--- a/pylint/test/input/func_noerror_new_style_class_py_30.py
+++ b/tests/input/func_noerror_new_style_class_py_30.py
diff --git a/pylint/test/input/func_noerror_no_warning_docstring.py b/tests/input/func_noerror_no_warning_docstring.py
index 315eeeaab..315eeeaab 100644
--- a/pylint/test/input/func_noerror_no_warning_docstring.py
+++ b/tests/input/func_noerror_no_warning_docstring.py
diff --git a/pylint/test/input/func_noerror_object_as_class_attribute.py b/tests/input/func_noerror_object_as_class_attribute.py
index 71cd027b7..71cd027b7 100644
--- a/pylint/test/input/func_noerror_object_as_class_attribute.py
+++ b/tests/input/func_noerror_object_as_class_attribute.py
diff --git a/pylint/test/input/func_noerror_overloaded_operator.py b/tests/input/func_noerror_overloaded_operator.py
index 3a158b00b..3a158b00b 100644
--- a/pylint/test/input/func_noerror_overloaded_operator.py
+++ b/tests/input/func_noerror_overloaded_operator.py
diff --git a/pylint/test/input/func_noerror_property_affectation_py26.py b/tests/input/func_noerror_property_affectation_py26.py
index 60118bbf6..60118bbf6 100644
--- a/pylint/test/input/func_noerror_property_affectation_py26.py
+++ b/tests/input/func_noerror_property_affectation_py26.py
diff --git a/pylint/test/input/func_noerror_yield_assign_py25.py b/tests/input/func_noerror_yield_assign_py25.py
index f40d8d96e..f40d8d96e 100644
--- a/pylint/test/input/func_noerror_yield_assign_py25.py
+++ b/tests/input/func_noerror_yield_assign_py25.py
diff --git a/pylint/test/input/func_noerror_yield_return_mix.py b/tests/input/func_noerror_yield_return_mix.py
index 8e050f0f0..8e050f0f0 100644
--- a/pylint/test/input/func_noerror_yield_return_mix.py
+++ b/tests/input/func_noerror_yield_return_mix.py
diff --git a/pylint/test/input/func_nonregr___file___global.py b/tests/input/func_nonregr___file___global.py
index 910033c4a..910033c4a 100644
--- a/pylint/test/input/func_nonregr___file___global.py
+++ b/tests/input/func_nonregr___file___global.py
diff --git a/pylint/test/input/func_return_yield_mix_py_33.py b/tests/input/func_return_yield_mix_py_33.py
index b120b80ac..b120b80ac 100644
--- a/pylint/test/input/func_return_yield_mix_py_33.py
+++ b/tests/input/func_return_yield_mix_py_33.py
diff --git a/pylint/test/input/func_typecheck_callfunc_assigment.py b/tests/input/func_typecheck_callfunc_assigment.py
index 36d476e89..36d476e89 100644
--- a/pylint/test/input/func_typecheck_callfunc_assigment.py
+++ b/tests/input/func_typecheck_callfunc_assigment.py
diff --git a/pylint/test/input/func_unused_import_py30.py b/tests/input/func_unused_import_py30.py
index 91a9e9ac9..91a9e9ac9 100644
--- a/pylint/test/input/func_unused_import_py30.py
+++ b/tests/input/func_unused_import_py30.py
diff --git a/pylint/test/input/func_variables_unused_name_from_wilcard_import.py b/tests/input/func_variables_unused_name_from_wilcard_import.py
index bb92155c6..bb92155c6 100644
--- a/pylint/test/input/func_variables_unused_name_from_wilcard_import.py
+++ b/tests/input/func_variables_unused_name_from_wilcard_import.py
diff --git a/pylint/test/input/func_w0122_py_30.py b/tests/input/func_w0122_py_30.py
index 6b8669130..6b8669130 100644
--- a/pylint/test/input/func_w0122_py_30.py
+++ b/tests/input/func_w0122_py_30.py
diff --git a/pylint/test/input/func_w0233.py b/tests/input/func_w0233.py
index eb5d97226..eb5d97226 100644
--- a/pylint/test/input/func_w0233.py
+++ b/tests/input/func_w0233.py
diff --git a/pylint/test/input/func_w0332_py_30.py b/tests/input/func_w0332_py_30.py
index 6a38e8c0d..6a38e8c0d 100644
--- a/pylint/test/input/func_w0332_py_30.py
+++ b/tests/input/func_w0332_py_30.py
diff --git a/pylint/test/input/func_w0401.py b/tests/input/func_w0401.py
index 12227bc9a..12227bc9a 100644
--- a/pylint/test/input/func_w0401.py
+++ b/tests/input/func_w0401.py
diff --git a/pylint/test/input/func_w0401_disabled.py b/tests/input/func_w0401_disabled.py
index 966706caf..966706caf 100644
--- a/pylint/test/input/func_w0401_disabled.py
+++ b/tests/input/func_w0401_disabled.py
diff --git a/pylint/test/input/func_w0401_disabled_in_func.py b/tests/input/func_w0401_disabled_in_func.py
index b9b0ced8d..b9b0ced8d 100644
--- a/pylint/test/input/func_w0401_disabled_in_func.py
+++ b/tests/input/func_w0401_disabled_in_func.py
diff --git a/pylint/test/input/func_w0401_package/__init__.py b/tests/input/func_w0401_package/__init__.py
index dedef6608..dedef6608 100644
--- a/pylint/test/input/func_w0401_package/__init__.py
+++ b/tests/input/func_w0401_package/__init__.py
diff --git a/pylint/test/input/func_w0401_package/all_the_things.py b/tests/input/func_w0401_package/all_the_things.py
index b8bd47b9e..b8bd47b9e 100644
--- a/pylint/test/input/func_w0401_package/all_the_things.py
+++ b/tests/input/func_w0401_package/all_the_things.py
diff --git a/pylint/test/input/func_w0401_package/thing1.py b/tests/input/func_w0401_package/thing1.py
index 34972a7d2..34972a7d2 100644
--- a/pylint/test/input/func_w0401_package/thing1.py
+++ b/tests/input/func_w0401_package/thing1.py
diff --git a/pylint/test/input/func_w0401_package/thing2.py b/tests/input/func_w0401_package/thing2.py
index 66d331677..66d331677 100644
--- a/pylint/test/input/func_w0401_package/thing2.py
+++ b/tests/input/func_w0401_package/thing2.py
diff --git a/pylint/test/input/func_w0404.py b/tests/input/func_w0404.py
index 2ce7d651c..2ce7d651c 100644
--- a/pylint/test/input/func_w0404.py
+++ b/tests/input/func_w0404.py
diff --git a/pylint/test/input/func_w0405.py b/tests/input/func_w0405.py
index 50a069d7a..50a069d7a 100644
--- a/pylint/test/input/func_w0405.py
+++ b/tests/input/func_w0405.py
diff --git a/pylint/test/input/func_w0406.py b/tests/input/func_w0406.py
index ceb12b5ff..ceb12b5ff 100644
--- a/pylint/test/input/func_w0406.py
+++ b/tests/input/func_w0406.py
diff --git a/pylint/test/input/func_w0611.py b/tests/input/func_w0611.py
index 887787242..887787242 100644
--- a/pylint/test/input/func_w0611.py
+++ b/tests/input/func_w0611.py
diff --git a/pylint/test/input/func_w0612.py b/tests/input/func_w0612.py
index 3d873bbeb..3d873bbeb 100644
--- a/pylint/test/input/func_w0612.py
+++ b/tests/input/func_w0612.py
diff --git a/pylint/test/input/func_w0613.py b/tests/input/func_w0613.py
index 02213c83b..02213c83b 100644
--- a/pylint/test/input/func_w0613.py
+++ b/tests/input/func_w0613.py
diff --git a/pylint/test/input/func_w0623_py30.py b/tests/input/func_w0623_py30.py
index 7eb27a923..7eb27a923 100644
--- a/pylint/test/input/func_w0623_py30.py
+++ b/tests/input/func_w0623_py30.py
diff --git a/pylint/test/input/func_w0801.py b/tests/input/func_w0801.py
index cd386ff55..cd386ff55 100644
--- a/pylint/test/input/func_w0801.py
+++ b/tests/input/func_w0801.py
diff --git a/pylint/test/input/hide_code_with_imports.py b/tests/input/hide_code_with_imports.py
index a8449c9b9..a8449c9b9 100644
--- a/pylint/test/input/hide_code_with_imports.py
+++ b/tests/input/hide_code_with_imports.py
diff --git a/pylint/test/input/ignore_except_pass_by_default.py b/tests/input/ignore_except_pass_by_default.py
index 444e540d2..444e540d2 100644
--- a/pylint/test/input/ignore_except_pass_by_default.py
+++ b/tests/input/ignore_except_pass_by_default.py
diff --git a/pylint/test/input/multiline-import b/tests/input/multiline-import
index b9507ef8a..b9507ef8a 100644
--- a/pylint/test/input/multiline-import
+++ b/tests/input/multiline-import
diff --git a/pylint/test/input/noext b/tests/input/noext
index 8aeda06d3..8aeda06d3 100644
--- a/pylint/test/input/noext
+++ b/tests/input/noext
diff --git a/pylint/test/input/not__init__.py b/tests/input/not__init__.py
index 60e92b76c..60e92b76c 100644
--- a/pylint/test/input/not__init__.py
+++ b/tests/input/not__init__.py
diff --git a/pylint/test/input/similar1 b/tests/input/similar1
index a533e2f6f..a533e2f6f 100644
--- a/pylint/test/input/similar1
+++ b/tests/input/similar1
diff --git a/pylint/test/input/similar2 b/tests/input/similar2
index 79bcab2fd..79bcab2fd 100644
--- a/pylint/test/input/similar2
+++ b/tests/input/similar2
diff --git a/pylint/test/input/w0401_cycle.py b/tests/input/w0401_cycle.py
index ddb42557e..ddb42557e 100644
--- a/pylint/test/input/w0401_cycle.py
+++ b/tests/input/w0401_cycle.py
diff --git a/pylint/test/input/w0801_same.py b/tests/input/w0801_same.py
index cd386ff55..cd386ff55 100644
--- a/pylint/test/input/w0801_same.py
+++ b/tests/input/w0801_same.py
diff --git a/pylint/test/message/unittest_message.py b/tests/message/unittest_message.py
index 7420ca273..7420ca273 100644
--- a/pylint/test/message/unittest_message.py
+++ b/tests/message/unittest_message.py
diff --git a/pylint/test/message/unittest_message_store.py b/tests/message/unittest_message_store.py
index 053bfca50..053bfca50 100644
--- a/pylint/test/message/unittest_message_store.py
+++ b/tests/message/unittest_message_store.py
diff --git a/pylint/test/messages/builtin_module.txt b/tests/messages/builtin_module.txt
index 2616c0e20..2616c0e20 100644
--- a/pylint/test/messages/builtin_module.txt
+++ b/tests/messages/builtin_module.txt
diff --git a/pylint/test/messages/func_3k_removed_stuff_py_30.txt b/tests/messages/func_3k_removed_stuff_py_30.txt
index 9920f1b64..9920f1b64 100644
--- a/pylint/test/messages/func_3k_removed_stuff_py_30.txt
+++ b/tests/messages/func_3k_removed_stuff_py_30.txt
diff --git a/pylint/test/messages/func_bad_cont_dictcomp_py27.txt b/tests/messages/func_bad_cont_dictcomp_py27.txt
index 51bde771e..51bde771e 100644
--- a/pylint/test/messages/func_bad_cont_dictcomp_py27.txt
+++ b/tests/messages/func_bad_cont_dictcomp_py27.txt
diff --git a/pylint/test/messages/func_bug113231.txt b/tests/messages/func_bug113231.txt
index a9d3f7ef3..a9d3f7ef3 100644
--- a/pylint/test/messages/func_bug113231.txt
+++ b/tests/messages/func_bug113231.txt
diff --git a/pylint/test/messages/func_disable_linebased.txt b/tests/messages/func_disable_linebased.txt
index 06e391d4f..06e391d4f 100644
--- a/pylint/test/messages/func_disable_linebased.txt
+++ b/tests/messages/func_disable_linebased.txt
diff --git a/pylint/test/messages/func_disable_linebased_py30.txt b/tests/messages/func_disable_linebased_py30.txt
index 06e391d4f..06e391d4f 100644
--- a/pylint/test/messages/func_disable_linebased_py30.txt
+++ b/tests/messages/func_disable_linebased_py30.txt
diff --git a/pylint/test/messages/func_dotted_ancestor.txt b/tests/messages/func_dotted_ancestor.txt
index 6e2c6fa5e..6e2c6fa5e 100644
--- a/pylint/test/messages/func_dotted_ancestor.txt
+++ b/tests/messages/func_dotted_ancestor.txt
diff --git a/pylint/test/messages/func_e0012.txt b/tests/messages/func_e0012.txt
index a6d1b698c..a6d1b698c 100644
--- a/pylint/test/messages/func_e0012.txt
+++ b/tests/messages/func_e0012.txt
diff --git a/pylint/test/messages/func_e0204.txt b/tests/messages/func_e0204.txt
index 40a5928b5..40a5928b5 100644
--- a/pylint/test/messages/func_e0204.txt
+++ b/tests/messages/func_e0204.txt
diff --git a/pylint/test/messages/func_e12xx.txt b/tests/messages/func_e12xx.txt
index 92640d256..92640d256 100644
--- a/pylint/test/messages/func_e12xx.txt
+++ b/tests/messages/func_e12xx.txt
diff --git a/pylint/test/messages/func_e13xx.txt b/tests/messages/func_e13xx.txt
index f2d0d364e..f2d0d364e 100644
--- a/pylint/test/messages/func_e13xx.txt
+++ b/tests/messages/func_e13xx.txt
diff --git a/pylint/test/messages/func_e13xx_py30.txt b/tests/messages/func_e13xx_py30.txt
index 7ac9fb180..7ac9fb180 100644
--- a/pylint/test/messages/func_e13xx_py30.txt
+++ b/tests/messages/func_e13xx_py30.txt
diff --git a/pylint/test/messages/func_excess_escapes.txt b/tests/messages/func_excess_escapes.txt
index 2f07722cf..2f07722cf 100644
--- a/pylint/test/messages/func_excess_escapes.txt
+++ b/tests/messages/func_excess_escapes.txt
diff --git a/pylint/test/messages/func_first_arg.txt b/tests/messages/func_first_arg.txt
index 8d932048a..8d932048a 100644
--- a/pylint/test/messages/func_first_arg.txt
+++ b/tests/messages/func_first_arg.txt
diff --git a/pylint/test/messages/func_i0011.txt b/tests/messages/func_i0011.txt
index 66d4bfc68..66d4bfc68 100644
--- a/pylint/test/messages/func_i0011.txt
+++ b/tests/messages/func_i0011.txt
diff --git a/pylint/test/messages/func_i0012.txt b/tests/messages/func_i0012.txt
index 5ad4cd6c6..5ad4cd6c6 100644
--- a/pylint/test/messages/func_i0012.txt
+++ b/tests/messages/func_i0012.txt
diff --git a/pylint/test/messages/func_i0013.txt b/tests/messages/func_i0013.txt
index 75d7afd60..75d7afd60 100644
--- a/pylint/test/messages/func_i0013.txt
+++ b/tests/messages/func_i0013.txt
diff --git a/pylint/test/messages/func_i0014.txt b/tests/messages/func_i0014.txt
index c3b521d5a..c3b521d5a 100644
--- a/pylint/test/messages/func_i0014.txt
+++ b/tests/messages/func_i0014.txt
diff --git a/pylint/test/messages/func_i0020.txt b/tests/messages/func_i0020.txt
index ddd1cb4a6..ddd1cb4a6 100644
--- a/pylint/test/messages/func_i0020.txt
+++ b/tests/messages/func_i0020.txt
diff --git a/pylint/test/messages/func_i0022.txt b/tests/messages/func_i0022.txt
index 28b7d71c1..28b7d71c1 100644
--- a/pylint/test/messages/func_i0022.txt
+++ b/tests/messages/func_i0022.txt
diff --git a/pylint/test/messages/func_logging_not_lazy_with_logger.txt b/tests/messages/func_logging_not_lazy_with_logger.txt
index 04823cf33..04823cf33 100644
--- a/pylint/test/messages/func_logging_not_lazy_with_logger.txt
+++ b/tests/messages/func_logging_not_lazy_with_logger.txt
diff --git a/pylint/test/messages/func_loopvar_in_dict_comp_py27.txt b/tests/messages/func_loopvar_in_dict_comp_py27.txt
index bc11121c4..bc11121c4 100644
--- a/pylint/test/messages/func_loopvar_in_dict_comp_py27.txt
+++ b/tests/messages/func_loopvar_in_dict_comp_py27.txt
diff --git a/pylint/test/messages/func_module___dict__.txt b/tests/messages/func_module___dict__.txt
index 416982434..416982434 100644
--- a/pylint/test/messages/func_module___dict__.txt
+++ b/tests/messages/func_module___dict__.txt
diff --git a/pylint/test/messages/func_nameerror_on_string_substitution.txt b/tests/messages/func_nameerror_on_string_substitution.txt
index aab21024b..aab21024b 100644
--- a/pylint/test/messages/func_nameerror_on_string_substitution.txt
+++ b/tests/messages/func_nameerror_on_string_substitution.txt
diff --git a/pylint/test/messages/func_no_dummy_redefined.txt b/tests/messages/func_no_dummy_redefined.txt
index a7db92f55..a7db92f55 100644
--- a/pylint/test/messages/func_no_dummy_redefined.txt
+++ b/tests/messages/func_no_dummy_redefined.txt
diff --git a/pylint/test/messages/func_nonregr___file___global.txt b/tests/messages/func_nonregr___file___global.txt
index c0d7340f9..c0d7340f9 100644
--- a/pylint/test/messages/func_nonregr___file___global.txt
+++ b/tests/messages/func_nonregr___file___global.txt
diff --git a/pylint/test/messages/func_raw_escapes.txt b/tests/messages/func_raw_escapes.txt
index 991fba7dd..991fba7dd 100644
--- a/pylint/test/messages/func_raw_escapes.txt
+++ b/tests/messages/func_raw_escapes.txt
diff --git a/pylint/test/messages/func_return_yield_mix_py_33.txt b/tests/messages/func_return_yield_mix_py_33.txt
index d81ce5cf4..d81ce5cf4 100644
--- a/pylint/test/messages/func_return_yield_mix_py_33.txt
+++ b/tests/messages/func_return_yield_mix_py_33.txt
diff --git a/pylint/test/messages/func_toolonglines_py30.txt b/tests/messages/func_toolonglines_py30.txt
index cd594f5fa..cd594f5fa 100644
--- a/pylint/test/messages/func_toolonglines_py30.txt
+++ b/tests/messages/func_toolonglines_py30.txt
diff --git a/pylint/test/messages/func_typecheck_callfunc_assigment.txt b/tests/messages/func_typecheck_callfunc_assigment.txt
index d1257ca17..d1257ca17 100644
--- a/pylint/test/messages/func_typecheck_callfunc_assigment.txt
+++ b/tests/messages/func_typecheck_callfunc_assigment.txt
diff --git a/pylint/test/messages/func_typecheck_getattr_py30.txt b/tests/messages/func_typecheck_getattr_py30.txt
index b6bf150f6..b6bf150f6 100644
--- a/pylint/test/messages/func_typecheck_getattr_py30.txt
+++ b/tests/messages/func_typecheck_getattr_py30.txt
diff --git a/pylint/test/messages/func_typecheck_non_callable_call.txt b/tests/messages/func_typecheck_non_callable_call.txt
index 8baa237a3..8baa237a3 100644
--- a/pylint/test/messages/func_typecheck_non_callable_call.txt
+++ b/tests/messages/func_typecheck_non_callable_call.txt
diff --git a/pylint/test/messages/func_unicode_literal_py26.txt b/tests/messages/func_unicode_literal_py26.txt
index e69de29bb..e69de29bb 100644
--- a/pylint/test/messages/func_unicode_literal_py26.txt
+++ b/tests/messages/func_unicode_literal_py26.txt
diff --git a/pylint/test/messages/func_unicode_literal_py274.txt b/tests/messages/func_unicode_literal_py274.txt
index 25efa9998..25efa9998 100644
--- a/pylint/test/messages/func_unicode_literal_py274.txt
+++ b/tests/messages/func_unicode_literal_py274.txt
diff --git a/pylint/test/messages/func_unused_import_py30.txt b/tests/messages/func_unused_import_py30.txt
index 1868abc2d..1868abc2d 100644
--- a/pylint/test/messages/func_unused_import_py30.txt
+++ b/tests/messages/func_unused_import_py30.txt
diff --git a/pylint/test/messages/func_use_for_or_listcomp_var_py29.txt b/tests/messages/func_use_for_or_listcomp_var_py29.txt
index 14d61ad65..14d61ad65 100644
--- a/pylint/test/messages/func_use_for_or_listcomp_var_py29.txt
+++ b/tests/messages/func_use_for_or_listcomp_var_py29.txt
diff --git a/pylint/test/messages/func_use_for_or_listcomp_var_py30.txt b/tests/messages/func_use_for_or_listcomp_var_py30.txt
index 46d3430af..46d3430af 100644
--- a/pylint/test/messages/func_use_for_or_listcomp_var_py30.txt
+++ b/tests/messages/func_use_for_or_listcomp_var_py30.txt
diff --git a/pylint/test/messages/func_variables_unused_name_from_wilcard_import.txt b/tests/messages/func_variables_unused_name_from_wilcard_import.txt
index 01c57af07..01c57af07 100644
--- a/pylint/test/messages/func_variables_unused_name_from_wilcard_import.txt
+++ b/tests/messages/func_variables_unused_name_from_wilcard_import.txt
diff --git a/pylint/test/messages/func_w0122_py_30.txt b/tests/messages/func_w0122_py_30.txt
index d833076d5..d833076d5 100644
--- a/pylint/test/messages/func_w0122_py_30.txt
+++ b/tests/messages/func_w0122_py_30.txt
diff --git a/pylint/test/messages/func_w0233.txt b/tests/messages/func_w0233.txt
index de4f0fba9..de4f0fba9 100644
--- a/pylint/test/messages/func_w0233.txt
+++ b/tests/messages/func_w0233.txt
diff --git a/pylint/test/messages/func_w0312.txt b/tests/messages/func_w0312.txt
index 917e8d0e2..917e8d0e2 100644
--- a/pylint/test/messages/func_w0312.txt
+++ b/tests/messages/func_w0312.txt
diff --git a/pylint/test/messages/func_w0332_py_30.txt b/tests/messages/func_w0332_py_30.txt
index 16f1d8024..16f1d8024 100644
--- a/pylint/test/messages/func_w0332_py_30.txt
+++ b/tests/messages/func_w0332_py_30.txt
diff --git a/pylint/test/messages/func_w0401.txt b/tests/messages/func_w0401.txt
index f6648f477..f6648f477 100644
--- a/pylint/test/messages/func_w0401.txt
+++ b/tests/messages/func_w0401.txt
diff --git a/pylint/test/messages/func_w0401_disabled.txt b/tests/messages/func_w0401_disabled.txt
index b5a8db3d2..b5a8db3d2 100644
--- a/pylint/test/messages/func_w0401_disabled.txt
+++ b/tests/messages/func_w0401_disabled.txt
diff --git a/pylint/test/messages/func_w0401_disabled_in_func.txt b/tests/messages/func_w0401_disabled_in_func.txt
index b5ce4524d..b5ce4524d 100644
--- a/pylint/test/messages/func_w0401_disabled_in_func.txt
+++ b/tests/messages/func_w0401_disabled_in_func.txt
diff --git a/pylint/test/messages/func_w0401_package.txt b/tests/messages/func_w0401_package.txt
index ca0512448..ca0512448 100644
--- a/pylint/test/messages/func_w0401_package.txt
+++ b/tests/messages/func_w0401_package.txt
diff --git a/pylint/test/messages/func_w0404.txt b/tests/messages/func_w0404.txt
index 2cfc13736..2cfc13736 100644
--- a/pylint/test/messages/func_w0404.txt
+++ b/tests/messages/func_w0404.txt
diff --git a/pylint/test/messages/func_w0405.txt b/tests/messages/func_w0405.txt
index 072b15547..072b15547 100644
--- a/pylint/test/messages/func_w0405.txt
+++ b/tests/messages/func_w0405.txt
diff --git a/pylint/test/messages/func_w0406.txt b/tests/messages/func_w0406.txt
index f6bc14db2..f6bc14db2 100644
--- a/pylint/test/messages/func_w0406.txt
+++ b/tests/messages/func_w0406.txt
diff --git a/pylint/test/messages/func_w0611.txt b/tests/messages/func_w0611.txt
index 2be0d0a8d..2be0d0a8d 100644
--- a/pylint/test/messages/func_w0611.txt
+++ b/tests/messages/func_w0611.txt
diff --git a/pylint/test/messages/func_w0612.txt b/tests/messages/func_w0612.txt
index a6d8bdc29..a6d8bdc29 100644
--- a/pylint/test/messages/func_w0612.txt
+++ b/tests/messages/func_w0612.txt
diff --git a/pylint/test/messages/func_w0613.txt b/tests/messages/func_w0613.txt
index 36cb38014..36cb38014 100644
--- a/pylint/test/messages/func_w0613.txt
+++ b/tests/messages/func_w0613.txt
diff --git a/pylint/test/messages/func_w0622.txt b/tests/messages/func_w0622.txt
index 719134726..719134726 100644
--- a/pylint/test/messages/func_w0622.txt
+++ b/tests/messages/func_w0622.txt
diff --git a/pylint/test/messages/func_w0623.txt b/tests/messages/func_w0623.txt
index 08fe8b571..08fe8b571 100644
--- a/pylint/test/messages/func_w0623.txt
+++ b/tests/messages/func_w0623.txt
diff --git a/pylint/test/messages/func_w0623_py30.txt b/tests/messages/func_w0623_py30.txt
index e5cc0f57e..e5cc0f57e 100644
--- a/pylint/test/messages/func_w0623_py30.txt
+++ b/tests/messages/func_w0623_py30.txt
diff --git a/pylint/test/messages/func_w0623_py_30.txt b/tests/messages/func_w0623_py_30.txt
index 77329bb0f..77329bb0f 100644
--- a/pylint/test/messages/func_w0623_py_30.txt
+++ b/tests/messages/func_w0623_py_30.txt
diff --git a/pylint/test/messages/func_w0801.txt b/tests/messages/func_w0801.txt
index 203ce9294..203ce9294 100644
--- a/pylint/test/messages/func_w0801.txt
+++ b/tests/messages/func_w0801.txt
diff --git a/pylint/test/messages/func_with_without_as_py25.txt b/tests/messages/func_with_without_as_py25.txt
index 18ca3711c..18ca3711c 100644
--- a/pylint/test/messages/func_with_without_as_py25.txt
+++ b/tests/messages/func_with_without_as_py25.txt
diff --git a/pylint/test/regrtest_data/.pylintrc b/tests/regrtest_data/.pylintrc
index 9a5bb5a44..9a5bb5a44 100644
--- a/pylint/test/regrtest_data/.pylintrc
+++ b/tests/regrtest_data/.pylintrc
diff --git a/pylint/test/regrtest_data/absimp/__init__.py b/tests/regrtest_data/absimp/__init__.py
index fdabe9f78..fdabe9f78 100644
--- a/pylint/test/regrtest_data/absimp/__init__.py
+++ b/tests/regrtest_data/absimp/__init__.py
diff --git a/pylint/test/regrtest_data/absimp/string.py b/tests/regrtest_data/absimp/string.py
index f47e9a5e9..f47e9a5e9 100644
--- a/pylint/test/regrtest_data/absimp/string.py
+++ b/tests/regrtest_data/absimp/string.py
diff --git a/pylint/test/regrtest_data/application_crash.py b/tests/regrtest_data/application_crash.py
index 8d3eb170b..8d3eb170b 100644
--- a/pylint/test/regrtest_data/application_crash.py
+++ b/tests/regrtest_data/application_crash.py
diff --git a/pylint/test/regrtest_data/bad_package/__init__.py b/tests/regrtest_data/bad_package/__init__.py
index 60585fdbe..60585fdbe 100644
--- a/pylint/test/regrtest_data/bad_package/__init__.py
+++ b/tests/regrtest_data/bad_package/__init__.py
diff --git a/pylint/test/regrtest_data/bad_package/wrong.py b/tests/regrtest_data/bad_package/wrong.py
index 2d2d78f98..2d2d78f98 100644
--- a/pylint/test/regrtest_data/bad_package/wrong.py
+++ b/tests/regrtest_data/bad_package/wrong.py
diff --git a/pylint/test/regrtest_data/beyond_top/__init__.py b/tests/regrtest_data/beyond_top/__init__.py
index 401fe0674..401fe0674 100644
--- a/pylint/test/regrtest_data/beyond_top/__init__.py
+++ b/tests/regrtest_data/beyond_top/__init__.py
diff --git a/pylint/test/regrtest_data/beyond_top/data.py b/tests/regrtest_data/beyond_top/data.py
index 9ec64d267..9ec64d267 100644
--- a/pylint/test/regrtest_data/beyond_top/data.py
+++ b/tests/regrtest_data/beyond_top/data.py
diff --git a/pylint/test/regrtest_data/classdoc_usage.py b/tests/regrtest_data/classdoc_usage.py
index 2d9df51cd..2d9df51cd 100644
--- a/pylint/test/regrtest_data/classdoc_usage.py
+++ b/tests/regrtest_data/classdoc_usage.py
diff --git a/pylint/test/regrtest_data/comments_pylintrc b/tests/regrtest_data/comments_pylintrc
index 93a33101f..93a33101f 100644
--- a/pylint/test/regrtest_data/comments_pylintrc
+++ b/tests/regrtest_data/comments_pylintrc
diff --git a/pylint/test/regrtest_data/decimal_inference.py b/tests/regrtest_data/decimal_inference.py
index 00c913040..00c913040 100644
--- a/pylint/test/regrtest_data/decimal_inference.py
+++ b/tests/regrtest_data/decimal_inference.py
diff --git a/pylint/test/regrtest_data/descriptor_crash.py b/tests/regrtest_data/descriptor_crash.py
index 4b3adccde..4b3adccde 100644
--- a/pylint/test/regrtest_data/descriptor_crash.py
+++ b/tests/regrtest_data/descriptor_crash.py
diff --git a/pylint/test/regrtest_data/dummy/__init__.py b/tests/regrtest_data/dummy/__init__.py
index 0b43a7096..0b43a7096 100644
--- a/pylint/test/regrtest_data/dummy/__init__.py
+++ b/tests/regrtest_data/dummy/__init__.py
diff --git a/pylint/test/regrtest_data/dummy/another.py b/tests/regrtest_data/dummy/another.py
index 56a871238..56a871238 100644
--- a/pylint/test/regrtest_data/dummy/another.py
+++ b/tests/regrtest_data/dummy/another.py
diff --git a/pylint/test/regrtest_data/dummy/dummy.py b/tests/regrtest_data/dummy/dummy.py
index 60345dc13..60345dc13 100644
--- a/pylint/test/regrtest_data/dummy/dummy.py
+++ b/tests/regrtest_data/dummy/dummy.py
diff --git a/pylint/test/regrtest_data/dummy_plugin.rc b/tests/regrtest_data/dummy_plugin.rc
index 162dedc89..162dedc89 100644
--- a/pylint/test/regrtest_data/dummy_plugin.rc
+++ b/tests/regrtest_data/dummy_plugin.rc
diff --git a/pylint/test/regrtest_data/dummy_plugin/dummy_conf_plugin.py b/tests/regrtest_data/dummy_plugin/dummy_conf_plugin.py
index f58387f83..f58387f83 100644
--- a/pylint/test/regrtest_data/dummy_plugin/dummy_conf_plugin.py
+++ b/tests/regrtest_data/dummy_plugin/dummy_conf_plugin.py
diff --git a/pylint/test/regrtest_data/dummy_plugin/dummy_plugin.py b/tests/regrtest_data/dummy_plugin/dummy_plugin.py
index 95b0b9305..95b0b9305 100644
--- a/pylint/test/regrtest_data/dummy_plugin/dummy_plugin.py
+++ b/tests/regrtest_data/dummy_plugin/dummy_plugin.py
diff --git a/pylint/test/regrtest_data/empty.py b/tests/regrtest_data/empty.py
index e69de29bb..e69de29bb 100644
--- a/pylint/test/regrtest_data/empty.py
+++ b/tests/regrtest_data/empty.py
diff --git a/pylint/test/regrtest_data/func_block_disable_msg.py b/tests/regrtest_data/func_block_disable_msg.py
index 36198db2b..36198db2b 100644
--- a/pylint/test/regrtest_data/func_block_disable_msg.py
+++ b/tests/regrtest_data/func_block_disable_msg.py
diff --git a/pylint/test/regrtest_data/import_assign.py b/tests/regrtest_data/import_assign.py
index c01cd52f7..c01cd52f7 100644
--- a/pylint/test/regrtest_data/import_assign.py
+++ b/tests/regrtest_data/import_assign.py
diff --git a/pylint/test/regrtest_data/import_package_subpackage_module.py b/tests/regrtest_data/import_package_subpackage_module.py
index 2864e3c9e..2864e3c9e 100644
--- a/pylint/test/regrtest_data/import_package_subpackage_module.py
+++ b/tests/regrtest_data/import_package_subpackage_module.py
diff --git a/pylint/test/regrtest_data/import_something.py b/tests/regrtest_data/import_something.py
index 3a74a717f..3a74a717f 100644
--- a/pylint/test/regrtest_data/import_something.py
+++ b/tests/regrtest_data/import_something.py
diff --git a/pylint/test/regrtest_data/init_wildcard/__init__.py b/tests/regrtest_data/init_wildcard/__init__.py
index 8a4b31cea..8a4b31cea 100644
--- a/pylint/test/regrtest_data/init_wildcard/__init__.py
+++ b/tests/regrtest_data/init_wildcard/__init__.py
diff --git a/pylint/test/regrtest_data/meta.py b/tests/regrtest_data/meta.py
index 700120727..700120727 100644
--- a/pylint/test/regrtest_data/meta.py
+++ b/tests/regrtest_data/meta.py
diff --git a/pylint/test/regrtest_data/module_global.py b/tests/regrtest_data/module_global.py
index 107d65289..107d65289 100644
--- a/pylint/test/regrtest_data/module_global.py
+++ b/tests/regrtest_data/module_global.py
diff --git a/pylint/test/regrtest_data/no_stdout_encoding.py b/tests/regrtest_data/no_stdout_encoding.py
index d72aa65bb..d72aa65bb 100644
--- a/pylint/test/regrtest_data/no_stdout_encoding.py
+++ b/tests/regrtest_data/no_stdout_encoding.py
diff --git a/pylint/test/regrtest_data/numarray_import.py b/tests/regrtest_data/numarray_import.py
index e89757f19..e89757f19 100644
--- a/pylint/test/regrtest_data/numarray_import.py
+++ b/tests/regrtest_data/numarray_import.py
diff --git a/pylint/test/regrtest_data/numarray_inf.py b/tests/regrtest_data/numarray_inf.py
index 4ea22a9c6..4ea22a9c6 100644
--- a/pylint/test/regrtest_data/numarray_inf.py
+++ b/tests/regrtest_data/numarray_inf.py
diff --git a/pylint/test/regrtest_data/package/AudioTime.py b/tests/regrtest_data/package/AudioTime.py
index ef65143c1..ef65143c1 100644
--- a/pylint/test/regrtest_data/package/AudioTime.py
+++ b/tests/regrtest_data/package/AudioTime.py
diff --git a/pylint/test/regrtest_data/package/__init__.py b/tests/regrtest_data/package/__init__.py
index bf6b73cda..bf6b73cda 100644
--- a/pylint/test/regrtest_data/package/__init__.py
+++ b/tests/regrtest_data/package/__init__.py
diff --git a/pylint/test/regrtest_data/package/subpackage/__init__.py b/tests/regrtest_data/package/subpackage/__init__.py
index dc4782e6c..dc4782e6c 100644
--- a/pylint/test/regrtest_data/package/subpackage/__init__.py
+++ b/tests/regrtest_data/package/subpackage/__init__.py
diff --git a/pylint/test/regrtest_data/package/subpackage/module.py b/tests/regrtest_data/package/subpackage/module.py
index 4b7244ba0..4b7244ba0 100644
--- a/pylint/test/regrtest_data/package/subpackage/module.py
+++ b/tests/regrtest_data/package/subpackage/module.py
diff --git a/pylint/test/regrtest_data/package_all/__init__.py b/tests/regrtest_data/package_all/__init__.py
index 4e3696bec..4e3696bec 100644
--- a/pylint/test/regrtest_data/package_all/__init__.py
+++ b/tests/regrtest_data/package_all/__init__.py
diff --git a/pylint/test/regrtest_data/package_all/notmissing.py b/tests/regrtest_data/package_all/notmissing.py
index 7cf85430a..7cf85430a 100644
--- a/pylint/test/regrtest_data/package_all/notmissing.py
+++ b/tests/regrtest_data/package_all/notmissing.py
diff --git a/pylint/test/regrtest_data/precedence_test.py b/tests/regrtest_data/precedence_test.py
index ff5871d46..ff5871d46 100644
--- a/pylint/test/regrtest_data/precedence_test.py
+++ b/tests/regrtest_data/precedence_test.py
diff --git a/pylint/test/regrtest_data/py3k-disabled.rc b/tests/regrtest_data/py3k-disabled.rc
index 41d775778..41d775778 100644
--- a/pylint/test/regrtest_data/py3k-disabled.rc
+++ b/tests/regrtest_data/py3k-disabled.rc
diff --git a/pylint/test/regrtest_data/py3k_error_flag.py b/tests/regrtest_data/py3k_error_flag.py
index 6bead4102..6bead4102 100644
--- a/pylint/test/regrtest_data/py3k_error_flag.py
+++ b/tests/regrtest_data/py3k_error_flag.py
diff --git a/pylint/test/regrtest_data/py3k_errors_and_warnings.py b/tests/regrtest_data/py3k_errors_and_warnings.py
index 3d033e86c..3d033e86c 100644
--- a/pylint/test/regrtest_data/py3k_errors_and_warnings.py
+++ b/tests/regrtest_data/py3k_errors_and_warnings.py
diff --git a/pylint/test/regrtest_data/special_attr_scope_lookup_crash.py b/tests/regrtest_data/special_attr_scope_lookup_crash.py
index b693a9fcc..b693a9fcc 100644
--- a/pylint/test/regrtest_data/special_attr_scope_lookup_crash.py
+++ b/tests/regrtest_data/special_attr_scope_lookup_crash.py
diff --git a/pylint/test/regrtest_data/syntax_error.py b/tests/regrtest_data/syntax_error.py
index bf86aff05..bf86aff05 100644
--- a/pylint/test/regrtest_data/syntax_error.py
+++ b/tests/regrtest_data/syntax_error.py
diff --git a/pylint/test/regrtest_data/test_pylintrc_comments.py b/tests/regrtest_data/test_pylintrc_comments.py
index 6bcff58d2..6bcff58d2 100644
--- a/pylint/test/regrtest_data/test_pylintrc_comments.py
+++ b/tests/regrtest_data/test_pylintrc_comments.py
diff --git a/pylint/test/regrtest_data/try_finally_disable_msg_crash.py b/tests/regrtest_data/try_finally_disable_msg_crash.py
index 1719308fd..1719308fd 100644
--- a/pylint/test/regrtest_data/try_finally_disable_msg_crash.py
+++ b/tests/regrtest_data/try_finally_disable_msg_crash.py
diff --git a/pylint/test/regrtest_data/unused_variable.py b/tests/regrtest_data/unused_variable.py
index eee909d53..eee909d53 100644
--- a/pylint/test/regrtest_data/unused_variable.py
+++ b/tests/regrtest_data/unused_variable.py
diff --git a/pylint/test/regrtest_data/wildcard.py b/tests/regrtest_data/wildcard.py
index 8a4b31cea..8a4b31cea 100644
--- a/pylint/test/regrtest_data/wildcard.py
+++ b/tests/regrtest_data/wildcard.py
diff --git a/pylint/test/regrtest_data/wrong_import_position.py b/tests/regrtest_data/wrong_import_position.py
index 9e2d099e0..9e2d099e0 100644
--- a/pylint/test/regrtest_data/wrong_import_position.py
+++ b/tests/regrtest_data/wrong_import_position.py
diff --git a/pylint/test/test_func.py b/tests/test_func.py
index 1566df992..1566df992 100644
--- a/pylint/test/test_func.py
+++ b/tests/test_func.py
diff --git a/pylint/test/test_functional.py b/tests/test_functional.py
index bb4145c4d..bb4145c4d 100644
--- a/pylint/test/test_functional.py
+++ b/tests/test_functional.py
diff --git a/pylint/test/test_import_graph.py b/tests/test_import_graph.py
index d7b009693..d7b009693 100644
--- a/pylint/test/test_import_graph.py
+++ b/tests/test_import_graph.py
diff --git a/pylint/test/test_regr.py b/tests/test_regr.py
index e91d4464b..e91d4464b 100644
--- a/pylint/test/test_regr.py
+++ b/tests/test_regr.py
diff --git a/pylint/test/test_self.py b/tests/test_self.py
index f90a89340..051eea87d 100644
--- a/pylint/test/test_self.py
+++ b/tests/test_self.py
@@ -339,24 +339,24 @@ class TestRunTC(object):
         expected = textwrap.dedent(
             """
         ************* Module data.clientmodule_test
-        pylint/test/data/clientmodule_test.py:10:8: W0612: Unused variable 'local_variable' (unused-variable)
-        pylint/test/data/clientmodule_test.py:18:4: C0111: Missing method docstring (missing-docstring)
-        pylint/test/data/clientmodule_test.py:22:0: C0111: Missing class docstring (missing-docstring)
-        """
+        {0}:10:8: W0612: Unused variable 'local_variable' (unused-variable)
+        {0}:18:4: C0111: Missing method docstring (missing-docstring)
+        {0}:22:0: C0111: Missing class docstring (missing-docstring)
+        """.format(module)
         )
         self._test_output(
             [module, "--disable=all", "--enable=all", "-rn"], expected_output=expected
         )
 
     def test_wrong_import_position_when_others_disabled(self):
+        module1 = join(HERE, "regrtest_data", "import_something.py")
+        module2 = join(HERE, "regrtest_data", "wrong_import_position.py")
         expected_output = textwrap.dedent(
             """
         ************* Module wrong_import_position
-        pylint/test/regrtest_data/wrong_import_position.py:11:0: C0413: Import "import os" should be placed at the top of the module (wrong-import-position)
-        """
+        {}:11:0: C0413: Import "import os" should be placed at the top of the module (wrong-import-position)
+        """.format(module2)
         )
-        module1 = join(HERE, "regrtest_data", "import_something.py")
-        module2 = join(HERE, "regrtest_data", "wrong_import_position.py")
         args = [
             module2,
             module1,
@@ -462,13 +462,13 @@ class TestRunTC(object):
         self._test_output([path], expected_output=expected)
 
     def test_error_mode_shows_no_score(self):
+        module = join(HERE, "regrtest_data", "application_crash.py")
         expected_output = textwrap.dedent(
             """
         ************* Module application_crash
-        pylint/test/regrtest_data/application_crash.py:1:6: E0602: Undefined variable 'something_undefined' (undefined-variable)
-        """
+        {}:1:6: E0602: Undefined variable 'something_undefined' (undefined-variable)
+        """.format(module)
         )
-        module = join(HERE, "regrtest_data", "application_crash.py")
         self._test_output([module, "-E"], expected_output=expected_output)
 
     def test_evaluation_score_shown_by_default(self):
@@ -524,10 +524,10 @@ class TestRunTC(object):
         expected = textwrap.dedent(
             """
         ************* Module test_pylintrc_comments
-        pylint/test/regrtest_data/test_pylintrc_comments.py:2:0: W0311: Bad indentation. Found 1 spaces, expected 4 (bad-indentation)
-        pylint/test/regrtest_data/test_pylintrc_comments.py:1:0: C0111: Missing module docstring (missing-docstring)
-        pylint/test/regrtest_data/test_pylintrc_comments.py:1:0: C0111: Missing function docstring (missing-docstring)
-        """
+        {0}:2:0: W0311: Bad indentation. Found 1 spaces, expected 4 (bad-indentation)
+        {0}:1:0: C0111: Missing module docstring (missing-docstring)
+        {0}:1:0: C0111: Missing function docstring (missing-docstring)
+        """.format(path)
         )
         self._test_output(
             [path, "--rcfile=%s" % config_path, "-rn"], expected_output=expected
@@ -539,13 +539,13 @@ class TestRunTC(object):
         )
 
     def test_getdefaultencoding_crashes_with_lc_ctype_utf8(self):
+        module = join(HERE, "regrtest_data", "application_crash.py")
         expected_output = textwrap.dedent(
             """
         ************* Module application_crash
-        pylint/test/regrtest_data/application_crash.py:1:6: E0602: Undefined variable 'something_undefined' (undefined-variable)
-        """
+        {}:1:6: E0602: Undefined variable 'something_undefined' (undefined-variable)
+        """.format(module)
         )
-        module = join(HERE, "regrtest_data", "application_crash.py")
         with _configure_lc_ctype("UTF-8"):
             self._test_output([module, "-E"], expected_output=expected_output)
 
@@ -564,7 +564,7 @@ class TestRunTC(object):
 
             self._test_output(
                 [module, "--output-format=parseable"],
-                expected_output=join(os.getcwd(), file_name),
+                expected_output=file_name,
             )
         finally:
             os.remove(module)
@@ -573,7 +573,7 @@ class TestRunTC(object):
     @pytest.mark.parametrize(
         "input_path,module,expected_path",
         [
-            (join(HERE, "mymodule.py"), "mymodule", "pylint/test/mymodule.py"),
+            (join(HERE, "mymodule.py"), "mymodule", join(HERE, "mymodule.py")),
             ("mymodule.py", "mymodule", "mymodule.py"),
         ],
     )
diff --git a/pylint/test/unittest_checker_base.py b/tests/unittest_checker_base.py
index 1feae5b7a..1feae5b7a 100644
--- a/pylint/test/unittest_checker_base.py
+++ b/tests/unittest_checker_base.py
diff --git a/pylint/test/unittest_checker_classes.py b/tests/unittest_checker_classes.py
index 3925cc36d..3925cc36d 100644
--- a/pylint/test/unittest_checker_classes.py
+++ b/tests/unittest_checker_classes.py
diff --git a/pylint/test/unittest_checker_exceptions.py b/tests/unittest_checker_exceptions.py
index e1596afa2..e1596afa2 100644
--- a/pylint/test/unittest_checker_exceptions.py
+++ b/tests/unittest_checker_exceptions.py
diff --git a/pylint/test/unittest_checker_format.py b/tests/unittest_checker_format.py
index c47b4e54b..c47b4e54b 100644
--- a/pylint/test/unittest_checker_format.py
+++ b/tests/unittest_checker_format.py
diff --git a/pylint/test/unittest_checker_imports.py b/tests/unittest_checker_imports.py
index 898be4ef5..898be4ef5 100644
--- a/pylint/test/unittest_checker_imports.py
+++ b/tests/unittest_checker_imports.py
diff --git a/pylint/test/unittest_checker_logging.py b/tests/unittest_checker_logging.py
index 8fb4cae93..8fb4cae93 100644
--- a/pylint/test/unittest_checker_logging.py
+++ b/tests/unittest_checker_logging.py
diff --git a/pylint/test/unittest_checker_misc.py b/tests/unittest_checker_misc.py
index b72b7acaa..b72b7acaa 100644
--- a/pylint/test/unittest_checker_misc.py
+++ b/tests/unittest_checker_misc.py
diff --git a/pylint/test/unittest_checker_python3.py b/tests/unittest_checker_python3.py
index 2fa8fca29..2fa8fca29 100644
--- a/pylint/test/unittest_checker_python3.py
+++ b/tests/unittest_checker_python3.py
diff --git a/pylint/test/unittest_checker_similar.py b/tests/unittest_checker_similar.py
index 7470e06c9..7470e06c9 100644
--- a/pylint/test/unittest_checker_similar.py
+++ b/tests/unittest_checker_similar.py
diff --git a/pylint/test/unittest_checker_spelling.py b/tests/unittest_checker_spelling.py
index c1777f74f..c1777f74f 100644
--- a/pylint/test/unittest_checker_spelling.py
+++ b/tests/unittest_checker_spelling.py
diff --git a/pylint/test/unittest_checker_stdlib.py b/tests/unittest_checker_stdlib.py
index 55c3dc8dc..55c3dc8dc 100644
--- a/pylint/test/unittest_checker_stdlib.py
+++ b/tests/unittest_checker_stdlib.py
diff --git a/pylint/test/unittest_checker_strings.py b/tests/unittest_checker_strings.py
index bc4fce6f9..bc4fce6f9 100644
--- a/pylint/test/unittest_checker_strings.py
+++ b/tests/unittest_checker_strings.py
diff --git a/pylint/test/unittest_checker_typecheck.py b/tests/unittest_checker_typecheck.py
index ba61a7d13..ba61a7d13 100644
--- a/pylint/test/unittest_checker_typecheck.py
+++ b/tests/unittest_checker_typecheck.py
diff --git a/pylint/test/unittest_checker_variables.py b/tests/unittest_checker_variables.py
index 299a550d2..299a550d2 100644
--- a/pylint/test/unittest_checker_variables.py
+++ b/tests/unittest_checker_variables.py
diff --git a/pylint/test/unittest_checkers_utils.py b/tests/unittest_checkers_utils.py
index 74a3b6259..74a3b6259 100644
--- a/pylint/test/unittest_checkers_utils.py
+++ b/tests/unittest_checkers_utils.py
diff --git a/pylint/test/unittest_config.py b/tests/unittest_config.py
index ca36c00eb..ca36c00eb 100644
--- a/pylint/test/unittest_config.py
+++ b/tests/unittest_config.py
diff --git a/pylint/test/unittest_lint.py b/tests/unittest_lint.py
index 8d871bfaf..8d871bfaf 100644
--- a/pylint/test/unittest_lint.py
+++ b/tests/unittest_lint.py
diff --git a/pylint/test/unittest_pyreverse_diadefs.py b/tests/unittest_pyreverse_diadefs.py
index 0659a5b11..0659a5b11 100644
--- a/pylint/test/unittest_pyreverse_diadefs.py
+++ b/tests/unittest_pyreverse_diadefs.py
diff --git a/pylint/test/unittest_pyreverse_inspector.py b/tests/unittest_pyreverse_inspector.py
index fe5df9b98..d94638c3c 100644
--- a/pylint/test/unittest_pyreverse_inspector.py
+++ b/tests/unittest_pyreverse_inspector.py
@@ -113,7 +113,7 @@ def test_interfaces():
 
 
 def test_from_directory(project):
-    expected = os.path.join("pylint", "test", "data", "__init__.py")
+    expected = os.path.join("tests", "data", "__init__.py")
     assert project.name == "data"
     assert project.path.endswith(expected)
 
diff --git a/pylint/test/unittest_pyreverse_writer.py b/tests/unittest_pyreverse_writer.py
index 01654024a..01654024a 100644
--- a/pylint/test/unittest_pyreverse_writer.py
+++ b/tests/unittest_pyreverse_writer.py
diff --git a/pylint/test/unittest_reporters_json.py b/tests/unittest_reporters_json.py
index 19a215acf..19a215acf 100644
--- a/pylint/test/unittest_reporters_json.py
+++ b/tests/unittest_reporters_json.py
diff --git a/pylint/test/unittest_reporting.py b/tests/unittest_reporting.py
index a374e1e3e..a374e1e3e 100644
--- a/pylint/test/unittest_reporting.py
+++ b/tests/unittest_reporting.py
diff --git a/pylint/test/utils/unittest_ast_walker.py b/tests/utils/unittest_ast_walker.py
index b8fb78eac..b8fb78eac 100644
--- a/pylint/test/utils/unittest_ast_walker.py
+++ b/tests/utils/unittest_ast_walker.py
diff --git a/pylint/test/utils/unittest_utils.py b/tests/utils/unittest_utils.py
index a009391de..a009391de 100644
--- a/pylint/test/utils/unittest_utils.py
+++ b/tests/utils/unittest_utils.py
diff --git a/tox.ini b/tox.ini
index 5d58ddde2..b4864e679 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,7 @@ deps =
     black==19.3b0
     isort==4.3.15
 commands =
-    black --check --exclude "functional|input|test/extension|test/regrtest_data|test/data" pylint
+    black --check pylint
     isort -rc pylint/ --check-only
 changedir = {toxinidir}
 
@@ -41,7 +41,7 @@ setenv =
     COVERAGE_FILE = {toxinidir}/.coverage.{envname}
 
 commands =
-    python -Wi {envsitepackagesdir}/coverage run -m pytest {envsitepackagesdir}/pylint/test/ {posargs:}
+    python -Wi {envsitepackagesdir}/coverage run -m pytest {toxinidir}/tests/ {posargs:}
 
     ; Transform absolute path to relative path
     ; for compatibility with coveralls.io and fix 'source not available' error.
@@ -58,7 +58,7 @@ deps =
    pyenchant
 
 commands =
-    python -Wi -m pytest {envsitepackagesdir}/pylint/test/ {posargs:} -k unittest_checker_spelling
+    python -Wi -m pytest {toxinidir}/tests/ {posargs:} -k unittest_checker_spelling
 
 changedir = {toxworkdir}