diff --git a/.copyrite_aliases b/.copyrite_aliases
deleted file mode 100644
index 3dea23b4f7..0000000000
--- a/.copyrite_aliases
+++ /dev/null
@@ -1,112 +0,0 @@
-[
-  {
-    "mails": ["cpopa@cloudbasesolutions.com", "pcmanticore@gmail.com"],
-    "authoritative_mail": "pcmanticore@gmail.com",
-    "name": "Claudiu Popa"
-  },
-  {
-    "mails": [
-      "pierre.sassoulas@gmail.com",
-      "pierre.sassoulas@cea.fr",
-      "pierre.sassoulas@wisebim.fr"
-    ],
-    "authoritative_mail": "pierre.sassoulas@gmail.com",
-    "name": "Pierre Sassoulas"
-  },
-  {
-    "mails": [
-      "alexandre.fayolle@logilab.fr",
-      "emile.anclin@logilab.fr",
-      "david.douard@logilab.fr",
-      "laura.medioni@logilab.fr",
-      "anthony.truchet@logilab.fr",
-      "alain.leufroy@logilab.fr",
-      "julien.cristau@logilab.fr",
-      "Adrien.DiMascio@logilab.fr",
-      "emile@crater.logilab.fr",
-      "sylvain.thenault@logilab.fr",
-      "pierre-yves.david@logilab.fr",
-      "nicolas.chauvat@logilab.fr",
-      "afayolle.ml@free.fr",
-      "aurelien.campeas@logilab.fr",
-      "charles.hebert@logilab.fr",
-      "julien.jehannet@logilab.fr",
-      "lmedioni@logilab.fr"
-    ],
-    "authoritative_mail": "contact@logilab.fr",
-    "name": "LOGILAB S.A. (Paris, FRANCE)"
-  },
-  {
-    "mails": ["moylop260@vauxoo.com"],
-    "name": "Moises Lopez",
-    "authoritative_mail": "moylop260@vauxoo.com"
-  },
-  {
-    "mails": [
-      "nathaniel@google.com",
-      "mbp@google.com",
-      "tmarek@google.com",
-      "shlomme@gmail.com",
-      "balparda@google.com",
-      "dlindquist@google.com"
-    ],
-    "name": "Google, Inc."
-  },
-  {
-    "mails": [
-      "ashley@awhetter.co.uk",
-      "awhetter.2011@my.bristol.ac.uk",
-      "asw@dneg.com",
-      "AWhetter@users.noreply.github.com"
-    ],
-    "name": "Ashley Whetter",
-    "authoritative_mail": "ashley@awhetter.co.uk"
-  },
-  {
-    "mails": ["ville.skytta@iki.fi", "ville.skytta@upcloud.com"],
-    "authoritative_mail": "ville.skytta@iki.fi",
-    "name": "Ville Skyttä"
-  },
-  {
-    "mails": [
-      "ubuntu@ip-172-31-89-59.ec2.internal",
-      "eli88fine@gmail.com",
-      "ejfine@gmail.com"
-    ],
-    "authoritative_mail": "ejfine@gmail.com",
-    "name": "Eli Fine"
-  },
-  {
-    "mails": ["andi.finkler@gmail.com", "3929834+DudeNr33@users.noreply.github.com"],
-    "authoritative_mail": "andi.finkler@gmail.com",
-    "name": "Andreas Finkler"
-  },
-  {
-    "mails": ["matusvalo@users.noreply.github.com", "matusvalo@gmail.com"],
-    "authoritative_mail": "matusvalo@users.noreply.github.com",
-    "name": "Matus Valo"
-  },
-  {
-    "mails": ["nickpesce22@gmail.com", "npesce@terpmail.umd.edu"],
-    "authoritative_mail": "nickpesce22@gmail.com",
-    "name": "Nick Pesce"
-  },
-  {
-    "mails": ["31762852+mbyrnepr2@users.noreply.github.com", "mbyrnepr2@gmail.com"],
-    "authoritative_mail": "31762852+mbyrnepr2@users.noreply.github.com",
-    "name": "Mark Byrne"
-  },
-  {
-    "mails": ["36848472+yushao2@users.noreply.github.com", "p.yushao2@gmail.com"],
-    "authoritative_mail": "36848472+yushao2@users.noreply.github.com",
-    "name": "Yu Shao, Pang"
-  },
-  {
-    "mails": [
-      "66853113+pre-commit-ci[bot]@users.noreply.github.com",
-      "49699333+dependabot[bot]@users.noreply.github.com"
-    ],
-    "authoritative_mail": "bot@noreply.github.com",
-    "name": "bot"
-  }
-]
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 5cb6329f62..c1c6615b09 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,11 +3,12 @@ Thank you for submitting a PR to pylint!
 
 To ease the process of reviewing your PR, do make sure to complete the following boxes.
 
-- [ ] Add yourself to CONTRIBUTORS if you are a new contributor.
 - [ ] Add a ChangeLog entry describing what your PR does.
 - [ ] If it's a new feature, or an important bug fix, add a What's New entry in
       `doc/whatsnew/<current release.rst>`.
 - [ ] Write a good description on what the PR does.
+- [ ] If you used multiple emails or multiple names when contributing, add your mails
+   and preferred name in ``script/.contributors_aliases.json``
 -->
 
 ## Type of Changes
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ff306bbf18..8432c93fbe 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -8,7 +8,8 @@ on:
   pull_request: ~
 
 env:
-  CACHE_VERSION: 3
+  # Also change CACHE_VERSION in the primer workflow
+  CACHE_VERSION: 5
   DEFAULT_PYTHON: 3.8
   PRE_COMMIT_CACHE: ~/.cache/pre-commit
 
@@ -16,17 +17,18 @@ jobs:
   prepare-base:
     name: Prepare base dependencies
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     outputs:
       python-key: ${{ steps.generate-python-key.outputs.key }}
       pre-commit-key: ${{ steps.generate-pre-commit-key.outputs.key }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.0
         with:
           fetch-depth: 0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v2.3.1
+        uses: actions/setup-python@v3.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Generate partial Python venv restore key
@@ -37,7 +39,7 @@ jobs:
           }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.0
         with:
           path: venv
           key: >-
@@ -59,7 +61,7 @@ jobs:
             hashFiles('.pre-commit-config.yaml') }}"
       - name: Restore pre-commit environment
         id: cache-precommit
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.0
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           key: >-
@@ -73,20 +75,21 @@ jobs:
           pre-commit install --install-hooks
 
   formatting:
-    name: Run pre-commit checks
+    name: checks / pre-commit
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     needs: prepare-base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v2.3.1
+        uses: actions/setup-python@v3.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.0
         with:
           path: venv
           key:
@@ -99,7 +102,7 @@ jobs:
           exit 1
       - name: Restore pre-commit environment
         id: cache-precommit
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.0
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }}
@@ -115,20 +118,21 @@ jobs:
           pre-commit run pylint --all-files
 
   spelling:
-    name: Run spelling checks
+    name: checks / spelling
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     needs: prepare-base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v2.3.1
+        uses: actions/setup-python@v3.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.0
         with:
           path: venv
           key:
@@ -144,9 +148,41 @@ jobs:
           . venv/bin/activate
           pytest tests/ -k unittest_spelling
 
+  documentation:
+    name: checks / documentation
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    needs: prepare-base
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v3.0.0
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        id: python
+        uses: actions/setup-python@v3.0.0
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+      - name: Restore Python virtual environment
+        id: cache-venv
+        uses: actions/cache@v3.0.0
+        with:
+          path: venv
+          key:
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.prepare-base.outputs.python-key }}
+      - name: Fail job if Python cache restore failed
+        if: steps.cache-venv.outputs.cache-hit != 'true'
+        run: |
+          echo "Failed to restore Python venv from cache"
+          exit 1
+      - name: Run checks on documentation code examples
+        run: |
+          . venv/bin/activate
+          pytest doc/test_messages_documentation.py
+
   prepare-tests-linux:
-    name: Prepare tests for Python ${{ matrix.python-version }} (Linux)
+    name: tests / prepare / ${{ matrix.python-version }} / Linux
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     strategy:
       matrix:
         python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
@@ -154,12 +190,12 @@ jobs:
       python-key: ${{ steps.generate-python-key.outputs.key }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.0
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v2.3.1
+        uses: actions/setup-python@v3.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Generate partial Python venv restore key
@@ -170,7 +206,7 @@ jobs:
           }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.0
         with:
           path: venv
           key: >-
@@ -187,8 +223,9 @@ jobs:
           pip install -U -r requirements_test.txt
 
   pytest-linux:
-    name: Run tests Python ${{ matrix.python-version }} (Linux)
+    name: tests / run / ${{ matrix.python-version }} / Linux
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     needs: prepare-tests-linux
     strategy:
       fail-fast: false
@@ -196,15 +233,15 @@ jobs:
         python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v2.3.1
+        uses: actions/setup-python@v3.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.0
         with:
           path: venv
           key:
@@ -218,16 +255,17 @@ jobs:
       - name: Run pytest
         run: |
           . venv/bin/activate
-          pytest --benchmark-disable --cov --cov-report= tests/
+          pytest -vv --durations=20 --benchmark-disable --cov --cov-report= tests/
       - name: Upload coverage artifact
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3.0.0
         with:
           name: coverage-${{ matrix.python-version }}
           path: .coverage
 
   coverage:
-    name: Process test coverage
+    name: tests / process / coverage
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     needs: ["prepare-tests-linux", "pytest-linux"]
     strategy:
       matrix:
@@ -236,15 +274,15 @@ jobs:
       COVERAGERC_FILE: .coveragerc
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v2.3.1
+        uses: actions/setup-python@v3.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.0
         with:
           path: venv
           key:
@@ -256,7 +294,7 @@ jobs:
           echo "Failed to restore Python venv from cache"
           exit 1
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@v2.0.10
+        uses: actions/download-artifact@v3.0.0
       - name: Combine coverage results
         run: |
           . venv/bin/activate
@@ -270,24 +308,25 @@ jobs:
           coveralls --rcfile=${{ env.COVERAGERC_FILE }} --service=github
 
   benchmark-linux:
-    name: Run benchmark tests Python ${{ matrix.python-version }} (Linux)
+    name: tests / run benchmark / ${{ matrix.python-version }} / Linux
     runs-on: ubuntu-latest
-    needs: prepare-tests-linux
+    timeout-minutes: 10
+    needs: ["prepare-tests-linux", "pytest-linux"]
     strategy:
       fail-fast: false
       matrix:
         python-version: [3.8, 3.9]
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v2.3.1
+        uses: actions/setup-python@v3.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.0
         with:
           path: venv
           key:
@@ -313,7 +352,7 @@ jobs:
         run: >-
           echo "::set-output name=datetime::"$(date "+%Y%m%d_%H%M")
       - name: Upload benchmark artifact
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3.0.0
         with:
           name:
             benchmark-${{ runner.os }}-${{ matrix.python-version }}_${{
@@ -321,8 +360,10 @@ jobs:
           path: .benchmarks/
 
   prepare-tests-windows:
-    name: Prepare tests for Python ${{ matrix.python-version }} (Windows)
+    name: tests / prepare / ${{ matrix.python-version }} / Windows
     runs-on: windows-latest
+    timeout-minutes: 10
+    needs: pytest-linux
     strategy:
       matrix:
         python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
@@ -330,12 +371,12 @@ jobs:
       python-key: ${{ steps.generate-python-key.outputs.key }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.0
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v2.3.1
+        uses: actions/setup-python@v3.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Generate partial Python venv restore key
@@ -346,7 +387,7 @@ jobs:
           }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.0
         with:
           path: venv
           key: >-
@@ -363,8 +404,9 @@ jobs:
           pip install -U -r requirements_test_min.txt
 
   pytest-windows:
-    name: Run tests Python ${{ matrix.python-version }} (Windows)
+    name: tests / run / ${{ matrix.python-version }} / Windows
     runs-on: windows-latest
+    timeout-minutes: 15
     needs: prepare-tests-windows
     strategy:
       fail-fast: false
@@ -376,15 +418,15 @@ jobs:
         # Workaround to set correct temp directory on Windows
         # https://github.com/actions/virtual-environments/issues/712
       - name: Check out code from GitHub
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v2.3.1
+        uses: actions/setup-python@v3.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.0
         with:
           path: venv
           key:
@@ -398,24 +440,25 @@ jobs:
       - name: Run pytest
         run: |
           . venv\\Scripts\\activate
-          pytest --benchmark-disable tests/
+          pytest -vv --durations=20 --benchmark-disable tests/
 
   prepare-tests-pypy:
-    name: Prepare tests for Python ${{ matrix.python-version }}
+    name: tests / prepare / ${{ matrix.python-version }} / Linux
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     strategy:
       matrix:
-        python-version: ["pypy3"]
+        python-version: ["pypy-3.6", "pypy-3.7"]
     outputs:
       python-key: ${{ steps.generate-python-key.outputs.key }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.0
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v2.3.1
+        uses: actions/setup-python@v3.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Generate partial Python venv restore key
@@ -426,14 +469,14 @@ jobs:
           }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.0
         with:
           path: venv
           key: >-
-            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ matrix.python-version }}-${{
             steps.generate-python-key.outputs.key }}
           restore-keys: |
-            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{ env.CACHE_VERSION }}-
+            ${{ runner.os }}-${{ matrix.python-version }}-venv-${{ env.CACHE_VERSION }}-
       - name: Create Python virtual environment
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -443,28 +486,29 @@ jobs:
           pip install -U -r requirements_test_min.txt
 
   pytest-pypy:
-    name: Run tests Python ${{ matrix.python-version }}
+    name: tests / run / ${{ matrix.python-version }} / Linux
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     needs: prepare-tests-pypy
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["pypy3"]
+        python-version: ["pypy-3.6", "pypy-3.7"]
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v2.3.1
+        uses: actions/setup-python@v3.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.0
         with:
           path: venv
           key:
-            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ matrix.python-version }}-${{
             needs.prepare-tests-pypy.outputs.python-key }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
@@ -474,4 +518,4 @@ jobs:
       - name: Run pytest
         run: |
           . venv/bin/activate
-          pytest --benchmark-disable tests/
+          pytest -vv --durations=20 --benchmark-disable tests/
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 26c0eea1c1..29493d2071 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -39,7 +39,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
diff --git a/.github/workflows/primer-test.yaml b/.github/workflows/primer-test.yaml
index d4f7b15048..e1c321b38e 100644
--- a/.github/workflows/primer-test.yaml
+++ b/.github/workflows/primer-test.yaml
@@ -1,4 +1,4 @@
-name: Primer tests
+name: Primer
 
 on:
   push:
@@ -9,9 +9,12 @@ on:
     paths:
       - "pylint/**"
       - "tests/primer/**"
+      - "requirements*"
+      - ".github/workflows/primer-test.yaml"
 
 env:
-  CACHE_VERSION: 3
+  # Also change CACHE_VERSION in the CI workflow
+  CACHE_VERSION: 5
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -19,8 +22,9 @@ concurrency:
 
 jobs:
   prepare-tests-linux:
-    name: Prepare tests for Python ${{ matrix.python-version }} (Linux)
+    name: prepare / ${{ matrix.python-version }} / Linux
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     strategy:
       matrix:
         python-version: [3.8, 3.9, "3.10"]
@@ -28,12 +32,12 @@ jobs:
       python-key: ${{ steps.generate-python-key.outputs.key }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.0
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v2.3.1
+        uses: actions/setup-python@v3.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Generate partial Python venv restore key
@@ -44,7 +48,7 @@ jobs:
           }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.0
         with:
           path: venv
           key: >-
@@ -61,23 +65,24 @@ jobs:
           pip install -U -r requirements_test.txt
 
   pytest-primer-stdlib:
-    name: Run primer tests on stdlib Python ${{ matrix.python-version }} (Linux)
+    name: run on stdlib / ${{ matrix.python-version }} / Linux
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     needs: prepare-tests-linux
     strategy:
       matrix:
         python-version: [3.8, 3.9, "3.10"]
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v2.3.5
+        uses: actions/checkout@v3.0.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v2.3.1
+        uses: actions/setup-python@v3.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.0
         with:
           path: venv
           key:
@@ -95,25 +100,24 @@ jobs:
           pytest -m primer_stdlib --primer-stdlib -n auto
 
   pytest-primer-external-batch-one:
-    name:
-      Run primer tests batch one on external libs Python ${{ matrix.python-version }}
-      (Linux)
+    name: run on batch one / ${{ matrix.python-version }} / Linux
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     needs: prepare-tests-linux
     strategy:
       matrix:
         python-version: [3.8, 3.9, "3.10"]
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v2.3.5
+        uses: actions/checkout@v3.0.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v2.3.1
+        uses: actions/setup-python@v3.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.0
         with:
           path: venv
           key:
@@ -131,25 +135,24 @@ jobs:
           pytest -m primer_external_batch_one --primer-external -n auto
 
   pytest-primer-external-batch-two:
-    name:
-      Run primer tests batch two on external libs Python ${{ matrix.python-version }}
-      (Linux)
+    name: run on batch two / ${{ matrix.python-version }} / Linux
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     needs: prepare-tests-linux
     strategy:
       matrix:
         python-version: [3.8, 3.9, "3.10"]
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v2.3.5
+        uses: actions/checkout@v3.0.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v2.3.1
+        uses: actions/setup-python@v3.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.0
         with:
           path: venv
           key:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5217fae7bb..1bf53bf711 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code from Github
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v2.3.1
+        uses: actions/setup-python@v3.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Install requirements
diff --git a/.gitignore b/.gitignore
index 7e7c9cc978..07ec6627cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 /pylint.egg-info/
 .tox
 *.sw[a-z]
+doc/messages/
 doc/technical_reference/extensions.rst
 doc/technical_reference/features.rst
 pyve
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7e692843b9..6bd4832deb 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,25 +3,32 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.1.0
     hooks:
       - id: trailing-whitespace
-        exclude: "tests/functional/t/trailing_whitespaces.py"
+        exclude: "tests/functional/t/trailing_whitespaces.py|tests/pyreverse/data/.*.html"
       - id: end-of-file-fixer
         exclude: "tests/functional/m/missing/missing_final_newline.py|tests/functional/t/trailing_newlines.py"
   - repo: https://github.com/myint/autoflake
     rev: v1.4
     hooks:
       - id: autoflake
-        exclude: &fixtures tests/functional/|tests/input|tests/regrtest_data/|tests/data/
+        exclude: &fixtures tests/functional/|tests/input|tests/regrtest_data/|tests/data/|doc/data/messages|tests/testutils/data/
         args:
           - --in-place
           - --remove-all-unused-imports
           - --expand-star-imports
           - --remove-duplicate-keys
           - --remove-unused-variables
+  - repo: https://github.com/Pierre-Sassoulas/copyright_notice_precommit
+    rev: f683ab7d10d5f7e779c75aea17197007583d14e4
+    hooks:
+      - id: copyright-notice
+        args: ["--notice=script/copyright.txt", "--enforce-all"]
+        exclude: tests/functional/|tests/input|tests/regrtest_data/|tests/data/|doc/data/messages|tests/testutils/data/|examples/|setup.py
+        types: [python]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.29.1
+    rev: v2.31.1
     hooks:
       - id: pyupgrade
         args: [--py36-plus]
@@ -31,12 +38,12 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 21.11b1
+    rev: 22.1.0
     hooks:
       - id: black
         args: [--safe, --quiet]
         exclude: *fixtures
-  - repo: https://github.com/Pierre-Sassoulas/black-disable-checker/
+  - repo: https://github.com/Pierre-Sassoulas/black-disable-checker
     rev: 1.0.1
     hooks:
       - id: black-disable-checker
@@ -44,7 +51,7 @@ repos:
     rev: 4.0.1
     hooks:
       - id: flake8
-        additional_dependencies: [flake8-typing-imports==1.10.1]
+        additional_dependencies: [flake8-typing-imports==1.12.0]
         exclude: *fixtures
   - repo: local
     hooks:
@@ -77,7 +84,7 @@ repos:
         types: [text] # necessary to include ChangeLog file
         files: ^(ChangeLog|doc/(.*/)*.*\.rst)
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.910-1
+    rev: v0.941
     hooks:
       - id: mypy
         name: mypy
@@ -86,11 +93,18 @@ repos:
         types: [python]
         args: []
         require_serial: true
-        additional_dependencies:
-          ["platformdirs==2.2.0", "types-pkg_resources==0.1.3", "types-toml==0.1.3"]
+        additional_dependencies: ["platformdirs==2.2.0", "types-pkg_resources==0.1.3"]
         exclude: tests/functional/|tests/input|tests(/.*)*/data|tests/regrtest_data/|tests/data/|tests(/.*)+/conftest.py|doc/|bin/
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.5.0
+    rev: v2.6.0
     hooks:
       - id: prettier
         args: [--prose-wrap=always, --print-width=88]
+        exclude: tests(/.*)*/data
+  - repo: https://github.com/DanielNoord/pydocstringformatter
+    rev: v0.5.3
+    hooks:
+      - id: pydocstringformatter
+        exclude: *fixtures
+        args: ["--split-summary-body", "--max-summary-lines=2"]
+        files: "pylint"
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000..6d30aaaae0
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,120 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our community a
+harassment-free experience for everyone, regardless of age, body size, visible or
+invisible disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal appearance,
+race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse,
+inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community
+include:
+
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes, and
+  learning from the experience
+- Focusing on what is best not just for us as individuals, but for the overall community
+
+Examples of unacceptable behavior include:
+
+- The use of sexualized language or imagery, and sexual attention or advances of any
+  kind
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email address, without
+  their explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional
+  setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in response to
+any behavior that they deem inappropriate, threatening, offensive, or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject comments,
+commits, code, wiki edits, issues, and other contributions that are not aligned to this
+Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when an
+individual is officially representing the community in public spaces. Examples of
+representing our community include using an official e-mail address, posting via an
+official social media account, or acting as an appointed representative at an online or
+offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to
+the community leaders responsible for enforcement at pierre.sassoulas at gmail.com. All
+complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the reporter
+of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the
+consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing clarity
+around the nature of the violation and an explanation of why the behavior was
+inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No interaction with
+the people involved, including unsolicited interaction with those enforcing the Code of
+Conduct, for a specified period of time. This includes avoiding interactions in
+community spaces as well as external channels like social media. Violating these terms
+may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including sustained
+inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public communication
+with the community for a specified period of time. No public or private interaction with
+the people involved, including unsolicited interaction with those enforcing the Code of
+Conduct, is allowed during this period. Violating these terms may lead to a permanent
+ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community standards,
+including sustained inappropriate behavior, harassment of an individual, or aggression
+toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
+available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 72df6038c5..e394f5f479 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -1,589 +1,549 @@
-Contributors
-------------
-
-Current team:
-
-* Ashley Whetter: maintainer, contributor
-
-* Bryce Guinta: maintainer, contributor
-
-* Claudiu Popa: maintainer, contributor
-
-* Cara Vinson: astroid committer.
-
-* Guillaume Peillex: committer
-
-* Łukasz Rogalski: committer.
+# This file is autocompleted by 'contributors-txt',
+# using the configuration in 'script/.contributors_aliases.json'.
+# Do not add new persons manually and only add information without
+# using '-' as the line first character.
+# Please verify that your change are stable if you modify manually.
+
+Ex-maintainers
+--------------
+- Claudiu Popa <pcmanticore@gmail.com>
+- Sylvain Thénault <thenault@gmail.com> : main author / maintainer
+- Torsten Marek <shlomme@gmail.com>
+
+
+Maintainers
+-----------
+
+- Pierre Sassoulas <pierre.sassoulas@gmail.com>
+- Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
+- Marc Mueller <30130371+cdce8p@users.noreply.github.com>
+- Hippo91 <guillaume.peillex@gmail.com>
+- Jacob Walls <jacobtylerwalls@gmail.com>
+- Łukasz Rogalski <rogalski.91@gmail.com>
+- Ashley Whetter <ashley@awhetter.co.uk>
+- Bryce Guinta <bryce.paul.guinta@gmail.com>
+- Andreas Finkler <3929834+DudeNr33@users.noreply.github.com>
+- Yu Shao, Pang <36848472+yushao2@users.noreply.github.com>
+- Dimitri Prybysh <dmand@yandex.ru>
+  * multiple-imports, not-iterable, not-a-mapping, various patches.
+- Roy Williams <roy.williams.iii@gmail.com> (Lyft)
+  * added check for implementing __eq__ without implementing __hash__,
+  * Added Python 3 check for accessing Exception.message.
+  * Added Python 3 check for calling encode/decode with invalid codecs.
+  * Added Python 3 check for accessing sys.maxint.
+  * Added Python 3 check for bad import statements.
+  * Added Python 3 check for accessing deprecated methods on the 'string' module,
+    various patches.
+- Florian Bruhin <me@the-compiler.org>
+- Arianna Yang <areveny@protonmail.com>
 
-* Roy Williams (Lyft): committer
-
-  added check for implementing __eq__ without implementing __hash__,
-  Added Python 3 check for accessing Exception.message.
-  Added Python 3 check for calling encode/decode with invalid codecs.
-  Added Python 3 check for accessing sys.maxint.
-  Added Python 3 check for bad import statements.
-  Added Python 3 check for accessing deprecated methods on the 'string' module,
-  various patches.
-
-* Dmitri Prybysh: committer
-
-  multiple-imports, not-iterable, not-a-mapping, various patches.
-
-* Jim Robertson: committer
-
-Ex-maintainers:
-
-* Sylvain Thenault (Logilab): main author / maintainer
-
-* Torsten Marek (Google): committer / contributor
 
+Contributors
+------------
 
 We would not be here without folks that contributed patches, pull requests,
 issues and their time to pylint. We're incredibly grateful to all of these
 contributors:
 
-
-* Daniel Balparda (Google): GPyLint maintainer (Google's pylint variant),
-  various patches
-
-* Martin Pool (Google): warnings for anomalous backslashes, symbolic names for
-  messages (like 'unused'), etc
-
-* Alexandre Fayolle (Logilab): TkInter gui, documentation, debian support
-
-* Julien Cristau, Emile Anclin (Logilab): python 3 support
-
-* Sandro Tosi: Debian packaging
-
-* Mads Kiilerich, Boris Feld, Bill Wendling, Sebastian Ulrich:
-  various patches
-
-* Brian van den Broek: windows installation documentation
-
-* Amaury Forgeot d'Arc: check names imported from a module exists in the module
-
-* Benjamin Niemann: allow block level enabling/disabling of messages
-
-* Nathaniel Manista: suspicious lambda checking
-
-* David Shea: invalid sequence and slice index
-
-* Carl Crowder: don't evaluate the value of arguments for 'dangerous-default-value'
-
-* Michal Nowikowski: wrong-spelling-in-comment, wrong-spelling-in-docstring,
-  parallel execution on multiple CPUs and other patches.
-
-* David Lindquist: logging-format-interpolation warning.
-
-* Brett Cannon: Port source code to be Python 2/3 compatible, Python 3
-  checker.
-
-* Vlad Temian: redundant-unittest-assert and the JSON reporter.
-
-* Cosmin Poieană: unichr-builtin and improvements to bad-open-mode.
-
-* Viorel Știrbu: intern-builtin warning.
-
-* Dan Goldsmith: support for msg-template in HTML reporter.
-
-* Chris Rebert: unidiomatic-typecheck.
-
-* Steven Myint: duplicate-except.
-
-* Radu Ciorba: not-context-manager and confusing-with-statement warnings.
-
-* Bruno Daniel: check_docs extension.
-
-* James Morgensen: ignored-modules option applies to import errors.
-
-* Cezar Elnazli: deprecated-method
-
-* Stéphane Wirtel: nonlocal-without-binding
-
-* Laura Medioni (Logilab, on behalf of the CNES): misplaced-comparison-constant,
-  no-classmethod-decorator, no-staticmethod-decorator, too-many-nested-blocks,
-  too-many-boolean-expressions, unneeded-not, wrong-import-order, ungrouped-imports,
-  wrong-import-position, redefined-variable-type
-
-* Aru Sahni: Git ignoring, regex-based ignores
-
-* Mike Frysinger: contributor.
-
-* Moisés López (Vauxoo): Support for deprecated-modules in modules not installed,
-  Refactor wrong-import-order to integrate it with `isort` library
-  Add check too-complex with mccabe for cyclomatic complexity
-  Refactor wrong-import-position to skip try-import and nested cases
-  Add consider-merging-isinstance, superfluous-else-return
-  Fix consider-using-ternary for 'True and True and True or True' case
-
-* Luis Escobar (Vauxoo), Moisés López (Vauxoo): Add bad-docstring-quotes and docstring-first-line-empty
-
-* Yannick Brehon: contributor.
-
-* Glenn Matthews: autogenerated documentation for optional extensions,
-  bug fixes and enhancements for docparams (née check_docs) extension
-
-* Elias Dorneles: minor adjust to config defaults and docs
-
-* Yuri Bochkarev: Added epytext support to docparams extension.
-
-* Alexander Todorov: added new error conditions to 'bad-super-call',
-  Added new check for incorrect len(SEQUENCE) usage,
-  Added new extension for comparison against empty string constants,
-  Added new extension which detects comparing integers to zero,
-  Added new useless-return checker,
-  Added new try-except-raise checker
-
-* Erik Eriksson - Added overlapping-except error check.
-
-* Anthony Foglia (Google): Added simple string slots check.
-
-* Derek Gustafson: contributor
-
-* Petr Pulc: require whitespace around annotations
-
-* John Paraskevopoulos: add 'differing-param-doc' and 'differing-type-doc'
-
-* Martin von Gagern (Google): Added 'raising-format-tuple' warning.
-
-* Ahirnish Pareek, 'keyword-arg-before-var-arg' check
-
-* Daniel Miller: contributor.
-
-* Bryce Guinta: contributor
-
-* Martin Bašti: contributor
-  Added new check for shallow copy of os.environ
-  Added new check for useless `with threading.Lock():` statement
-
-* Jacques Kvam: contributor
-
-* Brian Shaginaw: prevent error on exception check for functions
-
-* Ioana Tagirta: fix bad thread instantiation check
-
-* Reverb Chu: contributor
-
-* Tobias Hernstig: contributor
-
-* Konstantin Manna: contributor
-
-* Andreas Freimuth: fix indentation checking with tabs
-
-* Renat Galimov: contributor
-
-* Thomas Snowden: fix missing-docstring for inner functions
-
-* Mitchell Young: minor adjustment to docparams
-
-* Marianna Polatoglou: minor contribution for wildcard import check
-
-* Ben Green: contributor
-
-* Benjamin Freeman: contributor
-
-* Fureigh: contributor
-
-* Jace Browning: updated default report format with clickable paths
-
-* Sushobhit (sushobhit27): contributor
-  Added new check 'comparison-with-itself'.
-  Added new check 'useless-import-alias'.
-  Added support of annotations in missing-type-doc and missing-return-type-doc.
-  Added new check 'comparison-with-callable'.
-  Removed six package dependency.
-  Added new check 'chained-comparison'.
-  Added new check 'useless-object-inheritance'.
-
-* Mariatta Wijaya: contributor
-  Added new check `logging-fstring-interpolation`
-  Documentation typo fixes
-
-* Jason Owen: contributor
-
-* Mark Roman Miller: fix inline defs in too-many-statements
-
-* Adam Dangoor: contributor
-
-* Gary Tyler McLeod: contributor
-
-* Wolfgang Grafen, Axel Muller, Fabio Zadrozny, Pierre Rouleau,
-  Maarten ter Huurne, Mirko Friedenhagen and all the Logilab's team (among others).
-
-* Matej Marusak: contributor
-
-* Nick Drozd: contributor, performance improvements to astroid
-
-* Kosarchuk Sergey: contributor
-
-* Carey Metcalfe: demoted `try-except-raise` from error to warning
-
-* Marcus Näslund (naslundx): contributor
-
-* Natalie Serebryakova: contributor
-
-* Caio Carrara: contributor
-
-* Roberto Leinardi: PyCharm plugin maintainer
-
-* Aivar Annamaa: contributor
-
-* Hornwitser: fix import graph
-
-* Yuri Gribov: contributor
-
-* Drew Risinger: committer (docs)
-
-* Ben James
-
-* Tomer Chachamu, Richard Goodman: simplifiable-if-expression
-
-* Alan Chan: contributor
-
-* Benjamin Drung: contributing Debian Developer
-
-* Scott Worley: contributor
-
-* Michael Hudson-Doyle
-
-* Lucas Cimon: contributor
-
-* Mike Miller: contributor
-
-* Sergei Lebedev: contributor
-
-* Sasha Bagan
-
-* Pablo Galindo Salgado: contributor
-  Fix false positive 'Non-iterable value' with async comprehensions.
-
-* Matus Valo
-
-* Sardorbek Imomaliev: contributor
-
-* Justin Li (justinnhli)
-
-* Nicolas Dickreuter
-
-* Pascal Corpet
-
-* Svetoslav Neykov: contributor
-
-* Federico Bond: contributor
-
-* Fantix King (UChicago): contributor
-
-* Yory (yory8): contributor
-
-* Thomas Hisch: contributor
-
-* Clément Pit-Claudel : contributor
-
-* Goudcode: contributor
-
-* Paul Renvoise : contributor
-
-* Bluesheeptoken: contributor
-
-* Michael Scott Cuthbert: contributor
-
-* Pierre Sassoulas : maintainer, contributor
-
-* Nathan Marrow
-
-* Taewon Kim : contributor
-
-* Daniil Kharkov: contributor
-
-* Tyler N. Thieding: contributor
-
-* Zeb Nicholls: contributor
-    - Made W9011 compatible with 'of' syntax in return types
-
-* Martin Vielsmaier: contributor
-
-* Agustin Toledo: contributor
-
-* Nicholas Smith: contributor
-
-* Peter Kolbus (Garmin): contributor
-
-* Oisin Moran: contributor
-
-* Andrzej Klajnert: contributor
-
-* Andrés Pérez Hortal: contributor
-
-* Niko Wenselowski: contributor
-
-* Danny Hermes: contributor
-
-* Eric Froemling: contributor
-
-* Robert Schweizer: contributor
-
-* Hugo van Kemenade: contributor
-
-* Mikhail Fesenko: contributor
-
-* Trevor Bekolay: contributor
-    - Added --list-msgs-enabled command
-
-* Rémi Cardona: contributor
-
-* Daniel Draper: contributor
-
-* Gabriel R. Sezefredo: contributor
-    - Fixed "exception-escape" false positive with generators
-
-* laike9m: contributor
-
-* Janne Rönkkö: contributor
-
-* Hugues Bruant: contributor
-
-* Tim Gates: contributor
-
-* Enji Cooper: contributor
-
-* Bastien Vallet: contributor
-
-* Pek Chhan: contributor
-
-* Craig Henriques: contributor
-
-* Matthijs Blom: contributor
-
-* Andy Palmer: contributor
-
-* Wes Turner (Google): added new check 'inconsistent-quotes'
-
-* Athos Ribeiro
-    Fixed dict-keys-not-iterating false positive for inverse containment checks
-
-* Anubhav: contributor
-
-* Ben Graham: contributor
-
-* Anthony Tan: contributor
-
-* Benny Müller: contributor
-
-* Bernie Gray: contributor
-
-* Slavfox: contributor
-
-* Matthew Beckers (mattlbeck): contributor
-
-* Yang Yang: contributor
-
-* Andrew J. Simmons (anjsimmo): contributor
-
-* Damien Baty: contributor
-
-* Daniel R. Neal (danrneal): contributer
-
-* Jeremy Fleischman (jfly): contributer
-
-* Shiv Venkatasubrahmanyam
-
-* Jochen Preusche (iilei): contributor
-
-* Ram Rachum (cool-RR)
-
-* D. Alphus (Alphadelta14): contributor
-
-* Pieter Engelbrecht
-
-* Ethan Leba: contributor
-
-* Matěj Grabovský: contributor
-
-* Yeting Li (yetingli): contributor
-
-* Frost Ming (frostming): contributor
-
-* Luigi Bertaco Cristofolini (luigibertaco): contributor
-
-* Eli Fine (eli88fine): Fixed false positive duplicate code warning for lines with symbols only
-
-* Ganden Schaffner: contributor
-
-* Josselin Feist: contributor
-
-* David Cain: contributor
-
-* Pedro Algarvio (s0undt3ch): contributor
-
-* Luigi Bertaco Cristofolini (luigibertaco): contributor
-
-* Or Bahari
-
-* Joshua Cannon: contributor
-
-* Giuseppe Valente: contributor
-
-* Takashi Hirashima: contributor
-
-* Joffrey Mander: contributor
-
-* Julien Palard: contributor
-
-* Raphael Gaschignard: contributor
-
-* Sorin Sbarnea: contributor
-
-* Gergely Kalmár: contributor
-
-* Batuhan Taskaya: contributor
-
-* Frank Harrison (doublethefish): contributor
-
-* Gauthier Sebaux: contributor
-
-* Logan Miller (komodo472): contributor
-
-* Matthew Suozzo: contributor
-
-* Marc Mueller (cdce8p): contributor
-
-* David Gilman: contributor
-
-* Ikraduya Edian: contributor
-    - Added new checks 'consider-using-generator' and 'use-a-generator'.
-
-* Tiago Honorato: contributor
-
-* Lefteris Karapetsas: contributor
-
-* Louis Sautier: contributor
-
-* Quentin Young: contributor
-
-* Alexander Kapshuna: contributor
-
-* Mark Byrne: contributor
-
-* Konstantina Saketou: contributor
-
-* Andrew Howe: contributor
-
-* James Sinclair (irgeek): contributor
-
-* Andreas Finkler: contributor
-
-* Aidan Haase, Elizabeth Bott: contributor
-
-* Sebastian Müller: contributor
-
-* Ramiro Leal-Cavazos (ramiro050): Fixed bug preventing pylint from working with emacs tramp
-
-* manderj: contributor
-
-* qwiddle: contributor
-
-* das-intensity: contributor
-
-* Jiajunsu (victor): contributor
-
-* Andrew Haigh (nelfin): contributor
-
-* Pang Yu Shao (yushao2): contributor
-
-* Aditya Gupta (adityagupta1089) : contributor
-  - Added ignore_signatures to duplicate checker
-
-* Jacob Walls: contributor
-
-* ruro: contributor
-
-* David Liu (david-yz-liu): contributor
-
-* Bernard Nauwelaerts: contributor
-
-* Fabian Damken: contributor
-
-* Markus Siebenhaar: contributor
-
-* Lorena Buciu (lorena-b): contributor
-
-* Sergei Lebedev (superbobry): contributor
-
-* Maksym Humetskyi (mhumetskyi): contributor
-  - Fixed ignored empty functions by similarities checker with "ignore-signatures" option enabled
-  - Ignore function decorators signatures as well by similarities checker with "ignore-signatures" option enabled
-  - Ignore class methods and nested functions signatures as well by similarities checker with "ignore-signatures" option enabled
-
-* Daniel Dorani (doranid): contributor
-
-* Will Shanks: contributor
-
-* Mark Bell: contributor
-
-* Marco Gorelli: contributor
-  - Documented Jupyter integration
-
-* Rebecca Turner (9999years): contributor
-
-* Yilei Yang: contributor
-
-* Marcin Kurczewski (rr-): contributor
-
-* Tanvi Moharir: contributor
-  - Fix for invalid toml config
-
-* Eisuke Kawashima (e-kwsm): contributor
-
-* Daniel van Noord (DanielNoord): contributor
-
-* Michal Vasilek: contributor
-
-* Kai Mueller (kasium): contributor
-
-* Sam Vermeiren (PaaEl): contributor
-
-* Phil A. (flying-sheep): contributor
-
-* Melvin Hazeleger (melvio): contributor
-
-* Hayden Richards (SupImDos): contributor
-  - Fixed "no-self-use" for async methods
-  - Fixed "docparams" extension for async functions and methods
-
-* Jeroen Seegers (jeroenseegers): contributor
-  - Fixed `toml` dependency issue
-
-* Tim Martin: contributor
-
-* Jaehoon Hwang (jaehoonhwang): contributor
-
-* Samuel Forestier: contributor
-
-* Nick Pesce: contributor
-
-* James DesLauriers: contributor
-
-* Youngsoo Sung: contributor
-
-* Arianna Yang: contributor
-
-* Samuel Freilich (sfreilich): contributor
-
-* Mike Fiedler (miketheman): contributor
-
-* Takahide Nojima: contributor
-
-* Tushar Sadhwani (tusharsadhwani): contributor
-
-* Ikraduya Edian: contributor
-
-* Antonio Quarta (sgheppy): contributor
-
-* Harshil (harshil21): contributor
-
-* Felix von Drigalski (felixvd): contributor
-
-* Philipp Albrecht (pylbrecht): contributor
-
-* Allan Chandler (allanc65): contributor
-  - Fixed issue 5452, false positive missing-param-doc for multi-line Google-style params
+- Emile Anclin <emile.anclin@logilab.fr> (Logilab): python 3 support
+- Michal Nowikowski <godfryd@gmail.com>:
+  * wrong-spelling-in-comment
+  * wrong-spelling-in-docstring
+  * parallel execution on multiple CPUs
+- Bruno Daniel <bruno.daniel@blue-yonder.com>: check_docs extension.
+- Sushobhit <31987769+sushobhit27@users.noreply.github.com> (sushobhit27)
+  * Added new check 'comparison-with-itself'.
+  * Added new check 'useless-import-alias'.
+  * Added support of annotations in missing-type-doc and missing-return-type-doc.
+  * Added new check 'comparison-with-callable'.
+  * Removed six package dependency.
+  * Added new check 'chained-comparison'.
+  * Added new check 'useless-object-inheritance'.
+- Brett Cannon <brett@python.org>:
+  * Port source code to be Python 2/3 compatible
+  * Python 3 checker
+- Laura Médioni <laura.medioni@logilab.fr> (Logilab, on behalf of the CNES):
+  * misplaced-comparison-constant
+  * no-classmethod-decorator
+  * no-staticmethod-decorator
+  * too-many-nested-blocks,
+  * too-many-boolean-expressions
+  * unneeded-not
+  * wrong-import-order
+  * ungrouped-imports,
+  * wrong-import-position
+  * redefined-variable-type
+- Alexandre Fayolle <alexandre.fayolle@logilab.fr> (Logilab): TkInter gui, documentation, debian support
+- Nick Drozd <nicholasdrozd@gmail.com>: performance improvements to astroid
+- Julien Cristau <julien.cristau@logilab.fr> (Logilab): python 3 support
+- Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
+- Frank Harrison <frank@doublethefish.com> (doublethefish)
+- Moisés López <moylop260@vauxoo.com> (Vauxoo):
+  * Support for deprecated-modules in modules not installed,
+  * Refactor wrong-import-order to integrate it with `isort` library
+  * Add check too-complex with mccabe for cyclomatic complexity
+  * Refactor wrong-import-position to skip try-import and nested cases
+  * Add consider-merging-isinstance, superfluous-else-return
+  * Fix consider-using-ternary for 'True and True and True or True' case
+  * Add bad-docstring-quotes and docstring-first-line-empty
+- Ville Skyttä <ville.skytta@iki.fi>
+- Matus Valo <matusvalo@users.noreply.github.com>
+- Pierre-Yves David <pierre-yves.david@logilab.fr>
+- David Shea <dshea@redhat.com>: invalid sequence and slice index
+- Mark Byrne <31762852+mbyrnepr2@users.noreply.github.com>
+- Derek Gustafson <degustaf@gmail.com>
+- Cezar Elnazli <cezar.elnazli2@gmail.com>: deprecated-method
+- Nicolas Chauvat <nicolas.chauvat@logilab.fr>
+- Radu Ciorba <radu@devrandom.ro>: not-context-manager and confusing-with-statement warnings.
+- Holger Peters <email@holger-peters.de>
+- Cosmin Poieană <cmin@ropython.org>: unichr-builtin and improvements to bad-open-mode.
+- Steven Myint <hg@stevenmyint.com>: duplicate-except.
+- Peter Kolbus <peter.kolbus@gmail.com> (Garmin)
+- Luigi Bertaco Cristofolini <lucristofolini@gmail.com> (luigibertaco)
+- Glenn Matthews <glenn@e-dad.net>:
+  * autogenerated documentation for optional extensions,
+  * bug fixes and enhancements for docparams (née check_docs) extension
+- Vlad Temian <vladtemian@gmail.com>: redundant-unittest-assert and the JSON reporter.
+- Julien Jehannet <julien.jehannet@logilab.fr>
+- Boris Feld <lothiraldan@gmail.com>
+- Anthony Sottile <asottile@umich.edu>
+- Pedro Algarvio <pedro@algarvio.me> (s0undt3ch)
+- Julien Palard <julien@palard.fr>
+- David Liu <david@cs.toronto.edu> (david-yz-liu)
+- Dan Goldsmith <djgoldsmith@googlemail.com>: support for msg-template in HTML reporter.
+- Mariatta Wijaya <Mariatta@users.noreply.github.com>
+  * Added new check `logging-fstring-interpolation`
+  * Documentation typo fixes
+- Jakub Wilk <jwilk@jwilk.net>
+- Émile Crater <emile@crater.logilab.fr>
+- Pavel Roskin <proski@gnu.org>
+- Eli Fine <ejfine@gmail.com> (eli88fine): Fixed false positive duplicate code warning for lines with symbols only
+- David Gilman <davidgilman1@gmail.com>
+- Andrew Haigh <nelfin@gmail.com> (nelfin)
+- へーさん <hira9603859504@gmail.com>
+- orSolocate <38433858+orSolocate@users.noreply.github.com>
+- Tushar Sadhwani <tushar.sadhwani000@gmail.com> (tusharsadhwani)
+- Thomas Hisch <t.hisch@gmail.com>
+- Marianna Polatoglou <mpolatoglou@bloomberg.net>: minor contribution for wildcard import check
+- Manuel Vázquez Acosta <mva.led@gmail.com>
+- Luis Escobar <lescobar@vauxoo.com> (Vauxoo): Add bad-docstring-quotes and docstring-first-line-empty
+- Jim Robertson <jrobertson98atx@gmail.com>
+- Ethan Leba <ethanleba5@gmail.com>
+- Enji Cooper <yaneurabeya@gmail.com>
+- David Lindquist <dlindquist@google.com>: logging-format-interpolation warning.
+- Buck (Yelp) <buck@yelp.com>
+- Anthony Truchet <anthony.truchet@logilab.fr>
+- Alexander Todorov <atodorov@otb.bg>:
+  * added new error conditions to 'bad-super-call',
+  * Added new check for incorrect len(SEQUENCE) usage,
+  * Added new extension for comparison against empty string constants,
+  * Added new extension which detects comparing integers to zero,
+  * Added new useless-return checker,
+  * Added new try-except-raise checker
+- Téo Bouvard <teobouvard@gmail.com>
+- Mihai Balint <balint.mihai@gmail.com>
+- Mark Bell <mark00bell@googlemail.com>
+- Konstantina Saketou <56515303+ksaketou@users.noreply.github.com>
+- Hugo van Kemenade <hugovk@users.noreply.github.com>
+- Hornwitser <github@hornwitser.no>: fix import graph
+- Fureigh <rhys.fureigh@gsa.gov>
+- David Douard <david.douard@sdfa3.org>
+- Daniel Balparda <balparda@google.com> (Google): GPyLint maintainer (Google's pylint variant)
+- Bastien Vallet <bastien.vallet@gmail.com> (Djailla)
+- Aru Sahni <arusahni@gmail.com>: Git ignoring, regex-based ignores
+- Andreas Freimuth <andreas.freimuth@united-bits.de>: fix indentation checking with tabs
+- Alexandru Coman <fcoman@bitdefender.com>
+- Takahide Nojima <nozzy123nozzy@gmail.com>
+- Taewon D. Kim <kimt33@mcmaster.ca>
+- Sneaky Pete <sneakypete81@gmail.com>
+- Rene Zhang <rz99@cornell.edu>
+- Or Bahari <or.ba402@gmail.com>
+- Mr. Senko <atodorov@mrsenko.com>
+- Martin von Gagern <gagern@google.com> (Google): Added 'raising-format-tuple' warning.
+- Martin Vielsmaier <martin@vielsmaier.net>
+- Martin Pool <mbp@google.com> (Google):
+  * warnings for anomalous backslashes
+  * symbolic names for messages (like 'unused')
+  * etc.
+- Martin Bašti <MartinBasti@users.noreply.github.com>
+  * Added new check for shallow copy of os.environ
+  * Added new check for useless `with threading.Lock():` statement
+- Marcus Näslund <naslundx@gmail.com> (naslundx)
+- Marco Forte <fortemarco.irl@gmail.com>
+- Joseph Young <80432516+jpy-git@users.noreply.github.com> (jpy-git)
+- Ionel Maries Cristian <contact@ionelmc.ro>
+- Gergely Kalmár <gergely.kalmar@logikal.jp>
+- Daniel Harding <dharding@gmail.com>
+- Damien Baty <damien.baty@polyconseil.fr>
+- Benjamin Drung <benjamin.drung@profitbricks.com>: contributing Debian Developer
+- Anubhav <35621759+anubh-v@users.noreply.github.com>
+- Antonio Quarta <sgheppy88@gmail.com> (sgheppy)
+- Andrew J. Simmons <anjsimmo@gmail.com> (anjsimmo)
+- wtracy <afishionado@gmail.com>
+- jpkotta <jpkotta@gmail.com>
+- chohner <mail@chohner.com>
+- Tim Martin <tim@asymptotic.co.uk>
+- Tiago Honorato <61059243+tiagohonorato@users.noreply.github.com>
+- Steven M. Vascellaro <svascellaro@gmail.com>
+- Sergey B Kirpichev <skirpichev@gmail.com>
+- Roberto Leinardi <leinardi@gmail.com>: PyCharm plugin maintainer
+- Ricardo Gemignani <ricardo.gemignani@gmail.com>
+- Pieter Engelbrecht <pengelbrecht@rems2.com>
+- Philipp Albrecht <flying-sheep@web.de> (pylbrecht)
+- Nicolas Dickreuter <dickreuter@gmail.com>
+- Nick Bastin <nick.bastin@gmail.com>
+- Nathaniel Manista <nathaniel@google.com>: suspicious lambda checking
+- Mike Frysinger <vapier@gmail.com>
+- Maksym Humetskyi <Humetsky@gmail.com> (mhumetskyi)
+  * Fixed ignored empty functions by similarities checker with "ignore-signatures" option enabled
+  * Ignore function decorators signatures as well by similarities checker with "ignore-signatures" option enabled
+  * Ignore class methods and nested functions signatures as well by similarities checker with "ignore-signatures" option enabled
+- Lucas Cimon <lucas.cimon@gmail.com>
+- Kylian <development@goudcode.nl>
+- Konstantin Manna <Konstantin@Manna.uno>
+- Kai Mueller <15907922+kasium@users.noreply.github.com> (kasium)
+- Joshua Cannon <joshdcannon@gmail.com>
+- John Leach <jfleach@jfleach.com>
+- James Morgensen <james.morgensen@gmail.com>: ignored-modules option applies to import errors.
+- Jaehoon Hwang <jaehoonhwang@users.noreply.github.com> (jaehoonhwang)
+- Ganden Schaffner <gschaffner@pm.me>
+- Frost Ming <frostming@tencent.com> (frostming)
+- Federico Bond <federicobond@gmail.com>
+- Erik Wright <erik.wright@shopify.com>
+- Erik Eriksson <molobrakos@users.noreply.github.com>: Added overlapping-except error check.
+- Dan Hemberger <846186+hemberger@users.noreply.github.com>
+- Chris Rebert <code@rebertia.com>: unidiomatic-typecheck.
+- Aurelien Campeas <aurelien.campeas@logilab.fr>
+- Alexander Pervakov <frost.nzcr4@jagmort.com>
+- Alain Leufroy <alain.leufroy@logilab.fr>
+- xmo-odoo <xmo-odoo@users.noreply.github.com>
+- root@clnstor.am.local <root@clnstor.am.local>
+- grizzly.nyo@gmail.com <grizzly.nyo@gmail.com>
+- craig-sh <craig-sh@users.noreply.github.com>
+- bernie gray <bfgray3@users.noreply.github.com>
+- Yilei "Dolee" Yang <yileiyang@google.com>
+- Wes Turner <westurner@google.com> (Google): added new check 'inconsistent-quotes'
+- Tyler Thieding <tyler@thieding.com>
+- Tobias Hernstig <30827238+thernstig@users.noreply.github.com>
+- Thomas Grainger <tagrain@gmail.com>
+- Simu Toni <simutoni@gmail.com>
+- Sergei Lebedev <185856+superbobry@users.noreply.github.com> (superbobry)
+- Scott Worley <scottworley@scottworley.com>
+- Rémi Cardona <remi.cardona@polyconseil.fr>
+- Raphael Gaschignard <raphael@makeleaps.com>
+- Ram Rachum <ram@rachum.com> (cool-RR)
+- Radostin Stoyanov <rst0git@users.noreply.github.com>
+- Paul Renvoisé <PaulRenvoise@users.noreply.github.com>
+- PHeanEX <github@pheanex.de>
+- Omega Weapon <OmegaPhil+hg@gmail.com>
+- Nikolai Kristiansen <nikolaik@gmail.com>
+- Nick Pesce <nickpesce22@gmail.com>
+- Nathan Marrow <nmarrow@google.com>
+- Mikhail Fesenko <m.fesenko@corp.vk.com>
+- Matthew Suozzo <msuozzo@google.com>
+- Matthew Beckers <17108752+mattlbeck@users.noreply.github.com> (mattlbeck)
+- Mark Roman Miller <mtmiller@users.noreply.github.com>: fix inline defs in too-many-statements
+- Mads Kiilerich <mads@kiilerich.com>
+- Maarten ter Huurne <maarten@treewalker.org>
+- Lefteris Karapetsas <lefteris@refu.co>
+- LCD 47 <lcd047@gmail.com>
+- Justin Li <justinnhli@gmail.com> (justinnhli)
+- John Kirkham <jakirkham@gmail.com>
+- Jens H. Nielsen <Jens.Nielsen@microsoft.com>
+- Ioana Tagirta <ioana.tagirta@gmail.com>: fix bad thread instantiation check
+- Ikraduya Edian <ikraduya@gmail.com>: Added new checks 'consider-using-generator' and 'use-a-generator'.
+- Hugues Bruant <hugues.bruant@affirm.com>
+- Harut <yes@harutune.name>
+- Grygorii Iermolenko <gyermolenko@gmail.com>
+- Gabriel R. Sezefredo <g@briel.dev>: Fixed "exception-escape" false positive with generators
+- Filipe Brandenburger <filbranden@google.com>
+- Fantix King <fantix@uchicago.edu> (UChicago)
+- Elias Dorneles <eliasdorneles@gmail.com>: minor adjust to config defaults and docs
+- Derek Harland <derek.harland@finq.co.nz>
+- David Pursehouse <david.pursehouse@gmail.com>
+- Daniel Miller <millerdev@gmail.com>
+- Chris Murray <chris@chrismurray.scot>
+- Chris Lamb <chris@chris-lamb.co.uk>
+- Charles Hebert <charles.hebert@logilab.fr>
+- Carli Freudenberg <carli.freudenberg@energymeteo.de> (CarliJoy)
+  * Fixed issue 5281, added Unicode checker
+  * Improve non-ascii-name checker
+- Buck Golemon <workitharder@gmail.com>
+- Brian Shaginaw <brian.shaginaw@warbyparker.com>: prevent error on exception check for functions
+- Benny Mueller <benny.mueller91@gmail.com>
+- Ben James <benjames1999@hotmail.co.uk>
+- Ben Green <benhgreen@icloud.com>
+- Batuhan Taskaya <batuhanosmantaskaya@gmail.com>
+- Alexander Kapshuna <kapsh@kap.sh>
+- Adam Parkin <pzelnip@users.noreply.github.com>
+- 谭九鼎 <109224573@qq.com>
+- Łukasz Sznuk <ls@rdprojekt.pl>
+- y2kbugger <y2kbugger@users.noreply.github.com>
+- vinnyrose <vinnyrose@users.noreply.github.com>
+- ttenhoeve-aa <ttenhoeve@appannie.com>
+- thinwybk <florian.k@mailbox.org>
+- syutbai <syutbai@gmail.com>
+- sdet_liang <liangway@users.noreply.github.com>
+- pyves@crater.logilab.fr <pyves@crater.logilab.fr>
+- paschich <millen@gridium.com>
+- oittaa <8972248+oittaa@users.noreply.github.com>
+- moxian <aleftmail@inbox.ru>
+- mar-chi-pan <mar.polatoglou@gmail.com>
+- ludal@logilab.fr <ludal@logilab.fr>
+- lrjball <50599110+lrjball@users.noreply.github.com>
+- laike9m <laike9m@users.noreply.github.com>
+- jpkotta@shannon <jpkotta@shannon>
+- jaydesl <35102795+jaydesl@users.noreply.github.com>
+- jab <jab@users.noreply.github.com>
+- glmdgrielson <32415403+glmdgrielson@users.noreply.github.com>
+- glegoux <gilles.legoux@gmail.com>
+- gaurikholkar <f2013002@goa.bits-pilani.ac.in>
+- flyingbot91 <flyingbot91@gmx.com>
+- fahhem <fahhem>
+- fadedDexofan <fadedDexofan@gmail.com>
+- danields <danields761@gmail.com>
+- cosven <cosven@users.noreply.github.com>
+- cordis-dev <darius@adroiti.com>
+- bluesheeptoken <louis.fruleux1@gmail.com>
+- anatoly techtonik <techtonik@gmail.com>
+- amdev@AMDEV-WS01.cisco.com <amdev@AMDEV-WS01.cisco.com>
+- agutole <toldo_carp@hotmail.com>
+- Zeckie <49095968+Zeckie@users.noreply.github.com>
+- Zeb Nicholls <zebedee.nicholls@climate-energy-college.org>
+  * Made W9011 compatible with 'of' syntax in return types
+- Yuval Langer <yuvallanger@mail.tau.ac.il>
+- Yury Gribov <tetra2005@gmail.com>
+- Yuri Bochkarev <baltazar.bz@gmail.com>: Added epytext support to docparams extension.
+- Youngsoo Sung <ysung@bepro11.com>
+- Yory <39745367+yory8@users.noreply.github.com> (yory8)
+- Yoichi Nakayama <yoichi.nakayama@gmail.com>
+- Yeting Li <liyt@ios.ac.cn> (yetingli)
+- Yannack <yannack@users.noreply.github.com>
+- Yann Dirson <ydirson@free.fr>
+- Yang Yang <y4n9squared@gmail.com>
+- Xi Shen <davidshen84@gmail.com>
+- Will Shanks <wsha@posteo.net>
+- Viorel Știrbu <viorels@gmail.com>: intern-builtin warning.
+- Victor Jiajunsu <16359131+jiajunsu@users.noreply.github.com>
+- Trevor Bekolay <tbekolay@gmail.com>
+  * Added --list-msgs-enabled command
+- Tomer Chachamu <tomer.chachamu@gmail.com>: simplifiable-if-expression
+- Tomasz Magulski <tomasz@magullab.io>
+- Tim Hatch <tim@timhatch.com>
+- Tim Gates <tim.gates@iress.com>
+- Tanvi Moharir <74228962+tanvimoharir@users.noreply.github.com>: Fix for invalid toml config
+- T.Rzepka <Tobias.Rzepka@gmail.com>
+- Svetoslav Neykov <svet@hyperscience.com>
+- Stéphane Wirtel <stephane@wirtel.be>: nonlocal-without-binding
+- Stephen Longofono <8992396+SLongofono@users.noreply.github.com>
+- Stanislav Levin <slev@altlinux.org>
+- Sorin Sbarnea <ssbarnea@redhat.com>
+- Slavfox <slavfoxman@gmail.com>
+- Skip Montanaro <skip@pobox.com>
+- Shiv Venkatasubrahmanyam <shvenkat@users.noreply.github.com>
+- Sebastian Müller <mueller.seb@posteo.de>
+- Saugat Pachhai <suagatchhetri@outlook.com>
+- Sasha Bagan <pnlbagan@gmail.com>
+- Sardorbek Imomaliev <sardorbek.imomaliev@gmail.com>
+- Santiago Castro <bryant@montevideo.com.uy>
+- Sandro Tosi <sandro.tosi@gmail.com>: Debian packaging
+- Samuel Freilich <sfreilich@google.com> (sfreilich)
+- Samuel FORESTIER <HorlogeSkynet@users.noreply.github.com>
+- Sam Vermeiren <88253337+PaaEl@users.noreply.github.com> (PaaEl)
+- Ryan McGuire <ryan@enigmacurry.com>
+- Ry4an Brase <ry4an-hg@ry4an.org>
+- Ruro <ruro.ruro@ya.ru>
+- Roman Ivanov <me@roivanov.com>
+- Robin Tweedie <70587124+robin-wayve@users.noreply.github.com>
+- Robert Schweizer <robert_schweizer@gmx.de>
+- Reverb Chu <reverbc@users.noreply.github.com>
+- Renat Galimov <renat2017@gmail.com>
+- Rebecca Turner <rbt@sent.as> (9999years)
+- Randall Leeds <randall@bleeds.info>
+- Ramiro Leal-Cavazos <ramiroleal050@gmail.com> (ramiro050): Fixed bug preventing pylint from working with emacs tramp
+- Qwiddle13 <32040075+Qwiddle13@users.noreply.github.com>
+- Quentin Young <qlyoung@users.noreply.github.com>
+- Petr Pulc <petrpulc@gmail.com>: require whitespace around annotations
+- Peter Dawyndt <Peter.Dawyndt@UGent.be>
+- Peter Bittner <django@bittner.it>
+- Peter Aronoff <peter@aronoff.org>
+- Paul Cochrane <paul@liekut.de>
+- Patrik <patrik.mrx@gmail.com>
+- Pascal Corpet <pcorpet@users.noreply.github.com>
+- Pablo Galindo Salgado <Pablogsal@gmail.com>
+  * Fix false positive 'Non-iterable value' with async comprehensions.
+- Oisín Moran <OisinMoran@users.noreply.github.com>
+- Obscuron <Abscuron@gmail.com>
+- Noam Yorav-Raphael <noamraph@gmail.com>
+- Nir Soffer <nirsof@gmail.com>
+- Niko Wenselowski <niko@nerdno.de>
+- Nikita Sobolev <mail@sobolevn.me>
+- Nick Smith <clickthisnick@users.noreply.github.com>
+- Ned Batchelder <ned@nedbatchelder.com>
+- Natalie Serebryakova <natalie.serebryakova@Natalies-MacBook-Pro.local>
+- Mitchell Young <mitchelly@gmail.com>: minor adjustment to docparams
+- Mitar <mitar.github@tnode.com>
+- Mike Fiedler <miketheman@gmail.com> (miketheman)
+- Mike Bryant <leachim@leachim.info>
+- Michka Popoff <michkapopoff@gmail.com>
+- Michal Vasilek <michal@vasilek.cz>
+- Michael Scott Cuthbert <cuthbert@mit.edu>
+- Michael Kefeder <oss@multiwave.ch>
+- Michael Hudson-Doyle <michael.hudson@canonical.com>
+- Michael Giuffrida <mgiuffrida@users.noreply.github.com>
+- Melvin Hazeleger <31448155+melvio@users.noreply.github.com> (melvio)
+- Matěj Grabovský <mgrabovs@redhat.com>
+- Matthijs Blom <19817960+MatthijsBlom@users.noreply.github.com>
+- Matej Marušák <marusak.matej@gmail.com>
+- Markus Siebenhaar <41283549+siehar@users.noreply.github.com>
+- Marco Edward Gorelli <marcogorelli@protonmail.com>: Documented Jupyter integration
+- Marcin Kurczewski <rr-@sakuya.pl> (rr-)
+- Maik Röder <maikroeder@gmail.com>
+- Louis Sautier <sautier.louis@gmail.com>
+- Lorena Buciu <46202743+lorena-b@users.noreply.github.com> (lorena-b)
+- Logan Miller <14319179+komodo472@users.noreply.github.com> (komodo472)
+- Kári Tristan Helgason <kthelgason@gmail.com>
+- Kurian Benoy <70306694+kurianbenoy-aot@users.noreply.github.com>
+- Krzysztof Czapla <k.czapla68@gmail.com>
+- Kraig Brockschmidt <kraigbr@msn.com>
+- Kound <norman.freudenberg@posteo.de>
+- Kosarchuk Sergey <sergeykosarchuk@gmail.com>
+- Konrad Weihmann <46938494+priv-kweihmann@users.noreply.github.com>
+- Kian Meng, Ang <kianmeng.ang@gmail.com>
+- Kevin Phillips <thefriendlycoder@gmail.com>
+- Kevin Jing Qiu <kevin.jing.qiu@gmail.com>
+- Kayran Schmidt <59456929+yumasheta@users.noreply.github.com>
+- Jürgen Hermann <jh@web.de>
+- Jérome Perrin <perrinjerome@gmail.com> (perrinjerome)
+- Josselin Feist <josselin@trailofbits.com>
+- Jonathan Kotta <KottaJonathan@JohnDeere.com>
+- John Paraskevopoulos <io.paraskev@gmail.com>: add 'differing-param-doc' and 'differing-type-doc'
+- John McGehee <jmcgehee@altera.com>
+- John Gabriele <jgabriele@fastmail.fm>
+- John Belmonte <john@neggie.net>
+- Joffrey Mander <joffrey.mander+pro@gmail.com>
+- Jochen Preusche <iilei@users.noreply.github.com> (iilei)
+- Jeroen Seegers <jeroenseegers@users.noreply.github.com> (jeroenseegers)
+  * Fixed `toml` dependency issue
+- Jeremy Fleischman <jeremyfleischman@gmail.com> (jfly)
+- Jason Owen <jason.a.owen@gmail.com>
+- Jared Garst <cultofjared@gmail.com>
+- Jared Deckard <jared.deckard@gmail.com>
+- Janne Rönkkö <jannero@users.noreply.github.com>
+- James Sinclair <james@nurfherder.com> (irgeek)
+- James M. Allen <james.m.allen@gmail.com>
+- James Lingard <jchl@aristanetworks.com>
+- James Broadhead <jamesbroadhead@gmail.com>
+- Jakob Normark <jakobnormark@gmail.com>
+- Jake Lishman <jake@binhbar.com> (jakelishman)
+- Jacques Kvam <jwkvam@gmail.com>
+- Jace Browning <jacebrowning@gmail.com>: updated default report format with clickable paths
+- JT Olds <jtolds@xnet5.com>
+- Hayden Richards <62866982+SupImDos@users.noreply.github.com> (SupImDos)
+  * Fixed "no-self-use" for async methods
+  * Fixed "docparams" extension for async functions and methods
+- Harshil <37377066+harshil21@users.noreply.github.com> (harshil21)
+- Grant Welch <gwelch925+github@gmail.com>
+- Giuseppe Valente <gvalente@arista.com>
+- Gary Tyler McLeod <mail@garytyler.com>
+- Felix von Drigalski <FvDrigalski@gmail.com> (felixvd)
+- Fabrice Douchant <Fabrice.Douchant@logilab.fr>
+- Fabio Natali <me@fabionatali.com>
+- Fabian Damken <fdamken+github@frisp.org>
+- Eric Froemling <ericfroemling@gmail.com>
+- Emmanuel Chaudron <manu.chaud@hotmail.fr>
+- Elizabeth Bott <52465744+elizabethbott@users.noreply.github.com>
+- Eisuke Kawashima <e-kwsm@users.noreply.github.com> (e-kwsm)
+- Edgemaster <grand.edgemaster@gmail.com>
+- Drew Risinger <drewrisinger@users.noreply.github.com>
+- Dr. Nick <das-intensity@users.noreply.github.com>
+- Don Jayamanne <don.jayamanne@yahoo.com>
+- Dmytro Kyrychuk <dmytro.kyrychuck@gmail.com>
+- Denis Laxalde <denis.laxalde@logilab.fr>
+- David Cain <davidjosephcain@gmail.com>
+- Danny Hermes <daniel.j.hermes@gmail.com>
+- Daniele Procida <daniele@vurt.org>
+- Daniela Plascencia <daplascen@gmail.com>
+- Daniel R. Neal <dan.r.neal@gmail.com> (danrneal)
+- Daniel Draper <Germandrummer92@users.noreply.github.com>
+- Daniel Dorani <ddandd@gmail.com> (doranid)
+- Daniel Brookman <53625739+dbrookman@users.noreply.github.com>
+- Dan Garrette <dhgarrette@gmail.com>
+- Damien Nozay <damien.nozay@gmail.com>
+- Craig Citro <craigcitro@gmail.com>
+- Clément Pit-Claudel <cpitclaudel@users.noreply.github.com>
+- Christopher Zurcher <zurcher@users.noreply.github.com>
+- Carl Crowder <bitbucket@carlcrowder.com>: don't evaluate the value of arguments for 'dangerous-default-value'
+- Carey Metcalfe <carey@cmetcalfe.ca>: demoted `try-except-raise` from error to warning
+- Cameron Olechowski <camsterole@users.noreply.github.com>
+- Calin Don <calin.don@gmail.com>
+- Caio Carrara <ccarrara@redhat.com>
+- C.A.M. Gerlach <WIDEnetServices@gmail.com>
+- Bruno P. Kinoshita <kinow@users.noreply.github.com>
+- Brian C. Lane <bcl@redhat.com>
+- Brandon W Maister <quodlibetor@gmail.com>
+- BioGeek <jeroen.vangoey@gmail.com>
+- Benjamin Graham <benwilliamgraham@gmail.com>
+- Benedikt Morbach <benedikt.morbach@googlemail.com>
+- Banjamin Freeman <befreeman@users.noreply.github.com>
+- Athos Ribeiro <athoscr@fedoraproject.org>: Fixed dict-keys-not-iterating false positive for inverse containment checks
+- Arun Persaud <arun@nubati.net>
+- Arthur Lutz <arthur.lutz@logilab.fr>
+- Antonio Ossa <aaossa@uc.cl>
+- Anthony VEREZ <anthony.verez.external@cassidian.com>
+- Anthony Tan <tanant@users.noreply.github.com>
+- Anthony Foglia <afoglia@users.noreply.github.com> (Google): Added simple string slots check.
+- Anentropic <ego@anentropic.com>
+- Andy Palmer <25123779+ninezerozeronine@users.noreply.github.com>
+- Andrzej Klajnert <github@aklajnert.pl>
+- Andrew Howe <howeaj@users.noreply.github.com>
+- Andres Perez Hortal <andresperezcba@gmail.com>
+- Alok Singh <8325708+alok@users.noreply.github.com>
+- Allan Chandler <95424144+allanc65@users.noreply.github.com> (allanc65)
+  * Fixed issue 5452, false positive missing-param-doc for multi-line Google-style params
+- Alex Jurkiewicz <alex@jurkiewi.cz>
+- Alex Hearn <alex.d.hearn@gmail.com>
+- Alan Evangelista <alanoe@linux.vnet.ibm.com>
+- Alan Chan <achan961117@gmail.com>
+- Aivar Annamaa <aivarannamaa@users.noreply.github.com>
+- Aidan Haase <44787650+haasea@users.noreply.github.com>
+- Ahirnish Pareek <ahirnish@gmail.com>: 'keyword-arg-before-var-arg' check
+- Adrian Chirieac <chirieacam@gmail.com>
+- Aditya Gupta <adityagupta1089@users.noreply.github.com> (adityagupta1089)
+  * Added ignore_signatures to duplicate checker
+- Adam Dangoor <adamdangoor@gmail.com>
+
+
+Co-Author
+---------
+The following persons were credited manually but did not commit themselves
+under this name, or we did not manage to find their commits in the history.
+
+- Agustin Toledo
+- Amaury Forgeot d'Arc: check names imported from a module exists in the module
+- Anthony Tan
+- Axel Muller
+- Benjamin Niemann: allow block level enabling/disabling of messages
+- Bernard Nauwelaerts
+- Bill Wendling
+- Brian van den Broek: windows installation documentation
+- Craig Henriques
+- D. Alphus (Alphadelta14)
+- Daniil Kharkov
+- Eero Vuojolahti
+- Fabio Zadrozny
+- Gauthier Sebaux
+- James DesLauriers
+- manderj
+- Mirko Friedenhagen
+- Nicholas Smith
+- Nuzula H. Yudaka (Nuzhuka)
+- Pek Chhan
+- Peter Hammond
+- Pierre Rouleau
+- Richard Goodman: simplifiable-if-expression (with Tomer Chachamu)
+- Sebastian Ulrich
+- Takashi Hirashima
+- Thomas Snowden: fix missing-docstring for inner functions
+- Wolfgang Grafen
+- Yannick Brehon
diff --git a/ChangeLog b/ChangeLog
index 4dd010abbf..32c5122f04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,12 +2,13 @@
 Pylint's ChangeLog
 ------------------
 
-What's New in Pylint 2.13.0?
+What's New in Pylint 2.14.0?
 ============================
 Release date: TBA
 
 ..
-  Put new features here and also in 'doc/whatsnew/2.13.rst'
+  Put new features here and also in 'doc/whatsnew/2.14.rst'
+
 
 
 ..
@@ -15,17 +16,682 @@ Release date: TBA
   (Ie. not necessarily at the end)
 
 
-What's New in Pylint 2.12.3?
+What's New in Pylint 2.13.6?
 ============================
 Release date: TBA
 
-..
-  Put bug fixes that should not wait for a new minor version here
 
 
-..
-  Insert your changelog randomly, it will reduce merge conflicts
-  (Ie. not necessarily at the end)
+What's New in Pylint 2.13.5?
+============================
+Release date: 2022-04-06
+
+* Fix false positive regression in 2.13.0 for ``used-before-assignment`` for
+  homonyms between variable assignments in try/except blocks and variables in
+  subscripts in comprehensions.
+
+  Closes #6069
+  Closes #6136
+
+* ``lru-cache-decorating-method`` has been renamed to ``cache-max-size-none`` and
+  will only be emitted when ``maxsize`` is ``None``.
+
+  Closes #6180
+
+* Fix false positive for ``unused-import`` when disabling both ``used-before-assignment`` and ``undefined-variable``.
+
+  Closes #6089
+
+* Narrow the scope of the ``unnecessary-ellipsis`` checker to:
+  * functions & classes which contain both a docstring and an ellipsis.
+  * A body which contains an ellipsis ``nodes.Expr`` node & at least one other statement.
+
+* Fix false positive for ``used-before-assignment`` for assignments taking place via
+  nonlocal declarations after an earlier type annotation.
+
+  Closes #5394
+
+* Fix crash for ``redefined-slots-in-subclass`` when the type of the slot is not a const or a string.
+
+  Closes #6100
+
+* Only raise ``not-callable`` when all the inferred values of a property are not callable.
+
+  Closes #5931
+
+
+* Fix a false negative for ``subclassed-final-class`` when a set of other messages were disabled.
+
+
+What's New in Pylint 2.13.4?
+============================
+Release date: 2022-03-31
+
+* Fix false positive regression in 2.13.0 for ``used-before-assignment`` for
+  homonyms between variable assignments in try/except blocks and variables in
+  a comprehension's filter.
+
+  Closes #6035
+
+* Include ``testing_pylintrc`` in source and wheel distributions.
+
+  Closes #6028
+
+* Fix crash in ``super-init-not-called`` checker when using ``ctypes.Union``.
+
+  Closes #6027
+
+
+* Fix crash for ``unneccessary-ellipsis`` checker when an ellipsis is used inside of a container or a lambda expression.
+
+  Closes #6036
+  Closes #6037
+  Closes #6048
+
+
+What's New in Pylint 2.13.3?
+============================
+Release date: 2022-03-29
+
+* Fix false positive for ``unnecessary-ellipsis`` when using an ellipsis as a default argument.
+
+  Closes #5973
+
+* Fix crash involving unbalanced tuple unpacking.
+
+  Closes #5998
+
+* Fix false positive for 'nonexistent-operator' when repeated '-' are
+  separated (e.g. by parens).
+
+  Closes #5769
+
+
+What's New in Pylint 2.13.2?
+============================
+Release date: 2022-03-27
+
+* Fix crash when subclassing a ``namedtuple``.
+
+  Closes #5982
+
+* Fix false positive for ``superfluous-parens`` for patterns like
+  "return (a or b) in iterable".
+
+  Closes #5803
+
+* Fix a false negative regression in 2.13.0 where ``protected-access`` was not
+  raised on functions.
+
+  Fixes #5989
+
+* Better error messages in case of crash if pylint can't write the issue template.
+
+  Refer to #5987
+
+
+What's New in Pylint 2.13.1?
+============================
+Release date: 2022-03-26
+
+* Fix a regression in 2.13.0 where ``used-before-assignment`` was emitted for
+  the usage of a nonlocal in a try block.
+
+  Fixes #5965
+
+* Avoid emitting ``raising-bad-type`` when there is inference ambiguity on
+  the variable being raised.
+
+  Closes #2793
+
+* Loosen TypeVar default name pattern a bit to allow names with multiple uppercase
+  characters. E.g. ``HVACModeT`` or ``IPAddressT``.
+
+  Closes #5981
+
+* Fixed false positive for ``unused-argument`` when a ``nonlocal`` name is used
+  in a nested function that is returned without being called by its parent.
+
+  Closes #5187
+
+* Fix program crash for ``modified_iterating-list/set/dict`` when the list/dict/set
+  being iterated through is a function call.
+
+  Closes #5969
+
+* Don't emit ``broken-noreturn`` and ``broken-collections-callable`` errors
+  inside ``if TYPE_CHECKING`` blocks.
+
+
+What's New in Pylint 2.13.0?
+============================
+Release date: 2022-03-24
+
+* Add missing dunder methods to ``unexpected-special-method-signature`` check.
+
+* No longer emit ``no-member`` in for loops that reference ``self`` if the binary operation that
+  started the for loop uses a ``self`` that is encapsulated in tuples or lists.
+
+  Ref PyCQA/astroid#1360
+  Closes #4826
+
+* Output better error message if unsupported file formats are used with ``pyreverse``.
+
+  Closes #5950
+
+* Fix pyreverse diagrams type hinting for classmethods and staticmethods.
+
+* Fix pyreverse diagrams type hinting for methods returning None.
+
+* Fix matching ``--notes`` options that end in a non-word character.
+
+  Closes #5840
+
+* Updated the position of messages for class and function defintions to no longer cover
+  the complete definition. Only the ``def`` or ``class`` + the name of the class/function
+  are covered.
+
+  Closes #5466
+
+* ``using-f-string-in-unsupported-version`` and ``using-final-decorator-in-unsupported-version`` msgids
+    were renamed from ``W1601`` and ``W1602`` to ``W2601`` and ``W2602``. Disabling using these msgids will break.
+    This is done in order to restore consistency with the already existing msgids for ``apply-builtin`` and
+    ``basestring-builtin`` from the now deleted python 3K+ checker. There is now a check that we're not using
+    existing msgids or symbols from deleted checkers.
+
+  Closes #5729
+
+* The line numbering for messages related to function arguments is now more accurate. This can
+  require some message disables to be relocated to updated positions.
+
+* Add ``--recursive`` option to allow recursive discovery of all modules and packages in subtree. Running pylint with
+  ``--recursive=y`` option will check all discovered ``.py`` files and packages found inside subtree of directory provided
+  as parameter to pylint.
+
+  Closes #352
+
+* Add ``modified-iterating-list``, ``modified-iterating-dict`` and ``modified-iterating-set``,
+  emitted when items are added to or removed from respectively a list, dictionary or
+  set being iterated through.
+
+  Closes #5348
+
+* Fix false-negative for ``assignment-from-none`` checker using list.sort() method.
+
+  closes #5722
+
+* New extension ``import-private-name``: indicate imports of external private packages
+  and objects (prefixed with ``_``). It can be loaded using ``load-plugins=pylint.extensions.private_import``.
+
+  Closes #5463
+
+* Fixed crash from ``arguments-differ`` and ``arguments-renamed`` when methods were
+  defined outside the top level of a class.
+
+  Closes #5648
+
+* Removed the deprecated ``check_docs`` extension. You can use the ``docparams`` checker
+  to get the checks previously included in ``check_docs``.
+
+  Closes #5322
+
+* Added a ``testutil`` extra require to the packaging, as ``gitpython`` should not be a dependency
+  all the time but is still required to use the primer helper code in ``pylint.testutil``. You can
+  install it with ``pip install pylint[testutil]``.
+
+  Closes #5486
+
+* Reinstated checks from the python3 checker that are still useful for python 3
+  (``eq-without-hash``). This is now in the ``pylint.extensions.eq_without_hash`` optional
+  extension.
+
+  Closes #5025
+
+* Fixed an issue where ``ungrouped-imports`` could not be disabled without raising
+  ``useless-suppression``.
+
+  Ref #2366
+
+* Added several checkers to deal with unicode security issues
+  (see `Trojan Sources <https://trojansource.codes/>`_ and
+  `PEP 672 <https://www.python.org/dev/peps/pep-0672/>`_ for details) that also
+  concern the readability of the code. In detail the following checks were added:
+
+  * ``bad-file-encoding`` checks that the file is encoded in UTF-8 as suggested by
+    `PEP8 <https://www.python.org/dev/peps/pep-0008/#id20>`_.
+    UTF-16 and UTF-32 are `not supported by Python <https://bugs.python.org/issue1503789>`_
+    at the moment. If this ever changes
+    ``invalid-unicode-codec`` checks that they aren't used, to allow for backwards
+    compatibility.
+
+  * ``bidirectional-unicode`` checks for bidirectional unicode characters that
+    could make code execution different than what the user expects.
+
+  * ``invalid-character-backspace``, ``invalid-character-carriage-return``,
+    ``invalid-character-sub``, ``invalid-character-esc``,
+    ``invalid-character-zero-width-space`` and ``invalid-character-nul``
+    to check for possibly harmful unescaped characters.
+
+  Closes #5281
+
+* Use the ``tomli`` package instead of ``toml`` to parse ``.toml`` files.
+
+ Closes #5885
+
+* Fix false positive - Allow unpacking of ``self`` in a subclass of ``typing.NamedTuple``.
+
+ Closes #5312
+
+* Fixed false negative ``unpacking-non-sequence`` when value is an empty list.
+
+ Closes #5707
+
+* Better warning messages for useless else or elif when a function returns early.
+
+  Closes #5614
+
+* Fixed false positive ``consider-using-dict-comprehension`` when creating a dict
+  using a list of tuples where key AND value vary depending on the same condition.
+
+  Closes #5588
+
+* Fixed false positive for ``global-variable-undefined`` when ``global`` is used with a class name
+
+  Closes #3088
+
+* Fixed false positive for ``unused-variable`` when a ``nonlocal`` name is assigned as part of a multi-name assignment.
+
+  Closes #3781
+
+* Fixed a crash in ``unspecified-encoding`` checker when providing ``None``
+  to the ``mode`` argument of an ``open()`` call.
+
+  Closes #5731
+
+* Fixed a crash involving a ``NewType`` named with an f-string.
+
+  Closes #5770
+  Ref PyCQA/astroid#1400
+
+* Improved ``bad-open-mode`` message when providing ``None`` to the ``mode``
+  argument of an ``open()`` call.
+
+  Closes #5733
+
+* Added ``lru-cache-decorating-method`` checker with checks for the use of ``functools.lru_cache``
+  on class methods. This is unrecommended as it creates memory leaks by never letting the instance
+  getting garbage collected.
+
+  Closes #5670
+
+* Fixed crash with recursion error for inference of class attributes that referenced
+  the class itself.
+
+  Closes #5408
+  Ref PyCQA/astroid#1392
+
+* Fixed false positive for ``unused-argument`` when a method overridden in a subclass
+  does nothing with the value of a keyword-only argument.
+
+  Closes #5771
+  Ref PyCQA/astroid#1382
+
+* The issue template for crashes is now created for crashes which were previously not covered
+  by this mechanism.
+
+  Closes #5668
+
+* Rewrote checker for ``non-ascii-name``.
+   It now ensures __all__ Python names are ASCII and also properly
+   checks the names of imports (``non-ascii-module-import``) as
+   well as file names (``non-ascii-file-name``) and emits their respective new warnings.
+
+   Non ASCII characters could be homoglyphs (look alike characters) and hard to
+   enter on a non specialized keyboard.
+   See `Confusable Characters in PEP 672 <https://www.python.org/dev/peps/pep-0672/#confusable-characters-in-identifiers>`_
+
+* When run in parallel mode ``pylint`` now pickles the data passed to subprocesses with
+  the ``dill`` package. The ``dill`` package has therefore been added as a dependency.
+
+* An astroid issue where symlinks were not being taken into account
+  was fixed
+
+  Closes #1470
+  Closes #3499
+  Closes #4302
+  Closes #4798
+  Closes #5081
+
+* Fix a crash in ``unused-private-member`` checker when analyzing code using
+  ``type(self)`` in bound methods.
+
+  Closes #5569
+
+* Optimize parsing of long lines when ``missing-final-newline`` is enabled.
+
+  Closes #5724
+
+* Fix false positives for ``used-before-assignment`` from using named
+  expressions in a ternary operator test and using that expression as
+  a call argument.
+
+  Closes #5177, #5212
+
+* Fix false positive for ``undefined-variable`` when ``namedtuple`` class
+  attributes are used as return annotations.
+
+  Closes #5568
+
+* Fix false negative for ``undefined-variable`` and related variable messages
+  when the same undefined variable is used as a type annotation and is
+  accessed multiple times, or is used as a default argument to a function.
+
+  Closes #5399
+
+* Pyreverse - add output in mermaidjs format
+
+* Emit ``used-before-assignment`` instead of ``undefined-variable`` when attempting
+  to access unused type annotations.
+
+  Closes #5713
+
+* Added confidence level ``CONTROL_FLOW`` for warnings relying on assumptions
+  about control flow.
+
+* ``used-before-assignment`` now considers that assignments in a try block
+  may not have occurred when the except or finally blocks are executed.
+
+  Closes #85, #2615
+
+* Fixed false negative for ``used-before-assignment`` when a conditional
+  or context manager intervened before the try statement that suggested
+  it might fail.
+
+  Closes #4045
+
+* Fixed false negative for ``used-before-assignment`` in finally blocks
+  if an except handler did not define the assignment that might have failed
+  in the try block.
+
+* Fixed extremely long processing of long lines with comma's.
+
+  Closes #5483
+
+* Fixed crash on properties and inherited class methods when comparing them for
+  equality against an empty dict.
+
+  Closes #5646
+
+* Fixed a false positive for ``assigning-non-slot`` when the slotted class
+  defined ``__setattr__``.
+
+  Closes #3793
+
+* Fixed a false positive for ``invalid-class-object`` when the object
+  being assigned to the ``__class__`` attribute is uninferable.
+
+* Fixed false positive for ``used-before-assignment`` with self-referential type
+  annotation in conditional statements within class methods.
+
+  Closes #5499
+
+* Add checker ``redefined-slots-in-subclass``: Emitted when a slot is redefined in a subclass.
+
+  Closes #5617
+
+* Fixed false positive for ``global-variable-not-assigned`` when the ``del`` statement is used
+
+  Closes #5333
+
+* By default, pylint does no longer take files starting with ``.#`` into account. Those are
+  considered `emacs file locks`. See
+  https://www.gnu.org/software/emacs/manual/html_node/elisp/File-Locks.html.
+  This behavior can be reverted by redefining the ``ignore-patterns`` option.
+
+  Closes #367
+
+* Fixed a false positive for ``used-before-assignment`` when a named expression
+  appears as the first value in a container.
+
+  Closes #5112
+
+* ``used-before-assignment`` now assumes that assignments in except blocks
+  may not have occurred and warns accordingly.
+
+  Closes #4761
+
+* When evaluating statements after an except block, ``used-before-assignment``
+  assumes that assignments in the except blocks took place if the
+  corresponding try block contained a return statement.
+
+  Closes #5500
+
+* Fixed a false negative for ``used-before-assignment`` when some but not all
+  except handlers defined a name relied upon after an except block when the
+  corresponding try block contained a return statement.
+
+  Closes #5524
+
+* When evaluating statements in the ``else`` clause of a loop, ``used-before-assignment``
+  assumes that assignments in the except blocks took place if the
+  except handlers constituted the only ways for the loop to finish without
+  breaking early.
+
+  Closes #5683
+
+* ``used-before-assignment`` now checks names in try blocks.
+
+* Fixed false positive with ``used-before-assignment`` for assignment expressions
+  in lambda statements.
+
+  Closes #5360, #3877
+
+* Fixed a false positive (affecting unreleased development) for
+  ``used-before-assignment`` involving homonyms between filtered comprehensions
+  and assignments in except blocks.
+
+  Closes #5586
+
+* Fixed crash with slots assignments and annotated assignments.
+
+  Closes #5479
+
+* Fixed crash on list comprehensions that used ``type`` as inner variable name.
+
+  Closes #5461
+
+* Fixed crash in ``use-maxsplit-arg`` checker when providing the ``sep`` argument
+  to ``str.split()`` by keyword.
+
+  Closes #5737
+
+* Fix false positive for ``unused-variable`` for a comprehension variable matching
+  an outer scope type annotation.
+
+  Closes #5326
+
+* Fix false negative for ``undefined-variable`` for a variable used multiple times
+  in a comprehension matching an unused outer scope type annotation.
+
+  Closes #5654
+
+* Some files in ``pylint.testutils`` were deprecated. In the future imports should be done from the
+  ``pylint.testutils.functional`` namespace directly.
+
+* Fixed false positives for ``no-value-for-parameter`` with variadic
+  positional arguments.
+
+  Closes #5416
+
+* ``safe_infer`` no longer makes an inference when given two function
+  definitions with differing numbers of arguments.
+
+  Closes #3675
+
+* Fix ``comparison-with-callable`` false positive for callables that raise, such
+  as typing constants.
+
+  Closes #5557
+
+* Fixed a crash on ``__init__`` nodes when the attribute was previously uninferable due to a cache
+  limit size. This limit can be hit when the inheritance pattern of a class (and therefore of the ``__init__`` attribute) is very large.
+
+  Closes #5679
+
+* Fix false positive for ``used-before-assignment`` from a class definition
+  nested under a function subclassing a class defined outside the function.
+
+  Closes #4590
+
+* Fix ``unnecessary_dict_index_lookup`` false positive when deleting a dictionary's entry.
+
+  Closes #4716
+
+* Fix false positive for ``used-before-assignment`` when an except handler
+  shares a name with a test in a filtered comprehension.
+
+  Closes #5817
+
+* Fix crash in ``unnecessary-dict-index-lookup`` checker if the output of
+  ``items()`` is assigned to a 1-tuple.
+
+  Closes #5504
+
+* When invoking ``pylint``, ``epylint``, ``symilar`` or ``pyreverse`` by importing them in a python file
+  you can now pass an ``argv`` keyword besides patching ``sys.argv``.
+
+  Closes #5320
+
+* The ``PyLinter`` class will now be initialized with a ``TextReporter``
+  as its reporter if none is provided.
+
+* Fix ``super-init-not-called`` when parent or ``self`` is a ``Protocol``
+
+  Closes #4790
+
+* Fix false positive ``not-callable`` with attributes that alias ``NamedTuple``
+
+  Partially closes #1730
+
+* Emit ``redefined-outer-name`` when a nested except handler shadows an outer one.
+
+  Closes #4434
+  Closes #5370
+
+* Fix false positive ``super-init-not-called`` for classes that inherit their ``init`` from
+  a parent.
+
+  Closes #4941
+
+* ``encoding`` can now be supplied as a positional argument to calls that open
+  files without triggering ``unspecified-encoding``.
+
+  Closes #5638
+
+* Fatal errors now emit a score of 0.0 regardless of whether the linted module
+  contained any statements
+
+  Closes #5451
+
+* ``fatal`` was added to the variables permitted in score evaluation expressions.
+
+* The default score evaluation now uses a floor of 0.
+
+  Closes #2399
+
+* Fix false negative for ``consider-iterating-dictionary`` during membership checks encapsulated in iterables
+  or ``not in`` checks
+
+  Closes #5323
+
+* Fixed crash on uninferable decorators on Python 3.6 and 3.7
+
+* Add checker ``unnecessary-ellipsis``: Emitted when the ellipsis constant is used unnecessarily.
+
+  Closes #5460
+
+* Disable checker ``bad-docstring-quotes`` for Python <= 3.7, because in these versions the line
+  numbers for decorated functions and classes are not reliable which interferes with the checker.
+
+  Closes #3077
+
+* Fixed incorrect classification of Numpy-style docstring as Google-style docstring for
+  docstrings with property setter documentation.
+  Docstring classification is now based on the highest amount of matched sections instead
+  of the order in which the docstring styles were tried.
+
+* Fixed detection of ``arguments-differ`` when superclass static
+  methods lacked a ``@staticmethod`` decorator.
+
+  Closes #5371
+
+* ``TypingChecker``
+
+  * Added new check ``broken-noreturn`` to detect broken uses of ``typing.NoReturn``
+    if ``py-version`` is set to Python ``3.7.1`` or below.
+    https://bugs.python.org/issue34921
+
+  * Added new check ``broken-collections-callable`` to detect broken uses of ``collections.abc.Callable``
+    if ``py-version`` is set to Python ``3.9.1`` or below.
+    https://bugs.python.org/issue42965
+
+* The ``testutils`` for unittests now accept ``end_lineno`` and ``end_column``. Tests
+  without these will trigger a ``DeprecationWarning``.
+
+* ``arguments-differ`` will no longer complain about method redefinitions with extra parameters
+  that have default values.
+
+  Closes #1556, #5338
+
+* Fixed false positive ``unexpected-keyword-arg`` for decorators.
+
+  Closes #258
+
+* Importing the deprecated stdlib module ``xml.etree.cElementTree`` now emits ``deprecated_module``.
+
+  Closes #5862
+
+* Disables for ``deprecated-module`` and similar warnings for stdlib features deprecated
+  in newer versions of Python no longer raise ``useless-suppression`` when linting with
+  older Python interpreters where those features are not yet deprecated.
+
+* Importing the deprecated stdlib module ``distutils`` now emits ``deprecated_module`` on Python 3.10+.
+
+* ``missing-raises-doc`` will now check the class hierarchy of the raised exceptions
+
+  .. code-block:: python
+
+    def my_function()
+      """My function.
+
+      Raises:
+        Exception: if something fails
+      """
+      raise ValueError
+
+  Closes #4955
+
+* Allow disabling ``duplicate-code`` with a disable comment when running through
+  pylint.
+
+  Closes #214
+
+* Improve ``invalid-name`` check for ``TypeVar`` names.
+  The accepted pattern can be customized with ``--typevar-rgx``.
+
+  Closes #3401
+
+* Added new checker ``typevar-name-missing-variance``. Emitted when a covariant
+  or contravariant ``TypeVar`` does not end with  ``_co`` or ``_contra`` respectively or
+  when a ``TypeVar`` is not either but has a suffix.
+
+* Allow usage of mccabe 0.7.x release
+
+  Closes #5878
+
+* Fix ``unused-private-member`` false positive when accessing private methods through ``property``.
+
+  Closes #4756
 
 
 What's New in Pylint 2.12.2?
@@ -124,8 +790,8 @@ Release date: 2021-11-24
   output files without these will trigger a ``DeprecationWarning``. Expected output files
   can be easily updated with the ``python tests/test_functional.py --update-functional-output`` command.
 
-* The functional ``testutils`` now correctly check the distinction betweeen ``HIGH`` and
-  ``UNDEFINED`` confidence. Expected output files without defiend ``confidence`` levels will now
+* The functional ``testutils`` now correctly check the distinction between ``HIGH`` and
+  ``UNDEFINED`` confidence. Expected output files without defined ``confidence`` levels will now
   trigger a ``DeprecationWarning``. Expected output files can be easily updated with the
   ``python tests/test_functional.py --update-functional-output`` command.
 
@@ -146,6 +812,7 @@ Release date: 2021-11-24
 * Properly identify parameters with no documentation and add new message called ``missing-any-param-doc``
 
   Closes #3799
+
 * Add checkers ``overridden-final-method`` & ``subclassed-final-class``
 
   Closes #3197
@@ -248,7 +915,7 @@ Release date: 2021-11-24
 
   Closes #5194
 
-* Fix double emitting of ``not-callable`` on inferrable ``properties``
+* Fix double emitting of ``not-callable`` on inferable ``properties``
 
   Closes #4426
 
@@ -412,7 +1079,7 @@ Release date: 2021-09-16
   Closes #4776
 
 
-* Added ``py-version`` config key (if ``[MASTER]`` section). Used for version dependant checks.
+* Added ``py-version`` config key (if ``[MASTER]`` section). Used for version dependent checks.
   Will default to whatever Python version pylint is executed with.
 
 * ``CodeStyleChecker``
@@ -431,7 +1098,7 @@ Release date: 2021-09-16
 
   Closes #4751
 
-* https is now prefered in the documentation and http://pylint.pycqa.org correctly redirect to https://pylint.pycqa.org
+* https is now preferred in the documentation and http://pylint.pycqa.org correctly redirect to https://pylint.pycqa.org
 
   Closes #3802
 
@@ -645,7 +1312,7 @@ Release date: 2021-08-20
 * Fixed bug with ``cell-var-from-loop`` checker: it no longer has false negatives when
   both ``unused-variable`` and ``used-before-assignment`` are disabled.
 
-* Fix false postive for ``invalid-all-format`` if the list or tuple builtin functions are used
+* Fix false positive for ``invalid-all-format`` if the list or tuple builtin functions are used
 
   Closes #4711
 
@@ -1373,7 +2040,7 @@ Release date: 2021-02-21
 
   Close #3862
 
-* Fix linter multiprocessing pool shutdown (triggered warnings when runned in parallels with other pytest plugins)
+* Fix linter multiprocessing pool shutdown (triggered warnings when ran in parallels with other pytest plugins)
 
   Closes #3779
 
@@ -1400,7 +2067,7 @@ Release date: 2021-02-21
 
   Closes #3468
 
-* Fix ``useless-super-delegation`` false positive when default keyword argument is a dictionnary.
+* Fix ``useless-super-delegation`` false positive when default keyword argument is a dictionary.
 
   Close #3773
 
@@ -3401,7 +4068,7 @@ Release date: 2017-04-13
 
       This message is emitted when pylint finds an one-element tuple,
       created by a stray comma. This can suggest a potential problem in the
-      code and it is recommended to use parantheses in order to emphasise the
+      code and it is recommended to use parentheses in order to emphasise the
       creation of a tuple, rather than relying on the comma itself.
 
     * Don't emit not-callable for instances with unknown bases.
@@ -4101,7 +4768,7 @@ Release date: 2015-11-29
       directory 'test/extensions' and documentation file 'doc/extensions.rst'.
 
     * Added new checker 'extensions.check_docs' that verifies parameter
-      documention in Sphinx, Google, and Numpy style.
+      documentation in Sphinx, Google, and Numpy style.
 
     * Detect undefined variable cases, where the "definition" of an undefined
       variable was in del statement. Instead of emitting used-before-assignment,
@@ -4197,7 +4864,7 @@ Release date: 2015-11-29
       two a binary arithmetic operation is executed between two objects
       which don't support it (a number plus a string for instance).
       This is currently disabled, since the it exhibits way too many false
-      positives, but it will be reenabled as soon as possible.
+      positives, but it will be re-enabled as soon as possible.
 
     * New imported features from astroid into pyreverse: pyreverse.inspector.Project,
       pyreverse.inspector.project_from_files and pyreverse.inspector.interfaces.
@@ -5172,7 +5839,7 @@ Release date: 2012-10-05
 
     * #105337: allow custom reporter in output-format (patch by Kevin Jing Qiu)
 
-    * #104420: check for protocol completness and avoid false R0903
+    * #104420: check for protocol completeness and avoid false R0903
       (patch by Peter Hammond)
 
     * #100654: fix grammatical error for W0332 message (using 'l' as
@@ -5200,7 +5867,7 @@ Release date: 2012-07-17
       except handler contains a tuple of names instead of a single name.
       (patch by tmarek@google.com)
 
-    * #7394: W0212 (access to protected member) not emitted on assigments
+    * #7394: W0212 (access to protected member) not emitted on assignments
       (patch by lothiraldan@gmail.com)
 
     * #18772; no prototype consistency check for mangled methods (patch by
@@ -5795,7 +6462,7 @@ Release date: 2006-03-06
         - the C0101 check with its min-name-length option has
           been removed (this can be specified in the regxp after all...)
         - W0103 and W0121 are now handled by the variables checker
-          (W0103 is now W0603 and W0604 has been splitted into different messages)
+          (W0103 is now W0603 and W0604 has been split into different messages)
         - W0131 and W0132 messages  have been reclassified to C0111 and
           C0112 respectively
         - new W0104 message on statement without effect
@@ -5832,7 +6499,7 @@ Release date: 2006-01-10
       or the default ~/.pylintrc or /etc/pylintrc
 
     * fixed W0706 (Identifier used to raise an exception is assigned...)
-      false positive and reraising a catched exception instance
+      false positive and reraising a caught exception instance
 
     * fixed E0611 (No name get in module blabla) false positive when accessing
       to a class'__dict__
diff --git a/Dockerfile b/Dockerfile
index aafe62a6ae..2667145da8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9.0-alpine3.12
+FROM python:3.10.0-alpine3.15
 
 COPY ./ /tmp/build
 WORKDIR /tmp/build
diff --git a/README.rst b/README.rst
index 32871e01cc..4967a00f9e 100644
--- a/README.rst
+++ b/README.rst
@@ -149,7 +149,27 @@ Do not forget to clone astroid_ and install the last version::
     cd astroid
     python3 -m pip install -e .
 
+Show your usage
+-----------------
 
+You can place this badge in your README to let others know your project uses pylint.
+
+    .. image:: https://img.shields.io/badge/linting-pylint-yellowgreen
+        :target: https://github.com/PyCQA/pylint
+
+Use the badge in your project's README.md (or any other Markdown file)::
+
+    [![linting: pylint](https://img.shields.io/badge/linting-pylint-yellowgreen)](https://github.com/PyCQA/pylint)
+
+Use the badge in your project's README.rst (or any other rst file)::
+
+    .. image:: https://img.shields.io/badge/linting-pylint-yellowgreen
+        :target: https://github.com/PyCQA/pylint
+
+
+If you use GitHub Actions, and one of your CI workflows begins with "name: pylint", you
+can use GitHub's `workflow status badges <https://docs.github.com/en/actions/monitoring-and-troubleshooting-workflows/adding-a-workflow-status-badge#using-the-workflow-file-name>`_
+to show an up-to-date indication of whether pushes to your default branch pass pylint.
 For more detailed information, check the documentation.
 
 .. _here: https://pylint.pycqa.org/en/latest/user_guide/installation.html
diff --git a/doc/Makefile b/doc/Makefile
index 9d8ba83356..39266a91ea 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -150,6 +150,8 @@ features.rst: $(shell find ../pylint/checkers -type f -regex '.*\.py')
 	rm -f features.rst
 	PYTHONPATH=$(PYTHONPATH) $(PYTHON) ./exts/pylint_features.py
 
+messages: $(PYTHONPATH) $(PYTHON) ./exts/pylint_messages.py
+
 gen-examples:
 	chmod u+w ../examples/pylintrc
 	pylint --rcfile=/dev/null --generate-rcfile > ../examples/pylintrc
diff --git a/doc/additional_commands/index.rst b/doc/additional_commands/index.rst
index e4c92cab30..b8ebb15cb6 100644
--- a/doc/additional_commands/index.rst
+++ b/doc/additional_commands/index.rst
@@ -9,7 +9,7 @@ Pyreverse
 ---------
 
 ``pyreverse`` analyzes your source code and generates package and class diagrams.
-It supports output to ``.dot``/``.gv``, ``.vcg`` and ``.puml``/``.plantuml`` (PlantUML) file formats.
+It supports output to ``.dot``/``.gv``, ``.vcg``, ``.puml``/``.plantuml`` (PlantUML) and ``.mmd``/``.html`` (MermaidJS) file formats.
 If Graphviz (or the ``dot`` command) is installed, all `output formats supported by Graphviz <https://graphviz.org/docs/outputs/>`_
 can be used as well. In this case, ``pyreverse`` first generates a temporary ``.gv`` file, which is then
 fed to Graphviz to generate the final image.
diff --git a/doc/conf.py b/doc/conf.py
index d76cc67e3b..8b548ddc33 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -1,4 +1,7 @@
-#
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 # Pylint documentation build configuration file, created by
 # sphinx-quickstart on Thu Apr  4 20:31:25 2013.
 #
@@ -36,6 +39,7 @@
 extensions = [
     "pylint_features",
     "pylint_extensions",
+    "pylint_messages",
     "sphinx.ext.autosectionlabel",
     "sphinx.ext.intersphinx",
 ]
@@ -72,7 +76,7 @@
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ["_build"]
+exclude_patterns = ["_build", "data/**"]
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 # default_role = None
diff --git a/doc/data/messages/a/abstract-class-instantiated/bad.py b/doc/data/messages/a/abstract-class-instantiated/bad.py
new file mode 100644
index 0000000000..f514a5c3df
--- /dev/null
+++ b/doc/data/messages/a/abstract-class-instantiated/bad.py
@@ -0,0 +1,10 @@
+import abc
+
+
+class Animal(abc.ABC):
+    @abc.abstractmethod
+    def make_sound(self):
+        pass
+
+
+sheep = Animal()  # [abstract-class-instantiated]
diff --git a/doc/data/messages/a/abstract-class-instantiated/good.py b/doc/data/messages/a/abstract-class-instantiated/good.py
new file mode 100644
index 0000000000..c9dbce107b
--- /dev/null
+++ b/doc/data/messages/a/abstract-class-instantiated/good.py
@@ -0,0 +1,15 @@
+import abc
+
+
+class Animal(abc.ABC):
+    @abc.abstractmethod
+    def make_sound(self):
+        pass
+
+
+class Sheep(Animal):
+    def make_sound(self):
+        print("bhaaaaa")
+
+
+sheep = Sheep()
diff --git a/doc/data/messages/a/abstract-method/bad.py b/doc/data/messages/a/abstract-method/bad.py
new file mode 100644
index 0000000000..8b8ddf0f97
--- /dev/null
+++ b/doc/data/messages/a/abstract-method/bad.py
@@ -0,0 +1,20 @@
+class Pet:
+    def make_sound(self):
+        raise NotImplementedError
+
+
+class Cat(Pet):  # [abstract-method]
+    pass
+
+
+import abc
+
+
+class WildAnimal:
+    @abc.abstractmethod
+    def make_sound(self):
+        pass
+
+
+class Panther(WildAnimal):  # [abstract-method]
+    pass
diff --git a/doc/data/messages/a/abstract-method/good.py b/doc/data/messages/a/abstract-method/good.py
new file mode 100644
index 0000000000..4c4cda3f44
--- /dev/null
+++ b/doc/data/messages/a/abstract-method/good.py
@@ -0,0 +1,22 @@
+class Pet:
+    def make_sound(self):
+        raise NotImplementedError
+
+
+class Cat(Pet):
+    def make_sound(self):
+        print("Meeeow")
+
+
+import abc
+
+
+class WildAnimal:
+    @abc.abstractmethod
+    def make_sound(self):
+        pass
+
+
+class Panther(WildAnimal):
+    def make_sound(self):
+        print("MEEEOW")
diff --git a/doc/data/messages/a/access-member-before-definition/bad.py b/doc/data/messages/a/access-member-before-definition/bad.py
new file mode 100644
index 0000000000..cb17c86eef
--- /dev/null
+++ b/doc/data/messages/a/access-member-before-definition/bad.py
@@ -0,0 +1,5 @@
+class Foo:
+    def __init__(self, param):
+        if self.param:  # [access-member-before-definition]
+            pass
+        self.param = param
diff --git a/doc/data/messages/a/access-member-before-definition/good.py b/doc/data/messages/a/access-member-before-definition/good.py
new file mode 100644
index 0000000000..b2c877a4bd
--- /dev/null
+++ b/doc/data/messages/a/access-member-before-definition/good.py
@@ -0,0 +1,5 @@
+class Foo:
+    def __init__(self, param):
+        self.param = param
+        if self.param:
+            pass
diff --git a/doc/data/messages/a/anomalous-backslash-in-string/bad.py b/doc/data/messages/a/anomalous-backslash-in-string/bad.py
new file mode 100644
index 0000000000..08d8d1d6f4
--- /dev/null
+++ b/doc/data/messages/a/anomalous-backslash-in-string/bad.py
@@ -0,0 +1 @@
+string = "\z"  # [anomalous-backslash-in-string]
diff --git a/doc/data/messages/a/anomalous-backslash-in-string/good.py b/doc/data/messages/a/anomalous-backslash-in-string/good.py
new file mode 100644
index 0000000000..c2465e711c
--- /dev/null
+++ b/doc/data/messages/a/anomalous-backslash-in-string/good.py
@@ -0,0 +1,2 @@
+string = r"\z"
+string = "\n"
diff --git a/doc/data/messages/a/anomalous-unicode-escape-in-string/bad.py b/doc/data/messages/a/anomalous-unicode-escape-in-string/bad.py
new file mode 100644
index 0000000000..40a2a0caff
--- /dev/null
+++ b/doc/data/messages/a/anomalous-unicode-escape-in-string/bad.py
@@ -0,0 +1 @@
+print(b"\u{0}".format("0394"))  # [anomalous-unicode-escape-in-string]
diff --git a/doc/data/messages/a/anomalous-unicode-escape-in-string/good.py b/doc/data/messages/a/anomalous-unicode-escape-in-string/good.py
new file mode 100644
index 0000000000..f2285d70c9
--- /dev/null
+++ b/doc/data/messages/a/anomalous-unicode-escape-in-string/good.py
@@ -0,0 +1 @@
+print(b"\\u{0}".format("0394"))
diff --git a/doc/data/messages/a/assert-on-string-literal/bad.py b/doc/data/messages/a/assert-on-string-literal/bad.py
new file mode 100644
index 0000000000..d7c735baba
--- /dev/null
+++ b/doc/data/messages/a/assert-on-string-literal/bad.py
@@ -0,0 +1,2 @@
+def test():
+    assert "There is an AssertionError"  # [assert-on-string-literal]
diff --git a/doc/data/messages/a/assert-on-string-literal/good.py b/doc/data/messages/a/assert-on-string-literal/good.py
new file mode 100644
index 0000000000..436a8502f3
--- /dev/null
+++ b/doc/data/messages/a/assert-on-string-literal/good.py
@@ -0,0 +1,2 @@
+def test():
+    # Nothing, as an assert of a string literal will always pass
diff --git a/doc/data/messages/a/assert-on-tuple/bad.py b/doc/data/messages/a/assert-on-tuple/bad.py
new file mode 100644
index 0000000000..ffcc34c536
--- /dev/null
+++ b/doc/data/messages/a/assert-on-tuple/bad.py
@@ -0,0 +1 @@
+assert (1, None)  # [assert-on-tuple]
diff --git a/doc/data/messages/a/assert-on-tuple/good.py b/doc/data/messages/a/assert-on-tuple/good.py
new file mode 100644
index 0000000000..cea57cf274
--- /dev/null
+++ b/doc/data/messages/a/assert-on-tuple/good.py
@@ -0,0 +1,3 @@
+x, y = (1, None)
+assert x
+assert y
diff --git a/doc/data/messages/b/bad-open-mode/bad.py b/doc/data/messages/b/bad-open-mode/bad.py
new file mode 100644
index 0000000000..28cfb62283
--- /dev/null
+++ b/doc/data/messages/b/bad-open-mode/bad.py
@@ -0,0 +1,3 @@
+def foo(file_path):
+    with open(file_path, "rwx") as file:  # [bad-open-mode]
+        contents = file.read()
diff --git a/doc/data/messages/b/bad-open-mode/good.py b/doc/data/messages/b/bad-open-mode/good.py
new file mode 100644
index 0000000000..64a853b38c
--- /dev/null
+++ b/doc/data/messages/b/bad-open-mode/good.py
@@ -0,0 +1,3 @@
+def foo(file_path):
+    with open(file_path, "r") as file:
+        contents = file.read()
diff --git a/doc/data/messages/e/empty-docstring/bad.py b/doc/data/messages/e/empty-docstring/bad.py
new file mode 100644
index 0000000000..33dbb5f881
--- /dev/null
+++ b/doc/data/messages/e/empty-docstring/bad.py
@@ -0,0 +1,2 @@
+def foo():  # [empty-docstring]
+    """"""
diff --git a/doc/data/messages/e/empty-docstring/good.py b/doc/data/messages/e/empty-docstring/good.py
new file mode 100644
index 0000000000..b587ca4c6c
--- /dev/null
+++ b/doc/data/messages/e/empty-docstring/good.py
@@ -0,0 +1,2 @@
+def foo():
+    """A dummy description."""
diff --git a/doc/data/messages/r/redundant-unittest-assert/bad.py b/doc/data/messages/r/redundant-unittest-assert/bad.py
new file mode 100644
index 0000000000..dcfc2e2e4b
--- /dev/null
+++ b/doc/data/messages/r/redundant-unittest-assert/bad.py
@@ -0,0 +1,6 @@
+import unittest
+
+
+class DummyTestCase(unittest.TestCase):
+    def test_dummy(self):
+        self.assertTrue("foo")  # [redundant-unittest-assert]
diff --git a/doc/data/messages/r/redundant-unittest-assert/good.py b/doc/data/messages/r/redundant-unittest-assert/good.py
new file mode 100644
index 0000000000..b176d020da
--- /dev/null
+++ b/doc/data/messages/r/redundant-unittest-assert/good.py
@@ -0,0 +1,6 @@
+import unittest
+
+
+class DummyTestCase(unittest.TestCase):
+    def test_dummy(self):
+        # Nothing, as an assert of a string literal will always pass
diff --git a/doc/data/messages/u/unspecified-encoding/bad.py b/doc/data/messages/u/unspecified-encoding/bad.py
new file mode 100644
index 0000000000..4645923c58
--- /dev/null
+++ b/doc/data/messages/u/unspecified-encoding/bad.py
@@ -0,0 +1,3 @@
+def foo(file_path):
+    with open(file_path) as file:  # [unspecified-encoding]
+        contents = file.read()
diff --git a/doc/data/messages/u/unspecified-encoding/good.py b/doc/data/messages/u/unspecified-encoding/good.py
new file mode 100644
index 0000000000..a267a36070
--- /dev/null
+++ b/doc/data/messages/u/unspecified-encoding/good.py
@@ -0,0 +1,3 @@
+def foo(file_path):
+    with open(file_path, encoding="utf-8") as file:
+        contents = file.read()
diff --git a/doc/data/messages/y/yield-inside-async-function/bad.py b/doc/data/messages/y/yield-inside-async-function/bad.py
new file mode 100644
index 0000000000..6e1d6bd28b
--- /dev/null
+++ b/doc/data/messages/y/yield-inside-async-function/bad.py
@@ -0,0 +1,2 @@
+async def foo():
+    yield from [1, 2, 3]  # [yield-inside-async-function]
diff --git a/doc/data/messages/y/yield-inside-async-function/details.rst b/doc/data/messages/y/yield-inside-async-function/details.rst
new file mode 100644
index 0000000000..7d05701aeb
--- /dev/null
+++ b/doc/data/messages/y/yield-inside-async-function/details.rst
@@ -0,0 +1 @@
+The message can't be emitted when using Python < 3.5.
diff --git a/doc/data/messages/y/yield-inside-async-function/good.py b/doc/data/messages/y/yield-inside-async-function/good.py
new file mode 100644
index 0000000000..1af96506b5
--- /dev/null
+++ b/doc/data/messages/y/yield-inside-async-function/good.py
@@ -0,0 +1,7 @@
+async def foo():
+    def _inner_foo():
+        yield from [1, 2, 3]
+
+
+async def foo():
+    yield 42
diff --git a/doc/data/messages/y/yield-inside-async-function/related.rst b/doc/data/messages/y/yield-inside-async-function/related.rst
new file mode 100644
index 0000000000..98cb4e3a92
--- /dev/null
+++ b/doc/data/messages/y/yield-inside-async-function/related.rst
@@ -0,0 +1 @@
+- `PEP 525 <https://peps.python.org/pep-0525/>`_
diff --git a/doc/development_guide/contribute.rst b/doc/development_guide/contribute.rst
index 8e484a5147..a157532406 100644
--- a/doc/development_guide/contribute.rst
+++ b/doc/development_guide/contribute.rst
@@ -87,8 +87,8 @@ of Pylint as it gives you access to the latest ``ast`` parser.
 
 - Add a short entry in :file:`doc/whatsnew/VERSION.rst`.
 
-- Add yourself to the `CONTRIBUTORS` file, flag yourself appropriately
-  (if in doubt, you're a ``contributor``).
+- If you used multiple emails or multiple names when contributing, add your mails
+  and preferred name in the ``script/.contributors_aliases.json`` file.
 
 - Write a comprehensive commit message
 
@@ -101,8 +101,6 @@ of Pylint as it gives you access to the latest ``ast`` parser.
 - Send a pull request from GitHub (see `About pull requests`_ for more insight
   about this topic)
 
-
-
 .. _`Closing issues via commit messages`: https://help.github.com/articles/closing-issues-via-commit-messages/
 .. _`About pull requests`: https://help.github.com/articles/using-pull-requests/
 .. _tox: https://tox.readthedocs.io/en/latest/
diff --git a/doc/development_guide/index.rst b/doc/development_guide/index.rst
index 50343e4c9e..190efa3692 100644
--- a/doc/development_guide/index.rst
+++ b/doc/development_guide/index.rst
@@ -8,3 +8,4 @@ Development
 
    contribute
    testing
+   profiling
diff --git a/doc/development_guide/profiling.rst b/doc/development_guide/profiling.rst
new file mode 100644
index 0000000000..13a8bbaf4d
--- /dev/null
+++ b/doc/development_guide/profiling.rst
@@ -0,0 +1,118 @@
+.. -*- coding: utf-8 -*-
+.. _profiling:
+
+===================================
+ Profiling and performance analysis
+===================================
+
+Performance analysis for Pylint
+-------------------------------
+
+To analyse the performance of Pylint we recommend to use the ``cProfile`` module
+from ``stdlib``. Together with the ``pstats`` module this should give you all the tools
+you need to profile a Pylint run and see which functions take how long to run.
+
+The documentation for both modules can be found at cProfile_.
+
+To profile a run of Pylint over itself you can use the following code and run it from the base directory.
+Note that ``cProfile`` will create a document called ``stats`` that is then read by ``pstats``. The
+human-readable output will be stored by ``pstats`` in ``./profiler_stats``. It will be sorted by
+``cumulative time``:
+
+.. sourcecode:: python
+
+    import cProfile
+    import pstats
+    import sys
+
+    sys.argv = ["pylint", "pylint"]
+    cProfile.run("from pylint import __main__", "stats")
+
+    with open("profiler_stats", "w", encoding="utf-8") as file:
+        stats = pstats.Stats("stats", stream=file)
+        stats.sort_stats("cumtime")
+        stats.print_stats()
+
+You can also interact with the stats object by sorting or restricting the output.
+For example, to only print functions from the ``pylint`` module and sort by cumulative time you could
+use:
+
+.. sourcecode:: python
+
+    import cProfile
+    import pstats
+    import sys
+
+    sys.argv = ["pylint", "pylint"]
+    cProfile.run("from pylint import __main__", "stats")
+
+    with open("profiler_stats", "w", encoding="utf-8") as file:
+        stats = pstats.Stats("stats", stream=file)
+        stats.sort_stats("cumtime")
+        stats.print_stats("pylint/pylint")
+
+Lastly, to profile a run over your own module or code you can use:
+
+.. sourcecode:: python
+
+    import cProfile
+    import pstats
+    import sys
+
+    sys.argv = ["pylint", "your_dir/your_file"]
+    cProfile.run("from pylint import __main__", "stats")
+
+    with open("profiler_stats", "w", encoding="utf-8") as file:
+        stats = pstats.Stats("stats", stream=file)
+        stats.sort_stats("cumtime")
+        stats.print_stats()
+
+The documentation of the ``pstats`` module discusses other possibilites to interact with
+the profiling output.
+
+
+Performance analysis of a specific checker
+------------------------------------------
+
+To analyse the performance of specific checker within Pylint we can use the human-readable output
+created by ``pstats``.
+
+If you search in the ``profiler_stats`` file for the file name of the checker you will find all functional
+calls from functions within the checker. Let's say we want to check the ``visit_importfrom`` method of the
+``variables`` checker::
+
+    ncalls  tottime  percall  cumtime  percall filename:lineno(function)
+    622    0.006    0.000    8.039    0.013 /MY_PROGRAMMING_DIR/pylint/pylint/checkers/variables.py:1445(visit_importfrom)
+
+The previous line tells us that this method was called 622 times during the profile and we were inside the
+function itself for 6 ms in total. The time per call is less than a millisecond (0.006 / 622)
+and thus is displayed as being 0.
+
+Often you are more interested in the cumulative time (per call). This refers to the time spend within the function
+and any of the functions it called or they functions they called (etc.). In our example, the ``visit_importfrom``
+method and all of its child-functions took a little over 8 seconds to exectute, with an execution time of
+0.013 ms per call.
+
+You can also search the ``profiler_stats`` for an individual function you want to check. For example
+``_analyse_fallback_blocks``, a function called by ``visit_importfrom`` in the ``variables`` checker. This
+allows more detailed analysis of specific functions::
+
+    ncalls  tottime  percall  cumtime  percall filename:lineno(function)
+    1    0.000    0.000    0.000    0.000 /MY_PROGRAMMING_DIR/pylint/pylint/checkers/variables.py:1511(_analyse_fallback_blocks)
+
+
+Parsing the profiler stats with other tools
+-------------------------------------------
+
+Often you might want to create a visual representation of your profiling stats. A good tool
+to do this is gprof2dot_. This tool can create a ``.dot`` file from the profiling stats
+created by ``cProfile`` and ``pstats``. You can then convert the ``.dot`` file to a ``.png``
+file with one of the many converters found online.
+
+You can read the gprof2dot_ documentation for installation instructions for your specific environment.
+
+Another option would be snakeviz_.
+
+.. _cProfile: https://docs.python.org/3/library/profile.html
+.. _gprof2dot: https://github.com/jrfonseca/gprof2dot
+.. _snakeviz: https://jiffyclub.github.io/snakeviz/
diff --git a/doc/development_guide/testing.rst b/doc/development_guide/testing.rst
index 85d1043ef8..af14ad4aba 100644
--- a/doc/development_guide/testing.rst
+++ b/doc/development_guide/testing.rst
@@ -12,6 +12,14 @@ Test your code!
 
 Pylint is very well tested and has a high code coverage. New contributions are not accepted
 unless they include tests.
+
+Before you start testing your code, you need to install your source-code package locally.
+To set up your environment for testing, open a terminal outside of your forked repository and run:
+
+      pip install -e <forked_repo_dir_name>
+
+This ensures your testing environment is similar to Pylint's testing environment on GitHub.
+
 Pylint uses two types of tests: unittests and functional tests.
 
   - The unittests can be found in the ``/pylint/test`` directory and they can
@@ -75,12 +83,32 @@ can have sections of Pylint's configuration.
 The .rc file can also contain a section ``[testoptions]`` to pass options for the functional
 test runner. The following options are currently supported:
 
-    "min_pyver": Minimal python version required to run the test
-    "max_pyver": Python version from which the test won't be run. If the last supported version is 3.9 this setting should be set to 3.10.
-    "min_pyver_end_position": Minimal python version required to check the end_line and end_column attributes of the message
-    "requires": Packages required to be installed locally to run the test
-    "except_implementations": List of python implementations on which the test should not run
-    "exclude_platforms": List of operating systems on which the test should not run
+- "min_pyver": Minimal python version required to run the test
+- "max_pyver": Python version from which the test won't be run. If the last supported version is 3.9 this setting should be set to 3.10.
+- "min_pyver_end_position": Minimal python version required to check the end_line and end_column attributes of the message
+- "requires": Packages required to be installed locally to run the test
+- "except_implementations": List of python implementations on which the test should not run
+- "exclude_platforms": List of operating systems on which the test should not run
+
+**Functional test file locations**
+
+For existing checkers, new test cases should preferably be appended to the existing test file.
+For new checkers, a new file ``new_checker_message.py`` should be created (Note the use of
+underscores). This file should then be placed in the ``test/functional/n`` sub-directory.
+
+Some additional notes:
+
+- If the checker is part of an extension the test should go in ``test/functional/ext/extension_name``
+- If the test is a regression test it should go in ``test/r/regression`` or ``test/r/regression_02``.
+  The file name should start with ``regression_``.
+- For some sub-directories, such as ``test/functional/u``, there are additional sub-directories (``test/functional/u/use``).
+  Please check if your test file should be placed in any of these directories. It should be placed there
+  if the sub-directory name matches the word before the first underscore of your test file name.
+
+The folder structure is enforced when running the test suite, so you might be directed to put the file
+in a different sub-directory.
+
+**Running and updating functional tests**
 
 During development, it's sometimes helpful to run all functional tests in your
 current environment in order to have faster feedback. Run from Pylint root directory with::
diff --git a/doc/exts/pylint_extensions.py b/doc/exts/pylint_extensions.py
index 31678735d7..da1b9ee2e4 100755
--- a/doc/exts/pylint_extensions.py
+++ b/doc/exts/pylint_extensions.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
+
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Script used to generate the extensions file before building the actual documentation."""
 
@@ -14,16 +16,9 @@
 from pylint.lint import PyLinter
 from pylint.utils import get_rst_title
 
-# Some modules have been renamed and deprecated under their old names.
-# Skip documenting these modules since:
-# 1) They are deprecated, why document them moving forward?
-# 2) We can't load the deprecated module and the newly renamed module at the
-# same time without getting naming conflicts
-DEPRECATED_MODULES = ["check_docs"]  # ==> docparams
-
 
 def builder_inited(app):
-    """Output full documentation in ReST format for all extension modules"""
+    """Output full documentation in ReST format for all extension modules."""
     # PACKAGE/docs/exts/pylint_extensions.py --> PACKAGE/
     base_path = os.path.dirname(
         os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -34,7 +29,7 @@ def builder_inited(app):
     doc_files = {}
     for filename in os.listdir(ext_path):
         name, ext = os.path.splitext(filename)
-        if name[0] == "_" or name in DEPRECATED_MODULES:
+        if name[0] == "_":
             continue
         if ext == ".py":
             modules.append(f"pylint.extensions.{name}")
diff --git a/doc/exts/pylint_features.py b/doc/exts/pylint_features.py
index a867dd05fe..a605102243 100755
--- a/doc/exts/pylint_features.py
+++ b/doc/exts/pylint_features.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
+
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Script used to generate the features file before building the actual documentation."""
 
diff --git a/doc/exts/pylint_messages.py b/doc/exts/pylint_messages.py
new file mode 100644
index 0000000000..5c63171264
--- /dev/null
+++ b/doc/exts/pylint_messages.py
@@ -0,0 +1,304 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Script used to generate the messages files."""
+
+import os
+from collections import defaultdict
+from pathlib import Path
+from typing import DefaultDict, Dict, List, NamedTuple, Optional, Tuple
+
+from sphinx.application import Sphinx
+
+from pylint.checkers import initialize as initialize_checkers
+from pylint.constants import MSG_TYPES
+from pylint.extensions import initialize as initialize_extensions
+from pylint.lint import PyLinter
+from pylint.message import MessageDefinition
+from pylint.utils import get_rst_title
+
+PYLINT_BASE_PATH = Path(__file__).resolve().parent.parent.parent
+"""Base path to the project folder."""
+
+PYLINT_MESSAGES_PATH = PYLINT_BASE_PATH / "doc" / "messages"
+"""Path to the messages documentation folder."""
+
+PYLINT_MESSAGES_DATA_PATH = PYLINT_BASE_PATH / "doc" / "data" / "messages"
+"""Path to the folder with data for the messages documentation."""
+
+MSG_TYPES_DOC = {k: v if v != "info" else "information" for k, v in MSG_TYPES.items()}
+
+
+class MessageData(NamedTuple):
+    checker: str
+    id: str
+    name: str
+    definition: MessageDefinition
+    good_code: str
+    bad_code: str
+    details: str
+    related_links: str
+
+
+MessagesDict = Dict[str, List[MessageData]]
+OldMessagesDict = Dict[str, DefaultDict[Tuple[str, str], List[Tuple[str, str]]]]
+"""DefaultDict is indexed by tuples of (old name symbol, old name id) and values are
+tuples of (new name symbol, new name category)
+"""
+
+
+def _register_all_checkers_and_extensions(linter: PyLinter) -> None:
+    """Registers all checkers and extensions found in the default folders."""
+    initialize_checkers(linter)
+    initialize_extensions(linter)
+
+
+def _get_message_data(data_path: Path) -> Tuple[str, str, str, str]:
+    """Get the message data from the specified path."""
+    good_code, bad_code, details, related = "", "", "", ""
+
+    if not data_path.exists():
+        return good_code, bad_code, details, related
+
+    if (data_path / "good.py").exists():
+        with open(data_path / "good.py", encoding="utf-8") as file:
+            file_content = file.readlines()
+            indented_file_content = "".join("  " + i for i in file_content)
+            good_code = f"""
+**Correct code:**
+
+.. code-block:: python
+
+{indented_file_content}"""
+
+    if (data_path / "bad.py").exists():
+        with open(data_path / "bad.py", encoding="utf-8") as file:
+            file_content = file.readlines()
+            indented_file_content = "".join("  " + i for i in file_content)
+            bad_code = f"""
+**Problematic code:**
+
+.. code-block:: python
+
+{indented_file_content}"""
+
+    if (data_path / "details.rst").exists():
+        with open(data_path / "details.rst", encoding="utf-8") as file:
+            file_content_string = file.read()
+            details = f"""
+**Additional details:**
+
+{file_content_string}"""
+
+    if (data_path / "related.rst").exists():
+        with open(data_path / "related.rst", encoding="utf-8") as file:
+            file_content_string = file.read()
+            related = f"""
+**Related links:**
+
+{file_content_string}"""
+
+    return good_code, bad_code, details, related
+
+
+def _get_all_messages(
+    linter: PyLinter,
+) -> Tuple[MessagesDict, OldMessagesDict]:
+    """Get all messages registered to a linter and return a dictionary indexed by message
+    type.
+
+    Also return a dictionary of old message and the new messages they can be mapped to.
+    """
+    messages_dict: MessagesDict = {
+        "fatal": [],
+        "error": [],
+        "warning": [],
+        "convention": [],
+        "refactor": [],
+        "information": [],
+    }
+    old_messages: OldMessagesDict = {
+        "fatal": defaultdict(list),
+        "error": defaultdict(list),
+        "warning": defaultdict(list),
+        "convention": defaultdict(list),
+        "refactor": defaultdict(list),
+        "information": defaultdict(list),
+    }
+    for message in linter.msgs_store.messages:
+        message_data_path = (
+            PYLINT_MESSAGES_DATA_PATH / message.symbol[0] / message.symbol
+        )
+        good_code, bad_code, details, related = _get_message_data(message_data_path)
+
+        message_data = MessageData(
+            message.checker_name,
+            message.msgid,
+            message.symbol,
+            message,
+            good_code,
+            bad_code,
+            details,
+            related,
+        )
+        messages_dict[MSG_TYPES_DOC[message.msgid[0]]].append(message_data)
+
+        if message.old_names:
+            for old_name in message.old_names:
+                category = MSG_TYPES_DOC[old_name[0][0]]
+                old_messages[category][(old_name[1], old_name[0])].append(
+                    (message.symbol, MSG_TYPES_DOC[message.msgid[0]])
+                )
+
+    return messages_dict, old_messages
+
+
+def _write_message_page(messages_dict: MessagesDict) -> None:
+    """Create or overwrite the file for each message."""
+    for category, messages in messages_dict.items():
+        category_dir = PYLINT_MESSAGES_PATH / category
+        if not category_dir.exists():
+            category_dir.mkdir(parents=True, exist_ok=True)
+        for message in messages:
+            messages_file = os.path.join(category_dir, f"{message.name}.rst")
+            with open(messages_file, "w", encoding="utf-8") as stream:
+                stream.write(
+                    f""".. _{message.name}:
+
+{get_rst_title(f"{message.name} / {message.id}", "=")}
+**Message emitted:**
+
+{message.definition.msg}
+
+**Description:**
+
+*{message.definition.description}*
+
+{message.good_code}
+{message.bad_code}
+{message.details}
+{message.related_links}
+
+Created by ``{message.checker}`` checker
+"""
+                )
+
+
+def _write_messages_list_page(
+    messages_dict: MessagesDict, old_messages_dict: OldMessagesDict
+) -> None:
+    """Create or overwrite the page with the list of all messages."""
+    messages_file = os.path.join(PYLINT_MESSAGES_PATH, "messages_list.rst")
+    with open(messages_file, "w", encoding="utf-8") as stream:
+        # Write header of file
+        stream.write(
+            f""".. _messages-list:
+
+{get_rst_title("Overview of all Pylint messages", "=")}
+..
+  NOTE This file is auto-generated. Make any changes to the associated
+  docs extension in 'pylint_messages.py'.
+
+Pylint can emit the following messages:
+
+"""
+        )
+
+        # Iterate over tuple to keep same order
+        for category in (
+            "fatal",
+            "error",
+            "warning",
+            "convention",
+            "refactor",
+            "information",
+        ):
+            messages = sorted(messages_dict[category], key=lambda item: item.name)
+            old_messages = sorted(old_messages_dict[category], key=lambda item: item[0])
+            messages_string = "".join(
+                f"   {category}/{message.name}.rst\n" for message in messages
+            )
+            old_messages_string = "".join(
+                f"   {category}/{old_message[0]}.rst\n" for old_message in old_messages
+            )
+
+            # Write list per category
+            stream.write(
+                f"""{get_rst_title(category.capitalize(), "-")}
+All messages in the {category} category:
+
+.. toctree::
+   :maxdepth: 2
+   :titlesonly:
+
+{messages_string}
+All renamed messages in the {category} category:
+
+.. toctree::
+   :maxdepth: 1
+   :titlesonly:
+
+{old_messages_string}
+
+"""
+            )
+
+
+def _write_redirect_pages(old_messages: OldMessagesDict) -> None:
+    """Create redirect pages for old-messages."""
+    for category, old_names in old_messages.items():
+        category_dir = PYLINT_MESSAGES_PATH / category
+        if not os.path.exists(category_dir):
+            os.makedirs(category_dir)
+        for old_name, new_names in old_names.items():
+            old_name_file = os.path.join(category_dir, f"{old_name[0]}.rst")
+            with open(old_name_file, "w", encoding="utf-8") as stream:
+                new_names_string = "".join(
+                    f"   ../{new_name[1]}/{new_name[0]}.rst\n" for new_name in new_names
+                )
+                stream.write(
+                    f""".. _{old_name[0]}:
+
+{get_rst_title(" / ".join(old_name), "=")}
+"{old_name[0]} has been renamed. The new message can be found at:
+
+.. toctree::
+   :maxdepth: 2
+   :titlesonly:
+
+{new_names_string}
+"""
+                )
+
+
+# pylint: disable-next=unused-argument
+def build_messages_pages(app: Optional[Sphinx]) -> None:
+    """Overwrite messages files by printing the documentation to a stream.
+
+    Documentation is written in ReST format.
+    """
+    # Create linter, register all checkers and extensions and get all messages
+    linter = PyLinter()
+    _register_all_checkers_and_extensions(linter)
+    messages, old_messages = _get_all_messages(linter)
+
+    # Write message and category pages
+    _write_message_page(messages)
+    _write_messages_list_page(messages, old_messages)
+
+    # Write redirect pages
+    _write_redirect_pages(old_messages)
+
+
+def setup(app: Sphinx) -> None:
+    """Connects the extension to the Sphinx process."""
+    # Register callback at the builder-inited Sphinx event
+    # See https://www.sphinx-doc.org/en/master/extdev/appapi.html
+    app.connect("builder-inited", build_messages_pages)
+
+
+if __name__ == "__main__":
+    pass
+    # Uncomment to allow running this script by your local python interpreter
+    # build_messages_pages(None)
diff --git a/doc/faq.rst b/doc/faq.rst
index 6a401bf25d..04e3b14935 100644
--- a/doc/faq.rst
+++ b/doc/faq.rst
@@ -59,7 +59,7 @@ The supported running environment since Pylint 2.12.1 is Python 3.6.2+.
 
 Pylint expects the name of a package or module as its argument. As a
 convenience, you can give it a file name if it's possible to guess a module name from
-the file's path using the python path. Some examples :
+the file's path using the python path. Some examples:
 
 "pylint mymodule.py" should always work since the current working
 directory is automatically added on top of the python path
@@ -116,28 +116,48 @@ For example::
 
 Much probably. Read :ref:`ide-integration`
 
+3.5 I need to run pylint over all modules and packages in my project directory.
+-------------------------------------------------------------------------------
+
+By default the ``pylint`` command only accepts a list of python modules and packages. Using a
+directory which is not a package results in an error::
+
+    pylint mydir
+    ************* Module mydir
+    mydir/__init__.py:1:0: F0010: error while code parsing: Unable to load file mydir/__init__.py:
+    [Errno 2] No such file or directory: 'mydir/__init__.py' (parse-error)
+
+To execute pylint over all modules and packages under the directory, the ``--recursive=y`` option must
+be provided. This option makes ``pylint`` attempt to discover all modules (files ending with ``.py`` extension)
+and all packages (all directories containing a ``__init__.py`` file).
+Those modules and packages are then analyzed::
+
+    pylint --recursive=y mydir
+
+When ``--recursive=y`` option is used, modules and packages are also accepted as parameters::
+
+    pylint --recursive=y mydir mymodule mypackage
 
 4. Message Control
 ==================
 
 4.1 How to disable a particular message?
------------------------------------------------------------
+----------------------------------------
 
-For a single line : Add ``#pylint: disable=some-message,another-one`` at the
-end of the desired line of code. Since Pylint 2.10 you can also use
-``#pylint: disable-next=...`` on the line just above the problem.
-``...`` in the following example is a short hand for the list of
-messages you want to disable.
+For just a single line, add ``#pylint: disable=some-message,another-one`` at the end of
+the desired line of code. Since Pylint 2.10 you can also use ``#pylint: disable-next=...``
+on the line just above the problem. ``...`` in the following example is short for the
+list of messages you want to disable.
 
-For larger disable : You can add ``#pylint: disable=...`` at the block level to
-disable for the block. It's possible to enable for the reminder of the block
-with ``#pylint: enable=...`` A block is either a scope (say a function, a module),
-or a multiline statement (try, finally, if statements, for loops).
-`It's currently impossible to disable inside an else block`_
+For larger amounts of code, you can add ``#pylint: disable=...`` at the block level
+to disable messages for the entire block. It's possible to re-enable a message for the
+remainder of the block with ``#pylint: enable=...``. A block is either a scope (say a
+function, a module) or a multiline statement (try, finally, if statements, for loops).
+Note: It's currently impossible to `disable inside an else block`_.
 
 Read :ref:`message-control` for details and examples.
 
-.. _`It's currently impossible to disable inside an else block`: https://github.com/PyCQA/pylint/issues/872
+.. _`disable inside an else block`: https://github.com/PyCQA/pylint/issues/872
 
 4.2 Is there a way to disable a message for a particular module only?
 ---------------------------------------------------------------------
@@ -201,7 +221,7 @@ You can see the plugin you need to explicitly `load in the technical reference`_
 4.8 I am using another popular linter alongside pylint. Which messages should I disable to avoid duplicates?
 ------------------------------------------------------------------------------------------------------------
 
-pycodestyle_: unneeded-not, line-too-long, unnecessary-semicolon, trailing-whitespace, missing-final-newline, bad-indentation, multiple-statements, bare-except
+pycodestyle_: unneeded-not, line-too-long, unnecessary-semicolon, trailing-whitespace, missing-final-newline, bad-indentation, multiple-statements, bare-except, wrong-import-position
 
 pyflakes_: undefined-variable, unused-import, unused-variable
 
@@ -249,15 +269,16 @@ default value by changing the mixin-class-rgx option.
 6.1 Pylint gave my code a negative rating out of ten. That can't be right!
 --------------------------------------------------------------------------
 
-Even though the final rating Pylint renders is nominally out of ten, there's no
-lower bound on it. By default, the formula to calculate score is ::
-
-    10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+Prior to Pylint 2.13.0, the score formula used by default had no lower
+bound. The new default score formula is ::
 
-However, this option can be changed in the Pylint rc file. If having negative
-values really bugs you, you can set the formula to be the maximum of 0 and the
-above expression.
+    max(0, 0 if fatal else 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10))
 
+If your project contains a configuration file created by an earlier version of
+Pylint, you can set ``evaluation`` to the above expression to get the new
+behavior. Likewise, since negative values are still technically supported,
+``evaluation`` can be set to a version of the above expression that does not
+enforce a floor of zero.
 
 6.2 I think I found a bug in Pylint. What should I do?
 -------------------------------------------------------
diff --git a/doc/how_tos/custom_checkers.rst b/doc/how_tos/custom_checkers.rst
index 0f6ff60626..bfa623a9d4 100644
--- a/doc/how_tos/custom_checkers.rst
+++ b/doc/how_tos/custom_checkers.rst
@@ -37,30 +37,36 @@ Firstly we will need to fill in some required boilerplate:
 
   import astroid
   from astroid import nodes
+  from typing import TYPE_CHECKING, Optional
 
   from pylint.checkers import BaseChecker
   from pylint.interfaces import IAstroidChecker
-  from pylint.lint import PyLinter
+
+  if TYPE_CHECKING:
+      from pylint.lint import PyLinter
+
 
   class UniqueReturnChecker(BaseChecker):
       __implements__ = IAstroidChecker
 
-      name = 'unique-returns'
+      name = "unique-returns"
       priority = -1
       msgs = {
-          'W0001': (
-              'Returns a non-unique constant.',
-              'non-unique-returns',
-              'All constants returned in a function should be unique.'
+          "W0001": (
+              "Returns a non-unique constant.",
+              "non-unique-returns",
+              "All constants returned in a function should be unique.",
           ),
       }
       options = (
           (
-              'ignore-ints',
+              "ignore-ints",
               {
-                  'default': False, 'type': 'yn', 'metavar' : '<y or n>',
-                  'help': 'Allow returning non-unique integers',
-              }
+                  "default": False,
+                  "type": "yn",
+                  "metavar": "<y or n>",
+                  "help": "Allow returning non-unique integers",
+              },
           ),
       )
 
@@ -79,20 +85,19 @@ So far we have defined the following required components of our checker:
    going to emit. It has the following format::
 
        msgs = {
-           'message-id': (
-               'displayed-message', 'message-symbol', 'message-help'
+           "message-id": (
+               "displayed-message", "message-symbol", "message-help"
            )
        }
 
+
    * The ``message-id`` should be a 4-digit number,
      prefixed with a **message category**.
      There are multiple message categories,
      these being ``C``, ``W``, ``E``, ``F``, ``R``,
      standing for ``Convention``, ``Warning``, ``Error``, ``Fatal`` and ``Refactoring``.
-     The rest of the 5 digits should not conflict with existing checkers
-     and they should be consistent across the checker.
-     For instance,
-     the first two digits should not be different across the checker.
+     The 4 digits should not conflict with existing checkers
+     and the first 2 digits should consistent across the checker.
 
    * The ``displayed-message`` is used for displaying the message to the user,
      once it is emitted.
@@ -107,9 +112,10 @@ The options list defines any user configurable options.
 It has the following format::
 
     options = (
-        'option-symbol': {'argparse-like-kwarg': 'value'},
+        ("option-symbol", {"argparse-like-kwarg": "value"}),
     )
 
+
 * The ``option-symbol`` is a unique name for the option.
   This is used on the command line and in config files.
   The hyphen is replaced by an underscore when used in the checker,
@@ -119,8 +125,8 @@ Next we'll track when we enter and leave a function.
 
 .. code-block:: python
 
-  def __init__(self, linter: PyLinter =None) -> None:
-      super(UniqueReturnChecker, self).__init__(linter)
+  def __init__(self, linter: Optional["PyLinter"] = None) -> None:
+      super().__init__(linter)
       self._function_stack = []
 
   def visit_functiondef(self, node: nodes.FunctionDef) -> None:
@@ -145,7 +151,7 @@ which is called with an :class:`.astroid.nodes.Return` node.
 .. _astroid_extract_node:
 .. TODO We can shorten/remove this bit once astroid has API docs.
 
-We'll need to be able to figure out what attributes a
+We'll need to be able to figure out what attributes an
 :class:`.astroid.nodes.Return` node has available.
 We can use :func:`astroid.extract_node` for this::
 
@@ -163,7 +169,7 @@ We could also construct a more complete example::
   ...     if True:
   ...         return 5 #@
   ...     return 5 #@
-  """)
+  ... """)
   >>> node_a.value
   <Const.int l.4 at 0x7efe621a74e0>
   >>> node_a.value.value
@@ -183,13 +189,11 @@ Now we know how to use the astroid node, we can implement our check.
   def visit_return(self, node: nodes.Return) -> None:
       if not isinstance(node.value, nodes.Const):
           return
-
       for other_return in self._function_stack[-1]:
-         if (node.value.value == other_return.value.value and
-             not (self.config.ignore_ints and node.value.pytype() == int)):
-             self.add_message(
-                 'non-unique-returns', node=node,
-             )
+          if node.value.value == other_return.value.value and not (
+              self.config.ignore_ints and node.value.pytype() == int
+          ):
+              self.add_message("non-unique-returns", node=node)
 
       self._function_stack[-1].append(node)
 
@@ -201,7 +205,10 @@ Add the ``register`` function to the top level of the file.
 
 .. code-block:: python
 
-  def register(linter):
+  def register(linter: "PyLinter") -> None:
+      """This required method auto registers the checker during initialization.
+      :param linter: The linter to register the checker to.
+      """
       linter.register_checker(UniqueReturnChecker(linter))
 
 We are now ready to debug and test our checker!
@@ -257,6 +264,7 @@ We can use the example code that we used for debugging as our test cases.
   import my_plugin
   import pylint.testutils
 
+
   class TestUniqueReturnChecker(pylint.testutils.CheckerTestCase):
       CHECKER_CLASS = my_plugin.UniqueReturnChecker
 
@@ -272,7 +280,7 @@ We can use the example code that we used for debugging as our test cases.
           self.checker.visit_return(return_node_a)
           with self.assertAddsMessages(
               pylint.testutils.MessageTest(
-                  msg_id='non-unique-returns',
+                  msg_id="non-unique-returns",
                   node=return_node_b,
               ),
           ):
diff --git a/doc/how_tos/plugins.rst b/doc/how_tos/plugins.rst
index a68bd22f82..bc2c0f14cb 100644
--- a/doc/how_tos/plugins.rst
+++ b/doc/how_tos/plugins.rst
@@ -25,7 +25,19 @@ So a basic hello-world plugin can be implemented as:
 .. sourcecode:: python
 
   # Inside hello_plugin.py
-  def register(linter):
+  from typing import TYPE_CHECKING
+
+  import astroid
+
+  if TYPE_CHECKING:
+      from pylint.lint import PyLinter
+
+
+  def register(linter: "PyLinter") -> None:
+    """This required method auto registers the checker during initialization.
+
+    :param linter: The linter to register the checker to.
+    """
     print('Hello world')
 
 
@@ -43,7 +55,19 @@ We can extend hello-world plugin to ignore some specific names using
 .. sourcecode:: python
 
   # Inside hello_plugin.py
-  def register(linter):
+  from typing import TYPE_CHECKING
+
+  import astroid
+
+  if TYPE_CHECKING:
+      from pylint.lint import PyLinter
+
+
+  def register(linter: "PyLinter") -> None:
+    """This required method auto registers the checker during initialization.
+
+    :param linter: The linter to register the checker to.
+    """
     print('Hello world')
 
   def load_configuration(linter):
diff --git a/doc/how_tos/transform_plugins.rst b/doc/how_tos/transform_plugins.rst
index 30e057820d..031faa0f13 100644
--- a/doc/how_tos/transform_plugins.rst
+++ b/doc/how_tos/transform_plugins.rst
@@ -66,10 +66,19 @@ Module, Class, Function etc. In our case we need to transform a class. It can be
 
 .. sourcecode:: python
 
+  from typing import TYPE_CHECKING
+
   import astroid
 
-  def register(linter):
-    # Needed for registering the plugin.
+  if TYPE_CHECKING:
+      from pylint.lint import PyLinter
+
+
+  def register(linter: "PyLinter") -> None:
+    """This required method auto registers the checker during initialization.
+
+    :param linter: The linter to register the checker to.
+    """
     pass
 
   def transform(cls):
diff --git a/doc/index.rst b/doc/index.rst
index 1508ff679e..ff2bfd6014 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -17,6 +17,7 @@ refactored and can offer you details about the code's complexity.
 
    user_guide/index.rst
    how_tos/index.rst
+   messages/index.rst
    technical_reference/index.rst
    development_guide/index.rst
    additional_commands/index.rst
diff --git a/doc/messages/index.rst b/doc/messages/index.rst
new file mode 100644
index 0000000000..aceca53f61
--- /dev/null
+++ b/doc/messages/index.rst
@@ -0,0 +1,11 @@
+.. _messages:
+
+Messages
+===================
+
+.. toctree::
+  :maxdepth: 1
+  :titlesonly:
+
+  messages_introduction
+  messages_list
diff --git a/doc/messages/messages_introduction.rst b/doc/messages/messages_introduction.rst
new file mode 100644
index 0000000000..e351d1b9bd
--- /dev/null
+++ b/doc/messages/messages_introduction.rst
@@ -0,0 +1,15 @@
+.. _messages-introduction:
+
+Message categories
+=====================
+
+Pylint can emit various messages. These are categorized according to categories::
+
+    Convention
+    Error
+    Fatal
+    Information
+    Refactor
+    Warning
+
+A list of these messages can be found here: :ref:`messages-list`
diff --git a/doc/messages/messages_list.rst b/doc/messages/messages_list.rst
new file mode 100644
index 0000000000..d288857414
--- /dev/null
+++ b/doc/messages/messages_list.rst
@@ -0,0 +1,520 @@
+.. _messages-list:
+
+Overview of all Pylint messages
+===============================
+
+..
+  NOTE This file is auto-generated. Make any changes to the associated
+  docs extension in 'pylint_messages.py'.
+
+Pylint can emit the following messages:
+
+Fatal
+-----
+
+All messages in the fatal category:
+
+.. toctree::
+   :maxdepth: 2
+   :titlesonly:
+
+   fatal/astroid-error.rst
+   fatal/config-parse-error.rst
+   fatal/fatal.rst
+   fatal/method-check-failed.rst
+   fatal/parse-error.rst
+
+All renamed messages in the fatal category:
+
+.. toctree::
+   :maxdepth: 1
+   :titlesonly:
+
+   fatal/old-import-error.rst
+
+
+Error
+-----
+
+All messages in the error category:
+
+.. toctree::
+   :maxdepth: 2
+   :titlesonly:
+
+   error/abstract-class-instantiated.rst
+   error/access-member-before-definition.rst
+   error/assigning-non-slot.rst
+   error/assignment-from-no-return.rst
+   error/assignment-from-none.rst
+   error/await-outside-async.rst
+   error/bad-configuration-section.rst
+   error/bad-except-order.rst
+   error/bad-exception-context.rst
+   error/bad-format-character.rst
+   error/bad-option-value.rst
+   error/bad-plugin-value.rst
+   error/bad-reversed-sequence.rst
+   error/bad-str-strip-call.rst
+   error/bad-string-format-type.rst
+   error/bad-super-call.rst
+   error/bidirectional-unicode.rst
+   error/catching-non-exception.rst
+   error/class-variable-slots-conflict.rst
+   error/continue-in-finally.rst
+   error/dict-iter-missing-items.rst
+   error/duplicate-argument-name.rst
+   error/duplicate-bases.rst
+   error/format-needs-mapping.rst
+   error/function-redefined.rst
+   error/import-error.rst
+   error/inconsistent-mro.rst
+   error/inherit-non-class.rst
+   error/init-is-generator.rst
+   error/invalid-all-format.rst
+   error/invalid-all-object.rst
+   error/invalid-bool-returned.rst
+   error/invalid-bytes-returned.rst
+   error/invalid-character-backspace.rst
+   error/invalid-character-carriage-return.rst
+   error/invalid-character-esc.rst
+   error/invalid-character-nul.rst
+   error/invalid-character-sub.rst
+   error/invalid-character-zero-width-space.rst
+   error/invalid-class-object.rst
+   error/invalid-envvar-value.rst
+   error/invalid-format-returned.rst
+   error/invalid-getnewargs-ex-returned.rst
+   error/invalid-getnewargs-returned.rst
+   error/invalid-hash-returned.rst
+   error/invalid-index-returned.rst
+   error/invalid-length-hint-returned.rst
+   error/invalid-length-returned.rst
+   error/invalid-metaclass.rst
+   error/invalid-repr-returned.rst
+   error/invalid-sequence-index.rst
+   error/invalid-slice-index.rst
+   error/invalid-slots.rst
+   error/invalid-slots-object.rst
+   error/invalid-star-assignment-target.rst
+   error/invalid-str-returned.rst
+   error/invalid-unary-operand-type.rst
+   error/invalid-unicode-codec.rst
+   error/logging-format-truncated.rst
+   error/logging-too-few-args.rst
+   error/logging-too-many-args.rst
+   error/logging-unsupported-format.rst
+   error/method-hidden.rst
+   error/misplaced-bare-raise.rst
+   error/misplaced-format-function.rst
+   error/missing-format-string-key.rst
+   error/missing-kwoa.rst
+   error/mixed-format-string.rst
+   error/modified-iterating-dict.rst
+   error/modified-iterating-set.rst
+   error/no-member.rst
+   error/no-method-argument.rst
+   error/no-name-in-module.rst
+   error/no-self-argument.rst
+   error/no-value-for-parameter.rst
+   error/non-iterator-returned.rst
+   error/nonexistent-operator.rst
+   error/nonlocal-and-global.rst
+   error/nonlocal-without-binding.rst
+   error/not-a-mapping.rst
+   error/not-an-iterable.rst
+   error/not-async-context-manager.rst
+   error/not-callable.rst
+   error/not-context-manager.rst
+   error/not-in-loop.rst
+   error/notimplemented-raised.rst
+   error/raising-bad-type.rst
+   error/raising-non-exception.rst
+   error/redundant-keyword-arg.rst
+   error/relative-beyond-top-level.rst
+   error/repeated-keyword.rst
+   error/return-arg-in-generator.rst
+   error/return-in-init.rst
+   error/return-outside-function.rst
+   error/star-needs-assignment-target.rst
+   error/syntax-error.rst
+   error/too-few-format-args.rst
+   error/too-many-format-args.rst
+   error/too-many-function-args.rst
+   error/too-many-star-expressions.rst
+   error/truncated-format-string.rst
+   error/undefined-all-variable.rst
+   error/undefined-variable.rst
+   error/unexpected-keyword-arg.rst
+   error/unexpected-special-method-signature.rst
+   error/unhashable-dict-key.rst
+   error/unpacking-non-sequence.rst
+   error/unrecognized-inline-option.rst
+   error/unsubscriptable-object.rst
+   error/unsupported-assignment-operation.rst
+   error/unsupported-binary-operation.rst
+   error/unsupported-delete-operation.rst
+   error/unsupported-membership-test.rst
+   error/used-before-assignment.rst
+   error/used-prior-global-declaration.rst
+   error/yield-inside-async-function.rst
+   error/yield-outside-function.rst
+
+All renamed messages in the error category:
+
+.. toctree::
+   :maxdepth: 1
+   :titlesonly:
+
+   error/bad-context-manager.rst
+   error/maybe-no-member.rst
+   error/old-non-iterator-returned-2.rst
+   error/old-unbalanced-tuple-unpacking.rst
+
+
+Warning
+-------
+
+All messages in the warning category:
+
+.. toctree::
+   :maxdepth: 2
+   :titlesonly:
+
+   warning/abstract-method.rst
+   warning/anomalous-backslash-in-string.rst
+   warning/anomalous-unicode-escape-in-string.rst
+   warning/arguments-differ.rst
+   warning/arguments-out-of-order.rst
+   warning/arguments-renamed.rst
+   warning/assert-on-string-literal.rst
+   warning/assert-on-tuple.rst
+   warning/assign-to-new-keyword.rst
+   warning/attribute-defined-outside-init.rst
+   warning/bad-builtin.rst
+   warning/bad-format-string.rst
+   warning/bad-format-string-key.rst
+   warning/bad-indentation.rst
+   warning/bad-open-mode.rst
+   warning/bad-staticmethod-argument.rst
+   warning/bad-thread-instantiation.rst
+   warning/bare-except.rst
+   warning/binary-op-exception.rst
+   warning/boolean-datetime.rst
+   warning/broad-except.rst
+   warning/cell-var-from-loop.rst
+   warning/comparison-with-callable.rst
+   warning/confusing-with-statement.rst
+   warning/consider-ternary-expression.rst
+   warning/dangerous-default-value.rst
+   warning/deprecated-argument.rst
+   warning/deprecated-class.rst
+   warning/deprecated-decorator.rst
+   warning/deprecated-method.rst
+   warning/deprecated-module.rst
+   warning/deprecated-typing-alias.rst
+   warning/differing-param-doc.rst
+   warning/differing-type-doc.rst
+   warning/duplicate-except.rst
+   warning/duplicate-key.rst
+   warning/duplicate-string-formatting-argument.rst
+   warning/eval-used.rst
+   warning/exec-used.rst
+   warning/expression-not-assigned.rst
+   warning/f-string-without-interpolation.rst
+   warning/fixme.rst
+   warning/forgotten-debug-statement.rst
+   warning/format-combined-specification.rst
+   warning/format-string-without-interpolation.rst
+   warning/global-at-module-level.rst
+   warning/global-statement.rst
+   warning/global-variable-not-assigned.rst
+   warning/global-variable-undefined.rst
+   warning/implicit-str-concat.rst
+   warning/import-self.rst
+   warning/inconsistent-quotes.rst
+   warning/invalid-envvar-default.rst
+   warning/invalid-format-index.rst
+   warning/invalid-overridden-method.rst
+   warning/isinstance-second-argument-not-valid-type.rst
+   warning/keyword-arg-before-vararg.rst
+   warning/logging-format-interpolation.rst
+   warning/logging-fstring-interpolation.rst
+   warning/logging-not-lazy.rst
+   warning/lost-exception.rst
+   warning/lru-cache-decorating-method.rst
+   warning/misplaced-future.rst
+   warning/missing-any-param-doc.rst
+   warning/missing-format-argument-key.rst
+   warning/missing-format-attribute.rst
+   warning/missing-param-doc.rst
+   warning/missing-parentheses-for-call-in-test.rst
+   warning/missing-raises-doc.rst
+   warning/missing-return-doc.rst
+   warning/missing-return-type-doc.rst
+   warning/missing-type-doc.rst
+   warning/missing-yield-doc.rst
+   warning/missing-yield-type-doc.rst
+   warning/modified-iterating-list.rst
+   warning/multiple-constructor-doc.rst
+   warning/nan-comparison.rst
+   warning/no-init.rst
+   warning/non-ascii-file-name.rst
+   warning/non-parent-init-called.rst
+   warning/non-str-assignment-to-dunder-name.rst
+   warning/overlapping-except.rst
+   warning/overridden-final-method.rst
+   warning/pointless-statement.rst
+   warning/pointless-string-statement.rst
+   warning/possibly-unused-variable.rst
+   warning/preferred-module.rst
+   warning/protected-access.rst
+   warning/raise-missing-from.rst
+   warning/raising-format-tuple.rst
+   warning/redeclared-assigned-name.rst
+   warning/redefined-builtin.rst
+   warning/redefined-outer-name.rst
+   warning/redefined-slots-in-subclass.rst
+   warning/redundant-returns-doc.rst
+   warning/redundant-u-string-prefix.rst
+   warning/redundant-unittest-assert.rst
+   warning/redundant-yields-doc.rst
+   warning/reimported.rst
+   warning/self-assigning-variable.rst
+   warning/self-cls-assignment.rst
+   warning/shallow-copy-environ.rst
+   warning/signature-differs.rst
+   warning/subclassed-final-class.rst
+   warning/subprocess-popen-preexec-fn.rst
+   warning/subprocess-run-check.rst
+   warning/super-init-not-called.rst
+   warning/too-many-try-statements.rst
+   warning/try-except-raise.rst
+   warning/unbalanced-tuple-unpacking.rst
+   warning/undefined-loop-variable.rst
+   warning/unnecessary-ellipsis.rst
+   warning/unnecessary-lambda.rst
+   warning/unnecessary-pass.rst
+   warning/unnecessary-semicolon.rst
+   warning/unreachable.rst
+   warning/unspecified-encoding.rst
+   warning/unused-argument.rst
+   warning/unused-format-string-argument.rst
+   warning/unused-format-string-key.rst
+   warning/unused-import.rst
+   warning/unused-private-member.rst
+   warning/unused-variable.rst
+   warning/unused-wildcard-import.rst
+   warning/useless-else-on-loop.rst
+   warning/useless-param-doc.rst
+   warning/useless-super-delegation.rst
+   warning/useless-type-doc.rst
+   warning/useless-with-lock.rst
+   warning/using-constant-test.rst
+   warning/using-f-string-in-unsupported-version.rst
+   warning/using-final-decorator-in-unsupported-version.rst
+   warning/while-used.rst
+   warning/wildcard-import.rst
+   warning/wrong-exception-operation.rst
+
+All renamed messages in the warning category:
+
+.. toctree::
+   :maxdepth: 1
+   :titlesonly:
+
+   warning/implicit-str-concat-in-sequence.rst
+   warning/old-assignment-from-none.rst
+   warning/old-empty-docstring.rst
+   warning/old-missing-param-doc.rst
+   warning/old-missing-returns-doc.rst
+   warning/old-missing-type-doc.rst
+   warning/old-missing-yields-doc.rst
+   warning/old-non-iterator-returned-1.rst
+   warning/old-unidiomatic-typecheck.rst
+   warning/old-unpacking-non-sequence.rst
+
+
+Convention
+----------
+
+All messages in the convention category:
+
+.. toctree::
+   :maxdepth: 2
+   :titlesonly:
+
+   convention/bad-classmethod-argument.rst
+   convention/bad-docstring-quotes.rst
+   convention/bad-file-encoding.rst
+   convention/bad-mcs-classmethod-argument.rst
+   convention/bad-mcs-method-argument.rst
+   convention/compare-to-empty-string.rst
+   convention/compare-to-zero.rst
+   convention/consider-iterating-dictionary.rst
+   convention/consider-using-any-or-all.rst
+   convention/consider-using-dict-items.rst
+   convention/consider-using-enumerate.rst
+   convention/consider-using-f-string.rst
+   convention/disallowed-name.rst
+   convention/docstring-first-line-empty.rst
+   convention/empty-docstring.rst
+   convention/import-outside-toplevel.rst
+   convention/invalid-characters-in-docstring.rst
+   convention/invalid-name.rst
+   convention/line-too-long.rst
+   convention/misplaced-comparison-constant.rst
+   convention/missing-class-docstring.rst
+   convention/missing-final-newline.rst
+   convention/missing-function-docstring.rst
+   convention/missing-module-docstring.rst
+   convention/mixed-line-endings.rst
+   convention/multiple-imports.rst
+   convention/multiple-statements.rst
+   convention/non-ascii-module-import.rst
+   convention/non-ascii-name.rst
+   convention/single-string-used-for-slots.rst
+   convention/singleton-comparison.rst
+   convention/superfluous-parens.rst
+   convention/too-many-lines.rst
+   convention/trailing-newlines.rst
+   convention/trailing-whitespace.rst
+   convention/unexpected-line-ending-format.rst
+   convention/ungrouped-imports.rst
+   convention/unidiomatic-typecheck.rst
+   convention/unneeded-not.rst
+   convention/use-implicit-booleaness-not-comparison.rst
+   convention/use-implicit-booleaness-not-len.rst
+   convention/use-maxsplit-arg.rst
+   convention/use-sequence-for-iteration.rst
+   convention/useless-import-alias.rst
+   convention/wrong-import-order.rst
+   convention/wrong-import-position.rst
+   convention/wrong-spelling-in-comment.rst
+   convention/wrong-spelling-in-docstring.rst
+
+All renamed messages in the convention category:
+
+.. toctree::
+   :maxdepth: 1
+   :titlesonly:
+
+   convention/blacklisted-name.rst
+   convention/len-as-condition.rst
+   convention/missing-docstring.rst
+   convention/old-misplaced-comparison-constant.rst
+   convention/old-non-ascii-name.rst
+
+
+Refactor
+--------
+
+All messages in the refactor category:
+
+.. toctree::
+   :maxdepth: 2
+   :titlesonly:
+
+   refactor/chained-comparison.rst
+   refactor/comparison-with-itself.rst
+   refactor/condition-evals-to-constant.rst
+   refactor/confusing-consecutive-elif.rst
+   refactor/consider-alternative-union-syntax.rst
+   refactor/consider-merging-isinstance.rst
+   refactor/consider-swap-variables.rst
+   refactor/consider-using-alias.rst
+   refactor/consider-using-assignment-expr.rst
+   refactor/consider-using-dict-comprehension.rst
+   refactor/consider-using-from-import.rst
+   refactor/consider-using-generator.rst
+   refactor/consider-using-get.rst
+   refactor/consider-using-in.rst
+   refactor/consider-using-join.rst
+   refactor/consider-using-max-builtin.rst
+   refactor/consider-using-min-builtin.rst
+   refactor/consider-using-namedtuple-or-dataclass.rst
+   refactor/consider-using-set-comprehension.rst
+   refactor/consider-using-sys-exit.rst
+   refactor/consider-using-ternary.rst
+   refactor/consider-using-tuple.rst
+   refactor/consider-using-with.rst
+   refactor/cyclic-import.rst
+   refactor/duplicate-code.rst
+   refactor/else-if-used.rst
+   refactor/empty-comment.rst
+   refactor/inconsistent-return-statements.rst
+   refactor/literal-comparison.rst
+   refactor/no-classmethod-decorator.rst
+   refactor/no-else-break.rst
+   refactor/no-else-continue.rst
+   refactor/no-else-raise.rst
+   refactor/no-else-return.rst
+   refactor/no-self-use.rst
+   refactor/no-staticmethod-decorator.rst
+   refactor/property-with-parameters.rst
+   refactor/redefined-argument-from-local.rst
+   refactor/redefined-variable-type.rst
+   refactor/simplifiable-condition.rst
+   refactor/simplifiable-if-expression.rst
+   refactor/simplifiable-if-statement.rst
+   refactor/simplify-boolean-expression.rst
+   refactor/stop-iteration-return.rst
+   refactor/super-with-arguments.rst
+   refactor/too-complex.rst
+   refactor/too-few-public-methods.rst
+   refactor/too-many-ancestors.rst
+   refactor/too-many-arguments.rst
+   refactor/too-many-boolean-expressions.rst
+   refactor/too-many-branches.rst
+   refactor/too-many-instance-attributes.rst
+   refactor/too-many-locals.rst
+   refactor/too-many-nested-blocks.rst
+   refactor/too-many-public-methods.rst
+   refactor/too-many-return-statements.rst
+   refactor/too-many-statements.rst
+   refactor/trailing-comma-tuple.rst
+   refactor/unnecessary-comprehension.rst
+   refactor/unnecessary-dict-index-lookup.rst
+   refactor/use-a-generator.rst
+   refactor/use-dict-literal.rst
+   refactor/use-list-literal.rst
+   refactor/use-set-for-membership.rst
+   refactor/useless-object-inheritance.rst
+   refactor/useless-return.rst
+
+All renamed messages in the refactor category:
+
+.. toctree::
+   :maxdepth: 1
+   :titlesonly:
+
+   refactor/old-simplifiable-if-statement.rst
+   refactor/old-too-many-nested-blocks.rst
+
+
+Information
+-----------
+
+All messages in the information category:
+
+.. toctree::
+   :maxdepth: 2
+   :titlesonly:
+
+   information/bad-inline-option.rst
+   information/c-extension-no-member.rst
+   information/deprecated-pragma.rst
+   information/file-ignored.rst
+   information/locally-disabled.rst
+   information/raw-checker-failed.rst
+   information/suppressed-message.rst
+   information/use-symbolic-message-instead.rst
+   information/useless-suppression.rst
+
+All renamed messages in the information category:
+
+.. toctree::
+   :maxdepth: 1
+   :titlesonly:
+
+   information/deprecated-disable-all.rst
diff --git a/doc/release.md b/doc/release.md
index 0854464af9..556de5c0ae 100644
--- a/doc/release.md
+++ b/doc/release.md
@@ -2,51 +2,87 @@
 
 So, you want to release the `X.Y.Z` version of pylint ?
 
-## Process
+## Releasing a major or minor version
 
-1. Check if the dependencies of the package are correct, make sure that astroid is
-   pinned to the latest version.
-2. Install the release dependencies `pip3 install pre-commit tbump`
-3. Bump the version by using `tbump X.Y.Z --no-tag --no-push`
-4. Check the result (Do `git diff vX.Y.Z-1 ChangeLog doc/whatsnew/` in particular).
-5. Move back to a dev version for pylint with `tbump`:
+**Before releasing a major or minor version check if there are any unreleased commits on
+the maintenance branch. If so, release a last patch release first. See
+`Releasing a patch version`.**
+
+- Write the `Summary -- Release highlights` in `doc/whatsnew` and upgrade the release
+  date.
+- Remove the empty changelog for the last unreleased patch version `X.Y-1.Z'`. (For
+  example: `v2.3.5`)
+- Check the result of `git diff vX.Y-1.Z' ChangeLog`. (For example:
+  `git diff v2.3.4 ChangeLog`)
+- Install the release dependencies: `pip3 install -r requirements_test.txt`
+- Bump the version and release by using `tbump X.Y.0 --no-push --no-tag`. (For example:
+  `tbump 2.4.0 --no-push --no-tag`)
+- Check the commit created with `git show` amend the commit if required.
+- Create a new `What's new in Pylint X.Y+1` document. Add it to `doc/index.rst`. Take a
+  look at the examples from `doc/whatsnew`. Commit that with `git commit -am "wip"`.
+- Move the `main` branch up to a dev version with `tbump`:
 
 ```bash
-tbump X.Y.Z+1-dev0 --no-tag --no-push # You can interrupt during copyrite
-git commit -am "Move back to a dev version following X.Y.Z release"
+tbump X.Y+1.0-dev0 --no-tag --no-push  # You can interrupt after the first step
+git commit -am "Upgrade the version to x.y+1.0-dev0 following x.y.0 release"
 ```
 
-4. Check the result
-5. Open a merge request with the two commits (no one can push directly on `main`)
-6. After the merge recover the merged commits and tag the first one (the version should
-   be `X.Y.Z`) as `vX.Y.Z`
-7. Push the tag
-8. Go to GitHub, click on "Releases" then on the `vX.Y.Z` tag, choose edit tag, and copy
-   past the changelog in the description. This will trigger the release to pypi.
+For example:
 
-## Post release
+```bash
+tbump 2.5.0-dev0 --no-tag --no-push
+git commit -am "Upgrade the version to 2.5.0-dev0 following 2.4.0 release"
+```
 
-### Merge tags in main for pre-commit
+Check the commit, fixup the 'wip' commit with the what's new then push to a release
+branch
 
-If the tag you just made is not part of the main branch, merge the tag `vX.Y.Z` in the
-main branch by doing a history only merge. It's done in order to signal that this is an
-official release tag, and for `pre-commit autoupdate` to works.
+- Open a merge request with the two commits (no one can push directly on `main`)
+- After the merge, recover the merged commits on `main` and tag the first one (the
+  version should be `X.Y.Z`) as `vX.Y.Z` (For example: `v2.4.0`)
+- Push the tag.
+- Release the version on GitHub with the same name as the tag and copy and paste the
+  appropriate changelog in the description. This triggers the PyPI release.
+- Delete the `maintenance/X.Y-1.x` branch. (For example: `maintenance/2.3.x`)
+- Create a `maintenance/X.Y.x` (For example: `maintenance/2.4.x` from the `v2.4.0` tag.)
+- Close the current milestone and create the new ones (For example: close `2.4.0`,
+  create `2.4.1` and `2.6.0`)
 
-```bash
-git checkout main
-git merge --no-edit --strategy=ours vX.Y.Z
-git push
-```
+## Backporting a fix from `main` to the maintenance branch
+
+Whenever a commit on `main` should be released in a patch release on the current
+maintenance branch we cherry-pick the commit from `main`.
+
+- During the merge request on `main`, make sure that the changelog is for the patch
+  version `X.Y-1.Z'`. (For example: `v2.3.5`)
+- After the PR is merged on `main` cherry-pick the commits on the `maintenance/X.Y.x`
+  branch (For example: from `maintenance/2.4.x` cherry-pick a commit from `main`)
+- Remove the "need backport" label from cherry-picked issues
+- Release a patch version
 
-### Milestone handling
+## Releasing a patch version
 
-We move issue that were not done in the next milestone and block release only if it's an
-issue labelled as blocker.
+We release patch versions when a crash or a bug is fixed on the main branch and has been
+cherry-picked on the maintenance branch.
 
-- Close milestone `X.Y.Z`
-- Create the milestones for `X.Y.Z+1`, (or `X.Y+1.0`, and `X+1.0.0` if applicable)
+- Check the result of `git diff vX.Y-1.Z-1 ChangeLog`. (For example:
+  `git diff v2.3.4 ChangeLog`)
+- Install the release dependencies: `pip3 install -r requirements_test.txt`
+- Bump the version and release by using `tbump X.Y-1.Z --no-push`. (For example:
+  `tbump 2.3.5 --no-push`)
+- Check the result visually with `git show`.
+- Push the tag.
+- Release the version on GitHub with the same name as the tag and copy and paste the
+  appropriate changelog in the description. This triggers the PyPI release.
+- Merge the `maintenance/X.Y.x` branch on the main branch. The main branch should have
+  the changelog for `X.Y-1.Z+1` (For example `v2.3.6`). This merge is required so
+  `pre-commit autoupdate` works for pylint.
+- Fix version conflicts properly, or bump the version to `X.Y.0-devZ` (For example:
+  `2.4.0-dev6`) before pushing on the main branch
+- Close the current milestone and create the new one (For example: close `2.3.5`, create
+  `2.3.6`)
 
-#### What's new
+## Milestone handling
 
-If it's a minor release, create a new `What's new in Pylint X.Y+1` document. Add it to
-`doc/index.rst`. Take a look at the examples from `doc/whatsnew`.
+We move issues that were not done to the next milestone and block releases only if there
+are any open issues labelled as `blocker`.
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 586c5d9672..acaea1e853 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,3 +1,3 @@
-Sphinx==4.3.1
-python-docs-theme==2021.11.1
+Sphinx==4.4.0
+python-docs-theme==2022.1
 -e .
diff --git a/doc/test_messages_documentation.py b/doc/test_messages_documentation.py
new file mode 100644
index 0000000000..19a35b6d91
--- /dev/null
+++ b/doc/test_messages_documentation.py
@@ -0,0 +1,115 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Functional tests for the code examples in the messages documentation."""
+
+from collections import Counter
+from pathlib import Path
+from typing import Counter as CounterType
+from typing import List, TextIO, Tuple
+
+import pytest
+
+from pylint import checkers
+from pylint.config.config_initialization import _config_initialization
+from pylint.lint import PyLinter
+from pylint.message.message import Message
+from pylint.testutils.constants import _EXPECTED_RE
+from pylint.testutils.reporter_for_tests import FunctionalTestReporter
+
+MessageCounter = CounterType[Tuple[int, str]]
+
+
+def get_functional_test_files_from_directory(input_dir: Path) -> List[Tuple[str, Path]]:
+    """Get all functional tests in the input_dir."""
+    suite: List[Tuple[str, Path]] = []
+
+    for subdirectory in input_dir.iterdir():
+        for message_dir in subdirectory.iterdir():
+            if (message_dir / "good.py").exists():
+                suite.append(
+                    (message_dir.stem, message_dir / "good.py"),
+                )
+            if (message_dir / "bad.py").exists():
+                suite.append(
+                    (message_dir.stem, message_dir / "bad.py"),
+                )
+    return suite
+
+
+TESTS_DIR = Path(__file__).parent.resolve() / "data" / "messages"
+TESTS = get_functional_test_files_from_directory(TESTS_DIR)
+TESTS_NAMES = [f"{t[0]}-{t[1].stem}" for t in TESTS]
+
+
+class LintModuleTest:
+    def __init__(self, test_file: Tuple[str, Path]) -> None:
+        self._test_file = test_file
+
+        _test_reporter = FunctionalTestReporter()
+
+        self._linter = PyLinter()
+        self._linter.config.persistent = 0
+        checkers.initialize(self._linter)
+
+        _config_initialization(
+            self._linter,
+            args_list=[
+                str(test_file[1]),
+                "--disable=all",
+                f"--enable={test_file[0]}",
+            ],
+            reporter=_test_reporter,
+        )
+
+    def runTest(self) -> None:
+        self._runTest()
+
+    @staticmethod
+    def get_expected_messages(stream: TextIO) -> MessageCounter:
+        """Parse a file and get expected messages."""
+        messages: MessageCounter = Counter()
+        for i, line in enumerate(stream):
+            match = _EXPECTED_RE.search(line)
+            if match is None:
+                continue
+
+            line = match.group("line")
+            if line is None:
+                lineno = i + 1
+            else:
+                lineno = int(line)
+
+            for msg_id in match.group("msgs").split(","):
+                messages[lineno, msg_id.strip()] += 1
+        return messages
+
+    def _get_expected(self) -> MessageCounter:
+        """Get the expected messages for a file."""
+        with open(self._test_file[1], encoding="utf8") as f:
+            expected_msgs = self.get_expected_messages(f)
+        return expected_msgs
+
+    def _get_actual(self) -> MessageCounter:
+        """Get the actual messages after a run."""
+        messages: List[Message] = self._linter.reporter.messages
+        messages.sort(key=lambda m: (m.line, m.symbol, m.msg))
+        received_msgs: MessageCounter = Counter()
+        for msg in messages:
+            received_msgs[msg.line, msg.symbol] += 1
+        return received_msgs
+
+    def _runTest(self) -> None:
+        """Run the test and assert message differences."""
+        self._linter.check([str(self._test_file[1])])
+        expected_messages = self._get_expected()
+        actual_messages = self._get_actual()
+        assert expected_messages == actual_messages
+
+
+@pytest.mark.parametrize("test_file", TESTS, ids=TESTS_NAMES)
+@pytest.mark.filterwarnings("ignore::DeprecationWarning")
+def test_code_examples(test_file: Tuple[str, Path]) -> None:
+    lint_test = LintModuleTest(test_file)
+    lint_test.runTest()
diff --git a/doc/user_guide/options.rst b/doc/user_guide/options.rst
index 898c7a60a7..d89e5e988b 100644
--- a/doc/user_guide/options.rst
+++ b/doc/user_guide/options.rst
@@ -39,6 +39,8 @@ name is found in, and not the type of object assigned.
 +--------------------+---------------------------------------------------------------------------------------------------+
 | ``inlinevar``      | Loop variables in list comprehensions and generator expressions.                                  |
 +--------------------+---------------------------------------------------------------------------------------------------+
+| ``typevar``        | Type variable declared with ``TypeVar``.                                                          |
++--------------------+---------------------------------------------------------------------------------------------------+
 
 Default behavior
 ~~~~~~~~~~~~~~~~
@@ -82,6 +84,20 @@ Following options are exposed:
 
 .. option:: --inlinevar-naming-style=<style>
 
+Predefined Naming Patterns
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Pylint provides predefined naming patterns for some names. These patterns are often
+based on a Naming Style but there is no option to choose one of the styles mentioned above.
+The pattern can be overwritten with the options discussed below.
+
+The following type of names are checked with a predefined pattern:
+
++--------------------+---------------------------------------------------+------------------------------------------------------------+
+| Name type          | Good names                                        | Bad names                                                  |
++====================+===================================================+============================================================+
+| ``typevar``        | ``T``, ``_CallableT``, ``_T_co``, ``AnyStr``,     | ``DICT_T``, ``CALLABLE_T``, ``ENUM_T``, ``DeviceType``,    |
+|                    | ``DeviceTypeT``, ``IPAddressT``                   | ``_StrType``                                               |
++--------------------+---------------------------------------------------+------------------------------------------------------------+
 
 Custom regular expressions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -118,6 +134,8 @@ expression will lead to an instance of ``invalid-name``.
 
 .. option:: --inlinevar-rgx=<regex>
 
+.. option:: --typevar-rgx=<regex>
+
 Multiple naming styles for custom regular expressions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/doc/user_guide/output.rst b/doc/user_guide/output.rst
index 1aa18f3b31..75b92ff80d 100644
--- a/doc/user_guide/output.rst
+++ b/doc/user_guide/output.rst
@@ -21,27 +21,6 @@ a colorized report to stdout at the same time:
 
   --output-format=json:somefile.json,colorized
 
-Finally, it is possible to invoke pylint programmatically with a
-reporter initialized with a custom stream:
-
-::
-
-  pylint_output = StringIO() # Custom open stream
-  reporter = text.TextReporter(pylint_output)
-  Run(["test_file.py"], reporter=reporter, do_exit=False)
-  print(pylint_output.getvalue()) # Retrieve and print the text report
-
-The reporter can accept any stream object as as parameter. In this example,
-the stream outputs to a file:
-
-::
-
-  with open("report.out", "w") as f:
-    reporter = text.TextReporter(f)
-    Run(["test_file.py"], reporter=reporter, do_exit=False)
-
-This would be useful to capture pylint output in an open stream which
-can be passed onto another program.
 
 Custom message formats
 ''''''''''''''''''''''''''''
diff --git a/doc/user_guide/run.rst b/doc/user_guide/run.rst
index 5f280a4e7c..e49da5e517 100644
--- a/doc/user_guide/run.rst
+++ b/doc/user_guide/run.rst
@@ -2,8 +2,8 @@
  Running Pylint
 ================
 
-Invoking Pylint
----------------
+From the command line
+---------------------
 
 Pylint is meant to be called from the command line. The usage is ::
 
@@ -33,8 +33,15 @@ will work if ``directory`` is a python package (i.e. has an __init__.py
 file or it is an implicit namespace package) or if "directory" is in the
 python path.
 
+By default, pylint will exit with an error when one of the arguments is a directory which is not
+a python package. In order to run pylint over all modules and packages within the provided
+subtree of a directory, the ``--recursive=y`` option must be provided.
+
 For more details on this see the :ref:`faq`.
 
+From another python program
+---------------------------
+
 It is also possible to call Pylint from another Python program,
 thanks to the ``Run()`` function in the ``pylint.lint`` module
 (assuming Pylint options are stored in a list of strings ``pylint_options``) as:
@@ -45,12 +52,25 @@ thanks to the ``Run()`` function in the ``pylint.lint`` module
   pylint_opts = ['--disable=line-too-long', 'myfile.py']
   pylint.lint.Run(pylint_opts)
 
+Another option would be to use the ``run_pylint`` function, which is the same function
+called by the command line. You can either patch ``sys.argv`` or supply arguments yourself:
+
+.. sourcecode:: python
+
+  import pylint
+
+  sys.argv = ["pylint", "your_file"]
+  pylint.run_pylint()
+  # Or:
+  pylint.run_pylint(argv=["your_file"])
+
 To silently run Pylint on a ``module_name.py`` module,
 and get its standard output and error:
 
 .. sourcecode:: python
 
   from pylint import epylint as lint
+
   (pylint_stdout, pylint_stderr) = lint.py_run('module_name.py', return_std=True)
 
 It is also possible to include additional Pylint options in the first argument to ``py_run``:
@@ -58,11 +78,43 @@ It is also possible to include additional Pylint options in the first argument t
 .. sourcecode:: python
 
   from pylint import epylint as lint
+
   (pylint_stdout, pylint_stderr) = lint.py_run('module_name.py --disable C0114', return_std=True)
 
 The options ``--msg-template="{path}:{line}: {category} ({msg_id}, {symbol}, {obj}) {msg}"`` and
 ``--reports=n`` are set implicitly inside the ``epylint`` module.
 
+Finally, it is possible to invoke pylint programmatically with a
+reporter initialized with a custom stream:
+
+.. sourcecode:: python
+
+    from io import StringIO
+
+    from pylint.lint import Run
+    from pylint.reporters.text import TextReporter
+
+    pylint_output = StringIO()  # Custom open stream
+    reporter = TextReporter(pylint_output)
+    Run(["test_file.py"], reporter=reporter, do_exit=False)
+    print(pylint_output.getvalue())  # Retrieve and print the text report
+
+The reporter can accept any stream object as as parameter. In this example,
+the stream outputs to a file:
+
+.. sourcecode:: python
+
+    from pylint.lint import Run
+    from pylint.reporters.text import TextReporter
+
+    with open("report.out", "w") as f:
+        reporter = TextReporter(f)
+        Run(["test_file.py"], reporter=reporter, do_exit=False)
+
+This would be useful to capture pylint output in an open stream which
+can be passed onto another program.
+
+
 Command line options
 --------------------
 
@@ -165,24 +217,19 @@ initialization hooks (i.e. the ``--init-hook`` option).
 Exit codes
 ----------
 
-Pylint returns bit-encoded exit codes. If applicable, the table below lists the related
-stderr stream message output.
+Pylint returns bit-encoded exit codes.
 
-=========  =========================  ==========================================
-exit code  meaning                    stderr stream message
-=========  =========================  ==========================================
+=========  =========================
+exit code  meaning
+=========  =========================
 0          no error
 1          fatal message issued
 2          error message issued
 4          warning message issued
 8          refactor message issued
 16         convention message issued
-32         usage error                - "internal error while receiving results\
-                                        from child linter" "Error occurred,
-                                        stopping the linter."
-                                      - "<return of linter.help()>"
-                                      - "Jobs number <#> should be greater \
-                                        than 0"
-                                      - "<IOError message when trying to open \
-                                        output file>"
-=========  =========================  ==========================================
+32         usage error
+=========  =========================
+
+For example, an exit code of ``20`` means there was at least one warning message (4)
+and at least one convention message (16) and nothing else.
diff --git a/doc/whatsnew/2.11.rst b/doc/whatsnew/2.11.rst
index 647f326cdd..8d098e140c 100644
--- a/doc/whatsnew/2.11.rst
+++ b/doc/whatsnew/2.11.rst
@@ -67,7 +67,7 @@ Extensions
 Other Changes
 =============
 
-* Added ``py-version`` config key (if ``[MASTER]`` section). Used for version dependant checks.
+* Added ``py-version`` config key (if ``[MASTER]`` section). Used for version dependent checks.
   Will default to whatever Python version pylint is executed with.
 
 * The ``invalid-name`` message is now more detailed when using multiple naming style regexes.
diff --git a/doc/whatsnew/2.12.rst b/doc/whatsnew/2.12.rst
index 4704691d54..c47f2e91a9 100644
--- a/doc/whatsnew/2.12.rst
+++ b/doc/whatsnew/2.12.rst
@@ -139,8 +139,8 @@ Other Changes
   output files without these will trigger a ``DeprecationWarning``. Expected output files
   can be easily updated with the ``python tests/test_functional.py --update-functional-output`` command.
 
-* The functional ``testutils`` now correctly check the distinction betweeen ``HIGH`` and
-  ``UNDEFINED`` confidence. Expected output files without defiend ``confidence`` levels will now
+* The functional ``testutils`` now correctly check the distinction between ``HIGH`` and
+  ``UNDEFINED`` confidence. Expected output files without defined ``confidence`` levels will now
   trigger a ``DeprecationWarning``. Expected output files can be easily updated with the
   ``python tests/test_functional.py --update-functional-output`` command.
 
@@ -179,7 +179,7 @@ Other Changes
 
   Closes #5261
 
-* Fix double emitting of ``not-callable`` on inferrable ``properties``
+* Fix double emitting of ``not-callable`` on inferable ``properties``
 
   Closes #4426
 
diff --git a/doc/whatsnew/2.13.rst b/doc/whatsnew/2.13.rst
index 378b4103bf..73e898d243 100644
--- a/doc/whatsnew/2.13.rst
+++ b/doc/whatsnew/2.13.rst
@@ -3,23 +3,589 @@
 ***************************
 
 :Release: 2.13
-:Date: TBA
+:Date: 2022-03-24
 
 Summary -- Release highlights
 =============================
 
+In 2.13, we introduced a new check to deal with unicode security issues. On top of that a lot of work was
+done inside the unicode checker by @CarliJoy. We also introduced a new check when importing private name
+and for unnecessary ellipsis among other.
+
+We fixed long standing issues related to duplicate code that could not be disabled, line numbers
+that were not accurate some of the time, and added the ability to lint all files in a directory without
+specifying each one. One of the most anticipated issue from the repository. Thank you @matusvalo !
+
+A lot of ``undefined-variables`` and ``used-before-assignment`` issues were resolved thanks to @jacobtylerwalls.
+
+We started integrating ``pylint-error`` the documentation created by @vald-phoenix a developer from Hlyniane,
+Ukraine. We hope he's doing well despite the current situation. The deployment is set up but `there's still a lot to do so we welcome any community effort
+help to review, integrate, and add good/bad examples <https://github.com/PyCQA/pylint/issues/5953>`_. This should be doable
+without any pylint or astroid knowledge, so this is the perfect entrypoint if you want to contribute
+to pylint without investing any time learning the internals.
+
+This release is the last one to support interpreter below 3.7.2, 3.6 end of life was reached in december 2021.
+
 New checkers
 ============
 
+* Added several checkers to deal with unicode security issues
+  (see `Trojan Sources <https://trojansource.codes/>`_ and
+  `PEP 672 <https://www.python.org/dev/peps/pep-0672/>`_ for details) that also
+  concern the readability of the code. In detail the following checks were added:
+
+  * ``bad-file-encoding`` checks that the file is encoded in UTF-8 as suggested by
+    `PEP8 <https://www.python.org/dev/peps/pep-0008/#id20>`_.
+    UTF-16 and UTF-32 are `not supported by Python <https://bugs.python.org/issue1503789>`_
+    at the moment. If this ever changes
+    ``invalid-unicode-codec`` checks that they aren't used, to allow for backwards
+    compatibility.
+
+  * ``bidirectional-unicode`` checks for bidirectional unicode characters that
+    could make code execution different than what the user expects.
+
+  * ``invalid-character-backspace``, ``invalid-character-carriage-return``,
+    ``invalid-character-sub``, ``invalid-character-esc``,
+    ``invalid-character-zero-width-space`` and ``invalid-character-nul``
+    to check for possibly harmful unescaped characters.
+
+  Closes #5281
+
+* ``unnecessary-ellipsis``: Emitted when the ellipsis constant is used unnecessarily.
+
+  Closes #5460
+
+* Added new checker ``typevar-name-missing-variance``. Emitted when a covariant
+  or contravariant ``TypeVar`` does not end with  ``_co`` or ``_contra`` respectively or
+  when a ``TypeVar`` is not either but has a suffix.
+
+* Add ``modified-iterating-list``, ``modified-iterating-dict``, and ``modified-iterating-set``,
+  emitted when items are added to or removed from respectively a list, dictionary or
+  set being iterated through.
+
+  Closes #5348
+
+* Add checker ``redefined-slots-in-subclass``: Emitted when a slot is redefined in a subclass.
+
+  Closes #5617
+
+* Rewrote Checker of ``non-ascii-name``.
+   It now ensures __all__ Python names are ASCII and also properly
+   checks the names of imports (``non-ascii-module-import``) as
+   well as file names (``non-ascii-file-name``) and emits their respective new warnings.
+
+   Non ASCII characters could be homoglyphs (look alike characters) and hard to
+   enter on a non specialized keyboard.
+   See `Confusable Characters in PEP 672 <https://www.python.org/dev/peps/pep-0672/#confusable-characters-in-identifiers>`_
+
+* Added ``cache-max-size-none`` checker with checks for the use of ``functools.lru_cache``
+  on class methods with a ``maxsize`` of ``None``. This is unrecommended as it
+  creates memory leaks by never letting the instance get garbage collected.
+
+  Closes #5670
+  Clsoes #6180
+
 Removed checkers
 ================
 
+* Removed the deprecated ``check_docs`` extension. You can use the ``docparams`` checker
+  to get the checks previously included in ``check_docs``.
+
+  Closes #5322
+
 Extensions
 ==========
+* New extension ``import-private-name``: indicate imports of external private packages
+  and objects (prefixed with ``_``). It can be loaded using ``load-plugins=pylint.extensions.private_import``.
+
+  Closes #5463
+
+* Pyreverse - add output in mermaid-js format and html which is an mermaid js diagram with html boilerplate
+
+* ``TypingChecker``
+
+  * Added new check ``broken-noreturn`` to detect broken uses of ``typing.NoReturn``
+    if ``py-version`` is set to Python ``3.7.1`` or below.
+    https://bugs.python.org/issue34921
+
+  * Added new check ``broken-collections-callable`` to detect broken uses of ``collections.abc.Callable``
+    if ``py-version`` is set to Python ``3.9.1`` or below.
+    https://bugs.python.org/issue42965
+
+* ``DocstringParameterChecker``
+
+  * Fixed incorrect classification of Numpy-style docstring as Google-style docstring for
+    docstrings with property setter documentation.
+    Docstring classification is now based on the highest amount of matched sections instead
+    of the order in which the docstring styles were tried.
+
+* ``DocStringStyleChecker``
+
+    * Disable checker ``bad-docstring-quotes`` for Python <= 3.7, because in these versions the line
+      numbers for decorated functions and classes are not reliable which interferes with the checker.
+
+      Closes #3077
 
 Other Changes
 =============
 
+* Include ``testing_pylintrc`` in source and wheel distributions.
+
+  Closes #6028
+
+* Fix false positive for ``unused-import`` when disabling both ``used-before-assignment`` and ``undefined-variable``.
+
+  Closes #6089
+
+* Fix false positive for ``unnecessary-ellipsis`` when using an ellipsis as a default argument.
+
+  Closes #5973
+
+* Add missing dunder methods to ``unexpected-special-method-signature`` check.
+
+* No longer emit ``no-member`` in for loops that reference ``self`` if the binary operation that
+  started the for loop uses a ``self`` that is encapsulated in tuples or lists.
+
+  Ref PyCQA/astroid#1360
+  Closes #4826
+
+* Fix matching ``--notes`` options that end in a non-word character.
+
+  Closes #5840
+
+* The line numbering for messages related to function arguments is now more accurate. This can
+  require some message disables to be relocated to updated positions.
+
+* ``using-f-string-in-unsupported-version`` and ``using-final-decorator-in-unsupported-version`` msgids
+    were renamed from ``W1601`` and ``W1602`` to ``W2601`` and ``W2602``. Disables using these msgids will break.
+    This is done in order to restore consistency with the already existing msgids for ``apply-builtin`` and
+    ``basestring-builtin`` from the now deleted python 3K+ checker. There is now a check that we're not using
+    existing msgids or symbols from deleted checkers.
+
+  Closes #5729
+
+* Add ``--recursive`` option to allow recursive discovery of all modules and packages in subtree. Running pylint with
+  ``--recursive=y`` option will check all discovered ``.py`` files and packages found inside subtree of directory provided
+  as parameter to pylint.
+
+  Closes #352
+
+* Updated the position of messages for class and function defintions to no longer cover
+  the complete definition. Only the ``def`` or ``class`` + the name of the class/function
+  are covered.
+
+  Closes #5466
+
+* Reinstated checks from the python3 checker that are still useful for python 3
+  (``eq-without-hash``). This is now in the ``pylint.extensions.eq_without_hash`` optional
+  extension.
+
+  Closes #5025
+
+* Fix false-negative for ``assignment-from-none`` checker with list.sort() method.
+
+  Closes #5722
+
+* Fix ``unused-private-member`` false positive when accessing private methods through ``property``.
+
+  Closes #4756
+
+* Fixed crash from ``arguments-differ`` and ``arguments-renamed`` when methods were
+  defined outside the top level of a class.
+
+  Closes #5648
+
+* Better warning messages for useless else or elif when a function returns early.
+
+  Closes #5614
+
+* Use the ``tomli`` package instead of ``toml`` to parse ``.toml`` files.
+
+ Closes #5885
+
+* Fixed false positive ``consider-using-dict-comprehension`` when creating a dict
+  using a list of tuples where key AND value vary depending on the same condition.
+
+  Closes #5588
+
+* When run in parallel mode ``pylint`` now pickles the data passed to subprocesses with
+  the ``dill`` package. The ``dill`` package has therefore been added as a dependency.
+
+* Fixed false positive for ``global-variable-undefined`` when ``global`` is used with a class name
+
+  Closes #3088
+
+* Fixed crash on properties and inherited class methods when comparing them for
+  equality against an empty dict.
+
+  Closes #5646
+
+* By default, pylint does no longer take files starting with ``.#`` into account. Those are
+  considered `emacs file locks`_. This behavior can be reverted by redefining the
+  ``ignore-patterns`` option.
+
+  Closes #367
+
+.. _`emacs file locks`: https://www.gnu.org/software/emacs/manual/html_node/elisp/File-Locks.html
+
+* Fix ``super-init-not-called`` when parent or ``self`` is a ``Protocol``
+
+  Closes #4790
+
+* The issue template for crashes is now created for crashes which were previously not covered
+  by this mechanism.
+
+  Closes #5668
+
+* An astroid issue where symlinks were not being taken into account
+  was fixed
+
+  Closes #1470
+  Closes #3499
+  Closes #4302
+  Closes #4798
+  Closes #5081
+
+* Fix false negative for ``undefined-variable`` and related variable messages
+  when the same undefined variable is used as a type annotation and is
+  accessed multiple times, or is used as a default argument to a function.
+
+  Closes #5399
+
+* Emit ``used-before-assignment`` instead of ``undefined-variable`` when attempting
+  to access unused type annotations.
+
+  Closes #5713
+
+* Fixed an issue where ``ungrouped-imports`` could not be disabled without raising
+  ``useless-suppression``.
+
+  Ref #2366
+
+* Fixed a crash on ``__init__`` nodes when the attribute was previously uninferable due to a cache
+  limit size. This limit can be hit when the inheritance pattern of a class (and therefore of the ``__init__`` attribute) is very large.
+
+  Closes #5679
+
+* Fixed extremely long processing of long lines with comma's.
+
+  Closes #5483
+
+* Fix false positive ``super-init-not-called`` for classes that inherit their ``init`` from
+  a parent.
+
+  Closes #4941
+
+* Fix false positives for ``used-before-assignment`` from using named
+  expressions in a ternary operator test and using that expression as
+  a call argument.
+
+  Closes #5177, #5212
+
+* Fixed crash with recursion error for inference of class attributes that referenced
+  the class itself.
+
+  Closes #5408
+  Ref PyCQA/astroid#1392
+
+* Fixed false positive for ``unused-argument`` when a method overridden in a subclass
+  does nothing with the value of a keyword-only argument.
+
+  Closes #5771
+  Ref PyCQA/astroid#1382
+
+* Optimize parsing of long lines when ``missing-final-newline`` is enabled.
+
+  Closes #5724
+
+* Fix false positive for ``used-before-assignment`` from a class definition
+  nested under a function subclassing a class defined outside the function.
+
+  Closes #4590
+
+* Fix ``unnecessary_dict_index_lookup`` false positive when deleting a dictionary's entry.
+
+  Closes #4716
+
+* Fix false positive for ``used-before-assignment`` when an except handler
+  shares a name with a test in a filtered comprehension.
+
+  Closes #5817
+
+* Fix a crash in ``unused-private-member`` checker when analyzing code using
+  ``type(self)`` in bound methods.
+
+  Closes #5569
+
+* Fix crash in ``unnecessary-dict-index-lookup`` checker if the output of
+  ``items()`` is assigned to a 1-tuple.
+
+  Closes #5504
+
+* Fixed crash with slots assignments and annotated assignments.
+
+  Closes #5479
+
+* Fixed a crash in ``unspecified-encoding`` checker when providing ``None``
+  to the ``mode`` argument of an ``open()`` call.
+
+  Closes #5731
+
+* Fixed a crash involving a ``NewType`` named with an f-string.
+
+  Closes #5770
+  Ref PyCQA/astroid#1400
+
+* Improved ``bad-open-mode`` message when providing ``None`` to the ``mode``
+  argument of an ``open()`` call.
+
+  Closes #5733
+
+* Fix false negative for ``consider-iterating-dictionary`` during membership checks encapsulated in iterables
+  or ``not in`` checks
+
+  Closes #5323
+
+* Allow disabling ``duplicate-code`` with a disable comment when running through
+  pylint.
+
+  Closes #214
+
+* Fix false positive for ``undefined-variable`` when ``namedtuple`` class
+  attributes are used as return annotations.
+
+  Closes #5568
+
+* Added confidence level ``CONTROL_FLOW`` for warnings relying on assumptions
+  about control flow.
+
+* ``used-before-assignment`` now considers that assignments in a try block
+  may not have occurred when the except or finally blocks are executed.
+
+  Closes #85, #2615
+
+* Fixed false negative for ``used-before-assignment`` when a conditional
+  or context manager intervened before the try statement that suggested
+  it might fail.
+
+  Closes #4045
+
+* Fixed false negative for ``used-before-assignment`` in finally blocks
+  if an except handler did not define the assignment that might have failed
+  in the try block.
+
+* Fix a false positive for ``assigning-non-slot`` when the slotted class
+  defined ``__setattr__``.
+
+  Closes #3793
+
+* Fixed a false positive for ``invalid-class-object`` when the object
+  being assigned to the ``__class__`` attribute is uninferable.
+
+* Added a ``testutil`` extra require to the packaging, as ``gitpython`` should not be a dependency
+  all the time but is still required to use the primer helper code in ``pylint.testutil``. You can
+  install it with ``pip install pylint[testutil]``.
+
+  Closes #5486
+
+* Fixed a false positive for ``used-before-assignment`` when a named expression
+  appears as the first value in a container.
+
+  Closes #5112
+
+* Fixed false positive for ``used-before-assignment`` with self-referential type
+  annotation in conditional statements within class methods.
+
+  Closes #5499
+
+* ``used-before-assignment`` now assumes that assignments in except blocks
+  may not have occurred and warns accordingly.
+
+  Closes #4761
+
+* When evaluating statements after an except block, ``used-before-assignment``
+  assumes that assignments in the except blocks took place if the
+  corresponding try block contained a return statement.
+
+  Closes #5500
+
+* Fixed a false negative for ``used-before-assignment`` when some but not all
+  except handlers defined a name relied upon after an except block when the
+  corresponding try block contained a return statement.
+
+  Closes #5524
+
+* When evaluating statements in the ``else`` clause of a loop, ``used-before-assignment``
+  assumes that assignments in the except blocks took place if the
+  except handlers constituted the only ways for the loop to finish without
+  breaking early.
+
+  Closes #5683
+
+* ``used-before-assignment`` now checks names in try blocks.
+
+* Fixed false positive with ``used-before-assignment`` for assignment expressions
+  in lambda statements.
+
+  Closes #5360, #3877
+
+* Improve ``invalid-name`` check for ``TypeVar`` names.
+  The accepted pattern can be customized with ``--typevar-rgx``.
+
+  Closes #3401
+
+* Fixed a false positive (affecting unreleased development) for
+  ``used-before-assignment`` involving homonyms between filtered comprehensions
+  and assignments in except blocks.
+
+  Closes #5586
+
+* Fixed crash on list comprehensions that used ``type`` as inner variable name.
+
+  Closes #5461
+
+* Fixed crash in ``use-maxsplit-arg`` checker when providing the ``sep`` argument
+  to ``str.split()`` by keyword.
+
+  Closes #5737
+
+* Fix false positive for ``unused-variable`` for a comprehension variable matching
+  an outer scope type annotation.
+
+  Closes #5326
+
+* Fix false negative for ``undefined-variable`` for a variable used multiple times
+  in a comprehension matching an unused outer scope type annotation.
+
+  Closes #5654
+
 * Require Python ``3.6.2`` to run pylint.
 
   Closes #5065
+
+* Fixed crash on uninferable decorators on Python 3.6 and 3.7
+
+* Emit ``redefined-outer-name`` when a nested except handler shadows an outer one.
+
+  Closes #4434
+  Closes #5370
+
+* ``encoding`` can now be supplied as a positional argument to calls that open
+  files without triggering ``unspecified-encoding``.
+
+  Closes #5638
+
+* Fatal errors now emit a score of 0.0 regardless of whether the linted module
+  contained any statements
+
+  Closes #5451
+
+* ``fatal`` was added to the variables permitted in score evaluation expressions.
+
+* The default score evaluation now uses a floor of 0.
+
+  Closes #2399
+
+* Fix ``comparison-with-callable`` false positive for callables that raise, such
+  as typing constants.
+
+  Closes #5557
+
+* When invoking ``pylint``, ``epylint``, ``symilar`` or ``pyreverse`` by importing them in a python file
+  you can now pass an ``argv`` keyword besides patching ``sys.argv``.
+
+  Closes #5320
+
+* The ``PyLinter`` class will now be initialized with a ``TextReporter``
+  as its reporter if none is provided.
+
+* Fix false positive ``not-callable`` with attributes that alias ``NamedTuple``
+
+  Partially closes #1730
+
+* The ``testutils`` for unittests now accept ``end_lineno`` and ``end_column``. Tests
+  without these will trigger a ``DeprecationWarning``.
+
+* ``arguments-differ`` will no longer complain about method redefinitions with extra parameters
+  that have default values.
+
+  Closes #1556, #5338
+
+* Disables for ``deprecated-module`` and similar warnings for stdlib features deprecated
+  in newer versions of Python no longer raise ``useless-suppression`` when linting with
+  older Python interpreters where those features are not yet deprecated.
+
+* Importing the deprecated stdlib module ``xml.etree.cElementTree`` now emits ``deprecated_module``.
+
+  Closes #5862
+
+* Importing the deprecated stdlib module ``distutils`` now emits ``deprecated_module`` on Python 3.10+.
+
+* Fixed false positive ``unexpected-keyword-arg`` for decorators.
+
+  Closes #258
+
+* ``missing-raises-doc`` will now check the class hierarchy of the raised exceptions
+
+  .. code-block:: python
+
+    def my_function()
+      """My function.
+
+      Raises:
+        Exception: if something fails
+      """
+      raise ValueError
+
+  Closes #4955
+
+* Fixed false positive for ``unused-variable`` when a ``nonlocal`` name is assigned as part of a multi-name assignment.
+
+  Closes #3781
+
+* Fix false positive - Allow unpacking of ``self`` in a subclass of ``typing.NamedTuple``.
+
+  Closes #5312
+
+* Fixed false negative ``unpacking-non-sequence`` when value is an empty list.
+
+  Closes #5707
+
+* Fixed false positive for ``global-variable-not-assigned`` when the ``del`` statement is used
+
+  Closes #5333
+
+* Fix type hints in class diagrams generated by pyreverse for class methods and methods returning None.
+
+* Output better error message if unsupported file formats are used with ``pyreverse``.
+
+  Closes #5950
+
+* Fixed false positive for ``unused-argument`` when a ``nonlocal`` name is used
+  in a nested function that is returned without being called by its parent.
+
+  Closes #5187
+
+* Avoid emitting ``raising-bad-type`` when there is inference ambiguity on
+  the variable being raised.
+
+  Closes #2793
+
+* Fix false positive for ``superfluous-parens`` for patterns like
+  "return (a or b) in iterable".
+
+  Closes #5803
+
+* Fix false positive for ``used-before-assignment`` for assignments taking place via
+  nonlocal declarations after an earlier type annotation.
+
+  Closes #5394
+
+* Fix false positive for 'nonexistent-operator' when repeated '-' are
+  separated (e.g. by parens).
+
+  Closes #5769
+
+* Only raise ``not-callable`` when all the inferred values of a property are not callable.
+
+  Closes #5931
diff --git a/doc/whatsnew/2.7.rst b/doc/whatsnew/2.7.rst
index 35bdb9348b..6c0fccf181 100644
--- a/doc/whatsnew/2.7.rst
+++ b/doc/whatsnew/2.7.rst
@@ -35,7 +35,7 @@ Other Changes
 
 * Fix false positive for ``builtin-not-iterating`` when ``zip`` or ``map`` receives iterable
 
-* Fix linter multiprocessing pool shutdown which triggered warnings when runned in parallels with other pytest plugins.
+* Fix linter multiprocessing pool shutdown which triggered warnings when ran in parallels with other pytest plugins.
 
 * Enums are now required to be named in UPPER_CASE by ``invalid-name``.
 
diff --git a/examples/custom.py b/examples/custom.py
index bd9797e2ad..d7757dc788 100644
--- a/examples/custom.py
+++ b/examples/custom.py
@@ -1,13 +1,18 @@
+from typing import TYPE_CHECKING
+
 from astroid import nodes
 
 from pylint.checkers import BaseChecker
 from pylint.interfaces import IAstroidChecker
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
 
-# This is our checker class.
 # Checkers should always inherit from `BaseChecker`.
+
+
 class MyAstroidChecker(BaseChecker):
-    """Add class member attributes to the class locals dictionary."""
+    """Add class member attributes to the class local's dictionary."""
 
     # This class variable defines the type of checker that we are implementing.
     # In this case, we are implementing an AST checker.
@@ -31,8 +36,7 @@ class MyAstroidChecker(BaseChecker):
     options = (
         # Each option definition has a name which is used on the command line
         # and in config files, and a dictionary of arguments
-        # (similar to those to those to
-        # argparse.ArgumentParser.add_argument).
+        # (similar to argparse.ArgumentParser.add_argument).
         (
             "store-locals-indicator",
             {
@@ -49,8 +53,6 @@ def visit_call(self, node: nodes.Call) -> None:
         """Called when a :class:`.nodes.Call` node is visited.
 
         See :mod:`astroid` for the description of available nodes.
-
-        :param node: The node to check.
         """
         if not (
             isinstance(node.func, nodes.Attribute)
@@ -59,15 +61,14 @@ def visit_call(self, node: nodes.Call) -> None:
             and node.func.attrname == "create"
         ):
             return
-        in_class = node.frame()
+        in_class = node.frame(future=True)
         for param in node.args:
             in_class.locals[param.name] = node
 
 
-def register(linter):
-    """This required method auto registers the checker.
+def register(linter: "PyLinter") -> None:
+    """This required method auto registers the checker during initialization.
 
     :param linter: The linter to register the checker to.
-    :type linter: pylint.lint.PyLinter
     """
     linter.register_checker(MyAstroidChecker(linter))
diff --git a/examples/custom_raw.py b/examples/custom_raw.py
index 5f747869f8..365e9b7fa0 100644
--- a/examples/custom_raw.py
+++ b/examples/custom_raw.py
@@ -1,11 +1,16 @@
+from typing import TYPE_CHECKING
+
 from astroid import nodes
 
 from pylint.checkers import BaseChecker
 from pylint.interfaces import IRawChecker
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 class MyRawChecker(BaseChecker):
-    """check for line continuations with '\' instead of using triple
+    """Check for line continuations with '\' instead of using triple
     quoted string or parenthesis
     """
 
@@ -25,7 +30,7 @@ class MyRawChecker(BaseChecker):
     options = ()
 
     def process_module(self, node: nodes.Module) -> None:
-        """process a module
+        """Process a module.
 
         the module's content is accessible via node.stream() function
         """
@@ -35,6 +40,9 @@ def process_module(self, node: nodes.Module) -> None:
                     self.add_message("backslash-line-continuation", line=lineno)
 
 
-def register(linter):
-    """required method to auto register this checker"""
+def register(linter: "PyLinter") -> None:
+    """This required method auto registers the checker during initialization.
+
+    :param linter: The linter to register the checker to.
+    """
     linter.register_checker(MyRawChecker(linter))
diff --git a/examples/deprecation_checker.py b/examples/deprecation_checker.py
index 93910b724c..79a7285379 100644
--- a/examples/deprecation_checker.py
+++ b/examples/deprecation_checker.py
@@ -1,5 +1,4 @@
-"""
-Example checker detecting deprecated functions/methods. Following example searches for usages of
+"""Example checker detecting deprecated functions/methods. Following example searches for usages of
 deprecated function `deprecated_function` and deprecated method `MyClass.deprecated_method`
 from module mymodule:
 
@@ -38,11 +37,14 @@ def mymethod(self, arg0, arg1, deprecated1=None, arg2='foo', deprecated2='bar',
     ------------------------------------------------------------------
     Your code has been rated at 2.00/10 (previous run: 2.00/10, +0.00)
 """
-from typing import Set, Tuple, Union
+from typing import TYPE_CHECKING, Set, Tuple, Union
 
 from pylint.checkers import BaseChecker, DeprecatedMixin
 from pylint.interfaces import IAstroidChecker
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 class DeprecationChecker(DeprecatedMixin, BaseChecker):
     """Class implementing deprecation checker."""
@@ -90,10 +92,5 @@ def deprecated_arguments(
         return ()
 
 
-def register(linter):
-    """This required method auto registers the checker.
-
-    :param linter: The linter to register the checker to.
-    :type linter: pylint.lint.PyLinter
-    """
+def register(linter: "PyLinter") -> None:
     linter.register_checker(DeprecationChecker(linter))
diff --git a/examples/pylintrc b/examples/pylintrc
index 07e870b581..8fb3c179a6 100644
--- a/examples/pylintrc
+++ b/examples/pylintrc
@@ -66,7 +66,7 @@ confidence=
 # can either give multiple identifiers separated by comma (,) or put this
 # option multiple times (only on the command line, not in the configuration
 # file where it should appear only once). You can also use "--disable=all" to
-# disable everything first and then reenable specific checks. For example, if
+# disable everything first and then re-enable specific checks. For example, if
 # you want to run only the similarities checker, you can use "--disable=all
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use "--disable=all --enable=classes
@@ -90,11 +90,11 @@ enable=c-extension-no-member
 [REPORTS]
 
 # Python expression which should return a score less than or equal to 10. You
-# have access to the variables 'error', 'warning', 'refactor', and 'convention'
+# have access to the variables 'fatal', 'error', 'warning', 'refactor', 'convention' and 'info'
 # which contain the number of messages in each category, as well as 'statement'
 # which is the total number of statements analyzed. This score is used by the
 # global evaluation report (RP0004).
-evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+evaluation=max(0, 0 if fatal else 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10))
 
 # Template used to display messages. This is a python new-style format string
 # used to format the message information. See doc for all details.
diff --git a/pylint/__init__.py b/pylint/__init__.py
index ddf794f861..9fde923dc0 100644
--- a/pylint/__init__.py
+++ b/pylint/__init__.py
@@ -1,49 +1,57 @@
-# Copyright (c) 2008, 2012 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2014, 2016-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2018 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2020-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import os
 import sys
+from typing import Optional, Sequence
 
 from pylint.__pkginfo__ import __version__
 
 # pylint: disable=import-outside-toplevel
 
 
-def run_pylint():
+def run_pylint(argv: Optional[Sequence[str]] = None):
+    """Run pylint.
+
+    argv can be a sequence of strings normally supplied as arguments on the command line
+    """
     from pylint.lint import Run as PylintRun
 
     try:
-        PylintRun(sys.argv[1:])
+        PylintRun(argv or sys.argv[1:])
     except KeyboardInterrupt:
         sys.exit(1)
 
 
-def run_epylint():
+def run_epylint(argv: Optional[Sequence[str]] = None):
+    """Run epylint.
+
+    argv can be a list of strings normally supplied as arguments on the command line
+    """
     from pylint.epylint import Run as EpylintRun
 
-    EpylintRun()
+    EpylintRun(argv)
 
 
-def run_pyreverse():
-    """run pyreverse"""
+def run_pyreverse(argv: Optional[Sequence[str]] = None):
+    """Run pyreverse.
+
+    argv can be a sequence of strings normally supplied as arguments on the command line
+    """
     from pylint.pyreverse.main import Run as PyreverseRun
 
-    PyreverseRun(sys.argv[1:])
+    PyreverseRun(argv or sys.argv[1:])
 
 
-def run_symilar():
-    """run symilar"""
+def run_symilar(argv: Optional[Sequence[str]] = None):
+    """Run symilar.
+
+    argv can be a sequence of strings normally supplied as arguments on the command line
+    """
     from pylint.checkers.similar import Run as SimilarRun
 
-    SimilarRun(sys.argv[1:])
+    SimilarRun(argv or sys.argv[1:])
 
 
 def modify_sys_path() -> None:
diff --git a/pylint/__main__.py b/pylint/__main__.py
index 278570f619..7df5805f93 100644
--- a/pylint/__main__.py
+++ b/pylint/__main__.py
@@ -2,6 +2,7 @@
 
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import pylint
 
diff --git a/pylint/__pkginfo__.py b/pylint/__pkginfo__.py
index 1e2846ef01..614344f22f 100644
--- a/pylint/__pkginfo__.py
+++ b/pylint/__pkginfo__.py
@@ -1,12 +1,14 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 from typing import Tuple
 
-__version__ = "2.12.2"
+__version__ = "2.13.5"
 
 
 def get_numversion_from_version(v: str) -> Tuple:
-    """Kept for compatibility reason
+    """Kept for compatibility reason.
 
     See https://github.com/PyCQA/pylint/issues/4399
     https://github.com/PyCQA/pylint/issues/4420,
diff --git a/pylint/checkers/__init__.py b/pylint/checkers/__init__.py
index 273b085a05..2855d70293 100644
--- a/pylint/checkers/__init__.py
+++ b/pylint/checkers/__init__.py
@@ -1,25 +1,8 @@
-# Copyright (c) 2006-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2013-2014 Google, Inc.
-# Copyright (c) 2013 buck@yelp.com <buck@yelp.com>
-# Copyright (c) 2014-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Moises Lopez <moylop260@vauxoo.com>
-# Copyright (c) 2017-2018 Bryce Guinta <bryce.paul.guinta@gmail.com>
-# Copyright (c) 2018-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2019 Bruno P. Kinoshita <kinow@users.noreply.github.com>
-# Copyright (c) 2020-2021 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Frank Harrison <frank@doublethefish.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Matus Valo <matusvalo@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""utilities methods and classes for checkers
+"""Utilities methods and classes for checkers.
 
 Base id of standard checkers (used in msg and report ids):
 01: base
@@ -37,9 +20,20 @@
 13: string_format
 14: string_constant
 15: stdlib
-16: python3
+16: python3 (This one was deleted but needs to be reserved for consistency with old messages)
 17: refactoring
-18-50: not yet used: reserved for future internal checkers.
+.
+.
+.
+24: non-ascii-names
+25: unicode
+26: unsupported_version
+27: private-import
+28-50: not yet used: reserved for future internal checkers.
+This file is not updated. Use
+   script/get_unused_message_id_category.py
+to get the next free checker id.
+
 51-99: perhaps used: reserved for external checkers
 
 The raw_metrics checker has no number associated since it doesn't emit any
@@ -66,9 +60,10 @@ def table_lines_from_stats(
     old_stats: Optional[LinterStats],
     stat_type: Literal["duplicated_lines", "message_types"],
 ) -> List[str]:
-    """get values listed in <columns> from <stats> and <old_stats>,
-    and return a formatted list of values, designed to be given to a
-    ureport.Table object
+    """Get values listed in <columns> from <stats> and <old_stats>,
+    and return a formatted list of values.
+
+    The return value is designed to be given to a ureport.Table object
     """
     lines: List[str] = []
     if stat_type == "duplicated_lines":
@@ -114,8 +109,8 @@ def table_lines_from_stats(
                 ("error", "NC"),
             ]
 
-    for index, _ in enumerate(new):
-        new_value = new[index][1]
+    for index, value in enumerate(new):
+        new_value = value[1]
         old_value = old[index][1]
         diff_str = (
             diff_string(old_value, new_value)
@@ -124,12 +119,12 @@ def table_lines_from_stats(
         )
         new_str = f"{new_value:.3f}" if isinstance(new_value, float) else str(new_value)
         old_str = f"{old_value:.3f}" if isinstance(old_value, float) else str(old_value)
-        lines.extend((new[index][0].replace("_", " "), new_str, old_str, diff_str))
+        lines.extend((value[0].replace("_", " "), new_str, old_str, diff_str))
     return lines
 
 
 def initialize(linter):
-    """initialize linter with checkers in this package"""
+    """Initialize linter with checkers in this package."""
     register_plugins(linter, __path__[0])
 
 
diff --git a/pylint/checkers/async.py b/pylint/checkers/async.py
index 9aaead7c4f..a85ab41170 100644
--- a/pylint/checkers/async.py
+++ b/pylint/checkers/async.py
@@ -1,16 +1,11 @@
-# Copyright (c) 2015-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2017 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Checker for anything related to the async protocol (PEP 492)."""
 
 import sys
+from typing import TYPE_CHECKING
 
 import astroid
 from astroid import nodes
@@ -19,6 +14,9 @@
 from pylint.checkers import utils as checker_utils
 from pylint.checkers.utils import decorated_with
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 class AsyncChecker(checkers.BaseChecker):
     __implements__ = interfaces.IAstroidChecker
@@ -94,6 +92,5 @@ def visit_asyncwith(self, node: nodes.AsyncWith) -> None:
             )
 
 
-def register(linter):
-    """required method to auto register this checker"""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(AsyncChecker(linter))
diff --git a/pylint/checkers/base.py b/pylint/checkers/base.py
deleted file mode 100644
index 0206b12025..0000000000
--- a/pylint/checkers/base.py
+++ /dev/null
@@ -1,2591 +0,0 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2010 Daniel Harding <dharding@gmail.com>
-# Copyright (c) 2012-2014 Google, Inc.
-# Copyright (c) 2013-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Nick Bastin <nick.bastin@gmail.com>
-# Copyright (c) 2015 Michael Kefeder <oss@multiwave.ch>
-# Copyright (c) 2015 Dmitry Pribysh <dmand@yandex.ru>
-# Copyright (c) 2015 Stephane Wirtel <stephane@wirtel.be>
-# Copyright (c) 2015 Cosmin Poieana <cmin@ropython.org>
-# Copyright (c) 2015 Florian Bruhin <me@the-compiler.org>
-# Copyright (c) 2015 Radu Ciorba <radu@devrandom.ro>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016, 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2016, 2018 Jakub Wilk <jwilk@jwilk.net>
-# Copyright (c) 2016-2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2016 Glenn Matthews <glenn@e-dad.net>
-# Copyright (c) 2016 Elias Dorneles <eliasdorneles@gmail.com>
-# Copyright (c) 2016 Yannack <yannack@users.noreply.github.com>
-# Copyright (c) 2016 Alex Jurkiewicz <alex@jurkiewi.cz>
-# Copyright (c) 2017, 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2017, 2019-2021 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2017 danields <danields761@gmail.com>
-# Copyright (c) 2017 Jacques Kvam <jwkvam@gmail.com>
-# Copyright (c) 2017 ttenhoeve-aa <ttenhoeve@appannie.com>
-# Copyright (c) 2018-2019, 2021 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2018-2019, 2021 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2018 Sergei Lebedev <185856+superbobry@users.noreply.github.com>
-# Copyright (c) 2018 Lucas Cimon <lucas.cimon@gmail.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Natalie Serebryakova <natalie.serebryakova@Natalies-MacBook-Pro.local>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 SergeyKosarchuk <sergeykosarchuk@gmail.com>
-# Copyright (c) 2018 Steven M. Vascellaro <svascellaro@gmail.com>
-# Copyright (c) 2018 Mike Frysinger <vapier@gmail.com>
-# Copyright (c) 2018 Chris Lamb <chris@chris-lamb.co.uk>
-# Copyright (c) 2018 glmdgrielson <32415403+glmdgrielson@users.noreply.github.com>
-# Copyright (c) 2019 Daniel Draper <Germandrummer92@users.noreply.github.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2019 Niko Wenselowski <niko@nerdno.de>
-# Copyright (c) 2019 Nikita Sobolev <mail@sobolevn.me>
-# Copyright (c) 2019 Oisín Moran <OisinMoran@users.noreply.github.com>
-# Copyright (c) 2019 Fantix King <fantix@uchicago.edu>
-# Copyright (c) 2020 Peter Kolbus <peter.kolbus@gmail.com>
-# Copyright (c) 2020 ethan-leba <ethanleba5@gmail.com>
-# Copyright (c) 2020 へーさん <hira9603859504@gmail.com>
-# Copyright (c) 2020 Damien Baty <damien.baty@polyconseil.fr>
-# Copyright (c) 2020 Ram Rachum <ram@rachum.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2020 bernie gray <bfgray3@users.noreply.github.com>
-# Copyright (c) 2020 Gabriel R Sezefredo <g@briel.dev>
-# Copyright (c) 2020 Benny <benny.mueller91@gmail.com>
-# Copyright (c) 2020 Anubhav <35621759+anubh-v@users.noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Tushar Sadhwani <tushar.sadhwani000@gmail.com>
-# Copyright (c) 2021 Tim Martin <tim@asymptotic.co.uk>
-# Copyright (c) 2021 Jaehoon Hwang <jaehoonhwang@users.noreply.github.com>
-# Copyright (c) 2021 jaydesl <35102795+jaydesl@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-# Copyright (c) 2021 Yilei "Dolee" Yang <yileiyang@google.com>
-# Copyright (c) 2021 Lorena B <46202743+lorena-b@users.noreply.github.com>
-# Copyright (c) 2021 David Liu <david@cs.toronto.edu>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-# Copyright (c) 2021 Or Bahari <orbahari@mail.tau.ac.il>
-
-# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-
-"""basic checker for Python code"""
-import collections
-import itertools
-import re
-import sys
-from typing import Any, Dict, Iterator, Optional, Pattern, cast
-
-import astroid
-from astroid import nodes
-
-from pylint import checkers, interfaces
-from pylint import utils as lint_utils
-from pylint.checkers import utils
-from pylint.checkers.utils import (
-    infer_all,
-    is_overload_stub,
-    is_property_deleter,
-    is_property_setter,
-)
-from pylint.reporters.ureports import nodes as reporter_nodes
-from pylint.utils import LinterStats
-from pylint.utils.utils import get_global_option
-
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
-
-class NamingStyle:
-    """It may seem counterintuitive that single naming style has multiple "accepted"
-    forms of regular expressions, but we need to special-case stuff like dunder names
-    in method names."""
-
-    ANY: Pattern[str] = re.compile(".*")
-    CLASS_NAME_RGX: Pattern[str] = ANY
-    MOD_NAME_RGX: Pattern[str] = ANY
-    CONST_NAME_RGX: Pattern[str] = ANY
-    COMP_VAR_RGX: Pattern[str] = ANY
-    DEFAULT_NAME_RGX: Pattern[str] = ANY
-    CLASS_ATTRIBUTE_RGX: Pattern[str] = ANY
-
-    @classmethod
-    def get_regex(cls, name_type):
-        return {
-            "module": cls.MOD_NAME_RGX,
-            "const": cls.CONST_NAME_RGX,
-            "class": cls.CLASS_NAME_RGX,
-            "function": cls.DEFAULT_NAME_RGX,
-            "method": cls.DEFAULT_NAME_RGX,
-            "attr": cls.DEFAULT_NAME_RGX,
-            "argument": cls.DEFAULT_NAME_RGX,
-            "variable": cls.DEFAULT_NAME_RGX,
-            "class_attribute": cls.CLASS_ATTRIBUTE_RGX,
-            "class_const": cls.CONST_NAME_RGX,
-            "inlinevar": cls.COMP_VAR_RGX,
-        }[name_type]
-
-
-class SnakeCaseStyle(NamingStyle):
-    """Regex rules for snake_case naming style."""
-
-    CLASS_NAME_RGX = re.compile(r"[^\W\dA-Z][^\WA-Z]+$")
-    MOD_NAME_RGX = re.compile(r"[^\W\dA-Z][^\WA-Z]*$")
-    CONST_NAME_RGX = re.compile(r"([^\W\dA-Z][^\WA-Z]*|__.*__)$")
-    COMP_VAR_RGX = re.compile(r"[^\W\dA-Z][^\WA-Z]*$")
-    DEFAULT_NAME_RGX = re.compile(
-        r"([^\W\dA-Z][^\WA-Z]{2,}|_[^\WA-Z]*|__[^\WA-Z\d_][^\WA-Z]+__)$"
-    )
-    CLASS_ATTRIBUTE_RGX = re.compile(r"([^\W\dA-Z][^\WA-Z]{2,}|__.*__)$")
-
-
-class CamelCaseStyle(NamingStyle):
-    """Regex rules for camelCase naming style."""
-
-    CLASS_NAME_RGX = re.compile(r"[^\W\dA-Z][^\W_]+$")
-    MOD_NAME_RGX = re.compile(r"[^\W\dA-Z][^\W_]*$")
-    CONST_NAME_RGX = re.compile(r"([^\W\dA-Z][^\W_]*|__.*__)$")
-    COMP_VAR_RGX = re.compile(r"[^\W\dA-Z][^\W_]*$")
-    DEFAULT_NAME_RGX = re.compile(r"([^\W\dA-Z][^\W_]{2,}|__[^\W\dA-Z_]\w+__)$")
-    CLASS_ATTRIBUTE_RGX = re.compile(r"([^\W\dA-Z][^\W_]{2,}|__.*__)$")
-
-
-class PascalCaseStyle(NamingStyle):
-    """Regex rules for PascalCase naming style."""
-
-    CLASS_NAME_RGX = re.compile(r"[^\W\da-z][^\W_]+$")
-    MOD_NAME_RGX = re.compile(r"[^\W\da-z][^\W_]+$")
-    CONST_NAME_RGX = re.compile(r"([^\W\da-z][^\W_]*|__.*__)$")
-    COMP_VAR_RGX = re.compile(r"[^\W\da-z][^\W_]+$")
-    DEFAULT_NAME_RGX = re.compile(r"([^\W\da-z][^\W_]{2,}|__[^\W\dA-Z_]\w+__)$")
-    CLASS_ATTRIBUTE_RGX = re.compile(r"[^\W\da-z][^\W_]{2,}$")
-
-
-class UpperCaseStyle(NamingStyle):
-    """Regex rules for UPPER_CASE naming style."""
-
-    CLASS_NAME_RGX = re.compile(r"[^\W\da-z][^\Wa-z]+$")
-    MOD_NAME_RGX = re.compile(r"[^\W\da-z][^\Wa-z]+$")
-    CONST_NAME_RGX = re.compile(r"([^\W\da-z][^\Wa-z]*|__.*__)$")
-    COMP_VAR_RGX = re.compile(r"[^\W\da-z][^\Wa-z]+$")
-    DEFAULT_NAME_RGX = re.compile(r"([^\W\da-z][^\Wa-z]{2,}|__[^\W\dA-Z_]\w+__)$")
-    CLASS_ATTRIBUTE_RGX = re.compile(r"[^\W\da-z][^\Wa-z]{2,}$")
-
-
-class AnyStyle(NamingStyle):
-    pass
-
-
-NAMING_STYLES = {
-    "snake_case": SnakeCaseStyle,
-    "camelCase": CamelCaseStyle,
-    "PascalCase": PascalCaseStyle,
-    "UPPER_CASE": UpperCaseStyle,
-    "any": AnyStyle,
-}
-
-# do not require a doc string on private/system methods
-NO_REQUIRED_DOC_RGX = re.compile("^_")
-REVERSED_PROTOCOL_METHOD = "__reversed__"
-SEQUENCE_PROTOCOL_METHODS = ("__getitem__", "__len__")
-REVERSED_METHODS = (SEQUENCE_PROTOCOL_METHODS, (REVERSED_PROTOCOL_METHOD,))
-TYPECHECK_COMPARISON_OPERATORS = frozenset(("is", "is not", "==", "!="))
-LITERAL_NODE_TYPES = (nodes.Const, nodes.Dict, nodes.List, nodes.Set)
-UNITTEST_CASE = "unittest.case"
-TYPE_QNAME = "builtins.type"
-ABC_METACLASSES = {"_py_abc.ABCMeta", "abc.ABCMeta"}  # Python 3.7+,
-
-# Name categories that are always consistent with all naming conventions.
-EXEMPT_NAME_CATEGORIES = {"exempt", "ignore"}
-
-# A mapping from qname -> symbol, to be used when generating messages
-# about dangerous default values as arguments
-DEFAULT_ARGUMENT_SYMBOLS = dict(
-    zip(
-        [".".join(["builtins", x]) for x in ("set", "dict", "list")],
-        ["set()", "{}", "[]"],
-    ),
-    **{
-        x: f"{x}()"
-        for x in (
-            "collections.deque",
-            "collections.ChainMap",
-            "collections.Counter",
-            "collections.OrderedDict",
-            "collections.defaultdict",
-            "collections.UserDict",
-            "collections.UserList",
-        )
-    },
-)
-
-COMPARISON_OPERATORS = frozenset(("==", "!=", "<", ">", "<=", ">="))
-# List of methods which can be redefined
-REDEFINABLE_METHODS = frozenset(("__module__",))
-TYPING_FORWARD_REF_QNAME = "typing.ForwardRef"
-
-
-def _redefines_import(node):
-    """Detect that the given node (AssignName) is inside an
-    exception handler and redefines an import from the tryexcept body.
-    Returns True if the node redefines an import, False otherwise.
-    """
-    current = node
-    while current and not isinstance(current.parent, nodes.ExceptHandler):
-        current = current.parent
-    if not current or not utils.error_of_type(current.parent, ImportError):
-        return False
-    try_block = current.parent.parent
-    for import_node in try_block.nodes_of_class((nodes.ImportFrom, nodes.Import)):
-        for name, alias in import_node.names:
-            if alias:
-                if alias == node.name:
-                    return True
-            elif name == node.name:
-                return True
-    return False
-
-
-LOOPLIKE_NODES = (
-    nodes.For,
-    nodes.ListComp,
-    nodes.SetComp,
-    nodes.DictComp,
-    nodes.GeneratorExp,
-)
-
-
-def in_loop(node: nodes.NodeNG) -> bool:
-    """Return whether the node is inside a kind of for loop"""
-    return any(isinstance(parent, LOOPLIKE_NODES) for parent in node.node_ancestors())
-
-
-def in_nested_list(nested_list, obj):
-    """return true if the object is an element of <nested_list> or of a nested
-    list
-    """
-    for elmt in nested_list:
-        if isinstance(elmt, (list, tuple)):
-            if in_nested_list(elmt, obj):
-                return True
-        elif elmt == obj:
-            return True
-    return False
-
-
-def _get_break_loop_node(break_node):
-    """
-    Returns the loop node that holds the break node in arguments.
-
-    Args:
-        break_node (astroid.Break): the break node of interest.
-
-    Returns:
-        astroid.For or astroid.While: the loop node holding the break node.
-    """
-    loop_nodes = (nodes.For, nodes.While)
-    parent = break_node.parent
-    while not isinstance(parent, loop_nodes) or break_node in getattr(
-        parent, "orelse", []
-    ):
-        break_node = parent
-        parent = parent.parent
-        if parent is None:
-            break
-    return parent
-
-
-def _loop_exits_early(loop):
-    """
-    Returns true if a loop may ends up in a break statement.
-
-    Args:
-        loop (astroid.For, astroid.While): the loop node inspected.
-
-    Returns:
-        bool: True if the loop may ends up in a break statement, False otherwise.
-    """
-    loop_nodes = (nodes.For, nodes.While)
-    definition_nodes = (nodes.FunctionDef, nodes.ClassDef)
-    inner_loop_nodes = [
-        _node
-        for _node in loop.nodes_of_class(loop_nodes, skip_klass=definition_nodes)
-        if _node != loop
-    ]
-    return any(
-        _node
-        for _node in loop.nodes_of_class(nodes.Break, skip_klass=definition_nodes)
-        if _get_break_loop_node(_node) not in inner_loop_nodes
-    )
-
-
-def _is_multi_naming_match(match, node_type, confidence):
-    return (
-        match is not None
-        and match.lastgroup is not None
-        and match.lastgroup not in EXEMPT_NAME_CATEGORIES
-        and (node_type != "method" or confidence != interfaces.INFERENCE_FAILURE)
-    )
-
-
-BUILTIN_PROPERTY = "builtins.property"
-
-
-def _get_properties(config):
-    """Returns a tuple of property classes and names.
-
-    Property classes are fully qualified, such as 'abc.abstractproperty' and
-    property names are the actual names, such as 'abstract_property'.
-    """
-    property_classes = {BUILTIN_PROPERTY}
-    property_names = set()  # Not returning 'property', it has its own check.
-    if config is not None:
-        property_classes.update(config.property_classes)
-        property_names.update(
-            prop.rsplit(".", 1)[-1] for prop in config.property_classes
-        )
-    return property_classes, property_names
-
-
-def _determine_function_name_type(node: nodes.FunctionDef, config=None):
-    """Determine the name type whose regex the a function's name should match.
-
-    :param node: A function node.
-    :param config: Configuration from which to pull additional property classes.
-    :type config: :class:`optparse.Values`
-
-    :returns: One of ('function', 'method', 'attr')
-    :rtype: str
-    """
-    property_classes, property_names = _get_properties(config)
-    if not node.is_method():
-        return "function"
-
-    if is_property_setter(node) or is_property_deleter(node):
-        # If the function is decorated using the prop_method.{setter,getter}
-        # form, treat it like an attribute as well.
-        return "attr"
-
-    decorators = node.decorators.nodes if node.decorators else []
-    for decorator in decorators:
-        # If the function is a property (decorated with @property
-        # or @abc.abstractproperty), the name type is 'attr'.
-        if isinstance(decorator, nodes.Name) or (
-            isinstance(decorator, nodes.Attribute)
-            and decorator.attrname in property_names
-        ):
-            inferred = utils.safe_infer(decorator)
-            if (
-                inferred
-                and hasattr(inferred, "qname")
-                and inferred.qname() in property_classes
-            ):
-                return "attr"
-    return "method"
-
-
-def _has_abstract_methods(node):
-    """
-    Determine if the given `node` has abstract methods.
-
-    The methods should be made abstract by decorating them
-    with `abc` decorators.
-    """
-    return len(utils.unimplemented_abstract_methods(node)) > 0
-
-
-def report_by_type_stats(
-    sect,
-    stats: LinterStats,
-    old_stats: Optional[LinterStats],
-):
-    """make a report of
-
-    * percentage of different types documented
-    * percentage of different types with a bad name
-    """
-    # percentage of different types documented and/or with a bad name
-    nice_stats: Dict[str, Dict[str, str]] = {}
-    for node_type in ("module", "class", "method", "function"):
-        node_type = cast(Literal["function", "class", "method", "module"], node_type)
-        total = stats.get_node_count(node_type)
-        nice_stats[node_type] = {}
-        if total != 0:
-            undocumented_node = stats.get_undocumented(node_type)
-            documented = total - undocumented_node
-            percent = (documented * 100.0) / total
-            nice_stats[node_type]["percent_documented"] = f"{percent:.2f}"
-            badname_node = stats.get_bad_names(node_type)
-            percent = (badname_node * 100.0) / total
-            nice_stats[node_type]["percent_badname"] = f"{percent:.2f}"
-    lines = ["type", "number", "old number", "difference", "%documented", "%badname"]
-    for node_type in ("module", "class", "method", "function"):
-        node_type = cast(Literal["function", "class", "method", "module"], node_type)
-        new = stats.get_node_count(node_type)
-        old = old_stats.get_node_count(node_type) if old_stats else None
-        diff_str = lint_utils.diff_string(old, new) if old else None
-        lines += [
-            node_type,
-            str(new),
-            str(old) if old else "NC",
-            diff_str if diff_str else "NC",
-            nice_stats[node_type].get("percent_documented", "0"),
-            nice_stats[node_type].get("percent_badname", "0"),
-        ]
-    sect.append(reporter_nodes.Table(children=lines, cols=6, rheaders=1))
-
-
-def redefined_by_decorator(node):
-    """return True if the object is a method redefined via decorator.
-
-    For example:
-        @property
-        def x(self): return self._x
-        @x.setter
-        def x(self, value): self._x = value
-    """
-    if node.decorators:
-        for decorator in node.decorators.nodes:
-            if (
-                isinstance(decorator, nodes.Attribute)
-                and getattr(decorator.expr, "name", None) == node.name
-            ):
-                return True
-    return False
-
-
-class _BasicChecker(checkers.BaseChecker):
-    __implements__ = interfaces.IAstroidChecker
-    name = "basic"
-
-
-class BasicErrorChecker(_BasicChecker):
-    msgs = {
-        "E0100": (
-            "__init__ method is a generator",
-            "init-is-generator",
-            "Used when the special class method __init__ is turned into a "
-            "generator by a yield in its body.",
-        ),
-        "E0101": (
-            "Explicit return in __init__",
-            "return-in-init",
-            "Used when the special class method __init__ has an explicit "
-            "return value.",
-        ),
-        "E0102": (
-            "%s already defined line %s",
-            "function-redefined",
-            "Used when a function / class / method is redefined.",
-        ),
-        "E0103": (
-            "%r not properly in loop",
-            "not-in-loop",
-            "Used when break or continue keywords are used outside a loop.",
-        ),
-        "E0104": (
-            "Return outside function",
-            "return-outside-function",
-            'Used when a "return" statement is found outside a function or method.',
-        ),
-        "E0105": (
-            "Yield outside function",
-            "yield-outside-function",
-            'Used when a "yield" statement is found outside a function or method.',
-        ),
-        "E0106": (
-            "Return with argument inside generator",
-            "return-arg-in-generator",
-            'Used when a "return" statement with an argument is found '
-            "outside in a generator function or method (e.g. with some "
-            '"yield" statements).',
-            {"maxversion": (3, 3)},
-        ),
-        "E0107": (
-            "Use of the non-existent %s operator",
-            "nonexistent-operator",
-            "Used when you attempt to use the C-style pre-increment or "
-            "pre-decrement operator -- and ++, which doesn't exist in Python.",
-        ),
-        "E0108": (
-            "Duplicate argument name %s in function definition",
-            "duplicate-argument-name",
-            "Duplicate argument names in function definitions are syntax errors.",
-        ),
-        "E0110": (
-            "Abstract class %r with abstract methods instantiated",
-            "abstract-class-instantiated",
-            "Used when an abstract class with `abc.ABCMeta` as metaclass "
-            "has abstract methods and is instantiated.",
-        ),
-        "W0120": (
-            "Else clause on loop without a break statement",
-            "useless-else-on-loop",
-            "Loops should only have an else clause if they can exit early "
-            "with a break statement, otherwise the statements under else "
-            "should be on the same scope as the loop itself.",
-        ),
-        "E0112": (
-            "More than one starred expression in assignment",
-            "too-many-star-expressions",
-            "Emitted when there are more than one starred "
-            "expressions (`*x`) in an assignment. This is a SyntaxError.",
-        ),
-        "E0113": (
-            "Starred assignment target must be in a list or tuple",
-            "invalid-star-assignment-target",
-            "Emitted when a star expression is used as a starred assignment target.",
-        ),
-        "E0114": (
-            "Can use starred expression only in assignment target",
-            "star-needs-assignment-target",
-            "Emitted when a star expression is not used in an assignment target.",
-        ),
-        "E0115": (
-            "Name %r is nonlocal and global",
-            "nonlocal-and-global",
-            "Emitted when a name is both nonlocal and global.",
-        ),
-        "E0116": (
-            "'continue' not supported inside 'finally' clause",
-            "continue-in-finally",
-            "Emitted when the `continue` keyword is found "
-            "inside a finally clause, which is a SyntaxError.",
-            {"maxversion": (3, 8)},
-        ),
-        "E0117": (
-            "nonlocal name %s found without binding",
-            "nonlocal-without-binding",
-            "Emitted when a nonlocal variable does not have an attached "
-            "name somewhere in the parent scopes",
-        ),
-        "E0118": (
-            "Name %r is used prior to global declaration",
-            "used-prior-global-declaration",
-            "Emitted when a name is used prior a global declaration, "
-            "which results in an error since Python 3.6.",
-            {"minversion": (3, 6)},
-        ),
-    }
-
-    @utils.check_messages("function-redefined")
-    def visit_classdef(self, node: nodes.ClassDef) -> None:
-        self._check_redefinition("class", node)
-
-    def _too_many_starred_for_tuple(self, assign_tuple):
-        starred_count = 0
-        for elem in assign_tuple.itered():
-            if isinstance(elem, nodes.Tuple):
-                return self._too_many_starred_for_tuple(elem)
-            if isinstance(elem, nodes.Starred):
-                starred_count += 1
-        return starred_count > 1
-
-    @utils.check_messages("too-many-star-expressions", "invalid-star-assignment-target")
-    def visit_assign(self, node: nodes.Assign) -> None:
-        # Check *a, *b = ...
-        assign_target = node.targets[0]
-        # Check *a = b
-        if isinstance(node.targets[0], nodes.Starred):
-            self.add_message("invalid-star-assignment-target", node=node)
-
-        if not isinstance(assign_target, nodes.Tuple):
-            return
-        if self._too_many_starred_for_tuple(assign_target):
-            self.add_message("too-many-star-expressions", node=node)
-
-    @utils.check_messages("star-needs-assignment-target")
-    def visit_starred(self, node: nodes.Starred) -> None:
-        """Check that a Starred expression is used in an assignment target."""
-        if isinstance(node.parent, nodes.Call):
-            # f(*args) is converted to Call(args=[Starred]), so ignore
-            # them for this check.
-            return
-        if isinstance(node.parent, (nodes.List, nodes.Tuple, nodes.Set, nodes.Dict)):
-            # PEP 448 unpacking.
-            return
-
-        stmt = node.statement()
-        if not isinstance(stmt, nodes.Assign):
-            return
-
-        if stmt.value is node or stmt.value.parent_of(node):
-            self.add_message("star-needs-assignment-target", node=node)
-
-    @utils.check_messages(
-        "init-is-generator",
-        "return-in-init",
-        "function-redefined",
-        "return-arg-in-generator",
-        "duplicate-argument-name",
-        "nonlocal-and-global",
-        "used-prior-global-declaration",
-    )
-    def visit_functiondef(self, node: nodes.FunctionDef) -> None:
-        self._check_nonlocal_and_global(node)
-        self._check_name_used_prior_global(node)
-        if not redefined_by_decorator(
-            node
-        ) and not utils.is_registered_in_singledispatch_function(node):
-            self._check_redefinition(node.is_method() and "method" or "function", node)
-        # checks for max returns, branch, return in __init__
-        returns = node.nodes_of_class(
-            nodes.Return, skip_klass=(nodes.FunctionDef, nodes.ClassDef)
-        )
-        if node.is_method() and node.name == "__init__":
-            if node.is_generator():
-                self.add_message("init-is-generator", node=node)
-            else:
-                values = [r.value for r in returns]
-                # Are we returning anything but None from constructors
-                if any(v for v in values if not utils.is_none(v)):
-                    self.add_message("return-in-init", node=node)
-        # Check for duplicate names by clustering args with same name for detailed report
-        arg_clusters = collections.defaultdict(list)
-        arguments: Iterator[Any] = filter(None, [node.args.args, node.args.kwonlyargs])
-
-        for arg in itertools.chain.from_iterable(arguments):
-            arg_clusters[arg.name].append(arg)
-
-        # provide detailed report about each repeated argument
-        for argument_duplicates in arg_clusters.values():
-            if len(argument_duplicates) != 1:
-                for argument in argument_duplicates:
-                    self.add_message(
-                        "duplicate-argument-name",
-                        line=argument.lineno,
-                        node=argument,
-                        args=(argument.name,),
-                    )
-
-    visit_asyncfunctiondef = visit_functiondef
-
-    def _check_name_used_prior_global(self, node):
-
-        scope_globals = {
-            name: child
-            for child in node.nodes_of_class(nodes.Global)
-            for name in child.names
-            if child.scope() is node
-        }
-
-        if not scope_globals:
-            return
-
-        for node_name in node.nodes_of_class(nodes.Name):
-            if node_name.scope() is not node:
-                continue
-
-            name = node_name.name
-            corresponding_global = scope_globals.get(name)
-            if not corresponding_global:
-                continue
-
-            global_lineno = corresponding_global.fromlineno
-            if global_lineno and global_lineno > node_name.fromlineno:
-                self.add_message(
-                    "used-prior-global-declaration", node=node_name, args=(name,)
-                )
-
-    def _check_nonlocal_and_global(self, node):
-        """Check that a name is both nonlocal and global."""
-
-        def same_scope(current):
-            return current.scope() is node
-
-        from_iter = itertools.chain.from_iterable
-        nonlocals = set(
-            from_iter(
-                child.names
-                for child in node.nodes_of_class(nodes.Nonlocal)
-                if same_scope(child)
-            )
-        )
-
-        if not nonlocals:
-            return
-
-        global_vars = set(
-            from_iter(
-                child.names
-                for child in node.nodes_of_class(nodes.Global)
-                if same_scope(child)
-            )
-        )
-        for name in nonlocals.intersection(global_vars):
-            self.add_message("nonlocal-and-global", args=(name,), node=node)
-
-    @utils.check_messages("return-outside-function")
-    def visit_return(self, node: nodes.Return) -> None:
-        if not isinstance(node.frame(), nodes.FunctionDef):
-            self.add_message("return-outside-function", node=node)
-
-    @utils.check_messages("yield-outside-function")
-    def visit_yield(self, node: nodes.Yield) -> None:
-        self._check_yield_outside_func(node)
-
-    @utils.check_messages("yield-outside-function")
-    def visit_yieldfrom(self, node: nodes.YieldFrom) -> None:
-        self._check_yield_outside_func(node)
-
-    @utils.check_messages("not-in-loop", "continue-in-finally")
-    def visit_continue(self, node: nodes.Continue) -> None:
-        self._check_in_loop(node, "continue")
-
-    @utils.check_messages("not-in-loop")
-    def visit_break(self, node: nodes.Break) -> None:
-        self._check_in_loop(node, "break")
-
-    @utils.check_messages("useless-else-on-loop")
-    def visit_for(self, node: nodes.For) -> None:
-        self._check_else_on_loop(node)
-
-    @utils.check_messages("useless-else-on-loop")
-    def visit_while(self, node: nodes.While) -> None:
-        self._check_else_on_loop(node)
-
-    @utils.check_messages("nonexistent-operator")
-    def visit_unaryop(self, node: nodes.UnaryOp) -> None:
-        """check use of the non-existent ++ and -- operator operator"""
-        if (
-            (node.op in "+-")
-            and isinstance(node.operand, nodes.UnaryOp)
-            and (node.operand.op == node.op)
-        ):
-            self.add_message("nonexistent-operator", node=node, args=node.op * 2)
-
-    def _check_nonlocal_without_binding(self, node, name):
-        current_scope = node.scope()
-        while True:
-            if current_scope.parent is None:
-                break
-
-            if not isinstance(current_scope, (nodes.ClassDef, nodes.FunctionDef)):
-                self.add_message("nonlocal-without-binding", args=(name,), node=node)
-                return
-
-            if name not in current_scope.locals:
-                current_scope = current_scope.parent.scope()
-                continue
-
-            # Okay, found it.
-            return
-
-        if not isinstance(current_scope, nodes.FunctionDef):
-            self.add_message("nonlocal-without-binding", args=(name,), node=node)
-
-    @utils.check_messages("nonlocal-without-binding")
-    def visit_nonlocal(self, node: nodes.Nonlocal) -> None:
-        for name in node.names:
-            self._check_nonlocal_without_binding(node, name)
-
-    @utils.check_messages("abstract-class-instantiated")
-    def visit_call(self, node: nodes.Call) -> None:
-        """Check instantiating abstract class with
-        abc.ABCMeta as metaclass.
-        """
-        for inferred in infer_all(node.func):
-            self._check_inferred_class_is_abstract(inferred, node)
-
-    def _check_inferred_class_is_abstract(self, inferred, node):
-        if not isinstance(inferred, nodes.ClassDef):
-            return
-
-        klass = utils.node_frame_class(node)
-        if klass is inferred:
-            # Don't emit the warning if the class is instantiated
-            # in its own body or if the call is not an instance
-            # creation. If the class is instantiated into its own
-            # body, we're expecting that it knows what it is doing.
-            return
-
-        # __init__ was called
-        abstract_methods = _has_abstract_methods(inferred)
-
-        if not abstract_methods:
-            return
-
-        metaclass = inferred.metaclass()
-
-        if metaclass is None:
-            # Python 3.4 has `abc.ABC`, which won't be detected
-            # by ClassNode.metaclass()
-            for ancestor in inferred.ancestors():
-                if ancestor.qname() == "abc.ABC":
-                    self.add_message(
-                        "abstract-class-instantiated", args=(inferred.name,), node=node
-                    )
-                    break
-
-            return
-
-        if metaclass.qname() in ABC_METACLASSES:
-            self.add_message(
-                "abstract-class-instantiated", args=(inferred.name,), node=node
-            )
-
-    def _check_yield_outside_func(self, node):
-        if not isinstance(node.frame(), (nodes.FunctionDef, nodes.Lambda)):
-            self.add_message("yield-outside-function", node=node)
-
-    def _check_else_on_loop(self, node):
-        """Check that any loop with an else clause has a break statement."""
-        if node.orelse and not _loop_exits_early(node):
-            self.add_message(
-                "useless-else-on-loop",
-                node=node,
-                # This is not optimal, but the line previous
-                # to the first statement in the else clause
-                # will usually be the one that contains the else:.
-                line=node.orelse[0].lineno - 1,
-            )
-
-    def _check_in_loop(self, node, node_name):
-        """check that a node is inside a for or while loop"""
-        for parent in node.node_ancestors():
-            if isinstance(parent, (nodes.For, nodes.While)):
-                if node not in parent.orelse:
-                    return
-
-            if isinstance(parent, (nodes.ClassDef, nodes.FunctionDef)):
-                break
-            if (
-                isinstance(parent, nodes.TryFinally)
-                and node in parent.finalbody
-                and isinstance(node, nodes.Continue)
-            ):
-                self.add_message("continue-in-finally", node=node)
-
-        self.add_message("not-in-loop", node=node, args=node_name)
-
-    def _check_redefinition(self, redeftype, node):
-        """check for redefinition of a function / method / class name"""
-        parent_frame = node.parent.frame()
-
-        # Ignore function stubs created for type information
-        redefinitions = [
-            i
-            for i in parent_frame.locals[node.name]
-            if not (isinstance(i.parent, nodes.AnnAssign) and i.parent.simple)
-        ]
-        defined_self = next(
-            (local for local in redefinitions if not utils.is_overload_stub(local)),
-            node,
-        )
-        if defined_self is not node and not astroid.are_exclusive(node, defined_self):
-            # Additional checks for methods which are not considered
-            # redefined, since they are already part of the base API.
-            if (
-                isinstance(parent_frame, nodes.ClassDef)
-                and node.name in REDEFINABLE_METHODS
-            ):
-                return
-
-            # Skip typing.overload() functions.
-            if utils.is_overload_stub(node):
-                return
-
-            # Exempt functions redefined on a condition.
-            if isinstance(node.parent, nodes.If):
-                # Exempt "if not <func>" cases
-                if (
-                    isinstance(node.parent.test, nodes.UnaryOp)
-                    and node.parent.test.op == "not"
-                    and isinstance(node.parent.test.operand, nodes.Name)
-                    and node.parent.test.operand.name == node.name
-                ):
-                    return
-
-                # Exempt "if <func> is not None" cases
-                # pylint: disable=too-many-boolean-expressions
-                if (
-                    isinstance(node.parent.test, nodes.Compare)
-                    and isinstance(node.parent.test.left, nodes.Name)
-                    and node.parent.test.left.name == node.name
-                    and node.parent.test.ops[0][0] == "is"
-                    and isinstance(node.parent.test.ops[0][1], nodes.Const)
-                    and node.parent.test.ops[0][1].value is None
-                ):
-                    return
-
-            # Check if we have forward references for this node.
-            try:
-                redefinition_index = redefinitions.index(node)
-            except ValueError:
-                pass
-            else:
-                for redefinition in redefinitions[:redefinition_index]:
-                    inferred = utils.safe_infer(redefinition)
-                    if (
-                        inferred
-                        and isinstance(inferred, astroid.Instance)
-                        and inferred.qname() == TYPING_FORWARD_REF_QNAME
-                    ):
-                        return
-
-            dummy_variables_rgx = lint_utils.get_global_option(
-                self, "dummy-variables-rgx", default=None
-            )
-            if dummy_variables_rgx and dummy_variables_rgx.match(node.name):
-                return
-            self.add_message(
-                "function-redefined",
-                node=node,
-                args=(redeftype, defined_self.fromlineno),
-            )
-
-
-class BasicChecker(_BasicChecker):
-    """checks for :
-    * doc strings
-    * number of arguments, local variables, branches, returns and statements in
-    functions, methods
-    * required module attributes
-    * dangerous default values as arguments
-    * redefinition of function / method / class
-    * uses of the global statement
-    """
-
-    __implements__ = interfaces.IAstroidChecker
-
-    name = "basic"
-    msgs = {
-        "W0101": (
-            "Unreachable code",
-            "unreachable",
-            'Used when there is some code behind a "return" or "raise" '
-            "statement, which will never be accessed.",
-        ),
-        "W0102": (
-            "Dangerous default value %s as argument",
-            "dangerous-default-value",
-            "Used when a mutable value as list or dictionary is detected in "
-            "a default value for an argument.",
-        ),
-        "W0104": (
-            "Statement seems to have no effect",
-            "pointless-statement",
-            "Used when a statement doesn't have (or at least seems to) any effect.",
-        ),
-        "W0105": (
-            "String statement has no effect",
-            "pointless-string-statement",
-            "Used when a string is used as a statement (which of course "
-            "has no effect). This is a particular case of W0104 with its "
-            "own message so you can easily disable it if you're using "
-            "those strings as documentation, instead of comments.",
-        ),
-        "W0106": (
-            'Expression "%s" is assigned to nothing',
-            "expression-not-assigned",
-            "Used when an expression that is not a function call is assigned "
-            "to nothing. Probably something else was intended.",
-        ),
-        "W0108": (
-            "Lambda may not be necessary",
-            "unnecessary-lambda",
-            "Used when the body of a lambda expression is a function call "
-            "on the same argument list as the lambda itself; such lambda "
-            "expressions are in all but a few cases replaceable with the "
-            "function being called in the body of the lambda.",
-        ),
-        "W0109": (
-            "Duplicate key %r in dictionary",
-            "duplicate-key",
-            "Used when a dictionary expression binds the same key multiple times.",
-        ),
-        "W0122": (
-            "Use of exec",
-            "exec-used",
-            'Used when you use the "exec" statement (function for Python '
-            "3), to discourage its usage. That doesn't "
-            "mean you cannot use it !",
-        ),
-        "W0123": (
-            "Use of eval",
-            "eval-used",
-            'Used when you use the "eval" function, to discourage its '
-            "usage. Consider using `ast.literal_eval` for safely evaluating "
-            "strings containing Python expressions "
-            "from untrusted sources. ",
-        ),
-        "W0150": (
-            "%s statement in finally block may swallow exception",
-            "lost-exception",
-            "Used when a break or a return statement is found inside the "
-            "finally clause of a try...finally block: the exceptions raised "
-            "in the try clause will be silently swallowed instead of being "
-            "re-raised.",
-        ),
-        "W0199": (
-            "Assert called on a 2-item-tuple. Did you mean 'assert x,y'?",
-            "assert-on-tuple",
-            "A call of assert on a tuple will always evaluate to true if "
-            "the tuple is not empty, and will always evaluate to false if "
-            "it is.",
-        ),
-        "W0124": (
-            'Following "as" with another context manager looks like a tuple.',
-            "confusing-with-statement",
-            "Emitted when a `with` statement component returns multiple values "
-            "and uses name binding with `as` only for a part of those values, "
-            "as in with ctx() as a, b. This can be misleading, since it's not "
-            "clear if the context manager returns a tuple or if the node without "
-            "a name binding is another context manager.",
-        ),
-        "W0125": (
-            "Using a conditional statement with a constant value",
-            "using-constant-test",
-            "Emitted when a conditional statement (If or ternary if) "
-            "uses a constant value for its test. This might not be what "
-            "the user intended to do.",
-        ),
-        "W0126": (
-            "Using a conditional statement with potentially wrong function or method call due to missing parentheses",
-            "missing-parentheses-for-call-in-test",
-            "Emitted when a conditional statement (If or ternary if) "
-            "seems to wrongly call a function due to missing parentheses",
-        ),
-        "W0127": (
-            "Assigning the same variable %r to itself",
-            "self-assigning-variable",
-            "Emitted when we detect that a variable is assigned to itself",
-        ),
-        "W0128": (
-            "Redeclared variable %r in assignment",
-            "redeclared-assigned-name",
-            "Emitted when we detect that a variable was redeclared in the same assignment.",
-        ),
-        "E0111": (
-            "The first reversed() argument is not a sequence",
-            "bad-reversed-sequence",
-            "Used when the first argument to reversed() builtin "
-            "isn't a sequence (does not implement __reversed__, "
-            "nor __getitem__ and __len__",
-        ),
-        "E0119": (
-            "format function is not called on str",
-            "misplaced-format-function",
-            "Emitted when format function is not called on str object. "
-            'e.g doing print("value: {}").format(123) instead of '
-            'print("value: {}".format(123)). This might not be what the user '
-            "intended to do.",
-        ),
-        "W0129": (
-            "Assert statement has a string literal as its first argument. The assert will %s fail.",
-            "assert-on-string-literal",
-            "Used when an assert statement has a string literal as its first argument, which will "
-            "cause the assert to always pass.",
-        ),
-    }
-
-    reports = (("RP0101", "Statistics by type", report_by_type_stats),)
-
-    def __init__(self, linter):
-        super().__init__(linter)
-        self._tryfinallys = None
-
-    def open(self):
-        """initialize visit variables and statistics"""
-        py_version = get_global_option(self, "py-version")
-        self._py38_plus = py_version >= (3, 8)
-        self._tryfinallys = []
-        self.linter.stats.reset_node_count()
-
-    @utils.check_messages("using-constant-test", "missing-parentheses-for-call-in-test")
-    def visit_if(self, node: nodes.If) -> None:
-        self._check_using_constant_test(node, node.test)
-
-    @utils.check_messages("using-constant-test", "missing-parentheses-for-call-in-test")
-    def visit_ifexp(self, node: nodes.IfExp) -> None:
-        self._check_using_constant_test(node, node.test)
-
-    @utils.check_messages("using-constant-test", "missing-parentheses-for-call-in-test")
-    def visit_comprehension(self, node: nodes.Comprehension) -> None:
-        if node.ifs:
-            for if_test in node.ifs:
-                self._check_using_constant_test(node, if_test)
-
-    def _check_using_constant_test(self, node, test):
-        const_nodes = (
-            nodes.Module,
-            nodes.GeneratorExp,
-            nodes.Lambda,
-            nodes.FunctionDef,
-            nodes.ClassDef,
-            astroid.bases.Generator,
-            astroid.UnboundMethod,
-            astroid.BoundMethod,
-            nodes.Module,
-        )
-        structs = (nodes.Dict, nodes.Tuple, nodes.Set, nodes.List)
-
-        # These nodes are excepted, since they are not constant
-        # values, requiring a computation to happen.
-        except_nodes = (
-            nodes.Call,
-            nodes.BinOp,
-            nodes.BoolOp,
-            nodes.UnaryOp,
-            nodes.Subscript,
-        )
-        inferred = None
-        emit = isinstance(test, (nodes.Const,) + structs + const_nodes)
-        if not isinstance(test, except_nodes):
-            inferred = utils.safe_infer(test)
-
-        if emit:
-            self.add_message("using-constant-test", node=node)
-        elif isinstance(inferred, const_nodes):
-            # If the constant node is a FunctionDef or Lambda then
-            # it may be an illicit function call due to missing parentheses
-            call_inferred = None
-            try:
-                if isinstance(inferred, nodes.FunctionDef):
-                    call_inferred = inferred.infer_call_result()
-                elif isinstance(inferred, nodes.Lambda):
-                    call_inferred = inferred.infer_call_result(node)
-            except astroid.InferenceError:
-                call_inferred = None
-            if call_inferred:
-                try:
-                    for inf_call in call_inferred:
-                        if inf_call != astroid.Uninferable:
-                            self.add_message(
-                                "missing-parentheses-for-call-in-test", node=node
-                            )
-                            break
-                except astroid.InferenceError:
-                    pass
-            self.add_message("using-constant-test", node=node)
-
-    def visit_module(self, _: nodes.Module) -> None:
-        """check module name, docstring and required arguments"""
-        self.linter.stats.node_count["module"] += 1
-
-    def visit_classdef(self, _: nodes.ClassDef) -> None:
-        """check module name, docstring and redefinition
-        increment branch counter
-        """
-        self.linter.stats.node_count["klass"] += 1
-
-    @utils.check_messages(
-        "pointless-statement", "pointless-string-statement", "expression-not-assigned"
-    )
-    def visit_expr(self, node: nodes.Expr) -> None:
-        """Check for various kind of statements without effect"""
-        expr = node.value
-        if isinstance(expr, nodes.Const) and isinstance(expr.value, str):
-            # treat string statement in a separated message
-            # Handle PEP-257 attribute docstrings.
-            # An attribute docstring is defined as being a string right after
-            # an assignment at the module level, class level or __init__ level.
-            scope = expr.scope()
-            if isinstance(scope, (nodes.ClassDef, nodes.Module, nodes.FunctionDef)):
-                if isinstance(scope, nodes.FunctionDef) and scope.name != "__init__":
-                    pass
-                else:
-                    sibling = expr.previous_sibling()
-                    if (
-                        sibling is not None
-                        and sibling.scope() is scope
-                        and isinstance(sibling, (nodes.Assign, nodes.AnnAssign))
-                    ):
-                        return
-            self.add_message("pointless-string-statement", node=node)
-            return
-
-        # Ignore if this is :
-        # * a direct function call
-        # * the unique child of a try/except body
-        # * a yield statement
-        # * an ellipsis (which can be used on Python 3 instead of pass)
-        # warn W0106 if we have any underlying function call (we can't predict
-        # side effects), else pointless-statement
-        if (
-            isinstance(expr, (nodes.Yield, nodes.Await, nodes.Call))
-            or (isinstance(node.parent, nodes.TryExcept) and node.parent.body == [node])
-            or (isinstance(expr, nodes.Const) and expr.value is Ellipsis)
-        ):
-            return
-        if any(expr.nodes_of_class(nodes.Call)):
-            self.add_message(
-                "expression-not-assigned", node=node, args=expr.as_string()
-            )
-        else:
-            self.add_message("pointless-statement", node=node)
-
-    @staticmethod
-    def _filter_vararg(node, call_args):
-        # Return the arguments for the given call which are
-        # not passed as vararg.
-        for arg in call_args:
-            if isinstance(arg, nodes.Starred):
-                if (
-                    isinstance(arg.value, nodes.Name)
-                    and arg.value.name != node.args.vararg
-                ):
-                    yield arg
-            else:
-                yield arg
-
-    @staticmethod
-    def _has_variadic_argument(args, variadic_name):
-        if not args:
-            return True
-        for arg in args:
-            if isinstance(arg.value, nodes.Name):
-                if arg.value.name != variadic_name:
-                    return True
-            else:
-                return True
-        return False
-
-    @utils.check_messages("unnecessary-lambda")
-    def visit_lambda(self, node: nodes.Lambda) -> None:
-        """check whether or not the lambda is suspicious"""
-        # if the body of the lambda is a call expression with the same
-        # argument list as the lambda itself, then the lambda is
-        # possibly unnecessary and at least suspicious.
-        if node.args.defaults:
-            # If the arguments of the lambda include defaults, then a
-            # judgment cannot be made because there is no way to check
-            # that the defaults defined by the lambda are the same as
-            # the defaults defined by the function called in the body
-            # of the lambda.
-            return
-        call = node.body
-        if not isinstance(call, nodes.Call):
-            # The body of the lambda must be a function call expression
-            # for the lambda to be unnecessary.
-            return
-        if isinstance(node.body.func, nodes.Attribute) and isinstance(
-            node.body.func.expr, nodes.Call
-        ):
-            # Chained call, the intermediate call might
-            # return something else (but we don't check that, yet).
-            return
-
-        call_site = astroid.arguments.CallSite.from_call(call)
-        ordinary_args = list(node.args.args)
-        new_call_args = list(self._filter_vararg(node, call.args))
-        if node.args.kwarg:
-            if self._has_variadic_argument(call.kwargs, node.args.kwarg):
-                return
-
-        if node.args.vararg:
-            if self._has_variadic_argument(call.starargs, node.args.vararg):
-                return
-        elif call.starargs:
-            return
-
-        if call.keywords:
-            # Look for additional keyword arguments that are not part
-            # of the lambda's signature
-            lambda_kwargs = {keyword.name for keyword in node.args.defaults}
-            if len(lambda_kwargs) != len(call_site.keyword_arguments):
-                # Different lengths, so probably not identical
-                return
-            if set(call_site.keyword_arguments).difference(lambda_kwargs):
-                return
-
-        # The "ordinary" arguments must be in a correspondence such that:
-        # ordinary_args[i].name == call.args[i].name.
-        if len(ordinary_args) != len(new_call_args):
-            return
-        for arg, passed_arg in zip(ordinary_args, new_call_args):
-            if not isinstance(passed_arg, nodes.Name):
-                return
-            if arg.name != passed_arg.name:
-                return
-
-        self.add_message("unnecessary-lambda", line=node.fromlineno, node=node)
-
-    @utils.check_messages("dangerous-default-value")
-    def visit_functiondef(self, node: nodes.FunctionDef) -> None:
-        """check function name, docstring, arguments, redefinition,
-        variable names, max locals
-        """
-        if node.is_method():
-            self.linter.stats.node_count["method"] += 1
-        else:
-            self.linter.stats.node_count["function"] += 1
-        self._check_dangerous_default(node)
-
-    visit_asyncfunctiondef = visit_functiondef
-
-    def _check_dangerous_default(self, node):
-        """Check for dangerous default values as arguments."""
-
-        def is_iterable(internal_node):
-            return isinstance(internal_node, (nodes.List, nodes.Set, nodes.Dict))
-
-        defaults = node.args.defaults or [] + node.args.kw_defaults or []
-        for default in defaults:
-            if not default:
-                continue
-            try:
-                value = next(default.infer())
-            except astroid.InferenceError:
-                continue
-
-            if (
-                isinstance(value, astroid.Instance)
-                and value.qname() in DEFAULT_ARGUMENT_SYMBOLS
-            ):
-                if value is default:
-                    msg = DEFAULT_ARGUMENT_SYMBOLS[value.qname()]
-                elif isinstance(value, astroid.Instance) or is_iterable(value):
-                    # We are here in the following situation(s):
-                    #   * a dict/set/list/tuple call which wasn't inferred
-                    #     to a syntax node ({}, () etc.). This can happen
-                    #     when the arguments are invalid or unknown to
-                    #     the inference.
-                    #   * a variable from somewhere else, which turns out to be a list
-                    #     or a dict.
-                    if is_iterable(default):
-                        msg = value.pytype()
-                    elif isinstance(default, nodes.Call):
-                        msg = f"{value.name}() ({value.qname()})"
-                    else:
-                        msg = f"{default.as_string()} ({value.qname()})"
-                else:
-                    # this argument is a name
-                    msg = f"{default.as_string()} ({DEFAULT_ARGUMENT_SYMBOLS[value.qname()]})"
-                self.add_message("dangerous-default-value", node=node, args=(msg,))
-
-    @utils.check_messages("unreachable", "lost-exception")
-    def visit_return(self, node: nodes.Return) -> None:
-        """1 - check is the node has a right sibling (if so, that's some
-        unreachable code)
-        2 - check is the node is inside the finally clause of a try...finally
-        block
-        """
-        self._check_unreachable(node)
-        # Is it inside final body of a try...finally block ?
-        self._check_not_in_finally(node, "return", (nodes.FunctionDef,))
-
-    @utils.check_messages("unreachable")
-    def visit_continue(self, node: nodes.Continue) -> None:
-        """check is the node has a right sibling (if so, that's some unreachable
-        code)
-        """
-        self._check_unreachable(node)
-
-    @utils.check_messages("unreachable", "lost-exception")
-    def visit_break(self, node: nodes.Break) -> None:
-        """1 - check is the node has a right sibling (if so, that's some
-        unreachable code)
-        2 - check is the node is inside the finally clause of a try...finally
-        block
-        """
-        # 1 - Is it right sibling ?
-        self._check_unreachable(node)
-        # 2 - Is it inside final body of a try...finally block ?
-        self._check_not_in_finally(node, "break", (nodes.For, nodes.While))
-
-    @utils.check_messages("unreachable")
-    def visit_raise(self, node: nodes.Raise) -> None:
-        """check if the node has a right sibling (if so, that's some unreachable
-        code)
-        """
-        self._check_unreachable(node)
-
-    def _check_misplaced_format_function(self, call_node):
-        if not isinstance(call_node.func, nodes.Attribute):
-            return
-        if call_node.func.attrname != "format":
-            return
-
-        expr = utils.safe_infer(call_node.func.expr)
-        if expr is astroid.Uninferable:
-            return
-        if not expr:
-            # we are doubtful on inferred type of node, so here just check if format
-            # was called on print()
-            call_expr = call_node.func.expr
-            if not isinstance(call_expr, nodes.Call):
-                return
-            if (
-                isinstance(call_expr.func, nodes.Name)
-                and call_expr.func.name == "print"
-            ):
-                self.add_message("misplaced-format-function", node=call_node)
-
-    @utils.check_messages(
-        "eval-used", "exec-used", "bad-reversed-sequence", "misplaced-format-function"
-    )
-    def visit_call(self, node: nodes.Call) -> None:
-        """visit a Call node -> check if this is not a disallowed builtin
-        call and check for * or ** use
-        """
-        self._check_misplaced_format_function(node)
-        if isinstance(node.func, nodes.Name):
-            name = node.func.name
-            # ignore the name if it's not a builtin (i.e. not defined in the
-            # locals nor globals scope)
-            if not (name in node.frame() or name in node.root()):
-                if name == "exec":
-                    self.add_message("exec-used", node=node)
-                elif name == "reversed":
-                    self._check_reversed(node)
-                elif name == "eval":
-                    self.add_message("eval-used", node=node)
-
-    @utils.check_messages("assert-on-tuple", "assert-on-string-literal")
-    def visit_assert(self, node: nodes.Assert) -> None:
-        """check whether assert is used on a tuple or string literal."""
-        if (
-            node.fail is None
-            and isinstance(node.test, nodes.Tuple)
-            and len(node.test.elts) == 2
-        ):
-            self.add_message("assert-on-tuple", node=node)
-
-        if isinstance(node.test, nodes.Const) and isinstance(node.test.value, str):
-            if node.test.value:
-                when = "never"
-            else:
-                when = "always"
-            self.add_message("assert-on-string-literal", node=node, args=(when,))
-
-    @utils.check_messages("duplicate-key")
-    def visit_dict(self, node: nodes.Dict) -> None:
-        """check duplicate key in dictionary"""
-        keys = set()
-        for k, _ in node.items:
-            if isinstance(k, nodes.Const):
-                key = k.value
-            elif isinstance(k, nodes.Attribute):
-                key = k.as_string()
-            else:
-                continue
-            if key in keys:
-                self.add_message("duplicate-key", node=node, args=key)
-            keys.add(key)
-
-    def visit_tryfinally(self, node: nodes.TryFinally) -> None:
-        """update try...finally flag"""
-        self._tryfinallys.append(node)
-
-    def leave_tryfinally(self, _: nodes.TryFinally) -> None:
-        """update try...finally flag"""
-        self._tryfinallys.pop()
-
-    def _check_unreachable(self, node):
-        """check unreachable code"""
-        unreach_stmt = node.next_sibling()
-        if unreach_stmt is not None:
-            if (
-                isinstance(node, nodes.Return)
-                and isinstance(unreach_stmt, nodes.Expr)
-                and isinstance(unreach_stmt.value, nodes.Yield)
-            ):
-                # Don't add 'unreachable' for empty generators.
-                # Only add warning if 'yield' is followed by another node.
-                unreach_stmt = unreach_stmt.next_sibling()
-                if unreach_stmt is None:
-                    return
-            self.add_message("unreachable", node=unreach_stmt)
-
-    def _check_not_in_finally(self, node, node_name, breaker_classes=()):
-        """check that a node is not inside a finally clause of a
-        try...finally statement.
-        If we found before a try...finally block a parent which its type is
-        in breaker_classes, we skip the whole check."""
-        # if self._tryfinallys is empty, we're not an in try...finally block
-        if not self._tryfinallys:
-            return
-        # the node could be a grand-grand...-children of the try...finally
-        _parent = node.parent
-        _node = node
-        while _parent and not isinstance(_parent, breaker_classes):
-            if hasattr(_parent, "finalbody") and _node in _parent.finalbody:
-                self.add_message("lost-exception", node=node, args=node_name)
-                return
-            _node = _parent
-            _parent = _node.parent
-
-    def _check_reversed(self, node):
-        """check that the argument to `reversed` is a sequence"""
-        try:
-            argument = utils.safe_infer(utils.get_argument_from_call(node, position=0))
-        except utils.NoSuchArgumentError:
-            pass
-        else:
-            if argument is astroid.Uninferable:
-                return
-            if argument is None:
-                # Nothing was inferred.
-                # Try to see if we have iter().
-                if isinstance(node.args[0], nodes.Call):
-                    try:
-                        func = next(node.args[0].func.infer())
-                    except astroid.InferenceError:
-                        return
-                    if getattr(
-                        func, "name", None
-                    ) == "iter" and utils.is_builtin_object(func):
-                        self.add_message("bad-reversed-sequence", node=node)
-                return
-
-            if isinstance(argument, (nodes.List, nodes.Tuple)):
-                return
-
-            # dicts are reversible, but only from Python 3.8 onwards. Prior to
-            # that, any class based on dict must explicitly provide a
-            # __reversed__ method
-            if not self._py38_plus and isinstance(argument, astroid.Instance):
-                if any(
-                    ancestor.name == "dict" and utils.is_builtin_object(ancestor)
-                    for ancestor in itertools.chain(
-                        (argument._proxied,), argument._proxied.ancestors()
-                    )
-                ):
-                    try:
-                        argument.locals[REVERSED_PROTOCOL_METHOD]
-                    except KeyError:
-                        self.add_message("bad-reversed-sequence", node=node)
-                    return
-
-            if hasattr(argument, "getattr"):
-                # everything else is not a proper sequence for reversed()
-                for methods in REVERSED_METHODS:
-                    for meth in methods:
-                        try:
-                            argument.getattr(meth)
-                        except astroid.NotFoundError:
-                            break
-                    else:
-                        break
-                else:
-                    self.add_message("bad-reversed-sequence", node=node)
-            else:
-                self.add_message("bad-reversed-sequence", node=node)
-
-    @utils.check_messages("confusing-with-statement")
-    def visit_with(self, node: nodes.With) -> None:
-        # a "with" statement with multiple managers corresponds
-        # to one AST "With" node with multiple items
-        pairs = node.items
-        if pairs:
-            for prev_pair, pair in zip(pairs, pairs[1:]):
-                if isinstance(prev_pair[1], nodes.AssignName) and (
-                    pair[1] is None and not isinstance(pair[0], nodes.Call)
-                ):
-                    # Don't emit a message if the second is a function call
-                    # there's no way that can be mistaken for a name assignment.
-                    # If the line number doesn't match
-                    # we assume it's a nested "with".
-                    self.add_message("confusing-with-statement", node=node)
-
-    def _check_self_assigning_variable(self, node):
-        # Detect assigning to the same variable.
-
-        scope = node.scope()
-        scope_locals = scope.locals
-
-        rhs_names = []
-        targets = node.targets
-        if isinstance(targets[0], nodes.Tuple):
-            if len(targets) != 1:
-                # A complex assignment, so bail out early.
-                return
-            targets = targets[0].elts
-            if len(targets) == 1:
-                # Unpacking a variable into the same name.
-                return
-
-        if isinstance(node.value, nodes.Name):
-            if len(targets) != 1:
-                return
-            rhs_names = [node.value]
-        elif isinstance(node.value, nodes.Tuple):
-            rhs_count = len(node.value.elts)
-            if len(targets) != rhs_count or rhs_count == 1:
-                return
-            rhs_names = node.value.elts
-
-        for target, lhs_name in zip(targets, rhs_names):
-            if not isinstance(lhs_name, nodes.Name):
-                continue
-            if not isinstance(target, nodes.AssignName):
-                continue
-            if isinstance(scope, nodes.ClassDef) and target.name in scope_locals:
-                # Check that the scope is different than a class level, which is usually
-                # a pattern to expose module level attributes as class level ones.
-                continue
-            if target.name == lhs_name.name:
-                self.add_message(
-                    "self-assigning-variable", args=(target.name,), node=target
-                )
-
-    def _check_redeclared_assign_name(self, targets):
-        dummy_variables_rgx = lint_utils.get_global_option(
-            self, "dummy-variables-rgx", default=None
-        )
-
-        for target in targets:
-            if not isinstance(target, nodes.Tuple):
-                continue
-
-            found_names = []
-            for element in target.elts:
-                if isinstance(element, nodes.Tuple):
-                    self._check_redeclared_assign_name([element])
-                elif isinstance(element, nodes.AssignName) and element.name != "_":
-                    if dummy_variables_rgx and dummy_variables_rgx.match(element.name):
-                        return
-                    found_names.append(element.name)
-
-            names = collections.Counter(found_names)
-            for name, count in names.most_common():
-                if count > 1:
-                    self.add_message(
-                        "redeclared-assigned-name", args=(name,), node=target
-                    )
-
-    @utils.check_messages("self-assigning-variable", "redeclared-assigned-name")
-    def visit_assign(self, node: nodes.Assign) -> None:
-        self._check_self_assigning_variable(node)
-        self._check_redeclared_assign_name(node.targets)
-
-    @utils.check_messages("redeclared-assigned-name")
-    def visit_for(self, node: nodes.For) -> None:
-        self._check_redeclared_assign_name([node.target])
-
-
-KNOWN_NAME_TYPES = {
-    "module",
-    "const",
-    "class",
-    "function",
-    "method",
-    "attr",
-    "argument",
-    "variable",
-    "class_attribute",
-    "class_const",
-    "inlinevar",
-}
-
-HUMAN_READABLE_TYPES = {
-    "module": "module",
-    "const": "constant",
-    "class": "class",
-    "function": "function",
-    "method": "method",
-    "attr": "attribute",
-    "argument": "argument",
-    "variable": "variable",
-    "class_attribute": "class attribute",
-    "class_const": "class constant",
-    "inlinevar": "inline iteration",
-}
-
-DEFAULT_NAMING_STYLES = {
-    "module": "snake_case",
-    "const": "UPPER_CASE",
-    "class": "PascalCase",
-    "function": "snake_case",
-    "method": "snake_case",
-    "attr": "snake_case",
-    "argument": "snake_case",
-    "variable": "snake_case",
-    "class_attribute": "any",
-    "class_const": "UPPER_CASE",
-    "inlinevar": "any",
-}
-
-
-def _create_naming_options():
-    name_options = []
-    for name_type in sorted(KNOWN_NAME_TYPES):
-        human_readable_name = HUMAN_READABLE_TYPES[name_type]
-        default_style = DEFAULT_NAMING_STYLES[name_type]
-        name_type = name_type.replace("_", "-")
-        name_options.append(
-            (
-                f"{name_type}-naming-style",
-                {
-                    "default": default_style,
-                    "type": "choice",
-                    "choices": list(NAMING_STYLES.keys()),
-                    "metavar": "<style>",
-                    "help": f"Naming style matching correct {human_readable_name} names.",
-                },
-            )
-        )
-        name_options.append(
-            (
-                f"{name_type}-rgx",
-                {
-                    "default": None,
-                    "type": "regexp",
-                    "metavar": "<regexp>",
-                    "help": f"Regular expression matching correct {human_readable_name} names. Overrides {name_type}-naming-style.",
-                },
-            )
-        )
-    return tuple(name_options)
-
-
-class NameChecker(_BasicChecker):
-    msgs = {
-        "C0103": (
-            '%s name "%s" doesn\'t conform to %s',
-            "invalid-name",
-            "Used when the name doesn't conform to naming rules "
-            "associated to its type (constant, variable, class...).",
-        ),
-        "C0104": (
-            'Disallowed name "%s"',
-            "disallowed-name",
-            "Used when the name matches bad-names or bad-names-rgxs- (unauthorized names).",
-            {
-                "old_names": [
-                    ("C0102", "blacklisted-name"),
-                ]
-            },
-        ),
-        "C0144": (
-            '%s name "%s" contains a non-ASCII unicode character',
-            "non-ascii-name",
-            "Used when the name contains at least one non-ASCII unicode character.",
-        ),
-        "W0111": (
-            "Name %s will become a keyword in Python %s",
-            "assign-to-new-keyword",
-            "Used when assignment will become invalid in future "
-            "Python release due to introducing new keyword.",
-        ),
-    }
-
-    options = (
-        (
-            "good-names",
-            {
-                "default": ("i", "j", "k", "ex", "Run", "_"),
-                "type": "csv",
-                "metavar": "<names>",
-                "help": "Good variable names which should always be accepted,"
-                " separated by a comma.",
-            },
-        ),
-        (
-            "good-names-rgxs",
-            {
-                "default": "",
-                "type": "regexp_csv",
-                "metavar": "<names>",
-                "help": "Good variable names regexes, separated by a comma. If names match any regex,"
-                " they will always be accepted",
-            },
-        ),
-        (
-            "bad-names",
-            {
-                "default": ("foo", "bar", "baz", "toto", "tutu", "tata"),
-                "type": "csv",
-                "metavar": "<names>",
-                "help": "Bad variable names which should always be refused, "
-                "separated by a comma.",
-            },
-        ),
-        (
-            "bad-names-rgxs",
-            {
-                "default": "",
-                "type": "regexp_csv",
-                "metavar": "<names>",
-                "help": "Bad variable names regexes, separated by a comma. If names match any regex,"
-                " they will always be refused",
-            },
-        ),
-        (
-            "name-group",
-            {
-                "default": (),
-                "type": "csv",
-                "metavar": "<name1:name2>",
-                "help": (
-                    "Colon-delimited sets of names that determine each"
-                    " other's naming style when the name regexes"
-                    " allow several styles."
-                ),
-            },
-        ),
-        (
-            "include-naming-hint",
-            {
-                "default": False,
-                "type": "yn",
-                "metavar": "<y or n>",
-                "help": "Include a hint for the correct naming format with invalid-name.",
-            },
-        ),
-        (
-            "property-classes",
-            {
-                "default": ("abc.abstractproperty",),
-                "type": "csv",
-                "metavar": "<decorator names>",
-                "help": "List of decorators that produce properties, such as "
-                "abc.abstractproperty. Add to this list to register "
-                "other decorators that produce valid properties. "
-                "These decorators are taken in consideration only for invalid-name.",
-            },
-        ),
-    ) + _create_naming_options()
-
-    KEYWORD_ONSET = {(3, 7): {"async", "await"}}
-
-    def __init__(self, linter):
-        super().__init__(linter)
-        self._name_category = {}
-        self._name_group = {}
-        self._bad_names = {}
-        self._name_regexps = {}
-        self._name_hints = {}
-        self._good_names_rgxs_compiled = []
-        self._bad_names_rgxs_compiled = []
-        self._non_ascii_rgx_compiled = re.compile("[^\u0000-\u007F]")
-
-    def open(self):
-        self.linter.stats.reset_bad_names()
-        for group in self.config.name_group:
-            for name_type in group.split(":"):
-                self._name_group[name_type] = f"group_{group}"
-
-        regexps, hints = self._create_naming_rules()
-        self._name_regexps = regexps
-        self._name_hints = hints
-        self._good_names_rgxs_compiled = [
-            re.compile(rgxp) for rgxp in self.config.good_names_rgxs
-        ]
-        self._bad_names_rgxs_compiled = [
-            re.compile(rgxp) for rgxp in self.config.bad_names_rgxs
-        ]
-
-    def _create_naming_rules(self):
-        regexps = {}
-        hints = {}
-
-        for name_type in KNOWN_NAME_TYPES:
-            naming_style_option_name = f"{name_type}_naming_style"
-            naming_style_name = getattr(self.config, naming_style_option_name)
-
-            regexps[name_type] = NAMING_STYLES[naming_style_name].get_regex(name_type)
-
-            custom_regex_setting_name = f"{name_type}_rgx"
-            custom_regex = getattr(self.config, custom_regex_setting_name, None)
-            if custom_regex is not None:
-                regexps[name_type] = custom_regex
-
-            if custom_regex is not None:
-                hints[name_type] = f"{custom_regex.pattern!r} pattern"
-            else:
-                hints[name_type] = f"{naming_style_name} naming style"
-
-        return regexps, hints
-
-    @utils.check_messages("disallowed-name", "invalid-name", "non-ascii-name")
-    def visit_module(self, node: nodes.Module) -> None:
-        self._check_name("module", node.name.split(".")[-1], node)
-        self._bad_names = {}
-
-    def leave_module(self, _: nodes.Module) -> None:
-        for all_groups in self._bad_names.values():
-            if len(all_groups) < 2:
-                continue
-            groups = collections.defaultdict(list)
-            min_warnings = sys.maxsize
-            prevalent_group, _ = max(all_groups.items(), key=lambda item: len(item[1]))
-            for group in all_groups.values():
-                groups[len(group)].append(group)
-                min_warnings = min(len(group), min_warnings)
-            if len(groups[min_warnings]) > 1:
-                by_line = sorted(
-                    groups[min_warnings],
-                    key=lambda group: min(warning[0].lineno for warning in group),
-                )
-                warnings = itertools.chain(*by_line[1:])
-            else:
-                warnings = groups[min_warnings][0]
-            for args in warnings:
-                self._raise_name_warning(prevalent_group, *args)
-
-    @utils.check_messages(
-        "disallowed-name", "invalid-name", "assign-to-new-keyword", "non-ascii-name"
-    )
-    def visit_classdef(self, node: nodes.ClassDef) -> None:
-        self._check_assign_to_new_keyword_violation(node.name, node)
-        self._check_name("class", node.name, node)
-        for attr, anodes in node.instance_attrs.items():
-            if not any(node.instance_attr_ancestors(attr)):
-                self._check_name("attr", attr, anodes[0])
-
-    @utils.check_messages(
-        "disallowed-name", "invalid-name", "assign-to-new-keyword", "non-ascii-name"
-    )
-    def visit_functiondef(self, node: nodes.FunctionDef) -> None:
-        # Do not emit any warnings if the method is just an implementation
-        # of a base class method.
-        self._check_assign_to_new_keyword_violation(node.name, node)
-        confidence = interfaces.HIGH
-        if node.is_method():
-            if utils.overrides_a_method(node.parent.frame(), node.name):
-                return
-            confidence = (
-                interfaces.INFERENCE
-                if utils.has_known_bases(node.parent.frame())
-                else interfaces.INFERENCE_FAILURE
-            )
-
-        self._check_name(
-            _determine_function_name_type(node, config=self.config),
-            node.name,
-            node,
-            confidence,
-        )
-        # Check argument names
-        args = node.args.args
-        if args is not None:
-            self._recursive_check_names(args)
-
-    visit_asyncfunctiondef = visit_functiondef
-
-    @utils.check_messages("disallowed-name", "invalid-name", "non-ascii-name")
-    def visit_global(self, node: nodes.Global) -> None:
-        for name in node.names:
-            self._check_name("const", name, node)
-
-    @utils.check_messages(
-        "disallowed-name", "invalid-name", "assign-to-new-keyword", "non-ascii-name"
-    )
-    def visit_assignname(self, node: nodes.AssignName) -> None:
-        """check module level assigned names"""
-        self._check_assign_to_new_keyword_violation(node.name, node)
-        frame = node.frame()
-        assign_type = node.assign_type()
-        if isinstance(assign_type, nodes.Comprehension):
-            self._check_name("inlinevar", node.name, node)
-        elif isinstance(frame, nodes.Module):
-            if isinstance(assign_type, nodes.Assign):
-                if isinstance(utils.safe_infer(assign_type.value), nodes.ClassDef):
-                    self._check_name("class", node.name, node)
-                # Don't emit if the name redefines an import
-                # in an ImportError except handler.
-                elif not _redefines_import(node) and isinstance(
-                    utils.safe_infer(assign_type.value), nodes.Const
-                ):
-                    self._check_name("const", node.name, node)
-            elif isinstance(
-                assign_type, nodes.AnnAssign
-            ) and utils.is_assign_name_annotated_with(node, "Final"):
-                self._check_name("const", node.name, node)
-        elif isinstance(frame, nodes.FunctionDef):
-            # global introduced variable aren't in the function locals
-            if node.name in frame and node.name not in frame.argnames():
-                if not _redefines_import(node):
-                    self._check_name("variable", node.name, node)
-        elif isinstance(frame, nodes.ClassDef):
-            if not list(frame.local_attr_ancestors(node.name)):
-                for ancestor in frame.ancestors():
-                    if (
-                        ancestor.name == "Enum"
-                        and ancestor.root().name == "enum"
-                        or utils.is_assign_name_annotated_with(node, "Final")
-                    ):
-                        self._check_name("class_const", node.name, node)
-                        break
-                else:
-                    self._check_name("class_attribute", node.name, node)
-
-    def _recursive_check_names(self, args):
-        """check names in a possibly recursive list <arg>"""
-        for arg in args:
-            if isinstance(arg, nodes.AssignName):
-                self._check_name("argument", arg.name, arg)
-            else:
-                self._recursive_check_names(arg.elts)
-
-    def _find_name_group(self, node_type):
-        return self._name_group.get(node_type, node_type)
-
-    def _raise_name_warning(
-        self,
-        prevalent_group: Optional[str],
-        node: nodes.NodeNG,
-        node_type: str,
-        name: str,
-        confidence,
-        warning: str = "invalid-name",
-    ) -> None:
-        type_label = HUMAN_READABLE_TYPES[node_type]
-        hint = self._name_hints[node_type]
-        if prevalent_group:
-            # This happens in the multi naming match case. The expected
-            # prevalent group needs to be spelled out to make the message
-            # correct.
-            hint = f"the `{prevalent_group}` group in the {hint}"
-        if self.config.include_naming_hint:
-            hint += f" ({self._name_regexps[node_type].pattern!r} pattern)"
-        args = (
-            (type_label.capitalize(), name, hint)
-            if warning == "invalid-name"
-            else (type_label.capitalize(), name)
-        )
-
-        self.add_message(warning, node=node, args=args, confidence=confidence)
-        self.linter.stats.increase_bad_name(node_type, 1)
-
-    def _name_allowed_by_regex(self, name: str) -> bool:
-        return name in self.config.good_names or any(
-            pattern.match(name) for pattern in self._good_names_rgxs_compiled
-        )
-
-    def _name_disallowed_by_regex(self, name: str) -> bool:
-        return name in self.config.bad_names or any(
-            pattern.match(name) for pattern in self._bad_names_rgxs_compiled
-        )
-
-    def _check_name(self, node_type, name, node, confidence=interfaces.HIGH):
-        """check for a name using the type's regexp"""
-        non_ascii_match = self._non_ascii_rgx_compiled.match(name)
-        if non_ascii_match is not None:
-            self._raise_name_warning(
-                None, node, node_type, name, confidence, warning="non-ascii-name"
-            )
-
-        def _should_exempt_from_invalid_name(node):
-            if node_type == "variable":
-                inferred = utils.safe_infer(node)
-                if isinstance(inferred, nodes.ClassDef):
-                    return True
-            return False
-
-        if self._name_allowed_by_regex(name=name):
-            return
-        if self._name_disallowed_by_regex(name=name):
-            self.linter.stats.increase_bad_name(node_type, 1)
-            self.add_message("disallowed-name", node=node, args=name)
-            return
-        regexp = self._name_regexps[node_type]
-        match = regexp.match(name)
-
-        if _is_multi_naming_match(match, node_type, confidence):
-            name_group = self._find_name_group(node_type)
-            bad_name_group = self._bad_names.setdefault(name_group, {})
-            warnings = bad_name_group.setdefault(match.lastgroup, [])
-            warnings.append((node, node_type, name, confidence))
-
-        if match is None and not _should_exempt_from_invalid_name(node):
-            self._raise_name_warning(None, node, node_type, name, confidence)
-
-    def _check_assign_to_new_keyword_violation(self, name, node):
-        keyword_first_version = self._name_became_keyword_in_version(
-            name, self.KEYWORD_ONSET
-        )
-        if keyword_first_version is not None:
-            self.add_message(
-                "assign-to-new-keyword",
-                node=node,
-                args=(name, keyword_first_version),
-                confidence=interfaces.HIGH,
-            )
-
-    @staticmethod
-    def _name_became_keyword_in_version(name, rules):
-        for version, keywords in rules.items():
-            if name in keywords and sys.version_info < version:
-                return ".".join(str(v) for v in version)
-        return None
-
-
-class DocStringChecker(_BasicChecker):
-    msgs = {
-        "C0112": (
-            "Empty %s docstring",
-            "empty-docstring",
-            "Used when a module, function, class or method has an empty "
-            "docstring (it would be too easy ;).",
-            {"old_names": [("W0132", "old-empty-docstring")]},
-        ),
-        "C0114": (
-            "Missing module docstring",
-            "missing-module-docstring",
-            "Used when a module has no docstring."
-            "Empty modules do not require a docstring.",
-            {"old_names": [("C0111", "missing-docstring")]},
-        ),
-        "C0115": (
-            "Missing class docstring",
-            "missing-class-docstring",
-            "Used when a class has no docstring."
-            "Even an empty class must have a docstring.",
-            {"old_names": [("C0111", "missing-docstring")]},
-        ),
-        "C0116": (
-            "Missing function or method docstring",
-            "missing-function-docstring",
-            "Used when a function or method has no docstring."
-            "Some special methods like __init__ do not require a "
-            "docstring.",
-            {"old_names": [("C0111", "missing-docstring")]},
-        ),
-    }
-    options = (
-        (
-            "no-docstring-rgx",
-            {
-                "default": NO_REQUIRED_DOC_RGX,
-                "type": "regexp",
-                "metavar": "<regexp>",
-                "help": "Regular expression which should only match "
-                "function or class names that do not require a "
-                "docstring.",
-            },
-        ),
-        (
-            "docstring-min-length",
-            {
-                "default": -1,
-                "type": "int",
-                "metavar": "<int>",
-                "help": (
-                    "Minimum line length for functions/classes that"
-                    " require docstrings, shorter ones are exempt."
-                ),
-            },
-        ),
-    )
-
-    def open(self):
-        self.linter.stats.reset_undocumented()
-
-    @utils.check_messages("missing-docstring", "empty-docstring")
-    def visit_module(self, node: nodes.Module) -> None:
-        self._check_docstring("module", node)
-
-    @utils.check_messages("missing-docstring", "empty-docstring")
-    def visit_classdef(self, node: nodes.ClassDef) -> None:
-        if self.config.no_docstring_rgx.match(node.name) is None:
-            self._check_docstring("class", node)
-
-    @utils.check_messages("missing-docstring", "empty-docstring")
-    def visit_functiondef(self, node: nodes.FunctionDef) -> None:
-        if self.config.no_docstring_rgx.match(node.name) is None:
-            ftype = "method" if node.is_method() else "function"
-            if (
-                is_property_setter(node)
-                or is_property_deleter(node)
-                or is_overload_stub(node)
-            ):
-                return
-
-            if isinstance(node.parent.frame(), nodes.ClassDef):
-                overridden = False
-                confidence = (
-                    interfaces.INFERENCE
-                    if utils.has_known_bases(node.parent.frame())
-                    else interfaces.INFERENCE_FAILURE
-                )
-                # check if node is from a method overridden by its ancestor
-                for ancestor in node.parent.frame().ancestors():
-                    if ancestor.qname() == "builtins.object":
-                        continue
-                    if node.name in ancestor and isinstance(
-                        ancestor[node.name], nodes.FunctionDef
-                    ):
-                        overridden = True
-                        break
-                self._check_docstring(
-                    ftype, node, report_missing=not overridden, confidence=confidence  # type: ignore[arg-type]
-                )
-            elif isinstance(node.parent.frame(), nodes.Module):
-                self._check_docstring(ftype, node)  # type: ignore[arg-type]
-            else:
-                return
-
-    visit_asyncfunctiondef = visit_functiondef
-
-    def _check_docstring(
-        self,
-        node_type: Literal["class", "function", "method", "module"],
-        node,
-        report_missing=True,
-        confidence=interfaces.HIGH,
-    ):
-        """check the node has a non empty docstring"""
-        docstring = node.doc
-        if docstring is None:
-            docstring = _infer_dunder_doc_attribute(node)
-
-        if docstring is None:
-            if not report_missing:
-                return
-            lines = utils.get_node_last_lineno(node) - node.lineno
-
-            if node_type == "module" and not lines:
-                # If the module has no body, there's no reason
-                # to require a docstring.
-                return
-            max_lines = self.config.docstring_min_length
-
-            if node_type != "module" and max_lines > -1 and lines < max_lines:
-                return
-            if node_type == "class":
-                self.linter.stats.undocumented["klass"] += 1
-            else:
-                self.linter.stats.undocumented[node_type] += 1
-            if (
-                node.body
-                and isinstance(node.body[0], nodes.Expr)
-                and isinstance(node.body[0].value, nodes.Call)
-            ):
-                # Most likely a string with a format call. Let's see.
-                func = utils.safe_infer(node.body[0].value.func)
-                if isinstance(func, astroid.BoundMethod) and isinstance(
-                    func.bound, astroid.Instance
-                ):
-                    # Strings.
-                    if func.bound.name in {"str", "unicode", "bytes"}:
-                        return
-            if node_type == "module":
-                message = "missing-module-docstring"
-            elif node_type == "class":
-                message = "missing-class-docstring"
-            else:
-                message = "missing-function-docstring"
-            self.add_message(message, node=node, confidence=confidence)
-        elif not docstring.strip():
-            if node_type == "class":
-                self.linter.stats.undocumented["klass"] += 1
-            else:
-                self.linter.stats.undocumented[node_type] += 1
-            self.add_message(
-                "empty-docstring", node=node, args=(node_type,), confidence=confidence
-            )
-
-
-class PassChecker(_BasicChecker):
-    """check if the pass statement is really necessary"""
-
-    msgs = {
-        "W0107": (
-            "Unnecessary pass statement",
-            "unnecessary-pass",
-            'Used when a "pass" statement that can be avoided is encountered.',
-        )
-    }
-
-    @utils.check_messages("unnecessary-pass")
-    def visit_pass(self, node: nodes.Pass) -> None:
-        if len(node.parent.child_sequence(node)) > 1 or (
-            isinstance(node.parent, (nodes.ClassDef, nodes.FunctionDef))
-            and (node.parent.doc is not None)
-        ):
-            self.add_message("unnecessary-pass", node=node)
-
-
-def _is_one_arg_pos_call(call):
-    """Is this a call with exactly 1 argument,
-    where that argument is positional?
-    """
-    return isinstance(call, nodes.Call) and len(call.args) == 1 and not call.keywords
-
-
-def _infer_dunder_doc_attribute(node):
-    # Try to see if we have a `__doc__` attribute.
-    try:
-        docstring = node["__doc__"]
-    except KeyError:
-        return None
-
-    docstring = utils.safe_infer(docstring)
-    if not docstring:
-        return None
-    if not isinstance(docstring, nodes.Const):
-        return None
-    return docstring.value
-
-
-class ComparisonChecker(_BasicChecker):
-    """Checks for comparisons
-
-    - singleton comparison: 'expr == True', 'expr == False' and 'expr == None'
-    - yoda condition: 'const "comp" right' where comp can be '==', '!=', '<',
-      '<=', '>' or '>=', and right can be a variable, an attribute, a method or
-      a function
-    """
-
-    msgs = {
-        "C0121": (
-            "Comparison %s should be %s",
-            "singleton-comparison",
-            "Used when an expression is compared to singleton "
-            "values like True, False or None.",
-        ),
-        "C0123": (
-            "Use isinstance() rather than type() for a typecheck.",
-            "unidiomatic-typecheck",
-            "The idiomatic way to perform an explicit typecheck in "
-            "Python is to use isinstance(x, Y) rather than "
-            "type(x) == Y, type(x) is Y. Though there are unusual "
-            "situations where these give different results.",
-            {"old_names": [("W0154", "old-unidiomatic-typecheck")]},
-        ),
-        "R0123": (
-            "Comparison to literal",
-            "literal-comparison",
-            "Used when comparing an object to a literal, which is usually "
-            "what you do not want to do, since you can compare to a different "
-            "literal than what was expected altogether.",
-        ),
-        "R0124": (
-            "Redundant comparison - %s",
-            "comparison-with-itself",
-            "Used when something is compared against itself.",
-        ),
-        "W0143": (
-            "Comparing against a callable, did you omit the parenthesis?",
-            "comparison-with-callable",
-            "This message is emitted when pylint detects that a comparison with a "
-            "callable was made, which might suggest that some parenthesis were omitted, "
-            "resulting in potential unwanted behaviour.",
-        ),
-        "W0177": (
-            "Comparison %s should be %s",
-            "nan-comparison",
-            "Used when an expression is compared to NaN"
-            "values like numpy.NaN and float('nan')",
-        ),
-    }
-
-    def _check_singleton_comparison(
-        self, left_value, right_value, root_node, checking_for_absence: bool = False
-    ):
-        """Check if == or != is being used to compare a singleton value"""
-        singleton_values = (True, False, None)
-
-        def _is_singleton_const(node) -> bool:
-            return isinstance(node, nodes.Const) and any(
-                node.value is value for value in singleton_values
-            )
-
-        if _is_singleton_const(left_value):
-            singleton, other_value = left_value.value, right_value
-        elif _is_singleton_const(right_value):
-            singleton, other_value = right_value.value, left_value
-        else:
-            return
-
-        singleton_comparison_example = {False: "'{} is {}'", True: "'{} is not {}'"}
-
-        # True/False singletons have a special-cased message in case the user is
-        # mistakenly using == or != to check for truthiness
-        if singleton in {True, False}:
-            suggestion_template = (
-                "{} if checking for the singleton value {}, or {} if testing for {}"
-            )
-            truthiness_example = {False: "not {}", True: "{}"}
-            truthiness_phrase = {True: "truthiness", False: "falsiness"}
-
-            # Looks for comparisons like x == True or x != False
-            checking_truthiness = singleton is not checking_for_absence
-
-            suggestion = suggestion_template.format(
-                singleton_comparison_example[checking_for_absence].format(
-                    left_value.as_string(), right_value.as_string()
-                ),
-                singleton,
-                (
-                    "'bool({})'"
-                    if not utils.is_test_condition(root_node) and checking_truthiness
-                    else "'{}'"
-                ).format(
-                    truthiness_example[checking_truthiness].format(
-                        other_value.as_string()
-                    )
-                ),
-                truthiness_phrase[checking_truthiness],
-            )
-        else:
-            suggestion = singleton_comparison_example[checking_for_absence].format(
-                left_value.as_string(), right_value.as_string()
-            )
-        self.add_message(
-            "singleton-comparison",
-            node=root_node,
-            args=(f"'{root_node.as_string()}'", suggestion),
-        )
-
-    def _check_nan_comparison(
-        self, left_value, right_value, root_node, checking_for_absence: bool = False
-    ):
-        def _is_float_nan(node):
-            try:
-                if isinstance(node, nodes.Call) and len(node.args) == 1:
-                    if (
-                        node.args[0].value.lower() == "nan"
-                        and node.inferred()[0].pytype() == "builtins.float"
-                    ):
-                        return True
-                return False
-            except AttributeError:
-                return False
-
-        def _is_numpy_nan(node):
-            if isinstance(node, nodes.Attribute) and node.attrname == "NaN":
-                if isinstance(node.expr, nodes.Name):
-                    return node.expr.name in {"numpy", "nmp", "np"}
-            return False
-
-        def _is_nan(node) -> bool:
-            return _is_float_nan(node) or _is_numpy_nan(node)
-
-        nan_left = _is_nan(left_value)
-        if not nan_left and not _is_nan(right_value):
-            return
-
-        absence_text = ""
-        if checking_for_absence:
-            absence_text = "not "
-        if nan_left:
-            suggestion = f"'{absence_text}math.isnan({right_value.as_string()})'"
-        else:
-            suggestion = f"'{absence_text}math.isnan({left_value.as_string()})'"
-        self.add_message(
-            "nan-comparison",
-            node=root_node,
-            args=(f"'{root_node.as_string()}'", suggestion),
-        )
-
-    def _check_literal_comparison(self, literal, node: nodes.Compare):
-        """Check if we compare to a literal, which is usually what we do not want to do."""
-        is_other_literal = isinstance(literal, (nodes.List, nodes.Dict, nodes.Set))
-        is_const = False
-        if isinstance(literal, nodes.Const):
-            if isinstance(literal.value, bool) or literal.value is None:
-                # Not interested in this values.
-                return
-            is_const = isinstance(literal.value, (bytes, str, int, float))
-
-        if is_const or is_other_literal:
-            self.add_message("literal-comparison", node=node)
-
-    def _check_logical_tautology(self, node: nodes.Compare):
-        """Check if identifier is compared against itself.
-        :param node: Compare node
-        :Example:
-        val = 786
-        if val == val:  # [comparison-with-itself]
-            pass
-        """
-        left_operand = node.left
-        right_operand = node.ops[0][1]
-        operator = node.ops[0][0]
-        if isinstance(left_operand, nodes.Const) and isinstance(
-            right_operand, nodes.Const
-        ):
-            left_operand = left_operand.value
-            right_operand = right_operand.value
-        elif isinstance(left_operand, nodes.Name) and isinstance(
-            right_operand, nodes.Name
-        ):
-            left_operand = left_operand.name
-            right_operand = right_operand.name
-
-        if left_operand == right_operand:
-            suggestion = f"{left_operand} {operator} {right_operand}"
-            self.add_message("comparison-with-itself", node=node, args=(suggestion,))
-
-    def _check_callable_comparison(self, node):
-        operator = node.ops[0][0]
-        if operator not in COMPARISON_OPERATORS:
-            return
-
-        bare_callables = (nodes.FunctionDef, astroid.BoundMethod)
-        left_operand, right_operand = node.left, node.ops[0][1]
-        # this message should be emitted only when there is comparison of bare callable
-        # with non bare callable.
-        if (
-            sum(
-                1
-                for operand in (left_operand, right_operand)
-                if isinstance(utils.safe_infer(operand), bare_callables)
-            )
-            == 1
-        ):
-            self.add_message("comparison-with-callable", node=node)
-
-    @utils.check_messages(
-        "singleton-comparison",
-        "unidiomatic-typecheck",
-        "literal-comparison",
-        "comparison-with-itself",
-        "comparison-with-callable",
-    )
-    def visit_compare(self, node: nodes.Compare) -> None:
-        self._check_callable_comparison(node)
-        self._check_logical_tautology(node)
-        self._check_unidiomatic_typecheck(node)
-        # NOTE: this checker only works with binary comparisons like 'x == 42'
-        # but not 'x == y == 42'
-        if len(node.ops) != 1:
-            return
-
-        left = node.left
-        operator, right = node.ops[0]
-
-        if operator in {"==", "!="}:
-            self._check_singleton_comparison(
-                left, right, node, checking_for_absence=operator == "!="
-            )
-
-        if operator in {"==", "!=", "is", "is not"}:
-            self._check_nan_comparison(
-                left, right, node, checking_for_absence=operator in {"!=", "is not"}
-            )
-        if operator in {"is", "is not"}:
-            self._check_literal_comparison(right, node)
-
-    def _check_unidiomatic_typecheck(self, node):
-        operator, right = node.ops[0]
-        if operator in TYPECHECK_COMPARISON_OPERATORS:
-            left = node.left
-            if _is_one_arg_pos_call(left):
-                self._check_type_x_is_y(node, left, operator, right)
-
-    def _check_type_x_is_y(self, node, left, operator, right):
-        """Check for expressions like type(x) == Y."""
-        left_func = utils.safe_infer(left.func)
-        if not (
-            isinstance(left_func, nodes.ClassDef) and left_func.qname() == TYPE_QNAME
-        ):
-            return
-
-        if operator in {"is", "is not"} and _is_one_arg_pos_call(right):
-            right_func = utils.safe_infer(right.func)
-            if (
-                isinstance(right_func, nodes.ClassDef)
-                and right_func.qname() == TYPE_QNAME
-            ):
-                # type(x) == type(a)
-                right_arg = utils.safe_infer(right.args[0])
-                if not isinstance(right_arg, LITERAL_NODE_TYPES):
-                    # not e.g. type(x) == type([])
-                    return
-        self.add_message("unidiomatic-typecheck", node=node)
-
-
-def register(linter):
-    """required method to auto register this checker"""
-    linter.register_checker(BasicErrorChecker(linter))
-    linter.register_checker(BasicChecker(linter))
-    linter.register_checker(NameChecker(linter))
-    linter.register_checker(DocStringChecker(linter))
-    linter.register_checker(PassChecker(linter))
-    linter.register_checker(ComparisonChecker(linter))
diff --git a/pylint/checkers/base/__init__.py b/pylint/checkers/base/__init__.py
new file mode 100644
index 0000000000..7c162441b0
--- /dev/null
+++ b/pylint/checkers/base/__init__.py
@@ -0,0 +1,45 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+
+__all__ = [
+    "NameChecker",
+    "NamingStyle",
+    "KNOWN_NAME_TYPES_WITH_STYLE",
+    "SnakeCaseStyle",
+    "CamelCaseStyle",
+    "UpperCaseStyle",
+    "PascalCaseStyle",
+    "AnyStyle",
+]
+
+from typing import TYPE_CHECKING
+
+from pylint.checkers.base.basic_checker import BasicChecker
+from pylint.checkers.base.basic_error_checker import BasicErrorChecker
+from pylint.checkers.base.comparison_checker import ComparisonChecker
+from pylint.checkers.base.docstring_checker import DocStringChecker
+from pylint.checkers.base.name_checker import (
+    KNOWN_NAME_TYPES_WITH_STYLE,
+    AnyStyle,
+    CamelCaseStyle,
+    NamingStyle,
+    PascalCaseStyle,
+    SnakeCaseStyle,
+    UpperCaseStyle,
+)
+from pylint.checkers.base.name_checker.checker import NameChecker
+from pylint.checkers.base.pass_checker import PassChecker
+
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
+
+def register(linter: "PyLinter") -> None:
+    linter.register_checker(BasicErrorChecker(linter))
+    linter.register_checker(BasicChecker(linter))
+    linter.register_checker(NameChecker(linter))
+    linter.register_checker(DocStringChecker(linter))
+    linter.register_checker(PassChecker(linter))
+    linter.register_checker(ComparisonChecker(linter))
diff --git a/pylint/checkers/base/basic_checker.py b/pylint/checkers/base/basic_checker.py
new file mode 100644
index 0000000000..1e5a2a15bb
--- /dev/null
+++ b/pylint/checkers/base/basic_checker.py
@@ -0,0 +1,830 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Basic checker for Python code."""
+
+import collections
+import itertools
+import sys
+from typing import TYPE_CHECKING, Dict, Optional, cast
+
+import astroid
+from astroid import nodes
+
+from pylint import interfaces
+from pylint import utils as lint_utils
+from pylint.checkers import BaseChecker, utils
+from pylint.interfaces import IAstroidChecker
+from pylint.reporters.ureports import nodes as reporter_nodes
+from pylint.utils import LinterStats
+from pylint.utils.utils import get_global_option
+
+if TYPE_CHECKING:
+    pass
+
+if sys.version_info >= (3, 8):
+    from typing import Literal
+else:
+    from typing_extensions import Literal
+
+
+class _BasicChecker(BaseChecker):
+    """Permits separating multiple checks with the same checker name into classes/file."""
+
+    __implements__ = IAstroidChecker
+    name = "basic"
+
+
+REVERSED_PROTOCOL_METHOD = "__reversed__"
+SEQUENCE_PROTOCOL_METHODS = ("__getitem__", "__len__")
+REVERSED_METHODS = (SEQUENCE_PROTOCOL_METHODS, (REVERSED_PROTOCOL_METHOD,))
+# A mapping from qname -> symbol, to be used when generating messages
+# about dangerous default values as arguments
+DEFAULT_ARGUMENT_SYMBOLS = dict(
+    zip(
+        [".".join(["builtins", x]) for x in ("set", "dict", "list")],
+        ["set()", "{}", "[]"],
+    ),
+    **{
+        x: f"{x}()"
+        for x in (
+            "collections.deque",
+            "collections.ChainMap",
+            "collections.Counter",
+            "collections.OrderedDict",
+            "collections.defaultdict",
+            "collections.UserDict",
+            "collections.UserList",
+        )
+    },
+)
+
+
+def report_by_type_stats(
+    sect,
+    stats: LinterStats,
+    old_stats: Optional[LinterStats],
+):
+    """Make a report of.
+
+    * percentage of different types documented
+    * percentage of different types with a bad name
+    """
+    # percentage of different types documented and/or with a bad name
+    nice_stats: Dict[str, Dict[str, str]] = {}
+    for node_type in ("module", "class", "method", "function"):
+        node_type = cast(Literal["function", "class", "method", "module"], node_type)
+        total = stats.get_node_count(node_type)
+        nice_stats[node_type] = {}
+        if total != 0:
+            undocumented_node = stats.get_undocumented(node_type)
+            documented = total - undocumented_node
+            percent = (documented * 100.0) / total
+            nice_stats[node_type]["percent_documented"] = f"{percent:.2f}"
+            badname_node = stats.get_bad_names(node_type)
+            percent = (badname_node * 100.0) / total
+            nice_stats[node_type]["percent_badname"] = f"{percent:.2f}"
+    lines = ["type", "number", "old number", "difference", "%documented", "%badname"]
+    for node_type in ("module", "class", "method", "function"):
+        node_type = cast(Literal["function", "class", "method", "module"], node_type)
+        new = stats.get_node_count(node_type)
+        old = old_stats.get_node_count(node_type) if old_stats else None
+        diff_str = lint_utils.diff_string(old, new) if old else None
+        lines += [
+            node_type,
+            str(new),
+            str(old) if old else "NC",
+            diff_str if diff_str else "NC",
+            nice_stats[node_type].get("percent_documented", "0"),
+            nice_stats[node_type].get("percent_badname", "0"),
+        ]
+    sect.append(reporter_nodes.Table(children=lines, cols=6, rheaders=1))
+
+
+class BasicChecker(_BasicChecker):
+    """Basic checker.
+
+    Checks for :
+    * doc strings
+    * number of arguments, local variables, branches, returns and statements in
+    functions, methods
+    * required module attributes
+    * dangerous default values as arguments
+    * redefinition of function / method / class
+    * uses of the global statement
+    """
+
+    __implements__ = interfaces.IAstroidChecker
+
+    name = "basic"
+    msgs = {
+        "W0101": (
+            "Unreachable code",
+            "unreachable",
+            'Used when there is some code behind a "return" or "raise" '
+            "statement, which will never be accessed.",
+        ),
+        "W0102": (
+            "Dangerous default value %s as argument",
+            "dangerous-default-value",
+            "Used when a mutable value as list or dictionary is detected in "
+            "a default value for an argument.",
+        ),
+        "W0104": (
+            "Statement seems to have no effect",
+            "pointless-statement",
+            "Used when a statement doesn't have (or at least seems to) any effect.",
+        ),
+        "W0105": (
+            "String statement has no effect",
+            "pointless-string-statement",
+            "Used when a string is used as a statement (which of course "
+            "has no effect). This is a particular case of W0104 with its "
+            "own message so you can easily disable it if you're using "
+            "those strings as documentation, instead of comments.",
+        ),
+        "W0106": (
+            'Expression "%s" is assigned to nothing',
+            "expression-not-assigned",
+            "Used when an expression that is not a function call is assigned "
+            "to nothing. Probably something else was intended.",
+        ),
+        "W0108": (
+            "Lambda may not be necessary",
+            "unnecessary-lambda",
+            "Used when the body of a lambda expression is a function call "
+            "on the same argument list as the lambda itself; such lambda "
+            "expressions are in all but a few cases replaceable with the "
+            "function being called in the body of the lambda.",
+        ),
+        "W0109": (
+            "Duplicate key %r in dictionary",
+            "duplicate-key",
+            "Used when a dictionary expression binds the same key multiple times.",
+        ),
+        "W0122": (
+            "Use of exec",
+            "exec-used",
+            'Used when you use the "exec" statement (function for Python '
+            "3), to discourage its usage. That doesn't "
+            "mean you cannot use it !",
+        ),
+        "W0123": (
+            "Use of eval",
+            "eval-used",
+            'Used when you use the "eval" function, to discourage its '
+            "usage. Consider using `ast.literal_eval` for safely evaluating "
+            "strings containing Python expressions "
+            "from untrusted sources.",
+        ),
+        "W0150": (
+            "%s statement in finally block may swallow exception",
+            "lost-exception",
+            "Used when a break or a return statement is found inside the "
+            "finally clause of a try...finally block: the exceptions raised "
+            "in the try clause will be silently swallowed instead of being "
+            "re-raised.",
+        ),
+        "W0199": (
+            "Assert called on a 2-item-tuple. Did you mean 'assert x,y'?",
+            "assert-on-tuple",
+            "A call of assert on a tuple will always evaluate to true if "
+            "the tuple is not empty, and will always evaluate to false if "
+            "it is.",
+        ),
+        "W0124": (
+            'Following "as" with another context manager looks like a tuple.',
+            "confusing-with-statement",
+            "Emitted when a `with` statement component returns multiple values "
+            "and uses name binding with `as` only for a part of those values, "
+            "as in with ctx() as a, b. This can be misleading, since it's not "
+            "clear if the context manager returns a tuple or if the node without "
+            "a name binding is another context manager.",
+        ),
+        "W0125": (
+            "Using a conditional statement with a constant value",
+            "using-constant-test",
+            "Emitted when a conditional statement (If or ternary if) "
+            "uses a constant value for its test. This might not be what "
+            "the user intended to do.",
+        ),
+        "W0126": (
+            "Using a conditional statement with potentially wrong function or method call due to missing parentheses",
+            "missing-parentheses-for-call-in-test",
+            "Emitted when a conditional statement (If or ternary if) "
+            "seems to wrongly call a function due to missing parentheses",
+        ),
+        "W0127": (
+            "Assigning the same variable %r to itself",
+            "self-assigning-variable",
+            "Emitted when we detect that a variable is assigned to itself",
+        ),
+        "W0128": (
+            "Redeclared variable %r in assignment",
+            "redeclared-assigned-name",
+            "Emitted when we detect that a variable was redeclared in the same assignment.",
+        ),
+        "E0111": (
+            "The first reversed() argument is not a sequence",
+            "bad-reversed-sequence",
+            "Used when the first argument to reversed() builtin "
+            "isn't a sequence (does not implement __reversed__, "
+            "nor __getitem__ and __len__",
+        ),
+        "E0119": (
+            "format function is not called on str",
+            "misplaced-format-function",
+            "Emitted when format function is not called on str object. "
+            'e.g doing print("value: {}").format(123) instead of '
+            'print("value: {}".format(123)). This might not be what the user '
+            "intended to do.",
+        ),
+        "W0129": (
+            "Assert statement has a string literal as its first argument. The assert will %s fail.",
+            "assert-on-string-literal",
+            "Used when an assert statement has a string literal as its first argument, which will "
+            "cause the assert to always pass.",
+        ),
+    }
+
+    reports = (("RP0101", "Statistics by type", report_by_type_stats),)
+
+    def __init__(self, linter):
+        super().__init__(linter)
+        self._tryfinallys = None
+
+    def open(self):
+        """Initialize visit variables and statistics."""
+        py_version = get_global_option(self, "py-version")
+        self._py38_plus = py_version >= (3, 8)
+        self._tryfinallys = []
+        self.linter.stats.reset_node_count()
+
+    @utils.check_messages("using-constant-test", "missing-parentheses-for-call-in-test")
+    def visit_if(self, node: nodes.If) -> None:
+        self._check_using_constant_test(node, node.test)
+
+    @utils.check_messages("using-constant-test", "missing-parentheses-for-call-in-test")
+    def visit_ifexp(self, node: nodes.IfExp) -> None:
+        self._check_using_constant_test(node, node.test)
+
+    @utils.check_messages("using-constant-test", "missing-parentheses-for-call-in-test")
+    def visit_comprehension(self, node: nodes.Comprehension) -> None:
+        if node.ifs:
+            for if_test in node.ifs:
+                self._check_using_constant_test(node, if_test)
+
+    def _check_using_constant_test(self, node, test):
+        const_nodes = (
+            nodes.Module,
+            nodes.GeneratorExp,
+            nodes.Lambda,
+            nodes.FunctionDef,
+            nodes.ClassDef,
+            astroid.bases.Generator,
+            astroid.UnboundMethod,
+            astroid.BoundMethod,
+            nodes.Module,
+        )
+        structs = (nodes.Dict, nodes.Tuple, nodes.Set, nodes.List)
+
+        # These nodes are excepted, since they are not constant
+        # values, requiring a computation to happen.
+        except_nodes = (
+            nodes.Call,
+            nodes.BinOp,
+            nodes.BoolOp,
+            nodes.UnaryOp,
+            nodes.Subscript,
+        )
+        inferred = None
+        emit = isinstance(test, (nodes.Const,) + structs + const_nodes)
+        if not isinstance(test, except_nodes):
+            inferred = utils.safe_infer(test)
+
+        if emit:
+            self.add_message("using-constant-test", node=node)
+        elif isinstance(inferred, const_nodes):
+            # If the constant node is a FunctionDef or Lambda then
+            # it may be an illicit function call due to missing parentheses
+            call_inferred = None
+            try:
+                if isinstance(inferred, nodes.FunctionDef):
+                    call_inferred = inferred.infer_call_result()
+                elif isinstance(inferred, nodes.Lambda):
+                    call_inferred = inferred.infer_call_result(node)
+            except astroid.InferenceError:
+                call_inferred = None
+            if call_inferred:
+                try:
+                    for inf_call in call_inferred:
+                        if inf_call != astroid.Uninferable:
+                            self.add_message(
+                                "missing-parentheses-for-call-in-test", node=node
+                            )
+                            break
+                except astroid.InferenceError:
+                    pass
+            self.add_message("using-constant-test", node=node)
+
+    def visit_module(self, _: nodes.Module) -> None:
+        """Check module name, docstring and required arguments."""
+        self.linter.stats.node_count["module"] += 1
+
+    def visit_classdef(self, _: nodes.ClassDef) -> None:
+        """Check module name, docstring and redefinition
+        increment branch counter
+        """
+        self.linter.stats.node_count["klass"] += 1
+
+    @utils.check_messages(
+        "pointless-statement", "pointless-string-statement", "expression-not-assigned"
+    )
+    def visit_expr(self, node: nodes.Expr) -> None:
+        """Check for various kind of statements without effect."""
+        expr = node.value
+        if isinstance(expr, nodes.Const) and isinstance(expr.value, str):
+            # treat string statement in a separated message
+            # Handle PEP-257 attribute docstrings.
+            # An attribute docstring is defined as being a string right after
+            # an assignment at the module level, class level or __init__ level.
+            scope = expr.scope()
+            if isinstance(scope, (nodes.ClassDef, nodes.Module, nodes.FunctionDef)):
+                if isinstance(scope, nodes.FunctionDef) and scope.name != "__init__":
+                    pass
+                else:
+                    sibling = expr.previous_sibling()
+                    if (
+                        sibling is not None
+                        and sibling.scope() is scope
+                        and isinstance(sibling, (nodes.Assign, nodes.AnnAssign))
+                    ):
+                        return
+            self.add_message("pointless-string-statement", node=node)
+            return
+
+        # Ignore if this is :
+        # * a direct function call
+        # * the unique child of a try/except body
+        # * a yield statement
+        # * an ellipsis (which can be used on Python 3 instead of pass)
+        # warn W0106 if we have any underlying function call (we can't predict
+        # side effects), else pointless-statement
+        if (
+            isinstance(expr, (nodes.Yield, nodes.Await, nodes.Call))
+            or (isinstance(node.parent, nodes.TryExcept) and node.parent.body == [node])
+            or (isinstance(expr, nodes.Const) and expr.value is Ellipsis)
+        ):
+            return
+        if any(expr.nodes_of_class(nodes.Call)):
+            self.add_message(
+                "expression-not-assigned", node=node, args=expr.as_string()
+            )
+        else:
+            self.add_message("pointless-statement", node=node)
+
+    @staticmethod
+    def _filter_vararg(node, call_args):
+        # Return the arguments for the given call which are
+        # not passed as vararg.
+        for arg in call_args:
+            if isinstance(arg, nodes.Starred):
+                if (
+                    isinstance(arg.value, nodes.Name)
+                    and arg.value.name != node.args.vararg
+                ):
+                    yield arg
+            else:
+                yield arg
+
+    @staticmethod
+    def _has_variadic_argument(args, variadic_name):
+        if not args:
+            return True
+        for arg in args:
+            if isinstance(arg.value, nodes.Name):
+                if arg.value.name != variadic_name:
+                    return True
+            else:
+                return True
+        return False
+
+    @utils.check_messages("unnecessary-lambda")
+    def visit_lambda(self, node: nodes.Lambda) -> None:
+        """Check whether the lambda is suspicious."""
+        # if the body of the lambda is a call expression with the same
+        # argument list as the lambda itself, then the lambda is
+        # possibly unnecessary and at least suspicious.
+        if node.args.defaults:
+            # If the arguments of the lambda include defaults, then a
+            # judgment cannot be made because there is no way to check
+            # that the defaults defined by the lambda are the same as
+            # the defaults defined by the function called in the body
+            # of the lambda.
+            return
+        call = node.body
+        if not isinstance(call, nodes.Call):
+            # The body of the lambda must be a function call expression
+            # for the lambda to be unnecessary.
+            return
+        if isinstance(node.body.func, nodes.Attribute) and isinstance(
+            node.body.func.expr, nodes.Call
+        ):
+            # Chained call, the intermediate call might
+            # return something else (but we don't check that, yet).
+            return
+
+        call_site = astroid.arguments.CallSite.from_call(call)
+        ordinary_args = list(node.args.args)
+        new_call_args = list(self._filter_vararg(node, call.args))
+        if node.args.kwarg:
+            if self._has_variadic_argument(call.kwargs, node.args.kwarg):
+                return
+
+        if node.args.vararg:
+            if self._has_variadic_argument(call.starargs, node.args.vararg):
+                return
+        elif call.starargs:
+            return
+
+        if call.keywords:
+            # Look for additional keyword arguments that are not part
+            # of the lambda's signature
+            lambda_kwargs = {keyword.name for keyword in node.args.defaults}
+            if len(lambda_kwargs) != len(call_site.keyword_arguments):
+                # Different lengths, so probably not identical
+                return
+            if set(call_site.keyword_arguments).difference(lambda_kwargs):
+                return
+
+        # The "ordinary" arguments must be in a correspondence such that:
+        # ordinary_args[i].name == call.args[i].name.
+        if len(ordinary_args) != len(new_call_args):
+            return
+        for arg, passed_arg in zip(ordinary_args, new_call_args):
+            if not isinstance(passed_arg, nodes.Name):
+                return
+            if arg.name != passed_arg.name:
+                return
+
+        self.add_message("unnecessary-lambda", line=node.fromlineno, node=node)
+
+    @utils.check_messages("dangerous-default-value")
+    def visit_functiondef(self, node: nodes.FunctionDef) -> None:
+        """Check function name, docstring, arguments, redefinition,
+        variable names, max locals
+        """
+        if node.is_method():
+            self.linter.stats.node_count["method"] += 1
+        else:
+            self.linter.stats.node_count["function"] += 1
+        self._check_dangerous_default(node)
+
+    visit_asyncfunctiondef = visit_functiondef
+
+    def _check_dangerous_default(self, node):
+        """Check for dangerous default values as arguments."""
+
+        def is_iterable(internal_node):
+            return isinstance(internal_node, (nodes.List, nodes.Set, nodes.Dict))
+
+        defaults = node.args.defaults or [] + node.args.kw_defaults or []
+        for default in defaults:
+            if not default:
+                continue
+            try:
+                value = next(default.infer())
+            except astroid.InferenceError:
+                continue
+
+            if (
+                isinstance(value, astroid.Instance)
+                and value.qname() in DEFAULT_ARGUMENT_SYMBOLS
+            ):
+                if value is default:
+                    msg = DEFAULT_ARGUMENT_SYMBOLS[value.qname()]
+                elif isinstance(value, astroid.Instance) or is_iterable(value):
+                    # We are here in the following situation(s):
+                    #   * a dict/set/list/tuple call which wasn't inferred
+                    #     to a syntax node ({}, () etc.). This can happen
+                    #     when the arguments are invalid or unknown to
+                    #     the inference.
+                    #   * a variable from somewhere else, which turns out to be a list
+                    #     or a dict.
+                    if is_iterable(default):
+                        msg = value.pytype()
+                    elif isinstance(default, nodes.Call):
+                        msg = f"{value.name}() ({value.qname()})"
+                    else:
+                        msg = f"{default.as_string()} ({value.qname()})"
+                else:
+                    # this argument is a name
+                    msg = f"{default.as_string()} ({DEFAULT_ARGUMENT_SYMBOLS[value.qname()]})"
+                self.add_message("dangerous-default-value", node=node, args=(msg,))
+
+    @utils.check_messages("unreachable", "lost-exception")
+    def visit_return(self, node: nodes.Return) -> None:
+        """Return node visitor.
+
+        1 - check if the node has a right sibling (if so, that's some
+        unreachable code)
+        2 - check if the node is inside the 'finally' clause of a 'try...finally'
+        block
+        """
+        self._check_unreachable(node)
+        # Is it inside final body of a try...finally block ?
+        self._check_not_in_finally(node, "return", (nodes.FunctionDef,))
+
+    @utils.check_messages("unreachable")
+    def visit_continue(self, node: nodes.Continue) -> None:
+        """Check is the node has a right sibling (if so, that's some unreachable
+        code)
+        """
+        self._check_unreachable(node)
+
+    @utils.check_messages("unreachable", "lost-exception")
+    def visit_break(self, node: nodes.Break) -> None:
+        """Break node visitor.
+
+        1 - check if the node has a right sibling (if so, that's some
+        unreachable code)
+        2 - check if the node is inside the 'finally' clause of a 'try...finally'
+        block
+        """
+        # 1 - Is it right sibling ?
+        self._check_unreachable(node)
+        # 2 - Is it inside final body of a try...finally block ?
+        self._check_not_in_finally(node, "break", (nodes.For, nodes.While))
+
+    @utils.check_messages("unreachable")
+    def visit_raise(self, node: nodes.Raise) -> None:
+        """Check if the node has a right sibling (if so, that's some unreachable
+        code)
+        """
+        self._check_unreachable(node)
+
+    def _check_misplaced_format_function(self, call_node):
+        if not isinstance(call_node.func, nodes.Attribute):
+            return
+        if call_node.func.attrname != "format":
+            return
+
+        expr = utils.safe_infer(call_node.func.expr)
+        if expr is astroid.Uninferable:
+            return
+        if not expr:
+            # we are doubtful on inferred type of node, so here just check if format
+            # was called on print()
+            call_expr = call_node.func.expr
+            if not isinstance(call_expr, nodes.Call):
+                return
+            if (
+                isinstance(call_expr.func, nodes.Name)
+                and call_expr.func.name == "print"
+            ):
+                self.add_message("misplaced-format-function", node=call_node)
+
+    @utils.check_messages(
+        "eval-used", "exec-used", "bad-reversed-sequence", "misplaced-format-function"
+    )
+    def visit_call(self, node: nodes.Call) -> None:
+        """Visit a Call node -> check if this is not a disallowed builtin
+        call and check for * or ** use
+        """
+        self._check_misplaced_format_function(node)
+        if isinstance(node.func, nodes.Name):
+            name = node.func.name
+            # ignore the name if it's not a builtin (i.e. not defined in the
+            # locals nor globals scope)
+            if not (name in node.frame(future=True) or name in node.root()):
+                if name == "exec":
+                    self.add_message("exec-used", node=node)
+                elif name == "reversed":
+                    self._check_reversed(node)
+                elif name == "eval":
+                    self.add_message("eval-used", node=node)
+
+    @utils.check_messages("assert-on-tuple", "assert-on-string-literal")
+    def visit_assert(self, node: nodes.Assert) -> None:
+        """Check whether assert is used on a tuple or string literal."""
+        if (
+            node.fail is None
+            and isinstance(node.test, nodes.Tuple)
+            and len(node.test.elts) == 2
+        ):
+            self.add_message("assert-on-tuple", node=node)
+
+        if isinstance(node.test, nodes.Const) and isinstance(node.test.value, str):
+            if node.test.value:
+                when = "never"
+            else:
+                when = "always"
+            self.add_message("assert-on-string-literal", node=node, args=(when,))
+
+    @utils.check_messages("duplicate-key")
+    def visit_dict(self, node: nodes.Dict) -> None:
+        """Check duplicate key in dictionary."""
+        keys = set()
+        for k, _ in node.items:
+            if isinstance(k, nodes.Const):
+                key = k.value
+            elif isinstance(k, nodes.Attribute):
+                key = k.as_string()
+            else:
+                continue
+            if key in keys:
+                self.add_message("duplicate-key", node=node, args=key)
+            keys.add(key)
+
+    def visit_tryfinally(self, node: nodes.TryFinally) -> None:
+        """Update try...finally flag."""
+        self._tryfinallys.append(node)
+
+    def leave_tryfinally(self, _: nodes.TryFinally) -> None:
+        """Update try...finally flag."""
+        self._tryfinallys.pop()
+
+    def _check_unreachable(self, node):
+        """Check unreachable code."""
+        unreach_stmt = node.next_sibling()
+        if unreach_stmt is not None:
+            if (
+                isinstance(node, nodes.Return)
+                and isinstance(unreach_stmt, nodes.Expr)
+                and isinstance(unreach_stmt.value, nodes.Yield)
+            ):
+                # Don't add 'unreachable' for empty generators.
+                # Only add warning if 'yield' is followed by another node.
+                unreach_stmt = unreach_stmt.next_sibling()
+                if unreach_stmt is None:
+                    return
+            self.add_message("unreachable", node=unreach_stmt)
+
+    def _check_not_in_finally(self, node, node_name, breaker_classes=()):
+        """Check that a node is not inside a 'finally' clause of a
+        'try...finally' statement.
+
+        If we find a parent which type is in breaker_classes before
+        a 'try...finally' block we skip the whole check.
+        """
+        # if self._tryfinallys is empty, we're not an in try...finally block
+        if not self._tryfinallys:
+            return
+        # the node could be a grand-grand...-child of the 'try...finally'
+        _parent = node.parent
+        _node = node
+        while _parent and not isinstance(_parent, breaker_classes):
+            if hasattr(_parent, "finalbody") and _node in _parent.finalbody:
+                self.add_message("lost-exception", node=node, args=node_name)
+                return
+            _node = _parent
+            _parent = _node.parent
+
+    def _check_reversed(self, node):
+        """Check that the argument to `reversed` is a sequence."""
+        try:
+            argument = utils.safe_infer(utils.get_argument_from_call(node, position=0))
+        except utils.NoSuchArgumentError:
+            pass
+        else:
+            if argument is astroid.Uninferable:
+                return
+            if argument is None:
+                # Nothing was inferred.
+                # Try to see if we have iter().
+                if isinstance(node.args[0], nodes.Call):
+                    try:
+                        func = next(node.args[0].func.infer())
+                    except astroid.InferenceError:
+                        return
+                    if getattr(
+                        func, "name", None
+                    ) == "iter" and utils.is_builtin_object(func):
+                        self.add_message("bad-reversed-sequence", node=node)
+                return
+
+            if isinstance(argument, (nodes.List, nodes.Tuple)):
+                return
+
+            # dicts are reversible, but only from Python 3.8 onwards. Prior to
+            # that, any class based on dict must explicitly provide a
+            # __reversed__ method
+            if not self._py38_plus and isinstance(argument, astroid.Instance):
+                if any(
+                    ancestor.name == "dict" and utils.is_builtin_object(ancestor)
+                    for ancestor in itertools.chain(
+                        (argument._proxied,), argument._proxied.ancestors()
+                    )
+                ):
+                    try:
+                        argument.locals[REVERSED_PROTOCOL_METHOD]
+                    except KeyError:
+                        self.add_message("bad-reversed-sequence", node=node)
+                    return
+
+            if hasattr(argument, "getattr"):
+                # everything else is not a proper sequence for reversed()
+                for methods in REVERSED_METHODS:
+                    for meth in methods:
+                        try:
+                            argument.getattr(meth)
+                        except astroid.NotFoundError:
+                            break
+                    else:
+                        break
+                else:
+                    self.add_message("bad-reversed-sequence", node=node)
+            else:
+                self.add_message("bad-reversed-sequence", node=node)
+
+    @utils.check_messages("confusing-with-statement")
+    def visit_with(self, node: nodes.With) -> None:
+        # a "with" statement with multiple managers corresponds
+        # to one AST "With" node with multiple items
+        pairs = node.items
+        if pairs:
+            for prev_pair, pair in zip(pairs, pairs[1:]):
+                if isinstance(prev_pair[1], nodes.AssignName) and (
+                    pair[1] is None and not isinstance(pair[0], nodes.Call)
+                ):
+                    # Don't emit a message if the second is a function call
+                    # there's no way that can be mistaken for a name assignment.
+                    # If the line number doesn't match
+                    # we assume it's a nested "with".
+                    self.add_message("confusing-with-statement", node=node)
+
+    def _check_self_assigning_variable(self, node):
+        # Detect assigning to the same variable.
+
+        scope = node.scope()
+        scope_locals = scope.locals
+
+        rhs_names = []
+        targets = node.targets
+        if isinstance(targets[0], nodes.Tuple):
+            if len(targets) != 1:
+                # A complex assignment, so bail out early.
+                return
+            targets = targets[0].elts
+            if len(targets) == 1:
+                # Unpacking a variable into the same name.
+                return
+
+        if isinstance(node.value, nodes.Name):
+            if len(targets) != 1:
+                return
+            rhs_names = [node.value]
+        elif isinstance(node.value, nodes.Tuple):
+            rhs_count = len(node.value.elts)
+            if len(targets) != rhs_count or rhs_count == 1:
+                return
+            rhs_names = node.value.elts
+
+        for target, lhs_name in zip(targets, rhs_names):
+            if not isinstance(lhs_name, nodes.Name):
+                continue
+            if not isinstance(target, nodes.AssignName):
+                continue
+            # Check that the scope is different from a class level, which is usually
+            # a pattern to expose module level attributes as class level ones.
+            if isinstance(scope, nodes.ClassDef) and target.name in scope_locals:
+                continue
+            if target.name == lhs_name.name:
+                self.add_message(
+                    "self-assigning-variable", args=(target.name,), node=target
+                )
+
+    def _check_redeclared_assign_name(self, targets):
+        dummy_variables_rgx = lint_utils.get_global_option(
+            self, "dummy-variables-rgx", default=None
+        )
+
+        for target in targets:
+            if not isinstance(target, nodes.Tuple):
+                continue
+
+            found_names = []
+            for element in target.elts:
+                if isinstance(element, nodes.Tuple):
+                    self._check_redeclared_assign_name([element])
+                elif isinstance(element, nodes.AssignName) and element.name != "_":
+                    if dummy_variables_rgx and dummy_variables_rgx.match(element.name):
+                        return
+                    found_names.append(element.name)
+
+            names = collections.Counter(found_names)
+            for name, count in names.most_common():
+                if count > 1:
+                    self.add_message(
+                        "redeclared-assigned-name", args=(name,), node=target
+                    )
+
+    @utils.check_messages("self-assigning-variable", "redeclared-assigned-name")
+    def visit_assign(self, node: nodes.Assign) -> None:
+        self._check_self_assigning_variable(node)
+        self._check_redeclared_assign_name(node.targets)
+
+    @utils.check_messages("redeclared-assigned-name")
+    def visit_for(self, node: nodes.For) -> None:
+        self._check_redeclared_assign_name([node.target])
diff --git a/pylint/checkers/base/basic_error_checker.py b/pylint/checkers/base/basic_error_checker.py
new file mode 100644
index 0000000000..242c13fa2e
--- /dev/null
+++ b/pylint/checkers/base/basic_error_checker.py
@@ -0,0 +1,572 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Basic Error checker from the basic checker."""
+
+import collections
+import itertools
+from typing import Any, Iterator
+
+import astroid
+from astroid import nodes
+
+from pylint import utils as lint_utils
+from pylint.checkers import utils
+from pylint.checkers.base.basic_checker import _BasicChecker
+from pylint.checkers.utils import infer_all
+
+ABC_METACLASSES = {"_py_abc.ABCMeta", "abc.ABCMeta"}  # Python 3.7+,
+# List of methods which can be redefined
+REDEFINABLE_METHODS = frozenset(("__module__",))
+TYPING_FORWARD_REF_QNAME = "typing.ForwardRef"
+
+
+def _get_break_loop_node(break_node):
+    """Returns the loop node that holds the break node in arguments.
+
+    Args:
+        break_node (astroid.Break): the break node of interest.
+
+    Returns:
+        astroid.For or astroid.While: the loop node holding the break node.
+    """
+    loop_nodes = (nodes.For, nodes.While)
+    parent = break_node.parent
+    while not isinstance(parent, loop_nodes) or break_node in getattr(
+        parent, "orelse", []
+    ):
+        break_node = parent
+        parent = parent.parent
+        if parent is None:
+            break
+    return parent
+
+
+def _loop_exits_early(loop):
+    """Returns true if a loop may end with a break statement.
+
+    Args:
+        loop (astroid.For, astroid.While): the loop node inspected.
+
+    Returns:
+        bool: True if the loop may end with a break statement, False otherwise.
+    """
+    loop_nodes = (nodes.For, nodes.While)
+    definition_nodes = (nodes.FunctionDef, nodes.ClassDef)
+    inner_loop_nodes = [
+        _node
+        for _node in loop.nodes_of_class(loop_nodes, skip_klass=definition_nodes)
+        if _node != loop
+    ]
+    return any(
+        _node
+        for _node in loop.nodes_of_class(nodes.Break, skip_klass=definition_nodes)
+        if _get_break_loop_node(_node) not in inner_loop_nodes
+    )
+
+
+def _has_abstract_methods(node):
+    """Determine if the given `node` has abstract methods.
+
+    The methods should be made abstract by decorating them
+    with `abc` decorators.
+    """
+    return len(utils.unimplemented_abstract_methods(node)) > 0
+
+
+def redefined_by_decorator(node):
+    """Return True if the object is a method redefined via decorator.
+
+    For example:
+        @property
+        def x(self): return self._x
+        @x.setter
+        def x(self, value): self._x = value
+    """
+    if node.decorators:
+        for decorator in node.decorators.nodes:
+            if (
+                isinstance(decorator, nodes.Attribute)
+                and getattr(decorator.expr, "name", None) == node.name
+            ):
+                return True
+    return False
+
+
+class BasicErrorChecker(_BasicChecker):
+    msgs = {
+        "E0100": (
+            "__init__ method is a generator",
+            "init-is-generator",
+            "Used when the special class method __init__ is turned into a "
+            "generator by a yield in its body.",
+        ),
+        "E0101": (
+            "Explicit return in __init__",
+            "return-in-init",
+            "Used when the special class method __init__ has an explicit "
+            "return value.",
+        ),
+        "E0102": (
+            "%s already defined line %s",
+            "function-redefined",
+            "Used when a function / class / method is redefined.",
+        ),
+        "E0103": (
+            "%r not properly in loop",
+            "not-in-loop",
+            "Used when break or continue keywords are used outside a loop.",
+        ),
+        "E0104": (
+            "Return outside function",
+            "return-outside-function",
+            'Used when a "return" statement is found outside a function or method.',
+        ),
+        "E0105": (
+            "Yield outside function",
+            "yield-outside-function",
+            'Used when a "yield" statement is found outside a function or method.',
+        ),
+        "E0106": (
+            "Return with argument inside generator",
+            "return-arg-in-generator",
+            'Used when a "return" statement with an argument is found '
+            "outside in a generator function or method (e.g. with some "
+            '"yield" statements).',
+            {"maxversion": (3, 3)},
+        ),
+        "E0107": (
+            "Use of the non-existent %s operator",
+            "nonexistent-operator",
+            "Used when you attempt to use the C-style pre-increment or "
+            "pre-decrement operator -- and ++, which doesn't exist in Python.",
+        ),
+        "E0108": (
+            "Duplicate argument name %s in function definition",
+            "duplicate-argument-name",
+            "Duplicate argument names in function definitions are syntax errors.",
+        ),
+        "E0110": (
+            "Abstract class %r with abstract methods instantiated",
+            "abstract-class-instantiated",
+            "Used when an abstract class with `abc.ABCMeta` as metaclass "
+            "has abstract methods and is instantiated.",
+        ),
+        "W0120": (
+            "Else clause on loop without a break statement, remove the else and"
+            " de-indent all the code inside it",
+            "useless-else-on-loop",
+            "Loops should only have an else clause if they can exit early "
+            "with a break statement, otherwise the statements under else "
+            "should be on the same scope as the loop itself.",
+        ),
+        "E0112": (
+            "More than one starred expression in assignment",
+            "too-many-star-expressions",
+            "Emitted when there are more than one starred "
+            "expressions (`*x`) in an assignment. This is a SyntaxError.",
+        ),
+        "E0113": (
+            "Starred assignment target must be in a list or tuple",
+            "invalid-star-assignment-target",
+            "Emitted when a star expression is used as a starred assignment target.",
+        ),
+        "E0114": (
+            "Can use starred expression only in assignment target",
+            "star-needs-assignment-target",
+            "Emitted when a star expression is not used in an assignment target.",
+        ),
+        "E0115": (
+            "Name %r is nonlocal and global",
+            "nonlocal-and-global",
+            "Emitted when a name is both nonlocal and global.",
+        ),
+        "E0116": (
+            "'continue' not supported inside 'finally' clause",
+            "continue-in-finally",
+            "Emitted when the `continue` keyword is found "
+            "inside a finally clause, which is a SyntaxError.",
+            {"maxversion": (3, 8)},
+        ),
+        "E0117": (
+            "nonlocal name %s found without binding",
+            "nonlocal-without-binding",
+            "Emitted when a nonlocal variable does not have an attached "
+            "name somewhere in the parent scopes",
+        ),
+        "E0118": (
+            "Name %r is used prior to global declaration",
+            "used-prior-global-declaration",
+            "Emitted when a name is used prior a global declaration, "
+            "which results in an error since Python 3.6.",
+            {"minversion": (3, 6)},
+        ),
+    }
+
+    @utils.check_messages("function-redefined")
+    def visit_classdef(self, node: nodes.ClassDef) -> None:
+        self._check_redefinition("class", node)
+
+    def _too_many_starred_for_tuple(self, assign_tuple):
+        starred_count = 0
+        for elem in assign_tuple.itered():
+            if isinstance(elem, nodes.Tuple):
+                return self._too_many_starred_for_tuple(elem)
+            if isinstance(elem, nodes.Starred):
+                starred_count += 1
+        return starred_count > 1
+
+    @utils.check_messages("too-many-star-expressions", "invalid-star-assignment-target")
+    def visit_assign(self, node: nodes.Assign) -> None:
+        # Check *a, *b = ...
+        assign_target = node.targets[0]
+        # Check *a = b
+        if isinstance(node.targets[0], nodes.Starred):
+            self.add_message("invalid-star-assignment-target", node=node)
+
+        if not isinstance(assign_target, nodes.Tuple):
+            return
+        if self._too_many_starred_for_tuple(assign_target):
+            self.add_message("too-many-star-expressions", node=node)
+
+    @utils.check_messages("star-needs-assignment-target")
+    def visit_starred(self, node: nodes.Starred) -> None:
+        """Check that a Starred expression is used in an assignment target."""
+        if isinstance(node.parent, nodes.Call):
+            # f(*args) is converted to Call(args=[Starred]), so ignore
+            # them for this check.
+            return
+        if isinstance(node.parent, (nodes.List, nodes.Tuple, nodes.Set, nodes.Dict)):
+            # PEP 448 unpacking.
+            return
+
+        stmt = node.statement(future=True)
+        if not isinstance(stmt, nodes.Assign):
+            return
+
+        if stmt.value is node or stmt.value.parent_of(node):
+            self.add_message("star-needs-assignment-target", node=node)
+
+    @utils.check_messages(
+        "init-is-generator",
+        "return-in-init",
+        "function-redefined",
+        "return-arg-in-generator",
+        "duplicate-argument-name",
+        "nonlocal-and-global",
+        "used-prior-global-declaration",
+    )
+    def visit_functiondef(self, node: nodes.FunctionDef) -> None:
+        self._check_nonlocal_and_global(node)
+        self._check_name_used_prior_global(node)
+        if not redefined_by_decorator(
+            node
+        ) and not utils.is_registered_in_singledispatch_function(node):
+            self._check_redefinition(node.is_method() and "method" or "function", node)
+        # checks for max returns, branch, return in __init__
+        returns = node.nodes_of_class(
+            nodes.Return, skip_klass=(nodes.FunctionDef, nodes.ClassDef)
+        )
+        if node.is_method() and node.name == "__init__":
+            if node.is_generator():
+                self.add_message("init-is-generator", node=node)
+            else:
+                values = [r.value for r in returns]
+                # Are we returning anything but None from constructors
+                if any(v for v in values if not utils.is_none(v)):
+                    self.add_message("return-in-init", node=node)
+        # Check for duplicate names by clustering args with same name for detailed report
+        arg_clusters = collections.defaultdict(list)
+        arguments: Iterator[Any] = filter(None, [node.args.args, node.args.kwonlyargs])
+
+        for arg in itertools.chain.from_iterable(arguments):
+            arg_clusters[arg.name].append(arg)
+
+        # provide detailed report about each repeated argument
+        for argument_duplicates in arg_clusters.values():
+            if len(argument_duplicates) != 1:
+                for argument in argument_duplicates:
+                    self.add_message(
+                        "duplicate-argument-name",
+                        line=argument.lineno,
+                        node=argument,
+                        args=(argument.name,),
+                    )
+
+    visit_asyncfunctiondef = visit_functiondef
+
+    def _check_name_used_prior_global(self, node):
+
+        scope_globals = {
+            name: child
+            for child in node.nodes_of_class(nodes.Global)
+            for name in child.names
+            if child.scope() is node
+        }
+
+        if not scope_globals:
+            return
+
+        for node_name in node.nodes_of_class(nodes.Name):
+            if node_name.scope() is not node:
+                continue
+
+            name = node_name.name
+            corresponding_global = scope_globals.get(name)
+            if not corresponding_global:
+                continue
+
+            global_lineno = corresponding_global.fromlineno
+            if global_lineno and global_lineno > node_name.fromlineno:
+                self.add_message(
+                    "used-prior-global-declaration", node=node_name, args=(name,)
+                )
+
+    def _check_nonlocal_and_global(self, node):
+        """Check that a name is both nonlocal and global."""
+
+        def same_scope(current):
+            return current.scope() is node
+
+        from_iter = itertools.chain.from_iterable
+        nonlocals = set(
+            from_iter(
+                child.names
+                for child in node.nodes_of_class(nodes.Nonlocal)
+                if same_scope(child)
+            )
+        )
+
+        if not nonlocals:
+            return
+
+        global_vars = set(
+            from_iter(
+                child.names
+                for child in node.nodes_of_class(nodes.Global)
+                if same_scope(child)
+            )
+        )
+        for name in nonlocals.intersection(global_vars):
+            self.add_message("nonlocal-and-global", args=(name,), node=node)
+
+    @utils.check_messages("return-outside-function")
+    def visit_return(self, node: nodes.Return) -> None:
+        if not isinstance(node.frame(future=True), nodes.FunctionDef):
+            self.add_message("return-outside-function", node=node)
+
+    @utils.check_messages("yield-outside-function")
+    def visit_yield(self, node: nodes.Yield) -> None:
+        self._check_yield_outside_func(node)
+
+    @utils.check_messages("yield-outside-function")
+    def visit_yieldfrom(self, node: nodes.YieldFrom) -> None:
+        self._check_yield_outside_func(node)
+
+    @utils.check_messages("not-in-loop", "continue-in-finally")
+    def visit_continue(self, node: nodes.Continue) -> None:
+        self._check_in_loop(node, "continue")
+
+    @utils.check_messages("not-in-loop")
+    def visit_break(self, node: nodes.Break) -> None:
+        self._check_in_loop(node, "break")
+
+    @utils.check_messages("useless-else-on-loop")
+    def visit_for(self, node: nodes.For) -> None:
+        self._check_else_on_loop(node)
+
+    @utils.check_messages("useless-else-on-loop")
+    def visit_while(self, node: nodes.While) -> None:
+        self._check_else_on_loop(node)
+
+    @utils.check_messages("nonexistent-operator")
+    def visit_unaryop(self, node: nodes.UnaryOp) -> None:
+        """Check use of the non-existent ++ and -- operators."""
+        if (
+            (node.op in "+-")
+            and isinstance(node.operand, nodes.UnaryOp)
+            and (node.operand.op == node.op)
+            and (node.col_offset + 1 == node.operand.col_offset)
+        ):
+            self.add_message("nonexistent-operator", node=node, args=node.op * 2)
+
+    def _check_nonlocal_without_binding(self, node, name):
+        current_scope = node.scope()
+        while True:
+            if current_scope.parent is None:
+                break
+
+            if not isinstance(current_scope, (nodes.ClassDef, nodes.FunctionDef)):
+                self.add_message("nonlocal-without-binding", args=(name,), node=node)
+                return
+
+            if name not in current_scope.locals:
+                current_scope = current_scope.parent.scope()
+                continue
+
+            # Okay, found it.
+            return
+
+        if not isinstance(current_scope, nodes.FunctionDef):
+            self.add_message("nonlocal-without-binding", args=(name,), node=node)
+
+    @utils.check_messages("nonlocal-without-binding")
+    def visit_nonlocal(self, node: nodes.Nonlocal) -> None:
+        for name in node.names:
+            self._check_nonlocal_without_binding(node, name)
+
+    @utils.check_messages("abstract-class-instantiated")
+    def visit_call(self, node: nodes.Call) -> None:
+        """Check instantiating abstract class with
+        abc.ABCMeta as metaclass.
+        """
+        for inferred in infer_all(node.func):
+            self._check_inferred_class_is_abstract(inferred, node)
+
+    def _check_inferred_class_is_abstract(self, inferred, node):
+        if not isinstance(inferred, nodes.ClassDef):
+            return
+
+        klass = utils.node_frame_class(node)
+        if klass is inferred:
+            # Don't emit the warning if the class is instantiated
+            # in its own body or if the call is not an instance
+            # creation. If the class is instantiated into its own
+            # body, we're expecting that it knows what it is doing.
+            return
+
+        # __init__ was called
+        abstract_methods = _has_abstract_methods(inferred)
+
+        if not abstract_methods:
+            return
+
+        metaclass = inferred.metaclass()
+
+        if metaclass is None:
+            # Python 3.4 has `abc.ABC`, which won't be detected
+            # by ClassNode.metaclass()
+            for ancestor in inferred.ancestors():
+                if ancestor.qname() == "abc.ABC":
+                    self.add_message(
+                        "abstract-class-instantiated", args=(inferred.name,), node=node
+                    )
+                    break
+
+            return
+
+        if metaclass.qname() in ABC_METACLASSES:
+            self.add_message(
+                "abstract-class-instantiated", args=(inferred.name,), node=node
+            )
+
+    def _check_yield_outside_func(self, node):
+        if not isinstance(node.frame(future=True), (nodes.FunctionDef, nodes.Lambda)):
+            self.add_message("yield-outside-function", node=node)
+
+    def _check_else_on_loop(self, node):
+        """Check that any loop with an else clause has a break statement."""
+        if node.orelse and not _loop_exits_early(node):
+            self.add_message(
+                "useless-else-on-loop",
+                node=node,
+                # This is not optimal, but the line previous
+                # to the first statement in the else clause
+                # will usually be the one that contains the else:.
+                line=node.orelse[0].lineno - 1,
+            )
+
+    def _check_in_loop(self, node, node_name):
+        """Check that a node is inside a for or while loop."""
+        for parent in node.node_ancestors():
+            if isinstance(parent, (nodes.For, nodes.While)):
+                if node not in parent.orelse:
+                    return
+
+            if isinstance(parent, (nodes.ClassDef, nodes.FunctionDef)):
+                break
+            if (
+                isinstance(parent, nodes.TryFinally)
+                and node in parent.finalbody
+                and isinstance(node, nodes.Continue)
+            ):
+                self.add_message("continue-in-finally", node=node)
+
+        self.add_message("not-in-loop", node=node, args=node_name)
+
+    def _check_redefinition(self, redeftype, node):
+        """Check for redefinition of a function / method / class name."""
+        parent_frame = node.parent.frame(future=True)
+
+        # Ignore function stubs created for type information
+        redefinitions = [
+            i
+            for i in parent_frame.locals[node.name]
+            if not (isinstance(i.parent, nodes.AnnAssign) and i.parent.simple)
+        ]
+        defined_self = next(
+            (local for local in redefinitions if not utils.is_overload_stub(local)),
+            node,
+        )
+        if defined_self is not node and not astroid.are_exclusive(node, defined_self):
+            # Additional checks for methods which are not considered
+            # redefined, since they are already part of the base API.
+            if (
+                isinstance(parent_frame, nodes.ClassDef)
+                and node.name in REDEFINABLE_METHODS
+            ):
+                return
+
+            # Skip typing.overload() functions.
+            if utils.is_overload_stub(node):
+                return
+
+            # Exempt functions redefined on a condition.
+            if isinstance(node.parent, nodes.If):
+                # Exempt "if not <func>" cases
+                if (
+                    isinstance(node.parent.test, nodes.UnaryOp)
+                    and node.parent.test.op == "not"
+                    and isinstance(node.parent.test.operand, nodes.Name)
+                    and node.parent.test.operand.name == node.name
+                ):
+                    return
+
+                # Exempt "if <func> is not None" cases
+                # pylint: disable=too-many-boolean-expressions
+                if (
+                    isinstance(node.parent.test, nodes.Compare)
+                    and isinstance(node.parent.test.left, nodes.Name)
+                    and node.parent.test.left.name == node.name
+                    and node.parent.test.ops[0][0] == "is"
+                    and isinstance(node.parent.test.ops[0][1], nodes.Const)
+                    and node.parent.test.ops[0][1].value is None
+                ):
+                    return
+
+            # Check if we have forward references for this node.
+            try:
+                redefinition_index = redefinitions.index(node)
+            except ValueError:
+                pass
+            else:
+                for redefinition in redefinitions[:redefinition_index]:
+                    inferred = utils.safe_infer(redefinition)
+                    if (
+                        inferred
+                        and isinstance(inferred, astroid.Instance)
+                        and inferred.qname() == TYPING_FORWARD_REF_QNAME
+                    ):
+                        return
+
+            dummy_variables_rgx = lint_utils.get_global_option(
+                self, "dummy-variables-rgx", default=None
+            )
+            if dummy_variables_rgx and dummy_variables_rgx.match(node.name):
+                return
+            self.add_message(
+                "function-redefined",
+                node=node,
+                args=(redeftype, defined_self.fromlineno),
+            )
diff --git a/pylint/checkers/base/comparison_checker.py b/pylint/checkers/base/comparison_checker.py
new file mode 100644
index 0000000000..1db50761b4
--- /dev/null
+++ b/pylint/checkers/base/comparison_checker.py
@@ -0,0 +1,295 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Comparison checker from the basic checker."""
+
+import astroid
+from astroid import nodes
+
+from pylint.checkers import utils
+from pylint.checkers.base.basic_checker import _BasicChecker
+
+LITERAL_NODE_TYPES = (nodes.Const, nodes.Dict, nodes.List, nodes.Set)
+COMPARISON_OPERATORS = frozenset(("==", "!=", "<", ">", "<=", ">="))
+TYPECHECK_COMPARISON_OPERATORS = frozenset(("is", "is not", "==", "!="))
+TYPE_QNAME = "builtins.type"
+
+
+def _is_one_arg_pos_call(call):
+    """Is this a call with exactly 1 positional argument ?"""
+    return isinstance(call, nodes.Call) and len(call.args) == 1 and not call.keywords
+
+
+class ComparisonChecker(_BasicChecker):
+    """Checks for comparisons.
+
+    - singleton comparison: 'expr == True', 'expr == False' and 'expr == None'
+    - yoda condition: 'const "comp" right' where comp can be '==', '!=', '<',
+      '<=', '>' or '>=', and right can be a variable, an attribute, a method or
+      a function
+    """
+
+    msgs = {
+        "C0121": (
+            "Comparison %s should be %s",
+            "singleton-comparison",
+            "Used when an expression is compared to singleton "
+            "values like True, False or None.",
+        ),
+        "C0123": (
+            "Use isinstance() rather than type() for a typecheck.",
+            "unidiomatic-typecheck",
+            "The idiomatic way to perform an explicit typecheck in "
+            "Python is to use isinstance(x, Y) rather than "
+            "type(x) == Y, type(x) is Y. Though there are unusual "
+            "situations where these give different results.",
+            {"old_names": [("W0154", "old-unidiomatic-typecheck")]},
+        ),
+        "R0123": (
+            "Comparison to literal",
+            "literal-comparison",
+            "Used when comparing an object to a literal, which is usually "
+            "what you do not want to do, since you can compare to a different "
+            "literal than what was expected altogether.",
+        ),
+        "R0124": (
+            "Redundant comparison - %s",
+            "comparison-with-itself",
+            "Used when something is compared against itself.",
+        ),
+        "W0143": (
+            "Comparing against a callable, did you omit the parenthesis?",
+            "comparison-with-callable",
+            "This message is emitted when pylint detects that a comparison with a "
+            "callable was made, which might suggest that some parenthesis were omitted, "
+            "resulting in potential unwanted behaviour.",
+        ),
+        "W0177": (
+            "Comparison %s should be %s",
+            "nan-comparison",
+            "Used when an expression is compared to NaN"
+            "values like numpy.NaN and float('nan')",
+        ),
+    }
+
+    def _check_singleton_comparison(
+        self, left_value, right_value, root_node, checking_for_absence: bool = False
+    ):
+        """Check if == or != is being used to compare a singleton value."""
+        singleton_values = (True, False, None)
+
+        def _is_singleton_const(node) -> bool:
+            return isinstance(node, nodes.Const) and any(
+                node.value is value for value in singleton_values
+            )
+
+        if _is_singleton_const(left_value):
+            singleton, other_value = left_value.value, right_value
+        elif _is_singleton_const(right_value):
+            singleton, other_value = right_value.value, left_value
+        else:
+            return
+
+        singleton_comparison_example = {False: "'{} is {}'", True: "'{} is not {}'"}
+
+        # True/False singletons have a special-cased message in case the user is
+        # mistakenly using == or != to check for truthiness
+        if singleton in {True, False}:
+            suggestion_template = (
+                "{} if checking for the singleton value {}, or {} if testing for {}"
+            )
+            truthiness_example = {False: "not {}", True: "{}"}
+            truthiness_phrase = {True: "truthiness", False: "falsiness"}
+
+            # Looks for comparisons like x == True or x != False
+            checking_truthiness = singleton is not checking_for_absence
+
+            suggestion = suggestion_template.format(
+                singleton_comparison_example[checking_for_absence].format(
+                    left_value.as_string(), right_value.as_string()
+                ),
+                singleton,
+                (
+                    "'bool({})'"
+                    if not utils.is_test_condition(root_node) and checking_truthiness
+                    else "'{}'"
+                ).format(
+                    truthiness_example[checking_truthiness].format(
+                        other_value.as_string()
+                    )
+                ),
+                truthiness_phrase[checking_truthiness],
+            )
+        else:
+            suggestion = singleton_comparison_example[checking_for_absence].format(
+                left_value.as_string(), right_value.as_string()
+            )
+        self.add_message(
+            "singleton-comparison",
+            node=root_node,
+            args=(f"'{root_node.as_string()}'", suggestion),
+        )
+
+    def _check_nan_comparison(
+        self, left_value, right_value, root_node, checking_for_absence: bool = False
+    ):
+        def _is_float_nan(node):
+            try:
+                if isinstance(node, nodes.Call) and len(node.args) == 1:
+                    if (
+                        node.args[0].value.lower() == "nan"
+                        and node.inferred()[0].pytype() == "builtins.float"
+                    ):
+                        return True
+                return False
+            except AttributeError:
+                return False
+
+        def _is_numpy_nan(node):
+            if isinstance(node, nodes.Attribute) and node.attrname == "NaN":
+                if isinstance(node.expr, nodes.Name):
+                    return node.expr.name in {"numpy", "nmp", "np"}
+            return False
+
+        def _is_nan(node) -> bool:
+            return _is_float_nan(node) or _is_numpy_nan(node)
+
+        nan_left = _is_nan(left_value)
+        if not nan_left and not _is_nan(right_value):
+            return
+
+        absence_text = ""
+        if checking_for_absence:
+            absence_text = "not "
+        if nan_left:
+            suggestion = f"'{absence_text}math.isnan({right_value.as_string()})'"
+        else:
+            suggestion = f"'{absence_text}math.isnan({left_value.as_string()})'"
+        self.add_message(
+            "nan-comparison",
+            node=root_node,
+            args=(f"'{root_node.as_string()}'", suggestion),
+        )
+
+    def _check_literal_comparison(self, literal, node: nodes.Compare):
+        """Check if we compare to a literal, which is usually what we do not want to do."""
+        is_other_literal = isinstance(literal, (nodes.List, nodes.Dict, nodes.Set))
+        is_const = False
+        if isinstance(literal, nodes.Const):
+            if isinstance(literal.value, bool) or literal.value is None:
+                # Not interested in these values.
+                return
+            is_const = isinstance(literal.value, (bytes, str, int, float))
+
+        if is_const or is_other_literal:
+            self.add_message("literal-comparison", node=node)
+
+    def _check_logical_tautology(self, node: nodes.Compare):
+        """Check if identifier is compared against itself.
+
+        :param node: Compare node
+        :Example:
+        val = 786
+        if val == val:  # [comparison-with-itself]
+            pass
+        """
+        left_operand = node.left
+        right_operand = node.ops[0][1]
+        operator = node.ops[0][0]
+        if isinstance(left_operand, nodes.Const) and isinstance(
+            right_operand, nodes.Const
+        ):
+            left_operand = left_operand.value
+            right_operand = right_operand.value
+        elif isinstance(left_operand, nodes.Name) and isinstance(
+            right_operand, nodes.Name
+        ):
+            left_operand = left_operand.name
+            right_operand = right_operand.name
+
+        if left_operand == right_operand:
+            suggestion = f"{left_operand} {operator} {right_operand}"
+            self.add_message("comparison-with-itself", node=node, args=(suggestion,))
+
+    def _check_callable_comparison(self, node):
+        operator = node.ops[0][0]
+        if operator not in COMPARISON_OPERATORS:
+            return
+
+        bare_callables = (nodes.FunctionDef, astroid.BoundMethod)
+        left_operand, right_operand = node.left, node.ops[0][1]
+        # this message should be emitted only when there is comparison of bare callable
+        # with non bare callable.
+        number_of_bare_callables = 0
+        for operand in left_operand, right_operand:
+            inferred = utils.safe_infer(operand)
+            # Ignore callables that raise, as well as typing constants
+            # implemented as functions (that raise via their decorator)
+            if (
+                isinstance(inferred, bare_callables)
+                and "typing._SpecialForm" not in inferred.decoratornames()
+                and not any(isinstance(x, nodes.Raise) for x in inferred.body)
+            ):
+                number_of_bare_callables += 1
+        if number_of_bare_callables == 1:
+            self.add_message("comparison-with-callable", node=node)
+
+    @utils.check_messages(
+        "singleton-comparison",
+        "unidiomatic-typecheck",
+        "literal-comparison",
+        "comparison-with-itself",
+        "comparison-with-callable",
+    )
+    def visit_compare(self, node: nodes.Compare) -> None:
+        self._check_callable_comparison(node)
+        self._check_logical_tautology(node)
+        self._check_unidiomatic_typecheck(node)
+        # NOTE: this checker only works with binary comparisons like 'x == 42'
+        # but not 'x == y == 42'
+        if len(node.ops) != 1:
+            return
+
+        left = node.left
+        operator, right = node.ops[0]
+
+        if operator in {"==", "!="}:
+            self._check_singleton_comparison(
+                left, right, node, checking_for_absence=operator == "!="
+            )
+
+        if operator in {"==", "!=", "is", "is not"}:
+            self._check_nan_comparison(
+                left, right, node, checking_for_absence=operator in {"!=", "is not"}
+            )
+        if operator in {"is", "is not"}:
+            self._check_literal_comparison(right, node)
+
+    def _check_unidiomatic_typecheck(self, node):
+        operator, right = node.ops[0]
+        if operator in TYPECHECK_COMPARISON_OPERATORS:
+            left = node.left
+            if _is_one_arg_pos_call(left):
+                self._check_type_x_is_y(node, left, operator, right)
+
+    def _check_type_x_is_y(self, node, left, operator, right):
+        """Check for expressions like type(x) == Y."""
+        left_func = utils.safe_infer(left.func)
+        if not (
+            isinstance(left_func, nodes.ClassDef) and left_func.qname() == TYPE_QNAME
+        ):
+            return
+
+        if operator in {"is", "is not"} and _is_one_arg_pos_call(right):
+            right_func = utils.safe_infer(right.func)
+            if (
+                isinstance(right_func, nodes.ClassDef)
+                and right_func.qname() == TYPE_QNAME
+            ):
+                # type(x) == type(a)
+                right_arg = utils.safe_infer(right.args[0])
+                if not isinstance(right_arg, LITERAL_NODE_TYPES):
+                    # not e.g. type(x) == type([])
+                    return
+        self.add_message("unidiomatic-typecheck", node=node)
diff --git a/pylint/checkers/base/docstring_checker.py b/pylint/checkers/base/docstring_checker.py
new file mode 100644
index 0000000000..73a6c31e50
--- /dev/null
+++ b/pylint/checkers/base/docstring_checker.py
@@ -0,0 +1,209 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Docstring checker from the basic checker."""
+
+import re
+import sys
+
+import astroid
+from astroid import nodes
+
+from pylint import interfaces
+from pylint.checkers import utils
+from pylint.checkers.base.basic_checker import _BasicChecker
+from pylint.checkers.utils import (
+    is_overload_stub,
+    is_property_deleter,
+    is_property_setter,
+)
+
+if sys.version_info >= (3, 8):
+    from typing import Literal
+else:
+    from typing_extensions import Literal
+
+# do not require a doc string on private/system methods
+NO_REQUIRED_DOC_RGX = re.compile("^_")
+
+
+def _infer_dunder_doc_attribute(node):
+    # Try to see if we have a `__doc__` attribute.
+    try:
+        docstring = node["__doc__"]
+    except KeyError:
+        return None
+
+    docstring = utils.safe_infer(docstring)
+    if not docstring:
+        return None
+    if not isinstance(docstring, nodes.Const):
+        return None
+    return docstring.value
+
+
+class DocStringChecker(_BasicChecker):
+    msgs = {
+        "C0112": (
+            "Empty %s docstring",
+            "empty-docstring",
+            "Used when a module, function, class or method has an empty "
+            "docstring (it would be too easy ;).",
+            {"old_names": [("W0132", "old-empty-docstring")]},
+        ),
+        "C0114": (
+            "Missing module docstring",
+            "missing-module-docstring",
+            "Used when a module has no docstring."
+            "Empty modules do not require a docstring.",
+            {"old_names": [("C0111", "missing-docstring")]},
+        ),
+        "C0115": (
+            "Missing class docstring",
+            "missing-class-docstring",
+            "Used when a class has no docstring."
+            "Even an empty class must have a docstring.",
+            {"old_names": [("C0111", "missing-docstring")]},
+        ),
+        "C0116": (
+            "Missing function or method docstring",
+            "missing-function-docstring",
+            "Used when a function or method has no docstring."
+            "Some special methods like __init__ do not require a "
+            "docstring.",
+            {"old_names": [("C0111", "missing-docstring")]},
+        ),
+    }
+    options = (
+        (
+            "no-docstring-rgx",
+            {
+                "default": NO_REQUIRED_DOC_RGX,
+                "type": "regexp",
+                "metavar": "<regexp>",
+                "help": "Regular expression which should only match "
+                "function or class names that do not require a "
+                "docstring.",
+            },
+        ),
+        (
+            "docstring-min-length",
+            {
+                "default": -1,
+                "type": "int",
+                "metavar": "<int>",
+                "help": (
+                    "Minimum line length for functions/classes that"
+                    " require docstrings, shorter ones are exempt."
+                ),
+            },
+        ),
+    )
+
+    def open(self):
+        self.linter.stats.reset_undocumented()
+
+    @utils.check_messages("missing-docstring", "empty-docstring")
+    def visit_module(self, node: nodes.Module) -> None:
+        self._check_docstring("module", node)
+
+    @utils.check_messages("missing-docstring", "empty-docstring")
+    def visit_classdef(self, node: nodes.ClassDef) -> None:
+        if self.config.no_docstring_rgx.match(node.name) is None:
+            self._check_docstring("class", node)
+
+    @utils.check_messages("missing-docstring", "empty-docstring")
+    def visit_functiondef(self, node: nodes.FunctionDef) -> None:
+        if self.config.no_docstring_rgx.match(node.name) is None:
+            ftype = "method" if node.is_method() else "function"
+            if (
+                is_property_setter(node)
+                or is_property_deleter(node)
+                or is_overload_stub(node)
+            ):
+                return
+
+            if isinstance(node.parent.frame(future=True), nodes.ClassDef):
+                overridden = False
+                confidence = (
+                    interfaces.INFERENCE
+                    if utils.has_known_bases(node.parent.frame(future=True))
+                    else interfaces.INFERENCE_FAILURE
+                )
+                # check if node is from a method overridden by its ancestor
+                for ancestor in node.parent.frame(future=True).ancestors():
+                    if ancestor.qname() == "builtins.object":
+                        continue
+                    if node.name in ancestor and isinstance(
+                        ancestor[node.name], nodes.FunctionDef
+                    ):
+                        overridden = True
+                        break
+                self._check_docstring(
+                    ftype, node, report_missing=not overridden, confidence=confidence  # type: ignore[arg-type]
+                )
+            elif isinstance(node.parent.frame(future=True), nodes.Module):
+                self._check_docstring(ftype, node)  # type: ignore[arg-type]
+            else:
+                return
+
+    visit_asyncfunctiondef = visit_functiondef
+
+    def _check_docstring(
+        self,
+        node_type: Literal["class", "function", "method", "module"],
+        node,
+        report_missing=True,
+        confidence=interfaces.HIGH,
+    ):
+        """Check if the node has a non-empty docstring."""
+        docstring = node.doc_node.value if node.doc_node else None
+        if docstring is None:
+            docstring = _infer_dunder_doc_attribute(node)
+
+        if docstring is None:
+            if not report_missing:
+                return
+            lines = utils.get_node_last_lineno(node) - node.lineno
+
+            if node_type == "module" and not lines:
+                # If the module does not have a body, there's no reason
+                # to require a docstring.
+                return
+            max_lines = self.config.docstring_min_length
+
+            if node_type != "module" and max_lines > -1 and lines < max_lines:
+                return
+            if node_type == "class":
+                self.linter.stats.undocumented["klass"] += 1
+            else:
+                self.linter.stats.undocumented[node_type] += 1
+            if (
+                node.body
+                and isinstance(node.body[0], nodes.Expr)
+                and isinstance(node.body[0].value, nodes.Call)
+            ):
+                # Most likely a string with a format call. Let's see.
+                func = utils.safe_infer(node.body[0].value.func)
+                if isinstance(func, astroid.BoundMethod) and isinstance(
+                    func.bound, astroid.Instance
+                ):
+                    # Strings.
+                    if func.bound.name in {"str", "unicode", "bytes"}:
+                        return
+            if node_type == "module":
+                message = "missing-module-docstring"
+            elif node_type == "class":
+                message = "missing-class-docstring"
+            else:
+                message = "missing-function-docstring"
+            self.add_message(message, node=node, confidence=confidence)
+        elif not docstring.strip():
+            if node_type == "class":
+                self.linter.stats.undocumented["klass"] += 1
+            else:
+                self.linter.stats.undocumented[node_type] += 1
+            self.add_message(
+                "empty-docstring", node=node, args=(node_type,), confidence=confidence
+            )
diff --git a/pylint/checkers/base/name_checker/__init__.py b/pylint/checkers/base/name_checker/__init__.py
new file mode 100644
index 0000000000..3d6818b7ab
--- /dev/null
+++ b/pylint/checkers/base/name_checker/__init__.py
@@ -0,0 +1,25 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+__all__ = [
+    "NameChecker",
+    "NamingStyle",
+    "KNOWN_NAME_TYPES_WITH_STYLE",
+    "SnakeCaseStyle",
+    "CamelCaseStyle",
+    "UpperCaseStyle",
+    "PascalCaseStyle",
+    "AnyStyle",
+]
+
+from pylint.checkers.base.name_checker.checker import NameChecker
+from pylint.checkers.base.name_checker.naming_style import (
+    KNOWN_NAME_TYPES_WITH_STYLE,
+    AnyStyle,
+    CamelCaseStyle,
+    NamingStyle,
+    PascalCaseStyle,
+    SnakeCaseStyle,
+    UpperCaseStyle,
+)
diff --git a/pylint/checkers/base/name_checker/checker.py b/pylint/checkers/base/name_checker/checker.py
new file mode 100644
index 0000000000..9527ae1305
--- /dev/null
+++ b/pylint/checkers/base/name_checker/checker.py
@@ -0,0 +1,590 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Basic checker for Python code."""
+import collections
+import itertools
+import re
+import sys
+from typing import Dict, Optional, Pattern, Tuple
+
+import astroid
+from astroid import nodes
+
+from pylint import constants, interfaces
+from pylint.checkers import utils
+from pylint.checkers.base.basic_checker import _BasicChecker
+from pylint.checkers.base.name_checker.naming_style import (
+    KNOWN_NAME_TYPES,
+    KNOWN_NAME_TYPES_WITH_STYLE,
+    NAMING_STYLES,
+    _create_naming_options,
+)
+from pylint.checkers.utils import is_property_deleter, is_property_setter
+
+# Default patterns for name types that do not have styles
+DEFAULT_PATTERNS = {
+    "typevar": re.compile(
+        r"^_{0,2}(?:[^\W\da-z_]+|(?:[^\W\da-z_]+[^\WA-Z_]+)+T?(?<!Type))(?:_co(?:ntra)?)?$"
+    )
+}
+
+BUILTIN_PROPERTY = "builtins.property"
+TYPING_TYPE_VAR_QNAME = "typing.TypeVar"
+
+
+def _get_properties(config):
+    """Returns a tuple of property classes and names.
+
+    Property classes are fully qualified, such as 'abc.abstractproperty' and
+    property names are the actual names, such as 'abstract_property'.
+    """
+    property_classes = {BUILTIN_PROPERTY}
+    property_names = set()  # Not returning 'property', it has its own check.
+    if config is not None:
+        property_classes.update(config.property_classes)
+        property_names.update(
+            prop.rsplit(".", 1)[-1] for prop in config.property_classes
+        )
+    return property_classes, property_names
+
+
+def _redefines_import(node):
+    """Detect that the given node (AssignName) is inside an
+    exception handler and redefines an import from the tryexcept body.
+
+    Returns True if the node redefines an import, False otherwise.
+    """
+    current = node
+    while current and not isinstance(current.parent, nodes.ExceptHandler):
+        current = current.parent
+    if not current or not utils.error_of_type(current.parent, ImportError):
+        return False
+    try_block = current.parent.parent
+    for import_node in try_block.nodes_of_class((nodes.ImportFrom, nodes.Import)):
+        for name, alias in import_node.names:
+            if alias:
+                if alias == node.name:
+                    return True
+            elif name == node.name:
+                return True
+    return False
+
+
+def _determine_function_name_type(node: nodes.FunctionDef, config=None):
+    """Determine the name type whose regex the function's name should match.
+
+    :param node: A function node.
+    :param config: Configuration from which to pull additional property classes.
+    :type config: :class:`optparse.Values`
+
+    :returns: One of ('function', 'method', 'attr')
+    :rtype: str
+    """
+    property_classes, property_names = _get_properties(config)
+    if not node.is_method():
+        return "function"
+
+    if is_property_setter(node) or is_property_deleter(node):
+        # If the function is decorated using the prop_method.{setter,getter}
+        # form, treat it like an attribute as well.
+        return "attr"
+
+    decorators = node.decorators.nodes if node.decorators else []
+    for decorator in decorators:
+        # If the function is a property (decorated with @property
+        # or @abc.abstractproperty), the name type is 'attr'.
+        if isinstance(decorator, nodes.Name) or (
+            isinstance(decorator, nodes.Attribute)
+            and decorator.attrname in property_names
+        ):
+            inferred = utils.safe_infer(decorator)
+            if (
+                inferred
+                and hasattr(inferred, "qname")
+                and inferred.qname() in property_classes
+            ):
+                return "attr"
+    return "method"
+
+
+# Name categories that are always consistent with all naming conventions.
+EXEMPT_NAME_CATEGORIES = {"exempt", "ignore"}
+
+
+def _is_multi_naming_match(match, node_type, confidence):
+    return (
+        match is not None
+        and match.lastgroup is not None
+        and match.lastgroup not in EXEMPT_NAME_CATEGORIES
+        and (node_type != "method" or confidence != interfaces.INFERENCE_FAILURE)
+    )
+
+
+class NameChecker(_BasicChecker):
+    msgs = {
+        "C0103": (
+            '%s name "%s" doesn\'t conform to %s',
+            "invalid-name",
+            "Used when the name doesn't conform to naming rules "
+            "associated to its type (constant, variable, class...).",
+        ),
+        "C0104": (
+            'Disallowed name "%s"',
+            "disallowed-name",
+            "Used when the name matches bad-names or bad-names-rgxs- (unauthorized names).",
+            {
+                "old_names": [
+                    ("C0102", "blacklisted-name"),
+                ]
+            },
+        ),
+        "C0105": (
+            'Type variable "%s" is %s, use "%s" instead',
+            "typevar-name-incorrect-variance",
+            "Emitted when a TypeVar name doesn't reflect its type variance. "
+            "According to PEP8, it is recommended to add suffixes '_co' and "
+            "'_contra' to the variables used to declare covariant or "
+            "contravariant behaviour respectively. Invariant (default) variables "
+            "do not require a suffix. The message is also emitted when invariant "
+            "variables do have a suffix.",
+        ),
+        "W0111": (
+            "Name %s will become a keyword in Python %s",
+            "assign-to-new-keyword",
+            "Used when assignment will become invalid in future "
+            "Python release due to introducing new keyword.",
+        ),
+    }
+
+    options = (
+        (
+            "good-names",
+            {
+                "default": ("i", "j", "k", "ex", "Run", "_"),
+                "type": "csv",
+                "metavar": "<names>",
+                "help": "Good variable names which should always be accepted,"
+                " separated by a comma.",
+            },
+        ),
+        (
+            "good-names-rgxs",
+            {
+                "default": "",
+                "type": "regexp_csv",
+                "metavar": "<names>",
+                "help": "Good variable names regexes, separated by a comma. If names match any regex,"
+                " they will always be accepted",
+            },
+        ),
+        (
+            "bad-names",
+            {
+                "default": ("foo", "bar", "baz", "toto", "tutu", "tata"),
+                "type": "csv",
+                "metavar": "<names>",
+                "help": "Bad variable names which should always be refused, "
+                "separated by a comma.",
+            },
+        ),
+        (
+            "bad-names-rgxs",
+            {
+                "default": "",
+                "type": "regexp_csv",
+                "metavar": "<names>",
+                "help": "Bad variable names regexes, separated by a comma. If names match any regex,"
+                " they will always be refused",
+            },
+        ),
+        (
+            "name-group",
+            {
+                "default": (),
+                "type": "csv",
+                "metavar": "<name1:name2>",
+                "help": (
+                    "Colon-delimited sets of names that determine each"
+                    " other's naming style when the name regexes"
+                    " allow several styles."
+                ),
+            },
+        ),
+        (
+            "include-naming-hint",
+            {
+                "default": False,
+                "type": "yn",
+                "metavar": "<y or n>",
+                "help": "Include a hint for the correct naming format with invalid-name.",
+            },
+        ),
+        (
+            "property-classes",
+            {
+                "default": ("abc.abstractproperty",),
+                "type": "csv",
+                "metavar": "<decorator names>",
+                "help": "List of decorators that produce properties, such as "
+                "abc.abstractproperty. Add to this list to register "
+                "other decorators that produce valid properties. "
+                "These decorators are taken in consideration only for invalid-name.",
+            },
+        ),
+    ) + _create_naming_options()
+
+    KEYWORD_ONSET = {(3, 7): {"async", "await"}}
+
+    def __init__(self, linter):
+        super().__init__(linter)
+        self._name_category = {}
+        self._name_group = {}
+        self._bad_names = {}
+        self._name_regexps = {}
+        self._name_hints = {}
+        self._good_names_rgxs_compiled = []
+        self._bad_names_rgxs_compiled = []
+
+    def open(self):
+        self.linter.stats.reset_bad_names()
+        for group in self.config.name_group:
+            for name_type in group.split(":"):
+                self._name_group[name_type] = f"group_{group}"
+
+        regexps, hints = self._create_naming_rules()
+        self._name_regexps = regexps
+        self._name_hints = hints
+        self._good_names_rgxs_compiled = [
+            re.compile(rgxp) for rgxp in self.config.good_names_rgxs
+        ]
+        self._bad_names_rgxs_compiled = [
+            re.compile(rgxp) for rgxp in self.config.bad_names_rgxs
+        ]
+
+    def _create_naming_rules(self) -> Tuple[Dict[str, Pattern[str]], Dict[str, str]]:
+        regexps: Dict[str, Pattern[str]] = {}
+        hints: Dict[str, str] = {}
+
+        for name_type in KNOWN_NAME_TYPES:
+            if name_type in KNOWN_NAME_TYPES_WITH_STYLE:
+                naming_style_name = getattr(self.config, f"{name_type}_naming_style")
+                regexps[name_type] = NAMING_STYLES[naming_style_name].get_regex(
+                    name_type
+                )
+            else:
+                naming_style_name = "predefined"
+                regexps[name_type] = DEFAULT_PATTERNS[name_type]
+
+            custom_regex_setting_name = f"{name_type}_rgx"
+            custom_regex = getattr(self.config, custom_regex_setting_name, None)
+            if custom_regex is not None:
+                regexps[name_type] = custom_regex
+
+            if custom_regex is not None:
+                hints[name_type] = f"{custom_regex.pattern!r} pattern"
+            else:
+                hints[name_type] = f"{naming_style_name} naming style"
+
+        return regexps, hints
+
+    @utils.check_messages("disallowed-name", "invalid-name")
+    def visit_module(self, node: nodes.Module) -> None:
+        self._check_name("module", node.name.split(".")[-1], node)
+        self._bad_names = {}
+
+    def leave_module(self, _: nodes.Module) -> None:
+        for all_groups in self._bad_names.values():
+            if len(all_groups) < 2:
+                continue
+            groups = collections.defaultdict(list)
+            min_warnings = sys.maxsize
+            prevalent_group, _ = max(all_groups.items(), key=lambda item: len(item[1]))
+            for group in all_groups.values():
+                groups[len(group)].append(group)
+                min_warnings = min(len(group), min_warnings)
+            if len(groups[min_warnings]) > 1:
+                by_line = sorted(
+                    groups[min_warnings],
+                    key=lambda group: min(warning[0].lineno for warning in group),
+                )
+                warnings = itertools.chain(*by_line[1:])
+            else:
+                warnings = groups[min_warnings][0]
+            for args in warnings:
+                self._raise_name_warning(prevalent_group, *args)
+
+    @utils.check_messages("disallowed-name", "invalid-name", "assign-to-new-keyword")
+    def visit_classdef(self, node: nodes.ClassDef) -> None:
+        self._check_assign_to_new_keyword_violation(node.name, node)
+        self._check_name("class", node.name, node)
+        for attr, anodes in node.instance_attrs.items():
+            if not any(node.instance_attr_ancestors(attr)):
+                self._check_name("attr", attr, anodes[0])
+
+    @utils.check_messages("disallowed-name", "invalid-name", "assign-to-new-keyword")
+    def visit_functiondef(self, node: nodes.FunctionDef) -> None:
+        # Do not emit any warnings if the method is just an implementation
+        # of a base class method.
+        self._check_assign_to_new_keyword_violation(node.name, node)
+        confidence = interfaces.HIGH
+        if node.is_method():
+            if utils.overrides_a_method(node.parent.frame(future=True), node.name):
+                return
+            confidence = (
+                interfaces.INFERENCE
+                if utils.has_known_bases(node.parent.frame(future=True))
+                else interfaces.INFERENCE_FAILURE
+            )
+
+        self._check_name(
+            _determine_function_name_type(node, config=self.config),
+            node.name,
+            node,
+            confidence,
+        )
+        # Check argument names
+        args = node.args.args
+        if args is not None:
+            self._recursive_check_names(args)
+
+    visit_asyncfunctiondef = visit_functiondef
+
+    @utils.check_messages("disallowed-name", "invalid-name")
+    def visit_global(self, node: nodes.Global) -> None:
+        for name in node.names:
+            self._check_name("const", name, node)
+
+    @utils.check_messages(
+        "disallowed-name",
+        "invalid-name",
+        "assign-to-new-keyword",
+        "typevar-name-incorrect-variance",
+    )
+    def visit_assignname(self, node: nodes.AssignName) -> None:
+        """Check module level assigned names."""
+        self._check_assign_to_new_keyword_violation(node.name, node)
+        frame = node.frame(future=True)
+        assign_type = node.assign_type()
+
+        # Check names defined in comprehensions
+        if isinstance(assign_type, nodes.Comprehension):
+            self._check_name("inlinevar", node.name, node)
+
+        # Check names defined in module scope
+        elif isinstance(frame, nodes.Module):
+            # Check names defined in Assign nodes
+            if isinstance(assign_type, nodes.Assign):
+                inferred_assign_type = utils.safe_infer(assign_type.value)
+
+                # Check TypeVar's assigned alone or in tuple assignment
+                if isinstance(node.parent, nodes.Assign) and self._assigns_typevar(
+                    assign_type.value
+                ):
+                    self._check_name("typevar", assign_type.targets[0].name, node)
+                elif (
+                    isinstance(node.parent, nodes.Tuple)
+                    and isinstance(assign_type.value, nodes.Tuple)
+                    # protect against unbalanced tuple unpacking
+                    and node.parent.elts.index(node) < len(assign_type.value.elts)
+                    and self._assigns_typevar(
+                        assign_type.value.elts[node.parent.elts.index(node)]
+                    )
+                ):
+                    self._check_name(
+                        "typevar",
+                        assign_type.targets[0].elts[node.parent.elts.index(node)].name,
+                        node,
+                    )
+
+                # Check classes (TypeVar's are classes so they need to be excluded first)
+                elif isinstance(inferred_assign_type, nodes.ClassDef):
+                    self._check_name("class", node.name, node)
+
+                # Don't emit if the name redefines an import in an ImportError except handler.
+                elif not _redefines_import(node) and isinstance(
+                    inferred_assign_type, nodes.Const
+                ):
+                    self._check_name("const", node.name, node)
+            # Check names defined in AnnAssign nodes
+            elif isinstance(
+                assign_type, nodes.AnnAssign
+            ) and utils.is_assign_name_annotated_with(node, "Final"):
+                self._check_name("const", node.name, node)
+
+        # Check names defined in function scopes
+        elif isinstance(frame, nodes.FunctionDef):
+            # global introduced variable aren't in the function locals
+            if node.name in frame and node.name not in frame.argnames():
+                if not _redefines_import(node):
+                    self._check_name("variable", node.name, node)
+
+        # Check names defined in class scopes
+        elif isinstance(frame, nodes.ClassDef):
+            if not list(frame.local_attr_ancestors(node.name)):
+                for ancestor in frame.ancestors():
+                    if (
+                        ancestor.name == "Enum"
+                        and ancestor.root().name == "enum"
+                        or utils.is_assign_name_annotated_with(node, "Final")
+                    ):
+                        self._check_name("class_const", node.name, node)
+                        break
+                else:
+                    self._check_name("class_attribute", node.name, node)
+
+    def _recursive_check_names(self, args):
+        """Check names in a possibly recursive list <arg>."""
+        for arg in args:
+            if isinstance(arg, nodes.AssignName):
+                self._check_name("argument", arg.name, arg)
+            else:
+                self._recursive_check_names(arg.elts)
+
+    def _find_name_group(self, node_type):
+        return self._name_group.get(node_type, node_type)
+
+    def _raise_name_warning(
+        self,
+        prevalent_group: Optional[str],
+        node: nodes.NodeNG,
+        node_type: str,
+        name: str,
+        confidence,
+        warning: str = "invalid-name",
+    ) -> None:
+        type_label = constants.HUMAN_READABLE_TYPES[node_type]
+        hint = self._name_hints[node_type]
+        if prevalent_group:
+            # This happens in the multi naming match case. The expected
+            # prevalent group needs to be spelled out to make the message
+            # correct.
+            hint = f"the `{prevalent_group}` group in the {hint}"
+        if self.config.include_naming_hint:
+            hint += f" ({self._name_regexps[node_type].pattern!r} pattern)"
+        args = (
+            (type_label.capitalize(), name, hint)
+            if warning == "invalid-name"
+            else (type_label.capitalize(), name)
+        )
+
+        self.add_message(warning, node=node, args=args, confidence=confidence)
+        self.linter.stats.increase_bad_name(node_type, 1)
+
+    def _name_allowed_by_regex(self, name: str) -> bool:
+        return name in self.config.good_names or any(
+            pattern.match(name) for pattern in self._good_names_rgxs_compiled
+        )
+
+    def _name_disallowed_by_regex(self, name: str) -> bool:
+        return name in self.config.bad_names or any(
+            pattern.match(name) for pattern in self._bad_names_rgxs_compiled
+        )
+
+    def _check_name(self, node_type, name, node, confidence=interfaces.HIGH):
+        """Check for a name using the type's regexp."""
+
+        def _should_exempt_from_invalid_name(node):
+            if node_type == "variable":
+                inferred = utils.safe_infer(node)
+                if isinstance(inferred, nodes.ClassDef):
+                    return True
+            return False
+
+        if self._name_allowed_by_regex(name=name):
+            return
+        if self._name_disallowed_by_regex(name=name):
+            self.linter.stats.increase_bad_name(node_type, 1)
+            self.add_message("disallowed-name", node=node, args=name)
+            return
+        regexp = self._name_regexps[node_type]
+        match = regexp.match(name)
+
+        if _is_multi_naming_match(match, node_type, confidence):
+            name_group = self._find_name_group(node_type)
+            bad_name_group = self._bad_names.setdefault(name_group, {})
+            warnings = bad_name_group.setdefault(match.lastgroup, [])
+            warnings.append((node, node_type, name, confidence))
+
+        if match is None and not _should_exempt_from_invalid_name(node):
+            self._raise_name_warning(None, node, node_type, name, confidence)
+
+        # Check TypeVar names for variance suffixes
+        if node_type == "typevar":
+            self._check_typevar_variance(name, node)
+
+    def _check_assign_to_new_keyword_violation(self, name, node):
+        keyword_first_version = self._name_became_keyword_in_version(
+            name, self.KEYWORD_ONSET
+        )
+        if keyword_first_version is not None:
+            self.add_message(
+                "assign-to-new-keyword",
+                node=node,
+                args=(name, keyword_first_version),
+                confidence=interfaces.HIGH,
+            )
+
+    @staticmethod
+    def _name_became_keyword_in_version(name, rules):
+        for version, keywords in rules.items():
+            if name in keywords and sys.version_info < version:
+                return ".".join(str(v) for v in version)
+        return None
+
+    @staticmethod
+    def _assigns_typevar(node: Optional[nodes.NodeNG]) -> bool:
+        """Check if a node is assigning a TypeVar."""
+        if isinstance(node, astroid.Call):
+            inferred = utils.safe_infer(node.func)
+            if (
+                isinstance(inferred, astroid.ClassDef)
+                and inferred.qname() == TYPING_TYPE_VAR_QNAME
+            ):
+                return True
+        return False
+
+    def _check_typevar_variance(self, name: str, node: nodes.AssignName) -> None:
+        """Check if a TypeVar has a variance and if it's included in the name.
+
+        Returns the args for the message to be displayed.
+        """
+        if isinstance(node.parent, nodes.Assign):
+            keywords = node.assign_type().value.keywords
+        elif isinstance(node.parent, nodes.Tuple):
+            keywords = (
+                node.assign_type().value.elts[node.parent.elts.index(node)].keywords
+            )
+
+        for kw in keywords:
+            if kw.arg == "covariant" and kw.value.value:
+                if not name.endswith("_co"):
+                    suggest_name = f"{re.sub('_contra$', '', name)}_co"
+                    self.add_message(
+                        "typevar-name-incorrect-variance",
+                        node=node,
+                        args=(name, "covariant", suggest_name),
+                        confidence=interfaces.INFERENCE,
+                    )
+                return
+
+            if kw.arg == "contravariant" and kw.value.value:
+                if not name.endswith("_contra"):
+                    suggest_name = f"{re.sub('_co$', '', name)}_contra"
+                    self.add_message(
+                        "typevar-name-incorrect-variance",
+                        node=node,
+                        args=(name, "contravariant", suggest_name),
+                        confidence=interfaces.INFERENCE,
+                    )
+                return
+
+        if name.endswith("_co") or name.endswith("_contra"):
+            suggest_name = re.sub("_contra$|_co$", "", name)
+            self.add_message(
+                "typevar-name-incorrect-variance",
+                node=node,
+                args=(name, "invariant", suggest_name),
+                confidence=interfaces.INFERENCE,
+            )
diff --git a/pylint/checkers/base/name_checker/naming_style.py b/pylint/checkers/base/name_checker/naming_style.py
new file mode 100644
index 0000000000..98bdaf737b
--- /dev/null
+++ b/pylint/checkers/base/name_checker/naming_style.py
@@ -0,0 +1,175 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+import re
+from typing import Pattern
+
+from pylint import constants
+
+
+class NamingStyle:
+    """It may seem counterintuitive that single naming style has multiple "accepted"
+    forms of regular expressions, but we need to special-case stuff like dunder names in method names.
+    """
+
+    ANY: Pattern[str] = re.compile(".*")
+    CLASS_NAME_RGX: Pattern[str] = ANY
+    MOD_NAME_RGX: Pattern[str] = ANY
+    CONST_NAME_RGX: Pattern[str] = ANY
+    COMP_VAR_RGX: Pattern[str] = ANY
+    DEFAULT_NAME_RGX: Pattern[str] = ANY
+    CLASS_ATTRIBUTE_RGX: Pattern[str] = ANY
+
+    @classmethod
+    def get_regex(cls, name_type):
+        return {
+            "module": cls.MOD_NAME_RGX,
+            "const": cls.CONST_NAME_RGX,
+            "class": cls.CLASS_NAME_RGX,
+            "function": cls.DEFAULT_NAME_RGX,
+            "method": cls.DEFAULT_NAME_RGX,
+            "attr": cls.DEFAULT_NAME_RGX,
+            "argument": cls.DEFAULT_NAME_RGX,
+            "variable": cls.DEFAULT_NAME_RGX,
+            "class_attribute": cls.CLASS_ATTRIBUTE_RGX,
+            "class_const": cls.CONST_NAME_RGX,
+            "inlinevar": cls.COMP_VAR_RGX,
+        }[name_type]
+
+
+class SnakeCaseStyle(NamingStyle):
+    """Regex rules for snake_case naming style."""
+
+    CLASS_NAME_RGX = re.compile(r"[^\W\dA-Z][^\WA-Z]+$")
+    MOD_NAME_RGX = re.compile(r"[^\W\dA-Z][^\WA-Z]*$")
+    CONST_NAME_RGX = re.compile(r"([^\W\dA-Z][^\WA-Z]*|__.*__)$")
+    COMP_VAR_RGX = re.compile(r"[^\W\dA-Z][^\WA-Z]*$")
+    DEFAULT_NAME_RGX = re.compile(
+        r"([^\W\dA-Z][^\WA-Z]{2,}|_[^\WA-Z]*|__[^\WA-Z\d_][^\WA-Z]+__)$"
+    )
+    CLASS_ATTRIBUTE_RGX = re.compile(r"([^\W\dA-Z][^\WA-Z]{2,}|__.*__)$")
+
+
+class CamelCaseStyle(NamingStyle):
+    """Regex rules for camelCase naming style."""
+
+    CLASS_NAME_RGX = re.compile(r"[^\W\dA-Z][^\W_]+$")
+    MOD_NAME_RGX = re.compile(r"[^\W\dA-Z][^\W_]*$")
+    CONST_NAME_RGX = re.compile(r"([^\W\dA-Z][^\W_]*|__.*__)$")
+    COMP_VAR_RGX = re.compile(r"[^\W\dA-Z][^\W_]*$")
+    DEFAULT_NAME_RGX = re.compile(r"([^\W\dA-Z][^\W_]{2,}|__[^\W\dA-Z_]\w+__)$")
+    CLASS_ATTRIBUTE_RGX = re.compile(r"([^\W\dA-Z][^\W_]{2,}|__.*__)$")
+
+
+class PascalCaseStyle(NamingStyle):
+    """Regex rules for PascalCase naming style."""
+
+    CLASS_NAME_RGX = re.compile(r"[^\W\da-z][^\W_]+$")
+    MOD_NAME_RGX = re.compile(r"[^\W\da-z][^\W_]+$")
+    CONST_NAME_RGX = re.compile(r"([^\W\da-z][^\W_]*|__.*__)$")
+    COMP_VAR_RGX = re.compile(r"[^\W\da-z][^\W_]+$")
+    DEFAULT_NAME_RGX = re.compile(r"([^\W\da-z][^\W_]{2,}|__[^\W\dA-Z_]\w+__)$")
+    CLASS_ATTRIBUTE_RGX = re.compile(r"[^\W\da-z][^\W_]{2,}$")
+
+
+class UpperCaseStyle(NamingStyle):
+    """Regex rules for UPPER_CASE naming style."""
+
+    CLASS_NAME_RGX = re.compile(r"[^\W\da-z][^\Wa-z]+$")
+    MOD_NAME_RGX = re.compile(r"[^\W\da-z][^\Wa-z]+$")
+    CONST_NAME_RGX = re.compile(r"([^\W\da-z][^\Wa-z]*|__.*__)$")
+    COMP_VAR_RGX = re.compile(r"[^\W\da-z][^\Wa-z]+$")
+    DEFAULT_NAME_RGX = re.compile(r"([^\W\da-z][^\Wa-z]{2,}|__[^\W\dA-Z_]\w+__)$")
+    CLASS_ATTRIBUTE_RGX = re.compile(r"[^\W\da-z][^\Wa-z]{2,}$")
+
+
+class AnyStyle(NamingStyle):
+    pass
+
+
+NAMING_STYLES = {
+    "snake_case": SnakeCaseStyle,
+    "camelCase": CamelCaseStyle,
+    "PascalCase": PascalCaseStyle,
+    "UPPER_CASE": UpperCaseStyle,
+    "any": AnyStyle,
+}
+
+# Name types that have a style option
+KNOWN_NAME_TYPES_WITH_STYLE = {
+    "module",
+    "const",
+    "class",
+    "function",
+    "method",
+    "attr",
+    "argument",
+    "variable",
+    "class_attribute",
+    "class_const",
+    "inlinevar",
+}
+
+
+DEFAULT_NAMING_STYLES = {
+    "module": "snake_case",
+    "const": "UPPER_CASE",
+    "class": "PascalCase",
+    "function": "snake_case",
+    "method": "snake_case",
+    "attr": "snake_case",
+    "argument": "snake_case",
+    "variable": "snake_case",
+    "class_attribute": "any",
+    "class_const": "UPPER_CASE",
+    "inlinevar": "any",
+}
+
+
+# Name types that have a 'rgx' option
+KNOWN_NAME_TYPES = {
+    *KNOWN_NAME_TYPES_WITH_STYLE,
+    "typevar",
+}
+
+
+def _create_naming_options():
+    name_options = []
+    for name_type in sorted(KNOWN_NAME_TYPES):
+        human_readable_name = constants.HUMAN_READABLE_TYPES[name_type]
+        name_type_hyphened = name_type.replace("_", "-")
+
+        help_msg = f"Regular expression matching correct {human_readable_name} names. "
+        if name_type in KNOWN_NAME_TYPES_WITH_STYLE:
+            help_msg += f"Overrides {name_type_hyphened}-naming-style. "
+        help_msg += f"If left empty, {human_readable_name} names will be checked with the set naming style."
+
+        # Add style option for names that support it
+        if name_type in KNOWN_NAME_TYPES_WITH_STYLE:
+            default_style = DEFAULT_NAMING_STYLES[name_type]
+            name_options.append(
+                (
+                    f"{name_type_hyphened}-naming-style",
+                    {
+                        "default": default_style,
+                        "type": "choice",
+                        "choices": list(NAMING_STYLES.keys()),
+                        "metavar": "<style>",
+                        "help": f"Naming style matching correct {human_readable_name} names.",
+                    },
+                )
+            )
+
+        name_options.append(
+            (
+                f"{name_type_hyphened}-rgx",
+                {
+                    "default": None,
+                    "type": "regexp",
+                    "metavar": "<regexp>",
+                    "help": help_msg,
+                },
+            )
+        )
+    return tuple(name_options)
diff --git a/pylint/checkers/base/pass_checker.py b/pylint/checkers/base/pass_checker.py
new file mode 100644
index 0000000000..26b915bc45
--- /dev/null
+++ b/pylint/checkers/base/pass_checker.py
@@ -0,0 +1,28 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+from astroid import nodes
+
+from pylint.checkers import utils
+from pylint.checkers.base.basic_checker import _BasicChecker
+
+
+class PassChecker(_BasicChecker):
+    """Check if the pass statement is really necessary."""
+
+    msgs = {
+        "W0107": (
+            "Unnecessary pass statement",
+            "unnecessary-pass",
+            'Used when a "pass" statement that can be avoided is encountered.',
+        )
+    }
+
+    @utils.check_messages("unnecessary-pass")
+    def visit_pass(self, node: nodes.Pass) -> None:
+        if len(node.parent.child_sequence(node)) > 1 or (
+            isinstance(node.parent, (nodes.ClassDef, nodes.FunctionDef))
+            and node.parent.doc_node
+        ):
+            self.add_message("unnecessary-pass", node=node)
diff --git a/pylint/checkers/base_checker.py b/pylint/checkers/base_checker.py
index ca1ff39dc7..1cdc014fc0 100644
--- a/pylint/checkers/base_checker.py
+++ b/pylint/checkers/base_checker.py
@@ -1,22 +1,7 @@
-# Copyright (c) 2006-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2013-2014 Google, Inc.
-# Copyright (c) 2013 buck@yelp.com <buck@yelp.com>
-# Copyright (c) 2014-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Moises Lopez <moylop260@vauxoo.com>
-# Copyright (c) 2017-2018 Bryce Guinta <bryce.paul.guinta@gmail.com>
-# Copyright (c) 2018-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2019 Bruno P. Kinoshita <kinow@users.noreply.github.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 import functools
 from inspect import cleandoc
 from typing import Any, Optional
@@ -48,9 +33,10 @@ class BaseChecker(OptionsProviderMixIn):
     enabled: bool = True
 
     def __init__(self, linter=None):
-        """checker instances should have the linter as argument
+        """Checker instances should have the linter as argument.
 
-        :param ILinter linter: is an object implementing ILinter."""
+        :param ILinter linter: is an object implementing ILinter.
+        """
         if self.name is not None:
             self.name = self.name.lower()
         super().__init__()
@@ -66,8 +52,11 @@ def __repr__(self):
         return f"{status} '{self.name}' (responsible for '{msgs}')"
 
     def __str__(self):
-        """This might be incomplete because multiple class inheriting BaseChecker
-        can have the same name. Cf MessageHandlerMixIn.get_full_documentation()"""
+        """This might be incomplete because multiple classes inheriting BaseChecker
+        can have the same name.
+
+        See: MessageHandlerMixIn.get_full_documentation()
+        """
         return self.get_full_documentation(
             msgs=self.msgs, options=self.options_and_values(), reports=self.reports
         )
@@ -86,7 +75,7 @@ def get_full_documentation(self, msgs, options, reports, doc=None, module=None):
             # Provide anchor to link against
             result += get_rst_title(f"{checker_title} Documentation", "^")
             result += f"{cleandoc(doc)}\n\n"
-        # options might be an empty generator and not be False when casted to boolean
+        # options might be an empty generator and not be False when cast to boolean
         options = list(options)
         if options:
             result += get_rst_title(f"{checker_title} Options", "^")
@@ -132,7 +121,8 @@ def check_consistency(self):
         checker.
 
         :raises InvalidMessageError: If the checker id in the messages are not
-        always the same."""
+        always the same.
+        """
         checker_id = None
         existing_ids = []
         for message in self.messages:
@@ -186,10 +176,10 @@ def get_message_definition(self, msgid):
         raise InvalidMessageError(error_msg)
 
     def open(self):
-        """called before visiting project (i.e set of modules)"""
+        """Called before visiting project (i.e. set of modules)."""
 
     def close(self):
-        """called after visiting project (i.e set of modules)"""
+        """Called after visiting project (i.e set of modules)."""
 
 
 class BaseTokenChecker(BaseChecker):
diff --git a/pylint/checkers/classes/__init__.py b/pylint/checkers/classes/__init__.py
new file mode 100644
index 0000000000..5e9bc5ae36
--- /dev/null
+++ b/pylint/checkers/classes/__init__.py
@@ -0,0 +1,16 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+from typing import TYPE_CHECKING
+
+from pylint.checkers.classes.class_checker import ClassChecker
+from pylint.checkers.classes.special_methods_checker import SpecialMethodsChecker
+
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
+
+def register(linter: "PyLinter") -> None:
+    linter.register_checker(ClassChecker(linter))
+    linter.register_checker(SpecialMethodsChecker(linter))
diff --git a/pylint/checkers/classes.py b/pylint/checkers/classes/class_checker.py
similarity index 77%
rename from pylint/checkers/classes.py
rename to pylint/checkers/classes/class_checker.py
index 2d63b8bbd0..0156c3fcb8 100644
--- a/pylint/checkers/classes.py
+++ b/pylint/checkers/classes/class_checker.py
@@ -1,67 +1,19 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2010 Maarten ter Huurne <maarten@treewalker.org>
-# Copyright (c) 2012-2014 Google, Inc.
-# Copyright (c) 2012 FELD Boris <lothiraldan@gmail.com>
-# Copyright (c) 2013-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Michal Nowikowski <godfryd@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2014 David Pursehouse <david.pursehouse@gmail.com>
-# Copyright (c) 2015 Dmitry Pribysh <dmand@yandex.ru>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016-2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2016 Alexander Todorov <atodorov@otb.bg>
-# Copyright (c) 2016 Anthony Foglia <afoglia@users.noreply.github.com>
-# Copyright (c) 2016 Florian Bruhin <me@the-compiler.org>
-# Copyright (c) 2016 Moises Lopez <moylop260@vauxoo.com>
-# Copyright (c) 2016 Jakub Wilk <jwilk@jwilk.net>
-# Copyright (c) 2017, 2019-2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2018, 2021 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2018, 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2018-2019 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2018-2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2018 Lucas Cimon <lucas.cimon@gmail.com>
-# Copyright (c) 2018 Bryce Guinta <bryce.paul.guinta@gmail.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Ben Green <benhgreen@icloud.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 mattlbeck <17108752+mattlbeck@users.noreply.github.com>
-# Copyright (c) 2019-2020 craig-sh <craig-sh@users.noreply.github.com>
-# Copyright (c) 2019 Janne Rönkkö <jannero@users.noreply.github.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2019 Grygorii Iermolenko <gyermolenko@gmail.com>
-# Copyright (c) 2019 Andrzej Klajnert <github@aklajnert.pl>
-# Copyright (c) 2019 Pascal Corpet <pcorpet@users.noreply.github.com>
-# Copyright (c) 2020 GergelyKalmar <gergely.kalmar@logikal.jp>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Mark Byrne <31762852+mbyrnepr2@users.noreply.github.com>
-# Copyright (c) 2021 Samuel Freilich <sfreilich@google.com>
-# Copyright (c) 2021 Nick Pesce <nickpesce22@gmail.com>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-# Copyright (c) 2021 Yu Shao, Pang <36848472+yushao2@users.noreply.github.com>
-# Copyright (c) 2021 SupImDos <62866982+SupImDos@users.noreply.github.com>
-# Copyright (c) 2021 Kayran Schmidt <59456929+yumasheta@users.noreply.github.com>
-# Copyright (c) 2021 Konstantina Saketou <56515303+ksaketou@users.noreply.github.com>
-# Copyright (c) 2021 James Sinclair <james@nurfherder.com>
-# Copyright (c) 2021 tiagohonorato <61059243+tiagohonorato@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""classes checker for Python code
-"""
+"""Classes checker for Python code."""
 import collections
+import sys
 from itertools import chain, zip_longest
-from typing import List, Pattern
+from typing import Dict, List, Pattern, Set
 
 import astroid
-from astroid import nodes
+from astroid import bases, nodes
 
 from pylint.checkers import BaseChecker, utils
 from pylint.checkers.utils import (
     PYMETHODS,
-    SPECIAL_METHODS_PARAMS,
     check_messages,
     class_is_abstract,
     decorated_with,
@@ -72,7 +24,6 @@
     is_attr_protected,
     is_builtin_object,
     is_comprehension,
-    is_function_body_ellipsis,
     is_iterable,
     is_overload_stub,
     is_property_setter,
@@ -84,10 +35,14 @@
     unimplemented_abstract_methods,
     uninferable_final_decorators,
 )
-from pylint.interfaces import IAstroidChecker
+from pylint.interfaces import INFERENCE, IAstroidChecker
 from pylint.utils import get_global_option
 
-NEXT_METHOD = "__next__"
+if sys.version_info >= (3, 8):
+    from functools import cached_property
+else:
+    from astroid.decorators import cachedproperty as cached_property
+
 INVALID_BASE_CLASSES = {"bool", "range", "slice", "memoryview"}
 BUILTIN_DECORATORS = {"builtins.property", "builtins.classmethod"}
 ASTROID_TYPE_COMPARATORS = {
@@ -177,7 +132,7 @@ def _definition_equivalent_to_call(definition, call):
 
 def _positional_parameters(method):
     positional = method.args.args
-    if method.type in {"classmethod", "method"}:
+    if method.is_bound() and method.type in {"classmethod", "method"}:
         positional = positional[1:]
     return positional
 
@@ -190,8 +145,7 @@ class _DefaultMissing:
 
 
 def _has_different_parameters_default_value(original, overridden):
-    """
-    Check if original and overridden methods arguments have different default values
+    """Check if original and overridden methods arguments have different default values.
 
     Return True if one of the overridden arguments has a default
     value different from the default value of the original argument
@@ -237,15 +191,21 @@ def _has_different_parameters(
     overridden: List[nodes.AssignName],
     dummy_parameter_regex: Pattern,
 ) -> List[str]:
-    result = []
+    result: List[str] = []
     zipped = zip_longest(original, overridden)
     for original_param, overridden_param in zipped:
-        params = (original_param, overridden_param)
-        if not all(params):
+        if not overridden_param:
             return ["Number of parameters "]
 
+        if not original_param:
+            try:
+                overridden_param.parent.default_value(overridden_param.name)
+                continue
+            except astroid.NoDefault:
+                return ["Number of parameters "]
+
         # check for the arguments' name
-        names = [param.name for param in params]
+        names = [param.name for param in (original_param, overridden_param)]
         if any(dummy_parameter_regex.match(name) for name in names):
             continue
         if original_param.name != overridden_param.name:
@@ -257,12 +217,35 @@ def _has_different_parameters(
     return result
 
 
+def _has_different_keyword_only_parameters(
+    original: List[nodes.AssignName],
+    overridden: List[nodes.AssignName],
+) -> List[str]:
+    """Determine if the two methods have different keyword only parameters."""
+    original_names = [i.name for i in original]
+    overridden_names = [i.name for i in overridden]
+
+    if any(name not in overridden_names for name in original_names):
+        return ["Number of parameters "]
+
+    for name in overridden_names:
+        if name in original_names:
+            continue
+
+        try:
+            overridden[0].parent.default_value(name)
+        except astroid.NoDefault:
+            return ["Number of parameters "]
+
+    return []
+
+
 def _different_parameters(
     original: nodes.FunctionDef,
     overridden: nodes.FunctionDef,
     dummy_parameter_regex: Pattern,
 ) -> List[str]:
-    """Determine if the two methods have different parameters
+    """Determine if the two methods have different parameters.
 
     They are considered to have different parameters if:
 
@@ -299,8 +282,8 @@ def _different_parameters(
     different_positional = _has_different_parameters(
         original_parameters, overridden_parameters, dummy_parameter_regex
     )
-    different_kwonly = _has_different_parameters(
-        original_kwonlyargs, overridden.args.kwonlyargs, dummy_parameter_regex
+    different_kwonly = _has_different_keyword_only_parameters(
+        original_kwonlyargs, overridden.args.kwonlyargs
     )
     if different_kwonly and different_positional:
         if "Number " in different_positional[0] and "Number " in different_kwonly[0]:
@@ -360,7 +343,9 @@ def _has_data_descriptor(cls, attr):
 
 def _called_in_methods(func, klass, methods):
     """Check if the func was called in any of the given methods,
-    belonging to the *klass*. Returns True if so, False otherwise.
+    belonging to the *klass*.
+
+    Returns True if so, False otherwise.
     """
     if not isinstance(func, nodes.FunctionDef):
         return False
@@ -429,29 +414,6 @@ def _has_bare_super_call(fundef_node):
     return False
 
 
-def _safe_infer_call_result(node, caller, context=None):
-    """
-    Safely infer the return value of a function.
-
-    Returns None if inference failed or if there is some ambiguity (more than
-    one node has been inferred). Otherwise returns inferred value.
-    """
-    try:
-        inferit = node.infer_call_result(caller, context=context)
-        value = next(inferit)
-    except astroid.InferenceError:
-        return None  # inference failed
-    except StopIteration:
-        return None  # no values inferred
-    try:
-        next(inferit)
-        return None  # there is ambiguity on the inferred node
-    except astroid.InferenceError:
-        return None  # there is some kind of ambiguity
-    except StopIteration:
-        return value
-
-
 def _has_same_layout_slots(slots, assigned_value):
     inferred = next(assigned_value.infer())
     if isinstance(inferred, nodes.ClassDef):
@@ -550,7 +512,8 @@ def _has_same_layout_slots(slots, assigned_value):
         "%s %s %r method",
         "arguments-differ",
         "Used when a method has a different number of arguments than in "
-        "the implemented interface or in an overridden method.",
+        "the implemented interface or in an overridden method. Extra arguments "
+        "with default values are ignored.",
     ),
     "W0222": (
         "Signature differs from %s %r method",
@@ -616,6 +579,11 @@ def _has_same_layout_slots(slots, assigned_value):
         "subclassed-final-class",
         "Used when a class decorated with typing.final has been subclassed.",
     ),
+    "W0244": (
+        "Redefined slots %r in subclass",
+        "redefined-slots-in-subclass",
+        "Used when a slot is re-defined in a subclass.",
+    ),
     "E0236": (
         "Invalid object %r in __slots__, must contain only non empty strings",
         "invalid-slots-object",
@@ -713,7 +681,9 @@ def accessed(self, scope):
 
 
 class ClassChecker(BaseChecker):
-    """checks for :
+    """Checker for class nodes.
+
+    Checks for :
     * methods without self as first argument
     * overridden methods signature
     * access only to existent members via self
@@ -801,11 +771,11 @@ def open(self) -> None:
         py_version = get_global_option(self, "py-version")
         self._py38_plus = py_version >= (3, 8)
 
-    @astroid.decorators.cachedproperty
+    @cached_property
     def _dummy_rgx(self):
         return get_global_option(self, "dummy-variables-rgx", default=None)
 
-    @astroid.decorators.cachedproperty
+    @cached_property
     def _ignore_mixin(self):
         return get_global_option(self, "ignore-mixin-members", default=True)
 
@@ -820,9 +790,11 @@ def _ignore_mixin(self):
         "useless-object-inheritance",
         "inconsistent-mro",
         "duplicate-bases",
+        "redefined-slots-in-subclass",
+        "subclassed-final-class",
     )
     def visit_classdef(self, node: nodes.ClassDef) -> None:
-        """init visit variable _accessed"""
+        """Init visit variable _accessed."""
         self._check_bases_classes(node)
         # if not an exception or a metaclass
         if node.type == "class" and has_known_bases(node):
@@ -848,8 +820,7 @@ def _check_consistent_mro(self, node):
             pass
 
     def _check_proper_bases(self, node):
-        """
-        Detect that a class inherits something which is not
+        """Detect that a class inherits something which is not
         a class or a type.
         """
         for base in node.bases:
@@ -872,7 +843,7 @@ def _check_proper_bases(self, node):
                 )
 
     def _check_typing_final(self, node: nodes.ClassDef) -> None:
-        """Detect that a class does not subclass a class decorated with `typing.final`"""
+        """Detect that a class does not subclass a class decorated with `typing.final`."""
         if not self._py38_plus:
             return
         for base in node.bases:
@@ -890,9 +861,14 @@ def _check_typing_final(self, node: nodes.ClassDef) -> None:
                     node=node,
                 )
 
-    @check_messages("unused-private-member", "attribute-defined-outside-init")
+    @check_messages(
+        "unused-private-member",
+        "attribute-defined-outside-init",
+        "access-member-before-definition",
+    )
     def leave_classdef(self, node: nodes.ClassDef) -> None:
-        """close a class node:
+        """Checker for Class nodes.
+
         check that instance attributes are defined in __init__ and check
         access to existent members
         """
@@ -912,29 +888,35 @@ def _check_unused_private_functions(self, node: nodes.ClassDef) -> None:
                     n.name for n in parent_scope.nodes_of_class(nodes.Name)
                 ):
                     continue
-            for attribute in node.nodes_of_class(nodes.Attribute):
-                if (
-                    attribute.attrname != function_def.name
-                    or attribute.scope() == function_def  # We ignore recursive calls
-                ):
-                    continue
-                if isinstance(attribute.expr, nodes.Name) and attribute.expr.name in (
-                    "self",
-                    "cls",
-                    node.name,
-                ):
-                    # self.__attrname
-                    # cls.__attrname
-                    # node_name.__attrname
+            for child in node.nodes_of_class((nodes.Name, nodes.Attribute)):
+                # Check for cases where the functions are used as a variable instead of as a method call
+                if isinstance(child, nodes.Name) and child.name == function_def.name:
                     break
-                if isinstance(attribute.expr, nodes.Call):
-                    # type(self).__attrname
-                    inferred = safe_infer(attribute.expr)
+                if isinstance(child, nodes.Attribute):
+                    # Ignore recursive calls
                     if (
-                        isinstance(inferred, nodes.ClassDef)
-                        and inferred.name == node.name
+                        child.attrname != function_def.name
+                        or child.scope() == function_def
                     ):
+                        continue
+
+                    # Check self.__attrname, cls.__attrname, node_name.__attrname
+                    if isinstance(child.expr, nodes.Name) and child.expr.name in {
+                        "self",
+                        "cls",
+                        node.name,
+                    }:
+
                         break
+
+                    # Check type(self).__attrname
+                    if isinstance(child.expr, nodes.Call):
+                        inferred = safe_infer(child.expr)
+                        if (
+                            isinstance(inferred, nodes.ClassDef)
+                            and inferred.name == node.name
+                        ):
+                            break
             else:
                 name_stack = []
                 curr = parent_scope
@@ -952,7 +934,7 @@ def _check_unused_private_functions(self, node: nodes.ClassDef) -> None:
                 )
 
     def _check_unused_private_variables(self, node: nodes.ClassDef) -> None:
-        """Check if private variables are never used within a class"""
+        """Check if private variables are never used within a class."""
         for assign_name in node.nodes_of_class(nodes.AssignName):
             if isinstance(assign_name.parent, nodes.Arguments):
                 continue  # Ignore function arguments
@@ -999,14 +981,13 @@ def _check_unused_private_attributes(self, node: nodes.ClassDef) -> None:
                 if attribute.attrname != assign_attr.attrname:
                     continue
 
-                if (
-                    assign_attr.expr.name
-                    in {
-                        "cls",
-                        node.name,
-                    }
-                    and attribute.expr.name in {"cls", "self", node.name}
-                ):
+                if isinstance(attribute.expr, nodes.Call):
+                    continue
+
+                if assign_attr.expr.name in {
+                    "cls",
+                    node.name,
+                } and attribute.expr.name in {"cls", "self", node.name}:
                     # If assigned to cls or class name, can be accessed by cls/self/class name
                     break
 
@@ -1052,7 +1033,9 @@ def _check_attribute_defined_outside_init(self, cnode: nodes.ClassDef) -> None:
             nodes_lst = [
                 n
                 for n in nodes_lst
-                if not isinstance(n.statement(), (nodes.Delete, nodes.AugAssign))
+                if not isinstance(
+                    n.statement(future=True), (nodes.Delete, nodes.AugAssign)
+                )
                 and n.root() is current_module
             ]
             if not nodes_lst:
@@ -1060,7 +1043,7 @@ def _check_attribute_defined_outside_init(self, cnode: nodes.ClassDef) -> None:
 
             # Check if any method attr is defined in is a defining method
             # or if we have the attribute defined in a setter.
-            frames = (node.frame() for node in nodes_lst)
+            frames = (node.frame(future=True) for node in nodes_lst)
             if any(
                 frame.name in defining_methods or is_property_setter(frame)
                 for frame in frames
@@ -1072,7 +1055,7 @@ def _check_attribute_defined_outside_init(self, cnode: nodes.ClassDef) -> None:
                 attr_defined = False
                 # check if any parent method attr is defined in is a defining method
                 for node in parent.instance_attrs[attr]:
-                    if node.frame().name in defining_methods:
+                    if node.frame(future=True).name in defining_methods:
                         attr_defined = True
                 if attr_defined:
                     # we're done :)
@@ -1083,12 +1066,12 @@ def _check_attribute_defined_outside_init(self, cnode: nodes.ClassDef) -> None:
                     cnode.local_attr(attr)
                 except astroid.NotFoundError:
                     for node in nodes_lst:
-                        if node.frame().name not in defining_methods:
+                        if node.frame(future=True).name not in defining_methods:
                             # If the attribute was set by a call in any
                             # of the defining methods, then don't emit
                             # the warning.
                             if _called_in_methods(
-                                node.frame(), cnode, defining_methods
+                                node.frame(future=True), cnode, defining_methods
                             ):
                                 continue
                             self.add_message(
@@ -1096,7 +1079,7 @@ def _check_attribute_defined_outside_init(self, cnode: nodes.ClassDef) -> None:
                             )
 
     def visit_functiondef(self, node: nodes.FunctionDef) -> None:
-        """check method arguments, overriding"""
+        """Check method arguments, overriding."""
         # ignore actual functions
         if not node.is_method():
             return
@@ -1104,12 +1087,13 @@ def visit_functiondef(self, node: nodes.FunctionDef) -> None:
         self._check_useless_super_delegation(node)
         self._check_property_with_parameters(node)
 
-        klass = node.parent.frame()
+        # 'is_method()' is called and makes sure that this is a 'nodes.ClassDef'
+        klass = node.parent.frame(future=True)  # type: nodes.ClassDef
         self._meth_could_be_func = True
         # check first argument is self if this is actually a method
         self._check_first_arg_for_type(node, klass.type == "metaclass")
         if node.name == "__init__":
-            self._check_init(node)
+            self._check_init(node, klass)
             return
         # check signature if the method overloads inherited method
         for overridden in klass.local_attr_ancestors(node.name):
@@ -1165,12 +1149,12 @@ def visit_functiondef(self, node: nodes.FunctionDef) -> None:
         # check if the method is hidden by an attribute
         try:
             overridden = klass.instance_attr(node.name)[0]
-            overridden_frame = overridden.frame()
+            overridden_frame = overridden.frame(future=True)
             if (
                 isinstance(overridden_frame, nodes.FunctionDef)
                 and overridden_frame.type == "method"
             ):
-                overridden_frame = overridden_frame.parent.frame()
+                overridden_frame = overridden_frame.parent.frame(future=True)
             if not (
                 isinstance(overridden_frame, nodes.ClassDef)
                 and klass.is_subtype_of(overridden_frame.qname())
@@ -1192,7 +1176,7 @@ def visit_functiondef(self, node: nodes.FunctionDef) -> None:
     visit_asyncfunctiondef = visit_functiondef
 
     def _check_useless_super_delegation(self, function):
-        """Check if the given function node is an useless method override
+        """Check if the given function node is an useless method override.
 
         We consider it *useless* if it uses the super() builtin, but having
         nothing additional whatsoever than not implementing the method at all.
@@ -1253,7 +1237,7 @@ def _check_useless_super_delegation(self, function):
             return
 
         # Check values of default args
-        klass = function.parent.frame()
+        klass = function.parent.frame(future=True)
         meth_node = None
         for overridden in klass.local_attr_ancestors(function.name):
             # get astroid for the searched method
@@ -1349,11 +1333,11 @@ def _check_invalid_overridden_method(self, function_node, parent_function_node):
         ) and self._py38_plus:
             self.add_message(
                 "overridden-final-method",
-                args=(function_node.name, parent_function_node.parent.name),
+                args=(function_node.name, parent_function_node.parent.frame().name),
                 node=function_node,
             )
 
-    def _check_slots(self, node):
+    def _check_slots(self, node: nodes.ClassDef) -> None:
         if "__slots__" not in node.locals:
             return
         for slots in node.igetattr("__slots__"):
@@ -1383,6 +1367,41 @@ def _check_slots(self, node):
                     self._check_slots_elt(elt, node)
                 except astroid.InferenceError:
                     continue
+            self._check_redefined_slots(node, slots, values)
+
+    def _check_redefined_slots(
+        self,
+        node: nodes.ClassDef,
+        slots_node: nodes.NodeNG,
+        slots_list: List[nodes.NodeNG],
+    ) -> None:
+        """Check if `node` redefines a slot which is defined in an ancestor class."""
+        slots_names: List[str] = []
+        for slot in slots_list:
+            if isinstance(slot, nodes.Const):
+                slots_names.append(slot.value)
+            else:
+                inferred_slot = safe_infer(slot)
+                inferred_slot_value = getattr(inferred_slot, "value", None)
+                if isinstance(inferred_slot_value, str):
+                    slots_names.append(inferred_slot_value)
+
+        # Slots of all parent classes
+        ancestors_slots_names = {
+            slot.value
+            for ancestor in node.local_attr_ancestors("__slots__")
+            for slot in ancestor.slots() or []
+        }
+
+        # Slots which are common to `node` and its parent classes
+        redefined_slots = ancestors_slots_names.intersection(slots_names)
+
+        if redefined_slots:
+            self.add_message(
+                "redefined-slots-in-subclass",
+                args=([name for name in slots_names if name in redefined_slots],),
+                node=slots_node,
+            )
 
     def _check_slots_elt(self, elt, node):
         for inferred in elt.infer():
@@ -1413,7 +1432,7 @@ def _check_slots_elt(self, elt, node):
                 )
 
     def leave_functiondef(self, node: nodes.FunctionDef) -> None:
-        """on method node, check if this method couldn't be a function
+        """On method node, check if this method couldn't be a function.
 
         ignore class, static and abstract methods, initializer,
         methods overridden from a parent class.
@@ -1423,7 +1442,7 @@ def leave_functiondef(self, node: nodes.FunctionDef) -> None:
                 self._first_attrs.pop()
             if not self.linter.is_message_enabled("no-self-use"):
                 return
-            class_node = node.parent.frame()
+            class_node = node.parent.frame(future=True)
             if (
                 self._meth_could_be_func
                 and node.type == "method"
@@ -1442,8 +1461,10 @@ def leave_functiondef(self, node: nodes.FunctionDef) -> None:
     leave_asyncfunctiondef = leave_functiondef
 
     def visit_attribute(self, node: nodes.Attribute) -> None:
-        """check if the getattr is an access to a class member
-        if so, register it. Also check for access to protected
+        """Check if the getattr is an access to a class member
+        if so, register it
+
+        Also check for access to protected
         class member from outside its class (but ignore __special__
         methods)
         """
@@ -1469,8 +1490,12 @@ def _check_invalid_class_object(self, node: nodes.AssignAttr) -> None:
         if not node.attrname == "__class__":
             return
         inferred = safe_infer(node.parent.value)
-        if isinstance(inferred, nodes.ClassDef) or inferred is astroid.Uninferable:
-            # If is uninferrable, we allow it to prevent false positives
+        if (
+            isinstance(inferred, nodes.ClassDef)
+            or inferred is astroid.Uninferable
+            or inferred is None
+        ):
+            # If is uninferable, we allow it to prevent false positives
             return
         self.add_message("invalid-class-object", node=node)
 
@@ -1487,6 +1512,14 @@ def _check_in_slots(self, node):
             return
         if "__slots__" not in klass.locals or not klass.newstyle:
             return
+        # If `__setattr__` is defined on the class, then we can't reason about
+        # what will happen when assigning to an attribute.
+        if any(
+            base.locals.get("__setattr__")
+            for base in klass.mro()
+            if base.qname() != "builtins.object"
+        ):
+            return
 
         # If 'typing.Generic' is a base of bases of klass, the cached version
         # of 'slots()' might have been evaluated incorrectly, thus deleted cache entry.
@@ -1514,11 +1547,17 @@ def _check_in_slots(self, node):
                     # Properties circumvent the slots mechanism,
                     # so we should not emit a warning for them.
                     return
-                if node.attrname in klass.locals and _has_data_descriptor(
-                    klass, node.attrname
-                ):
-                    # Descriptors circumvent the slots mechanism as well.
-                    return
+                if node.attrname in klass.locals:
+                    for local_name in klass.locals.get(node.attrname):
+                        statement = local_name.statement(future=True)
+                        if (
+                            isinstance(statement, nodes.AnnAssign)
+                            and not statement.value
+                        ):
+                            return
+                    if _has_data_descriptor(klass, node.attrname):
+                        # Descriptors circumvent the slots mechanism as well.
+                        return
                 if node.attrname == "__class__" and _has_same_layout_slots(
                     slots, node.parent.value
                 ):
@@ -1539,7 +1578,7 @@ def visit_assign(self, assign_node: nodes.Assign) -> None:
         self._check_protected_attribute_access(node)
 
     def _check_classmethod_declaration(self, node):
-        """Checks for uses of classmethod() or staticmethod()
+        """Checks for uses of classmethod() or staticmethod().
 
         When a @classmethod or @staticmethod decorator should be used instead.
         A message will be emitted only if the assignment is at a class scope
@@ -1579,7 +1618,9 @@ def _check_classmethod_declaration(self, node):
 
     def _check_protected_attribute_access(self, node: nodes.Attribute):
         """Given an attribute access node (set or get), check if attribute
-        access is legitimate. Call _check_first_attr with node before calling
+        access is legitimate.
+
+        Call _check_first_attr with node before calling
         this method. Valid cases are:
         * self._attr in a method or cls._attr in a classmethod. Checked by
         _check_first_attr.
@@ -1643,7 +1684,7 @@ def _check_protected_attribute_access(self, node: nodes.Attribute):
                 # class A:
                 #     b = property(lambda: self._b)
 
-                stmt = node.parent.statement()
+                stmt = node.parent.statement(future=True)
                 if (
                     isinstance(stmt, nodes.Assign)
                     and len(stmt.targets) == 1
@@ -1654,7 +1695,7 @@ def _check_protected_attribute_access(self, node: nodes.Attribute):
                         return
 
                 if (
-                    self._is_classmethod(node.frame())
+                    self._is_classmethod(node.frame(future=True))
                     and self._is_inferred_instance(node.expr, klass)
                     and self._is_class_attribute(attrname, klass)
                 ):
@@ -1672,16 +1713,11 @@ def _check_protected_attribute_access(self, node: nodes.Attribute):
 
     @staticmethod
     def _is_called_inside_special_method(node: nodes.NodeNG) -> bool:
-        """
-        Returns true if the node is located inside a special (aka dunder) method
-        """
-        try:
-            frame_name = node.frame().name
-        except AttributeError:
-            return False
+        """Returns true if the node is located inside a special (aka dunder) method."""
+        frame_name = node.frame(future=True).name
         return frame_name and frame_name in PYMETHODS
 
-    def _is_type_self_call(self, expr):
+    def _is_type_self_call(self, expr: nodes.NodeNG) -> bool:
         return (
             isinstance(expr, nodes.Call)
             and isinstance(expr.func, nodes.Name)
@@ -1729,7 +1765,7 @@ def _is_class_attribute(name, klass):
             return False
 
     def visit_name(self, node: nodes.Name) -> None:
-        """check if the name handle an access to a class member
+        """Check if the name handle an access to a class member
         if so, register it
         """
         if self._first_attrs and (
@@ -1738,7 +1774,7 @@ def visit_name(self, node: nodes.Name) -> None:
             self._meth_could_be_func = False
 
     def _check_accessed_members(self, node, accessed):
-        """check that accessed members are defined"""
+        """Check that accessed members are defined."""
         excs = ("AttributeError", "Exception", "BaseException")
         for attr, nodes_lst in accessed.items():
             try:
@@ -1781,14 +1817,14 @@ def _check_accessed_members(self, node, accessed):
                     defstmt = defstmts[0]
                     # check that if the node is accessed in the same method as
                     # it's defined, it's accessed after the initial assignment
-                    frame = defstmt.frame()
+                    frame = defstmt.frame(future=True)
                     lno = defstmt.fromlineno
                     for _node in nodes_lst:
                         if (
-                            _node.frame() is frame
+                            _node.frame(future=True) is frame
                             and _node.fromlineno < lno
                             and not astroid.are_exclusive(
-                                _node.statement(), defstmt, excs
+                                _node.statement(future=True), defstmt, excs
                             )
                         ):
                             self.add_message(
@@ -1798,7 +1834,7 @@ def _check_accessed_members(self, node, accessed):
                             )
 
     def _check_first_arg_for_type(self, node, metaclass=0):
-        """check the name of first argument, expect:
+        """Check the name of first argument, expect:.
 
         * 'self' for a regular method
         * 'cls' for a class method or a metaclass regular method (actually
@@ -1874,7 +1910,7 @@ def _check_first_arg_config(self, first, config, node, message, method_name):
             self.add_message(message, args=(method_name, valid), node=node)
 
     def _check_bases_classes(self, node):
-        """check that the given class node implements abstract methods from
+        """Check that the given class node implements abstract methods from
         base classes
         """
 
@@ -1890,7 +1926,7 @@ def is_abstract(method):
             key=lambda item: item[0],
         )
         for name, method in methods:
-            owner = method.parent.frame()
+            owner = method.parent.frame(future=True)
             if owner is node:
                 continue
             # owner is not this class, it must be a parent class
@@ -1900,17 +1936,17 @@ def is_abstract(method):
                 continue
             self.add_message("abstract-method", node=node, args=(name, owner.name))
 
-    def _check_init(self, node):
-        """check that the __init__ method call super or ancestors'__init__
+    def _check_init(self, node: nodes.FunctionDef, klass_node: nodes.ClassDef) -> None:
+        """Check that the __init__ method call super or ancestors'__init__
         method (unless it is used for type hinting with `typing.overload`)
         """
         if not self.linter.is_message_enabled(
             "super-init-not-called"
         ) and not self.linter.is_message_enabled("non-parent-init-called"):
             return
-        klass_node = node.parent.frame()
         to_call = _ancestors_to_call(klass_node)
         not_called_yet = dict(to_call)
+        parents_with_called_inits: Set[bases.UnboundMethod] = set()
         for stmt in node.nodes_of_class(nodes.Call):
             expr = stmt.func
             if not isinstance(expr, nodes.Attribute) or expr.attrname != "__init__":
@@ -1943,7 +1979,9 @@ def _check_init(self, node):
                     if isinstance(klass, astroid.objects.Super):
                         return
                     try:
-                        del not_called_yet[klass]
+                        method = not_called_yet.pop(klass)
+                        # Record that the class' init has been called
+                        parents_with_called_inits.add(node_frame_class(method))
                     except KeyError:
                         if klass not in to_call:
                             self.add_message(
@@ -1952,15 +1990,38 @@ def _check_init(self, node):
             except astroid.InferenceError:
                 continue
         for klass, method in not_called_yet.items():
+            # Check if the init of the class that defines this init has already
+            # been called.
+            if node_frame_class(method) in parents_with_called_inits:
+                return
+
+            # Return if klass is protocol
+            if klass.qname() in utils.TYPING_PROTOCOLS:
+                return
+
+            # Return if any of the klass' first-order bases is protocol
+            for base in klass.bases:
+                try:
+                    for inf_base in base.infer():
+                        if inf_base.qname() in utils.TYPING_PROTOCOLS:
+                            return
+                except astroid.InferenceError:
+                    continue
+
             if decorated_with(node, ["typing.overload"]):
                 continue
             cls = node_frame_class(method)
             if klass.name == "object" or (cls and cls.name == "object"):
                 continue
-            self.add_message("super-init-not-called", args=klass.name, node=node)
+            self.add_message(
+                "super-init-not-called",
+                args=klass.name,
+                node=node,
+                confidence=INFERENCE,
+            )
 
     def _check_signature(self, method1, refmethod, class_type, cls):
-        """check that the signature of the two given methods match"""
+        """Check that the signature of the two given methods match."""
         if not (
             isinstance(method1, nodes.FunctionDef)
             and isinstance(refmethod, nodes.FunctionDef)
@@ -2009,24 +2070,24 @@ def _check_signature(self, method1, refmethod, class_type, cls):
                     error_type = "arguments-differ"
                     msg_args = (
                         msg
-                        + f"was {total_args_refmethod} in '{refmethod.parent.name}.{refmethod.name}' and "
+                        + f"was {total_args_refmethod} in '{refmethod.parent.frame().name}.{refmethod.name}' and "
                         f"is now {total_args_method1} in",
                         class_type,
-                        f"{method1.parent.name}.{method1.name}",
+                        f"{method1.parent.frame().name}.{method1.name}",
                     )
                 elif "renamed" in msg:
                     error_type = "arguments-renamed"
                     msg_args = (
                         msg,
                         class_type,
-                        f"{method1.parent.name}.{method1.name}",
+                        f"{method1.parent.frame().name}.{method1.name}",
                     )
                 else:
                     error_type = "arguments-differ"
                     msg_args = (
                         msg,
                         class_type,
-                        f"{method1.parent.name}.{method1.name}",
+                        f"{method1.parent.frame().name}.{method1.name}",
                     )
                 self.add_message(error_type, args=msg_args, node=method1)
         elif (
@@ -2038,381 +2099,45 @@ def _check_signature(self, method1, refmethod, class_type, cls):
             )
 
     def _uses_mandatory_method_param(self, node):
-        """Check that attribute lookup name use first attribute variable name
+        """Check that attribute lookup name use first attribute variable name.
 
         Name is `self` for method, `cls` for classmethod and `mcs` for metaclass.
         """
         return self._is_mandatory_method_param(node.expr)
 
-    def _is_mandatory_method_param(self, node):
-        """Check if nodes.Name corresponds to first attribute variable name
+    def _is_mandatory_method_param(self, node: nodes.NodeNG) -> bool:
+        """Check if nodes.Name corresponds to first attribute variable name.
 
         Name is `self` for method, `cls` for classmethod and `mcs` for metaclass.
+        Static methods return False.
         """
-        return (
-            self._first_attrs
-            and isinstance(node, nodes.Name)
-            and node.name == self._first_attrs[-1]
-        )
-
-
-class SpecialMethodsChecker(BaseChecker):
-    """Checker which verifies that special methods
-    are implemented correctly.
-    """
-
-    __implements__ = (IAstroidChecker,)
-    name = "classes"
-    msgs = {
-        "E0301": (
-            "__iter__ returns non-iterator",
-            "non-iterator-returned",
-            "Used when an __iter__ method returns something which is not an "
-            f"iterable (i.e. has no `{NEXT_METHOD}` method)",
-            {
-                "old_names": [
-                    ("W0234", "old-non-iterator-returned-1"),
-                    ("E0234", "old-non-iterator-returned-2"),
-                ]
-            },
-        ),
-        "E0302": (
-            "The special method %r expects %s param(s), %d %s given",
-            "unexpected-special-method-signature",
-            "Emitted when a special method was defined with an "
-            "invalid number of parameters. If it has too few or "
-            "too many, it might not work at all.",
-            {"old_names": [("E0235", "bad-context-manager")]},
-        ),
-        "E0303": (
-            "__len__ does not return non-negative integer",
-            "invalid-length-returned",
-            "Used when a __len__ method returns something which is not a "
-            "non-negative integer",
-        ),
-        "E0304": (
-            "__bool__ does not return bool",
-            "invalid-bool-returned",
-            "Used when a __bool__ method returns something which is not a bool",
-        ),
-        "E0305": (
-            "__index__ does not return int",
-            "invalid-index-returned",
-            "Used when an __index__ method returns something which is not "
-            "an integer",
-        ),
-        "E0306": (
-            "__repr__ does not return str",
-            "invalid-repr-returned",
-            "Used when a __repr__ method returns something which is not a string",
-        ),
-        "E0307": (
-            "__str__ does not return str",
-            "invalid-str-returned",
-            "Used when a __str__ method returns something which is not a string",
-        ),
-        "E0308": (
-            "__bytes__ does not return bytes",
-            "invalid-bytes-returned",
-            "Used when a __bytes__ method returns something which is not bytes",
-        ),
-        "E0309": (
-            "__hash__ does not return int",
-            "invalid-hash-returned",
-            "Used when a __hash__ method returns something which is not an integer",
-        ),
-        "E0310": (
-            "__length_hint__ does not return non-negative integer",
-            "invalid-length-hint-returned",
-            "Used when a __length_hint__ method returns something which is not a "
-            "non-negative integer",
-        ),
-        "E0311": (
-            "__format__ does not return str",
-            "invalid-format-returned",
-            "Used when a __format__ method returns something which is not a string",
-        ),
-        "E0312": (
-            "__getnewargs__ does not return a tuple",
-            "invalid-getnewargs-returned",
-            "Used when a __getnewargs__ method returns something which is not "
-            "a tuple",
-        ),
-        "E0313": (
-            "__getnewargs_ex__ does not return a tuple containing (tuple, dict)",
-            "invalid-getnewargs-ex-returned",
-            "Used when a __getnewargs_ex__ method returns something which is not "
-            "of the form tuple(tuple, dict)",
-        ),
-    }
-    priority = -2
-
-    def __init__(self, linter=None):
-        super().__init__(linter)
-        self._protocol_map = {
-            "__iter__": self._check_iter,
-            "__len__": self._check_len,
-            "__bool__": self._check_bool,
-            "__index__": self._check_index,
-            "__repr__": self._check_repr,
-            "__str__": self._check_str,
-            "__bytes__": self._check_bytes,
-            "__hash__": self._check_hash,
-            "__length_hint__": self._check_length_hint,
-            "__format__": self._check_format,
-            "__getnewargs__": self._check_getnewargs,
-            "__getnewargs_ex__": self._check_getnewargs_ex,
-        }
-
-    @check_messages(
-        "unexpected-special-method-signature",
-        "non-iterator-returned",
-        "invalid-length-returned",
-        "invalid-bool-returned",
-        "invalid-index-returned",
-        "invalid-repr-returned",
-        "invalid-str-returned",
-        "invalid-bytes-returned",
-        "invalid-hash-returned",
-        "invalid-length-hint-returned",
-        "invalid-format-returned",
-        "invalid-getnewargs-returned",
-        "invalid-getnewargs-ex-returned",
-    )
-    def visit_functiondef(self, node: nodes.FunctionDef) -> None:
-        if not node.is_method():
-            return
-
-        inferred = _safe_infer_call_result(node, node)
-        # Only want to check types that we are able to infer
-        if (
-            inferred
-            and node.name in self._protocol_map
-            and not is_function_body_ellipsis(node)
-        ):
-            self._protocol_map[node.name](node, inferred)
-
-        if node.name in PYMETHODS:
-            self._check_unexpected_method_signature(node)
-
-    visit_asyncfunctiondef = visit_functiondef
-
-    def _check_unexpected_method_signature(self, node):
-        expected_params = SPECIAL_METHODS_PARAMS[node.name]
-
-        if expected_params is None:
-            # This can support a variable number of parameters.
-            return
-        if not node.args.args and not node.args.vararg:
-            # Method has no parameter, will be caught
-            # by no-method-argument.
-            return
-
-        if decorated_with(node, ["builtins.staticmethod"]):
-            # We expect to not take in consideration self.
-            all_args = node.args.args
+        if self._first_attrs:
+            first_attr = self._first_attrs[-1]
         else:
-            all_args = node.args.args[1:]
-        mandatory = len(all_args) - len(node.args.defaults)
-        optional = len(node.args.defaults)
-        current_params = mandatory + optional
-
-        if isinstance(expected_params, tuple):
-            # The expected number of parameters can be any value from this
-            # tuple, although the user should implement the method
-            # to take all of them in consideration.
-            emit = mandatory not in expected_params
-            # pylint: disable-next=consider-using-f-string
-            expected_params = "between %d or %d" % expected_params
-        else:
-            # If the number of mandatory parameters doesn't
-            # suffice, the expected parameters for this
-            # function will be deduced from the optional
-            # parameters.
-            rest = expected_params - mandatory
-            if rest == 0:
-                emit = False
-            elif rest < 0:
-                emit = True
-            elif rest > 0:
-                emit = not ((optional - rest) >= 0 or node.args.vararg)
-
-        if emit:
-            verb = "was" if current_params <= 1 else "were"
-            self.add_message(
-                "unexpected-special-method-signature",
-                args=(node.name, expected_params, current_params, verb),
-                node=node,
+            # It's possible the function was already unregistered.
+            closest_func = utils.get_node_first_ancestor_of_type(
+                node, nodes.FunctionDef
             )
-
-    @staticmethod
-    def _is_wrapped_type(node, type_):
-        return (
-            isinstance(node, astroid.Instance)
-            and node.name == type_
-            and not isinstance(node, nodes.Const)
-        )
-
-    @staticmethod
-    def _is_int(node):
-        if SpecialMethodsChecker._is_wrapped_type(node, "int"):
-            return True
-
-        return isinstance(node, nodes.Const) and isinstance(node.value, int)
-
-    @staticmethod
-    def _is_str(node):
-        if SpecialMethodsChecker._is_wrapped_type(node, "str"):
-            return True
-
-        return isinstance(node, nodes.Const) and isinstance(node.value, str)
-
-    @staticmethod
-    def _is_bool(node):
-        if SpecialMethodsChecker._is_wrapped_type(node, "bool"):
-            return True
-
-        return isinstance(node, nodes.Const) and isinstance(node.value, bool)
-
-    @staticmethod
-    def _is_bytes(node):
-        if SpecialMethodsChecker._is_wrapped_type(node, "bytes"):
-            return True
-
-        return isinstance(node, nodes.Const) and isinstance(node.value, bytes)
-
-    @staticmethod
-    def _is_tuple(node):
-        if SpecialMethodsChecker._is_wrapped_type(node, "tuple"):
-            return True
-
-        return isinstance(node, nodes.Const) and isinstance(node.value, tuple)
-
-    @staticmethod
-    def _is_dict(node):
-        if SpecialMethodsChecker._is_wrapped_type(node, "dict"):
-            return True
-
-        return isinstance(node, nodes.Const) and isinstance(node.value, dict)
-
-    @staticmethod
-    def _is_iterator(node):
-        if node is astroid.Uninferable:
-            # Just ignore Uninferable objects.
-            return True
-        if isinstance(node, astroid.bases.Generator):
-            # Generators can be iterated.
-            return True
-
-        if isinstance(node, astroid.Instance):
-            try:
-                node.local_attr(NEXT_METHOD)
-                return True
-            except astroid.NotFoundError:
-                pass
-        elif isinstance(node, nodes.ClassDef):
-            metaclass = node.metaclass()
-            if metaclass and isinstance(metaclass, nodes.ClassDef):
-                try:
-                    metaclass.local_attr(NEXT_METHOD)
-                    return True
-                except astroid.NotFoundError:
-                    pass
-        return False
-
-    def _check_iter(self, node, inferred):
-        if not self._is_iterator(inferred):
-            self.add_message("non-iterator-returned", node=node)
-
-    def _check_len(self, node, inferred):
-        if not self._is_int(inferred):
-            self.add_message("invalid-length-returned", node=node)
-        elif isinstance(inferred, nodes.Const) and inferred.value < 0:
-            self.add_message("invalid-length-returned", node=node)
-
-    def _check_bool(self, node, inferred):
-        if not self._is_bool(inferred):
-            self.add_message("invalid-bool-returned", node=node)
-
-    def _check_index(self, node, inferred):
-        if not self._is_int(inferred):
-            self.add_message("invalid-index-returned", node=node)
-
-    def _check_repr(self, node, inferred):
-        if not self._is_str(inferred):
-            self.add_message("invalid-repr-returned", node=node)
-
-    def _check_str(self, node, inferred):
-        if not self._is_str(inferred):
-            self.add_message("invalid-str-returned", node=node)
-
-    def _check_bytes(self, node, inferred):
-        if not self._is_bytes(inferred):
-            self.add_message("invalid-bytes-returned", node=node)
-
-    def _check_hash(self, node, inferred):
-        if not self._is_int(inferred):
-            self.add_message("invalid-hash-returned", node=node)
-
-    def _check_length_hint(self, node, inferred):
-        if not self._is_int(inferred):
-            self.add_message("invalid-length-hint-returned", node=node)
-        elif isinstance(inferred, nodes.Const) and inferred.value < 0:
-            self.add_message("invalid-length-hint-returned", node=node)
-
-    def _check_format(self, node, inferred):
-        if not self._is_str(inferred):
-            self.add_message("invalid-format-returned", node=node)
-
-    def _check_getnewargs(self, node, inferred):
-        if not self._is_tuple(inferred):
-            self.add_message("invalid-getnewargs-returned", node=node)
-
-    def _check_getnewargs_ex(self, node, inferred):
-        if not self._is_tuple(inferred):
-            self.add_message("invalid-getnewargs-ex-returned", node=node)
-            return
-
-        if not isinstance(inferred, nodes.Tuple):
-            # If it's not an astroid.Tuple we can't analyze it further
-            return
-
-        found_error = False
-
-        if len(inferred.elts) != 2:
-            found_error = True
-        else:
-            for arg, check in (
-                (inferred.elts[0], self._is_tuple),
-                (inferred.elts[1], self._is_dict),
-            ):
-
-                if isinstance(arg, nodes.Call):
-                    arg = safe_infer(arg)
-
-                if arg and arg is not astroid.Uninferable:
-                    if not check(arg):
-                        found_error = True
-                        break
-
-        if found_error:
-            self.add_message("invalid-getnewargs-ex-returned", node=node)
-
-
-def _ancestors_to_call(klass_node, method="__init__"):
-    """return a dictionary where keys are the list of base classes providing
+            if closest_func is None:
+                return False
+            if not closest_func.is_bound():
+                return False
+            if not closest_func.args.args:
+                return False
+            first_attr = closest_func.args.args[0].name
+        return isinstance(node, nodes.Name) and node.name == first_attr
+
+
+def _ancestors_to_call(
+    klass_node: nodes.ClassDef, method="__init__"
+) -> Dict[nodes.ClassDef, bases.UnboundMethod]:
+    """Return a dictionary where keys are the list of base classes providing
     the queried method, and so that should/may be called from the method node
     """
-    to_call = {}
+    to_call: Dict[nodes.ClassDef, bases.UnboundMethod] = {}
     for base_node in klass_node.ancestors(recurs=False):
         try:
             to_call[base_node] = next(base_node.igetattr(method))
         except astroid.InferenceError:
             continue
     return to_call
-
-
-def register(linter):
-    """required method to auto register this checker"""
-    linter.register_checker(ClassChecker(linter))
-    linter.register_checker(SpecialMethodsChecker(linter))
diff --git a/pylint/checkers/classes/special_methods_checker.py b/pylint/checkers/classes/special_methods_checker.py
new file mode 100644
index 0000000000..9a7c9a7629
--- /dev/null
+++ b/pylint/checkers/classes/special_methods_checker.py
@@ -0,0 +1,391 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Special methods checker and helper function's module."""
+
+import astroid
+from astroid import nodes
+
+from pylint.checkers import BaseChecker
+from pylint.checkers.utils import (
+    PYMETHODS,
+    SPECIAL_METHODS_PARAMS,
+    check_messages,
+    decorated_with,
+    is_function_body_ellipsis,
+    safe_infer,
+)
+from pylint.interfaces import IAstroidChecker
+
+NEXT_METHOD = "__next__"
+
+
+def _safe_infer_call_result(node, caller, context=None):
+    """Safely infer the return value of a function.
+
+    Returns None if inference failed or if there is some ambiguity (more than
+    one node has been inferred). Otherwise, returns inferred value.
+    """
+    try:
+        inferit = node.infer_call_result(caller, context=context)
+        value = next(inferit)
+    except astroid.InferenceError:
+        return None  # inference failed
+    except StopIteration:
+        return None  # no values inferred
+    try:
+        next(inferit)
+        return None  # there is ambiguity on the inferred node
+    except astroid.InferenceError:
+        return None  # there is some kind of ambiguity
+    except StopIteration:
+        return value
+
+
+class SpecialMethodsChecker(BaseChecker):
+    """Checker which verifies that special methods
+    are implemented correctly.
+    """
+
+    __implements__ = (IAstroidChecker,)
+    name = "classes"
+    msgs = {
+        "E0301": (
+            "__iter__ returns non-iterator",
+            "non-iterator-returned",
+            "Used when an __iter__ method returns something which is not an "
+            f"iterable (i.e. has no `{NEXT_METHOD}` method)",
+            {
+                "old_names": [
+                    ("W0234", "old-non-iterator-returned-1"),
+                    ("E0234", "old-non-iterator-returned-2"),
+                ]
+            },
+        ),
+        "E0302": (
+            "The special method %r expects %s param(s), %d %s given",
+            "unexpected-special-method-signature",
+            "Emitted when a special method was defined with an "
+            "invalid number of parameters. If it has too few or "
+            "too many, it might not work at all.",
+            {"old_names": [("E0235", "bad-context-manager")]},
+        ),
+        "E0303": (
+            "__len__ does not return non-negative integer",
+            "invalid-length-returned",
+            "Used when a __len__ method returns something which is not a "
+            "non-negative integer",
+        ),
+        "E0304": (
+            "__bool__ does not return bool",
+            "invalid-bool-returned",
+            "Used when a __bool__ method returns something which is not a bool",
+        ),
+        "E0305": (
+            "__index__ does not return int",
+            "invalid-index-returned",
+            "Used when an __index__ method returns something which is not "
+            "an integer",
+        ),
+        "E0306": (
+            "__repr__ does not return str",
+            "invalid-repr-returned",
+            "Used when a __repr__ method returns something which is not a string",
+        ),
+        "E0307": (
+            "__str__ does not return str",
+            "invalid-str-returned",
+            "Used when a __str__ method returns something which is not a string",
+        ),
+        "E0308": (
+            "__bytes__ does not return bytes",
+            "invalid-bytes-returned",
+            "Used when a __bytes__ method returns something which is not bytes",
+        ),
+        "E0309": (
+            "__hash__ does not return int",
+            "invalid-hash-returned",
+            "Used when a __hash__ method returns something which is not an integer",
+        ),
+        "E0310": (
+            "__length_hint__ does not return non-negative integer",
+            "invalid-length-hint-returned",
+            "Used when a __length_hint__ method returns something which is not a "
+            "non-negative integer",
+        ),
+        "E0311": (
+            "__format__ does not return str",
+            "invalid-format-returned",
+            "Used when a __format__ method returns something which is not a string",
+        ),
+        "E0312": (
+            "__getnewargs__ does not return a tuple",
+            "invalid-getnewargs-returned",
+            "Used when a __getnewargs__ method returns something which is not "
+            "a tuple",
+        ),
+        "E0313": (
+            "__getnewargs_ex__ does not return a tuple containing (tuple, dict)",
+            "invalid-getnewargs-ex-returned",
+            "Used when a __getnewargs_ex__ method returns something which is not "
+            "of the form tuple(tuple, dict)",
+        ),
+    }
+    priority = -2
+
+    def __init__(self, linter=None):
+        super().__init__(linter)
+        self._protocol_map = {
+            "__iter__": self._check_iter,
+            "__len__": self._check_len,
+            "__bool__": self._check_bool,
+            "__index__": self._check_index,
+            "__repr__": self._check_repr,
+            "__str__": self._check_str,
+            "__bytes__": self._check_bytes,
+            "__hash__": self._check_hash,
+            "__length_hint__": self._check_length_hint,
+            "__format__": self._check_format,
+            "__getnewargs__": self._check_getnewargs,
+            "__getnewargs_ex__": self._check_getnewargs_ex,
+        }
+
+    @check_messages(
+        "unexpected-special-method-signature",
+        "non-iterator-returned",
+        "invalid-length-returned",
+        "invalid-bool-returned",
+        "invalid-index-returned",
+        "invalid-repr-returned",
+        "invalid-str-returned",
+        "invalid-bytes-returned",
+        "invalid-hash-returned",
+        "invalid-length-hint-returned",
+        "invalid-format-returned",
+        "invalid-getnewargs-returned",
+        "invalid-getnewargs-ex-returned",
+    )
+    def visit_functiondef(self, node: nodes.FunctionDef) -> None:
+        if not node.is_method():
+            return
+
+        inferred = _safe_infer_call_result(node, node)
+        # Only want to check types that we are able to infer
+        if (
+            inferred
+            and node.name in self._protocol_map
+            and not is_function_body_ellipsis(node)
+        ):
+            self._protocol_map[node.name](node, inferred)
+
+        if node.name in PYMETHODS:
+            self._check_unexpected_method_signature(node)
+
+    visit_asyncfunctiondef = visit_functiondef
+
+    def _check_unexpected_method_signature(self, node):
+        expected_params = SPECIAL_METHODS_PARAMS[node.name]
+
+        if expected_params is None:
+            # This can support a variable number of parameters.
+            return
+        if not node.args.args and not node.args.vararg:
+            # Method has no parameter, will be caught
+            # by no-method-argument.
+            return
+
+        if decorated_with(node, ["builtins.staticmethod"]):
+            # We expect to not take in consideration self.
+            all_args = node.args.args
+        else:
+            all_args = node.args.args[1:]
+        mandatory = len(all_args) - len(node.args.defaults)
+        optional = len(node.args.defaults)
+        current_params = mandatory + optional
+
+        if isinstance(expected_params, tuple):
+            # The expected number of parameters can be any value from this
+            # tuple, although the user should implement the method
+            # to take all of them in consideration.
+            emit = mandatory not in expected_params
+            # pylint: disable-next=consider-using-f-string
+            expected_params = "between %d or %d" % expected_params
+        else:
+            # If the number of mandatory parameters doesn't
+            # suffice, the expected parameters for this
+            # function will be deduced from the optional
+            # parameters.
+            rest = expected_params - mandatory
+            if rest == 0:
+                emit = False
+            elif rest < 0:
+                emit = True
+            elif rest > 0:
+                emit = not ((optional - rest) >= 0 or node.args.vararg)
+
+        if emit:
+            verb = "was" if current_params <= 1 else "were"
+            self.add_message(
+                "unexpected-special-method-signature",
+                args=(node.name, expected_params, current_params, verb),
+                node=node,
+            )
+
+    @staticmethod
+    def _is_wrapped_type(node, type_):
+        return (
+            isinstance(node, astroid.Instance)
+            and node.name == type_
+            and not isinstance(node, nodes.Const)
+        )
+
+    @staticmethod
+    def _is_int(node):
+        if SpecialMethodsChecker._is_wrapped_type(node, "int"):
+            return True
+
+        return isinstance(node, nodes.Const) and isinstance(node.value, int)
+
+    @staticmethod
+    def _is_str(node):
+        if SpecialMethodsChecker._is_wrapped_type(node, "str"):
+            return True
+
+        return isinstance(node, nodes.Const) and isinstance(node.value, str)
+
+    @staticmethod
+    def _is_bool(node):
+        if SpecialMethodsChecker._is_wrapped_type(node, "bool"):
+            return True
+
+        return isinstance(node, nodes.Const) and isinstance(node.value, bool)
+
+    @staticmethod
+    def _is_bytes(node):
+        if SpecialMethodsChecker._is_wrapped_type(node, "bytes"):
+            return True
+
+        return isinstance(node, nodes.Const) and isinstance(node.value, bytes)
+
+    @staticmethod
+    def _is_tuple(node):
+        if SpecialMethodsChecker._is_wrapped_type(node, "tuple"):
+            return True
+
+        return isinstance(node, nodes.Const) and isinstance(node.value, tuple)
+
+    @staticmethod
+    def _is_dict(node):
+        if SpecialMethodsChecker._is_wrapped_type(node, "dict"):
+            return True
+
+        return isinstance(node, nodes.Const) and isinstance(node.value, dict)
+
+    @staticmethod
+    def _is_iterator(node):
+        if node is astroid.Uninferable:
+            # Just ignore Uninferable objects.
+            return True
+        if isinstance(node, astroid.bases.Generator):
+            # Generators can be iterated.
+            return True
+        # pylint: disable-next=fixme
+        # TODO: Should be covered by https://github.com/PyCQA/astroid/pull/1475
+        if isinstance(node, nodes.ComprehensionScope):
+            # Comprehensions can be iterated.
+            return True
+
+        if isinstance(node, astroid.Instance):
+            try:
+                node.local_attr(NEXT_METHOD)
+                return True
+            except astroid.NotFoundError:
+                pass
+        elif isinstance(node, nodes.ClassDef):
+            metaclass = node.metaclass()
+            if metaclass and isinstance(metaclass, nodes.ClassDef):
+                try:
+                    metaclass.local_attr(NEXT_METHOD)
+                    return True
+                except astroid.NotFoundError:
+                    pass
+        return False
+
+    def _check_iter(self, node, inferred):
+        if not self._is_iterator(inferred):
+            self.add_message("non-iterator-returned", node=node)
+
+    def _check_len(self, node, inferred):
+        if not self._is_int(inferred):
+            self.add_message("invalid-length-returned", node=node)
+        elif isinstance(inferred, nodes.Const) and inferred.value < 0:
+            self.add_message("invalid-length-returned", node=node)
+
+    def _check_bool(self, node, inferred):
+        if not self._is_bool(inferred):
+            self.add_message("invalid-bool-returned", node=node)
+
+    def _check_index(self, node, inferred):
+        if not self._is_int(inferred):
+            self.add_message("invalid-index-returned", node=node)
+
+    def _check_repr(self, node, inferred):
+        if not self._is_str(inferred):
+            self.add_message("invalid-repr-returned", node=node)
+
+    def _check_str(self, node, inferred):
+        if not self._is_str(inferred):
+            self.add_message("invalid-str-returned", node=node)
+
+    def _check_bytes(self, node, inferred):
+        if not self._is_bytes(inferred):
+            self.add_message("invalid-bytes-returned", node=node)
+
+    def _check_hash(self, node, inferred):
+        if not self._is_int(inferred):
+            self.add_message("invalid-hash-returned", node=node)
+
+    def _check_length_hint(self, node, inferred):
+        if not self._is_int(inferred):
+            self.add_message("invalid-length-hint-returned", node=node)
+        elif isinstance(inferred, nodes.Const) and inferred.value < 0:
+            self.add_message("invalid-length-hint-returned", node=node)
+
+    def _check_format(self, node, inferred):
+        if not self._is_str(inferred):
+            self.add_message("invalid-format-returned", node=node)
+
+    def _check_getnewargs(self, node, inferred):
+        if not self._is_tuple(inferred):
+            self.add_message("invalid-getnewargs-returned", node=node)
+
+    def _check_getnewargs_ex(self, node, inferred):
+        if not self._is_tuple(inferred):
+            self.add_message("invalid-getnewargs-ex-returned", node=node)
+            return
+
+        if not isinstance(inferred, nodes.Tuple):
+            # If it's not an astroid.Tuple we can't analyze it further
+            return
+
+        found_error = False
+
+        if len(inferred.elts) != 2:
+            found_error = True
+        else:
+            for arg, check in (
+                (inferred.elts[0], self._is_tuple),
+                (inferred.elts[1], self._is_dict),
+            ):
+
+                if isinstance(arg, nodes.Call):
+                    arg = safe_infer(arg)
+
+                if arg and arg is not astroid.Uninferable:
+                    if not check(arg):
+                        found_error = True
+                        break
+
+        if found_error:
+            self.add_message("invalid-getnewargs-ex-returned", node=node)
diff --git a/pylint/checkers/deprecated.py b/pylint/checkers/deprecated.py
index ac1cd6425d..299922f2b3 100644
--- a/pylint/checkers/deprecated.py
+++ b/pylint/checkers/deprecated.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Checker mixin for deprecated functionality."""
 from itertools import chain
@@ -22,6 +23,7 @@
 
 class DeprecatedMixin(BaseChecker):
     """A mixin implementing logic for checking deprecated symbols.
+
     A class implementing mixin must define "deprecated-method" Message.
     """
 
@@ -70,7 +72,7 @@ def visit_call(self, node: nodes.Call) -> None:
         "deprecated-class",
     )
     def visit_import(self, node: nodes.Import) -> None:
-        """triggered when an import statement is seen"""
+        """Triggered when an import statement is seen."""
         for name in (name for name, _ in node.names):
             self.check_deprecated_module(node, name)
             if "." in name:
@@ -89,7 +91,7 @@ def deprecated_decorators(self) -> Iterable:
 
     @utils.check_messages("deprecated-decorator")
     def visit_decorators(self, node: nodes.Decorators) -> None:
-        """Triggered when a decorator statement is seen"""
+        """Triggered when a decorator statement is seen."""
         children = list(node.get_children())
         if not children:
             return
@@ -106,7 +108,7 @@ def visit_decorators(self, node: nodes.Decorators) -> None:
         "deprecated-class",
     )
     def visit_importfrom(self, node: nodes.ImportFrom) -> None:
-        """triggered when a from statement is seen"""
+        """Triggered when a from statement is seen."""
         basename = node.modname
         basename = get_import_name(node, basename)
         self.check_deprecated_module(node, basename)
@@ -174,14 +176,15 @@ def deprecated_classes(self, module: str) -> Iterable:
         return ()
 
     def check_deprecated_module(self, node, mod_path):
-        """Checks if the module is deprecated"""
+        """Checks if the module is deprecated."""
         for mod_name in self.deprecated_modules():
             if mod_path == mod_name or mod_path.startswith(mod_name + "."):
                 self.add_message("deprecated-module", node=node, args=mod_path)
 
     def check_deprecated_method(self, node, inferred):
-        """Executes the checker for the given node. This method should
-        be called from the checker implementing this mixin.
+        """Executes the checker for the given node.
+
+        This method should be called from the checker implementing this mixin.
         """
 
         # Reject nodes which aren't of interest to us.
@@ -225,7 +228,7 @@ def check_deprecated_method(self, node, inferred):
                 )
 
     def check_deprecated_class(self, node, mod_name, class_names):
-        """Checks if the class is deprecated"""
+        """Checks if the class is deprecated."""
 
         for class_name in class_names:
             if class_name in self.deprecated_classes(mod_name):
@@ -234,7 +237,7 @@ def check_deprecated_class(self, node, mod_name, class_names):
                 )
 
     def check_deprecated_class_in_call(self, node):
-        """Checks if call the deprecated class"""
+        """Checks if call the deprecated class."""
 
         if isinstance(node.func, nodes.Attribute) and isinstance(
             node.func.expr, nodes.Name
diff --git a/pylint/checkers/design_analysis.py b/pylint/checkers/design_analysis.py
index e6537a4177..dcc43dc502 100644
--- a/pylint/checkers/design_analysis.py
+++ b/pylint/checkers/design_analysis.py
@@ -1,38 +1,13 @@
-# Copyright (c) 2006, 2009-2010, 2012-2015 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2012, 2014 Google, Inc.
-# Copyright (c) 2014-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2017 ahirnish <ahirnish@gmail.com>
-# Copyright (c) 2018 Lucas Cimon <lucas.cimon@gmail.com>
-# Copyright (c) 2018 Mike Frysinger <vapier@gmail.com>
-# Copyright (c) 2018 Mark Miller <725mrm@gmail.com>
-# Copyright (c) 2018 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2018 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2018 Jakub Wilk <jwilk@jwilk.net>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Michael Scott Cuthbert <cuthbert@mit.edu>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Mike Fiedler <miketheman@gmail.com>
-# Copyright (c) 2021 Youngsoo Sung <ysung@bepro11.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-# Copyright (c) 2021 Andrew Haigh <hello@nelf.in>
-# Copyright (c) 2021 Melvin <31448155+melvio@users.noreply.github.com>
-# Copyright (c) 2021 Rebecca Turner <rbt@sent.as>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Yu Shao, Pang <36848472+yushao2@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""check for signs of poor design"""
+"""Check for signs of poor design."""
 
 import re
+import sys
 from collections import defaultdict
-from typing import FrozenSet, Iterator, List, Set, cast
+from typing import TYPE_CHECKING, FrozenSet, Iterator, List, Set, cast
 
 import astroid
 from astroid import nodes
@@ -42,6 +17,14 @@
 from pylint.checkers.utils import check_messages
 from pylint.interfaces import IAstroidChecker
 
+if sys.version_info >= (3, 8):
+    from functools import cached_property
+else:
+    from astroid.decorators import cachedproperty as cached_property
+
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 MSGS = {  # pylint: disable=consider-using-namedtuple-or-dataclass
     "R0901": (
         "Too many ancestors (%s/%s)",
@@ -190,7 +173,7 @@
 
 
 def _is_exempt_from_public_methods(node: astroid.ClassDef) -> bool:
-    """Check if a class is exempt from too-few-public-methods"""
+    """Check if a class is exempt from too-few-public-methods."""
 
     # If it's a typing.Namedtuple, typing.TypedDict or an Enum
     for ancestor in node.ancestors():
@@ -222,7 +205,7 @@ def _is_exempt_from_public_methods(node: astroid.ClassDef) -> bool:
 
 
 def _count_boolean_expressions(bool_op):
-    """Counts the number of boolean expressions in BoolOp `bool_op` (recursive)
+    """Counts the number of boolean expressions in BoolOp `bool_op` (recursive).
 
     example: a and (b or c or (d and e)) ==> 5 boolean expressions
     """
@@ -288,7 +271,9 @@ def _get_parents(
 
 
 class MisdesignChecker(BaseChecker):
-    """checks for sign of poor/misdesign:
+    """Checker of potential misdesigns.
+
+    Checks for sign of poor/misdesign:
     * number of methods, attributes, local variables...
     * size, complexity of functions, methods
     """
@@ -425,7 +410,7 @@ def __init__(self, linter=None):
         self._stmts = None
 
     def open(self):
-        """initialize visit variables"""
+        """Initialize visit variables."""
         self.linter.stats.reset_node_count()
         self._returns = []
         self._branches = defaultdict(int)
@@ -438,7 +423,7 @@ def _inc_all_stmts(self, amount):
         for i, _ in enumerate(self._stmts):
             self._stmts[i] += amount
 
-    @astroid.decorators.cachedproperty
+    @cached_property
     def _ignored_argument_names(self):
         return utils.get_global_option(self, "ignored-argument-names", default=None)
 
@@ -449,7 +434,7 @@ def _ignored_argument_names(self):
         "too-many-public-methods",
     )
     def visit_classdef(self, node: nodes.ClassDef) -> None:
-        """check size of inheritance hierarchy and number of instance attributes"""
+        """Check size of inheritance hierarchy and number of instance attributes."""
         parents = _get_parents(
             node, STDLIB_CLASSES_IGNORE_ANCESTOR.union(self.config.ignored_parents)
         )
@@ -470,7 +455,7 @@ def visit_classdef(self, node: nodes.ClassDef) -> None:
 
     @check_messages("too-few-public-methods", "too-many-public-methods")
     def leave_classdef(self, node: nodes.ClassDef) -> None:
-        """check number of public methods"""
+        """Check number of public methods."""
         my_methods = sum(
             1 for method in node.mymethods() if not method.name.startswith("_")
         )
@@ -523,7 +508,7 @@ def leave_classdef(self, node: nodes.ClassDef) -> None:
         "keyword-arg-before-vararg",
     )
     def visit_functiondef(self, node: nodes.FunctionDef) -> None:
-        """check function name, docstring, arguments, redefinition,
+        """Check function name, docstring, arguments, redefinition,
         variable names, max locals
         """
         # init branch and returns counters
@@ -566,7 +551,7 @@ def visit_functiondef(self, node: nodes.FunctionDef) -> None:
         "too-many-statements",
     )
     def leave_functiondef(self, node: nodes.FunctionDef) -> None:
-        """most of the work is done here on close:
+        """Most of the work is done here on close:
         checks for max returns, branch, return in __init__
         """
         returns = self._returns.pop()
@@ -595,20 +580,20 @@ def leave_functiondef(self, node: nodes.FunctionDef) -> None:
     leave_asyncfunctiondef = leave_functiondef
 
     def visit_return(self, _: nodes.Return) -> None:
-        """count number of returns"""
+        """Count number of returns."""
         if not self._returns:
             return  # return outside function, reported by the base checker
         self._returns[-1] += 1
 
     def visit_default(self, node: nodes.NodeNG) -> None:
-        """default visit method -> increments the statements counter if
+        """Default visit method -> increments the statements counter if
         necessary
         """
         if node.is_statement:
             self._inc_all_stmts(1)
 
     def visit_tryexcept(self, node: nodes.TryExcept) -> None:
-        """increments the branches counter"""
+        """Increments the branches counter."""
         branches = len(node.handlers)
         if node.orelse:
             branches += 1
@@ -616,13 +601,13 @@ def visit_tryexcept(self, node: nodes.TryExcept) -> None:
         self._inc_all_stmts(branches)
 
     def visit_tryfinally(self, node: nodes.TryFinally) -> None:
-        """increments the branches counter"""
+        """Increments the branches counter."""
         self._inc_branch(node, 2)
         self._inc_all_stmts(2)
 
     @check_messages("too-many-boolean-expressions")
     def visit_if(self, node: nodes.If) -> None:
-        """increments the branches counter and checks boolean expressions"""
+        """Increments the branches counter and checks boolean expressions."""
         self._check_boolean_expressions(node)
         branches = 1
         # don't double count If nodes coming from some 'elif'
@@ -634,9 +619,8 @@ def visit_if(self, node: nodes.If) -> None:
         self._inc_all_stmts(branches)
 
     def _check_boolean_expressions(self, node):
-        """Go through "if" node `node` and counts its boolean expressions
-
-        if the "if" node test is a BoolOp node
+        """Go through "if" node `node` and count its boolean expressions
+        if the 'if' node test is a BoolOp node
         """
         condition = node.test
         if not isinstance(condition, astroid.BoolOp):
@@ -650,7 +634,7 @@ def _check_boolean_expressions(self, node):
             )
 
     def visit_while(self, node: nodes.While) -> None:
-        """increments the branches counter"""
+        """Increments the branches counter."""
         branches = 1
         if node.orelse:
             branches += 1
@@ -659,10 +643,9 @@ def visit_while(self, node: nodes.While) -> None:
     visit_for = visit_while
 
     def _inc_branch(self, node, branchesnum=1):
-        """increments the branches counter"""
+        """Increments the branches counter."""
         self._branches[node.scope()] += branchesnum
 
 
-def register(linter):
-    """required method to auto register this checker"""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(MisdesignChecker(linter))
diff --git a/pylint/checkers/ellipsis_checker.py b/pylint/checkers/ellipsis_checker.py
new file mode 100644
index 0000000000..7a1298afe2
--- /dev/null
+++ b/pylint/checkers/ellipsis_checker.py
@@ -0,0 +1,57 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Ellipsis checker for Python code."""
+from typing import TYPE_CHECKING
+
+from astroid import nodes
+
+from pylint.checkers import BaseChecker
+from pylint.checkers.utils import check_messages
+from pylint.interfaces import IAstroidChecker
+
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
+
+class EllipsisChecker(BaseChecker):
+    __implements__ = (IAstroidChecker,)
+    name = "unnecessary_ellipsis"
+    msgs = {
+        "W2301": (
+            "Unnecessary ellipsis constant",
+            "unnecessary-ellipsis",
+            "Used when the ellipsis constant is encountered and can be avoided. "
+            "A line of code consisting of an ellipsis is unnecessary if "
+            "there is a docstring on the preceding line or if there is a "
+            "statement in the same scope.",
+        )
+    }
+
+    @check_messages("unnecessary-ellipsis")
+    def visit_const(self, node: nodes.Const) -> None:
+        """Check if the ellipsis constant is used unnecessarily.
+
+        Emits a warning when:
+         - A line consisting of an ellipsis is preceded by a docstring.
+         - A statement exists in the same scope as the ellipsis.
+           For example: A function consisting of an ellipsis followed by a
+           return statement on the next line.
+        """
+        if (
+            node.pytype() == "builtins.Ellipsis"
+            and isinstance(node.parent, nodes.Expr)
+            and (
+                (
+                    isinstance(node.parent.parent, (nodes.ClassDef, nodes.FunctionDef))
+                    and node.parent.parent.doc_node
+                )
+                or len(node.parent.parent.body) > 1
+            )
+        ):
+            self.add_message("unnecessary-ellipsis", node=node)
+
+
+def register(linter: "PyLinter") -> None:
+    linter.register_checker(EllipsisChecker(linter))
diff --git a/pylint/checkers/exceptions.py b/pylint/checkers/exceptions.py
index 5af1679f1d..9ef9ea42e6 100644
--- a/pylint/checkers/exceptions.py
+++ b/pylint/checkers/exceptions.py
@@ -1,42 +1,11 @@
-# Copyright (c) 2006-2011, 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2011-2014 Google, Inc.
-# Copyright (c) 2012 Tim Hatch <tim@timhatch.com>
-# Copyright (c) 2013-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Rene Zhang <rz99@cornell.edu>
-# Copyright (c) 2015 Florian Bruhin <me@the-compiler.org>
-# Copyright (c) 2015 Steven Myint <hg@stevenmyint.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Erik <erik.eriksson@yahoo.com>
-# Copyright (c) 2016 Jakub Wilk <jwilk@jwilk.net>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2017 Martin von Gagern <gagern@google.com>
-# Copyright (c) 2018 Lucas Cimon <lucas.cimon@gmail.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Natalie Serebryakova <natalie.serebryakova@Natalies-MacBook-Pro.local>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Carey Metcalfe <carey@cmetcalfe.ca>
-# Copyright (c) 2018 Mike Frysinger <vapier@gmail.com>
-# Copyright (c) 2018 Alexander Todorov <atodorov@otb.bg>
-# Copyright (c) 2018 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Djailla <bastien.vallet@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Ram Rachum <ram@rachum.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Checks for various exception related errors."""
 import builtins
 import inspect
-from typing import Any, List, Optional
+from typing import TYPE_CHECKING, Any, List, Optional
 
 import astroid
 from astroid import nodes, objects
@@ -44,6 +13,9 @@
 from pylint import checkers, interfaces
 from pylint.checkers import utils
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 def _builtin_exceptions():
     def predicate(obj):
@@ -54,8 +26,8 @@ def predicate(obj):
 
 
 def _annotated_unpack_infer(stmt, context=None):
-    """
-    Recursively generate nodes inferred by the given statement.
+    """Recursively generate nodes inferred by the given statement.
+
     If the inferred value is a list or a tuple, recurse on the elements.
     Returns an iterator which yields tuples in the format
     ('original node', 'inferred node').
@@ -73,7 +45,7 @@ def _annotated_unpack_infer(stmt, context=None):
 
 
 def _is_raising(body: List) -> bool:
-    """Return whether the given statement node raises an exception"""
+    """Return whether the given statement node raises an exception."""
     return any(isinstance(node, nodes.Raise) for node in body)
 
 
@@ -90,8 +62,8 @@ def _is_raising(body: List) -> bool:
     "E0702": (
         "Raising %s while only classes or instances are allowed",
         "raising-bad-type",
-        "Used when something which is neither a class, an instance or a "
-        "string is raised (i.e. a `TypeError` will be raised).",
+        "Used when something which is neither a class nor an instance "
+        "is raised (i.e. a `TypeError` will be raised).",
     ),
     "E0703": (
         "Exception context set to something which is not an exception, nor None",
@@ -300,13 +272,10 @@ def visit_raise(self, node: nodes.Raise) -> None:
         expr = node.exc
         ExceptionRaiseRefVisitor(self, node).visit(expr)
 
-        try:
-            inferred_value = expr.inferred()[-1]
-        except astroid.InferenceError:
-            pass
-        else:
-            if inferred_value:
-                ExceptionRaiseLeafVisitor(self, node).visit(inferred_value)
+        inferred = utils.safe_infer(expr)
+        if inferred is None or inferred is astroid.Uninferable:
+            return
+        ExceptionRaiseLeafVisitor(self, node).visit(inferred)
 
     def _check_misplaced_bare_raise(self, node):
         # Filter out if it's present in __exit__.
@@ -447,7 +416,7 @@ def gather_exceptions_from_handler(
 
         bare_raise = False
         handler_having_bare_raise = None
-        excs_in_bare_handler = []
+        exceptions_in_bare_handler = []
         for handler in node.handlers:
             if bare_raise:
                 # check that subsequent handler is not parent of handler which had bare raise.
@@ -457,14 +426,14 @@ def gather_exceptions_from_handler(
                 excs_in_current_handler = gather_exceptions_from_handler(handler)
                 if not excs_in_current_handler:
                     break
-                if excs_in_bare_handler is None:
+                if exceptions_in_bare_handler is None:
                     # It can be `None` when the inference failed
                     break
                 for exc_in_current_handler in excs_in_current_handler:
                     inferred_current = utils.safe_infer(exc_in_current_handler)
                     if any(
                         utils.is_subclass_of(utils.safe_infer(e), inferred_current)
-                        for e in excs_in_bare_handler
+                        for e in exceptions_in_bare_handler
                     ):
                         bare_raise = False
                         break
@@ -475,7 +444,7 @@ def gather_exceptions_from_handler(
                 if handler.body[0].exc is None:
                     bare_raise = True
                     handler_having_bare_raise = handler
-                    excs_in_bare_handler = gather_exceptions_from_handler(handler)
+                    exceptions_in_bare_handler = gather_exceptions_from_handler(handler)
         else:
             if bare_raise:
                 self.add_message("try-except-raise", node=handler_having_bare_raise)
@@ -504,7 +473,7 @@ def visit_compare(self, node: nodes.Compare) -> None:
         "duplicate-except",
     )
     def visit_tryexcept(self, node: nodes.TryExcept) -> None:
-        """check for empty except"""
+        """Check for empty except."""
         self._check_try_except_raise(node)
         exceptions_classes: List[Any] = []
         nb_handlers = len(node.handlers)
@@ -525,52 +494,51 @@ def visit_tryexcept(self, node: nodes.TryExcept) -> None:
                 )
             else:
                 try:
-                    excs = list(_annotated_unpack_infer(handler.type))
+                    exceptions = list(_annotated_unpack_infer(handler.type))
                 except astroid.InferenceError:
                     continue
 
-                for part, exc in excs:
-                    if exc is astroid.Uninferable:
+                for part, exception in exceptions:
+                    if exception is astroid.Uninferable:
                         continue
-                    if isinstance(exc, astroid.Instance) and utils.inherit_from_std_ex(
-                        exc
-                    ):
-                        exc = exc._proxied
+                    if isinstance(
+                        exception, astroid.Instance
+                    ) and utils.inherit_from_std_ex(exception):
+                        exception = exception._proxied
 
-                    self._check_catching_non_exception(handler, exc, part)
+                    self._check_catching_non_exception(handler, exception, part)
 
-                    if not isinstance(exc, nodes.ClassDef):
+                    if not isinstance(exception, nodes.ClassDef):
                         continue
 
                     exc_ancestors = [
                         anc
-                        for anc in exc.ancestors()
+                        for anc in exception.ancestors()
                         if isinstance(anc, nodes.ClassDef)
                     ]
 
                     for previous_exc in exceptions_classes:
                         if previous_exc in exc_ancestors:
-                            msg = f"{previous_exc.name} is an ancestor class of {exc.name}"
+                            msg = f"{previous_exc.name} is an ancestor class of {exception.name}"
                             self.add_message(
                                 "bad-except-order", node=handler.type, args=msg
                             )
                     if (
-                        exc.name in self.config.overgeneral_exceptions
-                        and exc.root().name == utils.EXCEPTIONS_MODULE
+                        exception.name in self.config.overgeneral_exceptions
+                        and exception.root().name == utils.EXCEPTIONS_MODULE
                         and not _is_raising(handler.body)
                     ):
                         self.add_message(
-                            "broad-except", args=exc.name, node=handler.type
+                            "broad-except", args=exception.name, node=handler.type
                         )
 
-                    if exc in exceptions_classes:
+                    if exception in exceptions_classes:
                         self.add_message(
-                            "duplicate-except", args=exc.name, node=handler.type
+                            "duplicate-except", args=exception.name, node=handler.type
                         )
 
-                exceptions_classes += [exc for _, exc in excs]
+                exceptions_classes += [exc for _, exc in exceptions]
 
 
-def register(linter):
-    """required method to auto register this checker"""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(ExceptionsChecker(linter))
diff --git a/pylint/checkers/format.py b/pylint/checkers/format.py
index cdbacd4cfd..70c56a621a 100644
--- a/pylint/checkers/format.py
+++ b/pylint/checkers/format.py
@@ -1,53 +1,10 @@
-# Copyright (c) 2006-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2012-2015 Google, Inc.
-# Copyright (c) 2013 moxian <aleftmail@inbox.ru>
-# Copyright (c) 2014-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 frost-nzcr4 <frost.nzcr4@jagmort.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Michal Nowikowski <godfryd@gmail.com>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Mike Frysinger <vapier@gentoo.org>
-# Copyright (c) 2015 Fabio Natali <me@fabionatali.com>
-# Copyright (c) 2015 Harut <yes@harutune.name>
-# Copyright (c) 2015 Mihai Balint <balint.mihai@gmail.com>
-# Copyright (c) 2015 Pavel Roskin <proski@gnu.org>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Petr Pulc <petrpulc@gmail.com>
-# Copyright (c) 2016 Moises Lopez <moylop260@vauxoo.com>
-# Copyright (c) 2016 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2017, 2019-2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2017-2018 Bryce Guinta <bryce.paul.guinta@gmail.com>
-# Copyright (c) 2017 Krzysztof Czapla <k.czapla68@gmail.com>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2017 James M. Allen <james.m.allen@gmail.com>
-# Copyright (c) 2017 vinnyrose <vinnyrose@users.noreply.github.com>
-# Copyright (c) 2018-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2018, 2020 Bryce Guinta <bryce.guinta@protonmail.com>
-# Copyright (c) 2018, 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2018 Lucas Cimon <lucas.cimon@gmail.com>
-# Copyright (c) 2018 Michael Hudson-Doyle <michael.hudson@canonical.com>
-# Copyright (c) 2018 Natalie Serebryakova <natalie.serebryakova@Natalies-MacBook-Pro.local>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Marcus Näslund <naslundx@gmail.com>
-# Copyright (c) 2018 Mike Frysinger <vapier@gmail.com>
-# Copyright (c) 2018 Fureigh <rhys.fureigh@gsa.gov>
-# Copyright (c) 2018 Andreas Freimuth <andreas.freimuth@united-bits.de>
-# Copyright (c) 2018 Jakub Wilk <jwilk@jwilk.net>
-# Copyright (c) 2019 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2020 Raphael Gaschignard <raphael@rtpg.co>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Tushar Sadhwani <tushar.sadhwani000@gmail.com>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-# Copyright (c) 2021 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Python code format's checker.
 
-By default try to follow Guido's style guide :
+By default, try to follow Guido's style guide :
 
 https://www.python.org/doc/essays/styleguide/
 
@@ -56,7 +13,7 @@
 
 import tokenize
 from functools import reduce
-from typing import List
+from typing import TYPE_CHECKING, List
 
 from astroid import nodes
 
@@ -71,6 +28,10 @@
 from pylint.interfaces import IAstroidChecker, IRawChecker, ITokenChecker
 from pylint.utils.pragma_parser import OPTION_PO, PragmaParserError, parse_pragma
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
+
 _ASYNC_TOKEN = "async"
 _KEYWORD_TOKENS = [
     "assert",
@@ -233,7 +194,9 @@ def line(self, idx):
 
 
 class FormatChecker(BaseTokenChecker):
-    """checks for :
+    """Formatting checker.
+
+    Checks for :
     * unauthorized constructions
     * strict indentation
     * line length
@@ -344,7 +307,7 @@ def __init__(self, linter=None):
         self._bracket_stack = [None]
 
     def new_line(self, tokens, line_end, line_start):
-        """a new line has been encountered, process it if necessary"""
+        """A new line has been encountered, process it if necessary."""
         if _last_token_on_line_is(tokens, line_end, ";"):
             self.add_message("unnecessary-semicolon", line=tokens.start_line(line_end))
 
@@ -357,6 +320,7 @@ def new_line(self, tokens, line_end, line_start):
     def process_module(self, _node: nodes.Module) -> None:
         pass
 
+    # pylint: disable-next=too-many-return-statements
     def _check_keyword_parentheses(
         self, tokens: List[tokenize.TokenInfo], start: int
     ) -> None:
@@ -419,19 +383,15 @@ def _check_keyword_parentheses(
                     # The empty tuple () is always accepted.
                     if i == start + 2:
                         return
-                    if keyword_token == "not":
-                        if not found_and_or:
-                            self.add_message(
-                                "superfluous-parens", line=line_num, args=keyword_token
-                            )
-                    elif keyword_token in {"return", "yield"}:
-                        self.add_message(
-                            "superfluous-parens", line=line_num, args=keyword_token
-                        )
-                    elif not found_and_or and keyword_token != "in":
-                        self.add_message(
-                            "superfluous-parens", line=line_num, args=keyword_token
-                        )
+                    if found_and_or:
+                        return
+                    if keyword_token == "in":
+                        # This special case was added in https://github.com/PyCQA/pylint/pull/4948
+                        # but it could be removed in the future. Avoid churn for now.
+                        return
+                    self.add_message(
+                        "superfluous-parens", line=line_num, args=keyword_token
+                    )
                 return
             elif depth == 1:
                 # This is a tuple, which is always acceptable.
@@ -452,7 +412,7 @@ def _check_keyword_parentheses(
                 elif token[1] == "for":
                     return
                 # A generator expression can have an 'else' token in it.
-                # We check the rest of the tokens to see if any problems incure after
+                # We check the rest of the tokens to see if any problems incur after
                 # the 'else'.
                 elif token[1] == "else":
                     if "(" in (i.string for i in tokens[i:]):
@@ -467,7 +427,7 @@ def _prepare_token_dispatcher(self):
         return dispatch
 
     def process_tokens(self, tokens):
-        """process tokens and search for :
+        """Process tokens and search for :
 
         _ too long lines (i.e. longer than <max_chars>)
         _ optionally bad construct (if given, bad_construct must be a compiled
@@ -586,7 +546,7 @@ def _check_line_ending(self, line_ending, line_num):
 
     @check_messages("multiple-statements")
     def visit_default(self, node: nodes.NodeNG) -> None:
-        """check the node line number and check it if not yet done"""
+        """Check the node line number and check it if not yet done."""
         if not node.is_statement:
             return
         if not node.root().pure_python:
@@ -594,7 +554,7 @@ def visit_default(self, node: nodes.NodeNG) -> None:
         prev_sibl = node.previous_sibling()
         if prev_sibl is not None:
             prev_line = prev_sibl.fromlineno
-        # The line on which a finally: occurs in a try/finally
+        # The line on which a 'finally': occurs in a 'try/finally'
         # is not directly represented in the AST. We infer it
         # by taking the last line of the body and adding 1, which
         # should be the line of finally:
@@ -602,8 +562,10 @@ def visit_default(self, node: nodes.NodeNG) -> None:
             isinstance(node.parent, nodes.TryFinally) and node in node.parent.finalbody
         ):
             prev_line = node.parent.body[0].tolineno + 1
+        elif isinstance(node.parent, nodes.Module):
+            prev_line = 0
         else:
-            prev_line = node.parent.statement().fromlineno
+            prev_line = node.parent.statement(future=True).fromlineno
         line = node.fromlineno
         assert line, node
         if prev_line == line and self._visited_lines.get(line) != 2:
@@ -655,7 +617,7 @@ def _check_multi_statement_line(self, node, line):
             and isinstance(node.value, nodes.Const)
             and node.value.value is Ellipsis
         ):
-            frame = node.frame()
+            frame = node.frame(future=True)
             if is_overload_stub(frame) or is_protocol_class(node_frame_class(frame)):
                 return
 
@@ -663,9 +625,7 @@ def _check_multi_statement_line(self, node, line):
         self._visited_lines[line] = 2
 
     def check_line_ending(self, line: str, i: int) -> None:
-        """
-        Check that the final newline is not missing and that there is no trailing whitespace.
-        """
+        """Check that the final newline is not missing and that there is no trailing whitespace."""
         if not line.endswith("\n"):
             self.add_message("missing-final-newline", line=i)
             return
@@ -677,9 +637,7 @@ def check_line_ending(self, line: str, i: int) -> None:
             )
 
     def check_line_length(self, line: str, i: int, checker_off: bool) -> None:
-        """
-        Check that the line length is less than the authorized value
-        """
+        """Check that the line length is less than the authorized value."""
         max_chars = self.config.max_line_length
         ignore_long_line = self.config.ignore_long_lines
         line = line.rstrip()
@@ -691,9 +649,7 @@ def check_line_length(self, line: str, i: int, checker_off: bool) -> None:
 
     @staticmethod
     def remove_pylint_option_from_lines(options_pattern_obj) -> str:
-        """
-        Remove the `# pylint ...` pattern from lines
-        """
+        """Remove the `# pylint ...` pattern from lines."""
         lines = options_pattern_obj.string
         purged_lines = (
             lines[: options_pattern_obj.start(1)].rstrip()
@@ -703,9 +659,7 @@ def remove_pylint_option_from_lines(options_pattern_obj) -> str:
 
     @staticmethod
     def is_line_length_check_activated(pylint_pattern_match_object) -> bool:
-        """
-        Return true if the line length check is activated
-        """
+        """Return true if the line length check is activated."""
         try:
             for pragma in parse_pragma(pylint_pattern_match_object.group(2)):
                 if pragma.action == "disable" and "line-too-long" in pragma.messages:
@@ -717,9 +671,7 @@ def is_line_length_check_activated(pylint_pattern_match_object) -> bool:
 
     @staticmethod
     def specific_splitlines(lines: str) -> List[str]:
-        """
-        Split lines according to universal newlines except those in a specific sets
-        """
+        """Split lines according to universal newlines except those in a specific sets."""
         unsplit_ends = {
             "\v",
             "\x0b",
@@ -743,11 +695,12 @@ def specific_splitlines(lines: str) -> List[str]:
         return res
 
     def check_lines(self, lines: str, lineno: int) -> None:
-        """
+        """Check given lines for potential messages.
+
         Check lines have :
-            - a final newline
-            - no trailing whitespace
-            - less than a maximum number of characters
+        - a final newline
+        - no trailing whitespace
+        - less than a maximum number of characters
         """
         # we're first going to do a rough check whether any lines in this set
         # go over the line limit. If none of them do, then we don't need to
@@ -793,7 +746,7 @@ def check_lines(self, lines: str, lineno: int) -> None:
             self.check_line_length(line, lineno + offset, checker_off)
 
     def check_indent_level(self, string, expected, line_num):
-        """return the indent level of the string"""
+        """Return the indent level of the string."""
         indent = self.config.indent_string
         if indent == "\\t":  # \t is not interpreted in the configuration file
             indent = "\t"
@@ -817,6 +770,5 @@ def check_indent_level(self, string, expected, line_num):
             )
 
 
-def register(linter):
-    """required method to auto register this checker"""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(FormatChecker(linter))
diff --git a/pylint/checkers/imports.py b/pylint/checkers/imports.py
index ddec800e0d..fb99bbf4b6 100644
--- a/pylint/checkers/imports.py
+++ b/pylint/checkers/imports.py
@@ -1,58 +1,13 @@
-# Copyright (c) 2006-2015 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2012-2014 Google, Inc.
-# Copyright (c) 2013 buck@yelp.com <buck@yelp.com>
-# Copyright (c) 2014-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015-2016 Moises Lopez <moylop260@vauxoo.com>
-# Copyright (c) 2015 Dmitry Pribysh <dmand@yandex.ru>
-# Copyright (c) 2015 Cezar <celnazli@bitdefender.com>
-# Copyright (c) 2015 Florian Bruhin <me@the-compiler.org>
-# Copyright (c) 2015 Noam Yorav-Raphael <noamraph@gmail.com>
-# Copyright (c) 2015 James Morgensen <james.morgensen@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016, 2021 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2016 Jared Garst <cultofjared@gmail.com>
-# Copyright (c) 2016 Maik Röder <maikroeder@gmail.com>
-# Copyright (c) 2016 Glenn Matthews <glenn@e-dad.net>
-# Copyright (c) 2017, 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2017 Michka Popoff <michkapopoff@gmail.com>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2017 Erik Wright <erik.wright@shopify.com>
-# Copyright (c) 2018 Lucas Cimon <lucas.cimon@gmail.com>
-# Copyright (c) 2018 Hornwitser <github@hornwitser.no>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Natalie Serebryakova <natalie.serebryakova@Natalies-MacBook-Pro.local>
-# Copyright (c) 2018 Mike Frysinger <vapier@gmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Marianna Polatoglou <mpolatoglou@bloomberg.net>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019, 2021 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2019 Nick Smith <clickthisnick@users.noreply.github.com>
-# Copyright (c) 2019 Paul Renvoisé <renvoisepaul@gmail.com>
-# Copyright (c) 2020 Peter Kolbus <peter.kolbus@gmail.com>
-# Copyright (c) 2020 Damien Baty <damien.baty@polyconseil.fr>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Tushar Sadhwani <tushar.sadhwani000@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Will Shanks <wsha@posteo.net>
-# Copyright (c) 2021 Matus Valo <matusvalo@users.noreply.github.com>
-# Copyright (c) 2021 Yu Shao, Pang <36848472+yushao2@users.noreply.github.com>
-# Copyright (c) 2021 Andrew Howe <howeaj@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""imports checkers for Python code"""
+"""Imports checkers for Python code."""
 
 import collections
 import copy
 import os
-import sys
-from distutils import sysconfig
-from typing import Any, Dict, List, Optional, Set, Tuple, Union
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Set, Tuple, Union
 
 import astroid
 from astroid import nodes
@@ -69,13 +24,15 @@
 from pylint.exceptions import EmptyReportError
 from pylint.graph import DotBackend, get_cycles
 from pylint.interfaces import IAstroidChecker
-from pylint.lint import PyLinter
 from pylint.reporters.ureports.nodes import Paragraph, Section, VerbatimText
 from pylint.utils import IsortDriver, get_global_option
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 def _qualified_names(modname):
-    """Split the names of the given module into subparts
+    """Split the names of the given module into subparts.
 
     For example,
         _qualified_names('pylint.checkers.ImportsChecker')
@@ -87,7 +44,7 @@ def _qualified_names(modname):
 
 
 def _get_first_import(node, context, name, base, level, alias):
-    """return the node where [base.]<name> is imported or None if not found"""
+    """Return the node where [base.]<name> is imported or None if not found."""
     fullname = f"{base}.{name}" if base else name
 
     first = None
@@ -138,7 +95,7 @@ def _ignore_import_failure(node, modname, ignored_modules):
 
 
 def _make_tree_defs(mod_files_list):
-    """get a list of 2-uple (module, list_of_files_which_import_this_module),
+    """Get a list of 2-uple (module, list_of_files_which_import_this_module),
     it will return a dictionary to represent this as a tree
     """
     tree_defs = {}
@@ -151,7 +108,7 @@ def _make_tree_defs(mod_files_list):
 
 
 def _repr_tree_defs(data, indent_str=None):
-    """return a string which represents imports as a tree"""
+    """Return a string which represents imports as a tree."""
     lines = []
     nodes_items = data.items()
     for i, (mod, (sub, files)) in enumerate(sorted(nodes_items, key=lambda x: x[0])):
@@ -160,7 +117,7 @@ def _repr_tree_defs(data, indent_str=None):
             lines.append(f"{mod} {files}")
             sub_indent_str = "  "
         else:
-            lines.append(fr"{indent_str}\-{mod} {files}")
+            lines.append(rf"{indent_str}\-{mod} {files}")
             if i == len(nodes_items) - 1:
                 sub_indent_str = f"{indent_str}  "
             else:
@@ -171,7 +128,7 @@ def _repr_tree_defs(data, indent_str=None):
 
 
 def _dependencies_graph(filename: str, dep_info: Dict[str, Set[str]]) -> str:
-    """write dependencies as a dot (graphviz) file"""
+    """Write dependencies as a dot (graphviz) file."""
     done = {}
     printer = DotBackend(os.path.splitext(os.path.basename(filename))[0], rankdir="LR")
     printer.emit('URL="." node[shape="box"]')
@@ -192,7 +149,7 @@ def _dependencies_graph(filename: str, dep_info: Dict[str, Set[str]]) -> str:
 def _make_graph(
     filename: str, dep_info: Dict[str, Set[str]], sect: Section, gtype: str
 ):
-    """generate a dependencies graph and add some information about it in the
+    """Generate a dependencies graph and add some information about it in the
     report's section
     """
     outputfile = _dependencies_graph(filename, dep_info)
@@ -300,7 +257,9 @@ def _make_graph(
 
 
 class ImportsChecker(DeprecatedMixin, BaseChecker):
-    """checks for
+    """BaseChecker for import statements.
+
+    Checks for
     * external modules dependencies
     * relative / wildcard imports
     * cyclic imports
@@ -425,9 +384,7 @@ class ImportsChecker(DeprecatedMixin, BaseChecker):
         ),
     )
 
-    def __init__(
-        self, linter: Optional[PyLinter] = None
-    ):  # pylint: disable=super-init-not-called # See https://github.com/PyCQA/pylint/issues/4941
+    def __init__(self, linter: Optional["PyLinter"] = None) -> None:
         BaseChecker.__init__(self, linter)
         self.import_graph: collections.defaultdict = collections.defaultdict(set)
         self._imports_stack: List[Tuple[Any, Any]] = []
@@ -441,35 +398,8 @@ def __init__(
             ("RP0402", "Modules dependencies graph", self._report_dependencies_graph),
         )
 
-        self._site_packages = self._compute_site_packages()
-
-    @staticmethod
-    def _compute_site_packages():
-        def _normalized_path(path):
-            return os.path.normcase(os.path.abspath(path))
-
-        paths = set()
-        real_prefix = getattr(sys, "real_prefix", None)
-        for prefix in filter(None, (real_prefix, sys.prefix)):
-            path = sysconfig.get_python_lib(prefix=prefix)
-            path = _normalized_path(path)
-            paths.add(path)
-
-        # Handle Debian's derivatives /usr/local.
-        if os.path.isfile("/etc/debian_version"):
-            for prefix in filter(None, (real_prefix, sys.prefix)):
-                libpython = os.path.join(
-                    prefix,
-                    "local",
-                    "lib",
-                    "python" + sysconfig.get_python_version(),
-                    "dist-packages",
-                )
-                paths.add(libpython)
-        return paths
-
     def open(self):
-        """called before visiting project (i.e set of modules)"""
+        """Called before visiting project (i.e set of modules)."""
         self.linter.stats.dependencies = {}
         self.linter.stats = self.linter.stats
         self.import_graph = collections.defaultdict(set)
@@ -491,7 +421,7 @@ def _import_graph_without_ignored_edges(self):
         return filtered_graph
 
     def close(self):
-        """called before visiting project (i.e set of modules)"""
+        """Called before visiting project (i.e set of modules)."""
         if self.linter.is_message_enabled("cyclic-import"):
             graph = self._import_graph_without_ignored_edges()
             vertices = list(graph)
@@ -504,7 +434,7 @@ def deprecated_modules(self):
 
     @check_messages(*MSGS)
     def visit_import(self, node: nodes.Import) -> None:
-        """triggered when an import statement is seen"""
+        """Triggered when an import statement is seen."""
         self._check_reimport(node)
         self._check_import_as_rename(node)
         self._check_toplevel(node)
@@ -530,7 +460,7 @@ def visit_import(self, node: nodes.Import) -> None:
 
     @check_messages(*MSGS)
     def visit_importfrom(self, node: nodes.ImportFrom) -> None:
-        """triggered when a from statement is seen"""
+        """Triggered when a from statement is seen."""
         basename = node.modname
         imported_module = self._get_imported_module(node, basename)
 
@@ -566,10 +496,6 @@ def leave_module(self, node: nodes.Module) -> None:
         met_from: Set[str] = set()  # set for 'from x import y' style
         current_package = None
         for import_node, import_name in std_imports + ext_imports + loc_imports:
-            if not self.linter.is_message_enabled(
-                "ungrouped-imports", import_node.fromlineno
-            ):
-                continue
             met = met_from if isinstance(import_node, nodes.ImportFrom) else met_import
             package, _, _ = import_name.partition(".")
             if (
@@ -580,6 +506,10 @@ def leave_module(self, node: nodes.Module) -> None:
             ):
                 self.add_message("ungrouped-imports", node=import_node, args=package)
             current_package = package
+            if not self.linter.is_message_enabled(
+                "ungrouped-imports", import_node.fromlineno
+            ):
+                continue
             met.add(package)
 
         self._imports_stack = []
@@ -673,7 +603,7 @@ def _check_same_line_imports(self, node):
                 self.add_message("reimported", node=node, args=(name, node.fromlineno))
 
     def _check_position(self, node):
-        """Check `node` import or importfrom node position is correct
+        """Check `node` import or importfrom node position is correct.
 
         Send a message  if `node` comes before another instruction
         """
@@ -683,7 +613,7 @@ def _check_position(self, node):
             self.add_message("wrong-import-position", node=node, args=node.as_string())
 
     def _record_import(self, node, importedmodnode):
-        """Record the package `node` imports from"""
+        """Record the package `node` imports from."""
         if isinstance(node, nodes.ImportFrom):
             importedname = node.modname
         else:
@@ -709,7 +639,7 @@ def _is_fallback_import(node, imports):
         return any(astroid.are_exclusive(import_node, node) for import_node in imports)
 
     def _check_imports_order(self, _module_node):
-        """Checks imports of module `node` are grouped by category
+        """Checks imports of module `node` are grouped by category.
 
         Imports must follow this order: standard, 3rd party, local
         """
@@ -831,7 +761,7 @@ def _get_imported_module(self, importnode, modname):
     def _add_imported_module(
         self, node: Union[nodes.Import, nodes.ImportFrom], importedmodname: str
     ) -> None:
-        """notify an imported module, used to analyze dependencies"""
+        """Notify an imported module, used to analyze dependencies."""
         module_file = node.root().file
         context_name = node.root().name
         base = os.path.splitext(os.path.basename(module_file))[0]
@@ -858,7 +788,7 @@ def _add_imported_module(
                 self._module_pkg[context_name] = context_name.rsplit(".", 1)[0]
 
             # handle dependencies
-            dependencies_stat: Dict[str, Union[Set]] = self.linter.stats.dependencies
+            dependencies_stat: Dict[str, Set[str]] = self.linter.stats.dependencies
             importedmodnames = dependencies_stat.setdefault(importedmodname, set())
             if context_name not in importedmodnames:
                 importedmodnames.add(context_name)
@@ -872,7 +802,7 @@ def _add_imported_module(
                 self._excluded_edges[context_name].add(importedmodname)
 
     def _check_preferred_module(self, node, mod_path):
-        """check if the module has a preferred replacement"""
+        """Check if the module has a preferred replacement."""
         if mod_path in self.preferred_modules:
             self.add_message(
                 "preferred-module",
@@ -904,11 +834,11 @@ def _check_import_as_rename(
                 )
 
     def _check_reimport(self, node, basename=None, level=None):
-        """check if the import is necessary (i.e. not already done)"""
+        """Check if the import is necessary (i.e. not already done)."""
         if not self.linter.is_message_enabled("reimported"):
             return
 
-        frame = node.frame()
+        frame = node.frame(future=True)
         root = node.root()
         contexts = [(frame, level)]
         if root is not frame:
@@ -925,7 +855,7 @@ def _check_reimport(self, node, basename=None, level=None):
                     )
 
     def _report_external_dependencies(self, sect, _, _dummy):
-        """return a verbatim layout for displaying dependencies"""
+        """Return a verbatim layout for displaying dependencies."""
         dep_info = _make_tree_defs(self._external_dependencies_info().items())
         if not dep_info:
             raise EmptyReportError()
@@ -933,7 +863,7 @@ def _report_external_dependencies(self, sect, _, _dummy):
         sect.append(VerbatimText(tree_str))
 
     def _report_dependencies_graph(self, sect, _, _dummy):
-        """write dependencies as a dot (graphviz) file"""
+        """Write dependencies as a dot (graphviz) file."""
         dep_info = self.linter.stats.dependencies
         if not dep_info or not (
             self.config.import_graph
@@ -952,7 +882,7 @@ def _report_dependencies_graph(self, sect, _, _dummy):
             _make_graph(filename, self._internal_dependencies_info(), sect, "internal ")
 
     def _filter_dependencies_graph(self, internal):
-        """build the internal or the external dependency graph"""
+        """Build the internal or the external dependency graph."""
         graph = collections.defaultdict(set)
         for importee, importers in self.linter.stats.dependencies.items():
             for importer in importers:
@@ -964,14 +894,14 @@ def _filter_dependencies_graph(self, internal):
 
     @astroid.decorators.cached
     def _external_dependencies_info(self):
-        """return cached external dependencies information or build and
+        """Return cached external dependencies information or build and
         cache them
         """
         return self._filter_dependencies_graph(internal=False)
 
     @astroid.decorators.cached
     def _internal_dependencies_info(self):
-        """return cached internal dependencies information or build and
+        """Return cached internal dependencies information or build and
         cache them
         """
         return self._filter_dependencies_graph(internal=True)
@@ -1018,6 +948,5 @@ def _check_toplevel(self, node):
             )
 
 
-def register(linter):
-    """required method to auto register this checker"""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(ImportsChecker(linter))
diff --git a/pylint/checkers/logging.py b/pylint/checkers/logging.py
index 242c5e800d..743f40db8c 100644
--- a/pylint/checkers/logging.py
+++ b/pylint/checkers/logging.py
@@ -1,32 +1,10 @@
-# Copyright (c) 2009-2011, 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2009, 2012, 2014 Google, Inc.
-# Copyright (c) 2012 Mike Bryant <leachim@leachim.info>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016, 2019-2020 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2016 Chris Murray <chris@chrismurray.scot>
-# Copyright (c) 2017 guillaume2 <guillaume.peillex@gmail.col>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2018 Alan Chan <achan961117@gmail.com>
-# Copyright (c) 2018 Yury Gribov <tetra2005@gmail.com>
-# Copyright (c) 2018 Mike Frysinger <vapier@gmail.com>
-# Copyright (c) 2018 Mariatta Wijaya <mariatta@python.org>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Djailla <bastien.vallet@gmail.com>
-# Copyright (c) 2019 Svet <svet@hyperscience.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""checker for use of Python logging
-"""
+"""Checker for use of Python logging."""
 import string
-from typing import Set
+from typing import TYPE_CHECKING, Set
 
 import astroid
 from astroid import nodes
@@ -35,6 +13,9 @@
 from pylint.checkers import utils
 from pylint.checkers.utils import check_messages, infer_all
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 MSGS = {  # pylint: disable=consider-using-namedtuple-or-dataclass
     "W1201": (
         "Use %s formatting in logging functions",
@@ -292,9 +273,7 @@ def _helper_string(self, node):
 
     @staticmethod
     def _is_operand_literal_str(operand):
-        """
-        Return True if the operand in argument is a literal string
-        """
+        """Return True if the operand in argument is a literal string."""
         return isinstance(operand, nodes.Const) and operand.name == "str"
 
     def _check_call_func(self, node: nodes.Call):
@@ -401,6 +380,5 @@ def _count_supplied_tokens(args):
     return sum(1 for arg in args if not isinstance(arg, nodes.Keyword))
 
 
-def register(linter):
-    """Required method to auto-register this checker."""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(LoggingChecker(linter))
diff --git a/pylint/checkers/mapreduce_checker.py b/pylint/checkers/mapreduce_checker.py
index cb76decf9b..d6ee875dc5 100644
--- a/pylint/checkers/mapreduce_checker.py
+++ b/pylint/checkers/mapreduce_checker.py
@@ -1,20 +1,17 @@
-# Copyright (c) 2020 Frank Harrison <frank@doublethefish.com>
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 import abc
 
 
 class MapReduceMixin(metaclass=abc.ABCMeta):
-    """A mixin design to allow multiprocess/threaded runs of a Checker"""
+    """A mixin design to allow multiprocess/threaded runs of a Checker."""
 
     @abc.abstractmethod
     def get_map_data(self):
-        """Returns mergable/reducible data that will be examined"""
+        """Returns mergeable/reducible data that will be examined."""
 
-    @classmethod
     @abc.abstractmethod
-    def reduce_map_data(cls, linter, data):
-        """For a given Checker, receives data for all mapped runs"""
+    def reduce_map_data(self, linter, data):
+        """For a given Checker, receives data for all mapped runs."""
diff --git a/pylint/checkers/misc.py b/pylint/checkers/misc.py
index 8090679e84..e5e77bb81d 100644
--- a/pylint/checkers/misc.py
+++ b/pylint/checkers/misc.py
@@ -1,35 +1,12 @@
-# Copyright (c) 2006, 2009-2013 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2012-2014 Google, Inc.
-# Copyright (c) 2014-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Alexandru Coman <fcoman@bitdefender.com>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2016 glegoux <gilles.legoux@gmail.com>
-# Copyright (c) 2017-2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2017 Mikhail Fesenko <proggga@gmail.com>
-# Copyright (c) 2018 Rogalski, Lukasz <lukasz.rogalski@intel.com>
-# Copyright (c) 2018 Lucas Cimon <lucas.cimon@gmail.com>
-# Copyright (c) 2018 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020 wtracy <afishionado@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2020 Benny <benny.mueller91@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Konstantina Saketou <56515303+ksaketou@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-
-"""Check source code is ascii only or has an encoding declaration (PEP 263)"""
+"""Check source code is ascii only or has an encoding declaration (PEP 263)."""
 
 import re
 import tokenize
-from typing import List, Optional
+from typing import TYPE_CHECKING, List, Optional
 
 from astroid import nodes
 
@@ -38,6 +15,9 @@
 from pylint.typing import ManagedMessage
 from pylint.utils.pragma_parser import OPTION_PO, PragmaParserError, parse_pragma
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 class ByIdManagedMessagesChecker(BaseChecker):
 
@@ -73,7 +53,9 @@ def process_module(self, node: nodes.Module) -> None:
 
 class EncodingChecker(BaseChecker):
 
-    """checks for:
+    """BaseChecker for encoding issues.
+
+    Checks for:
     * warning notes in the code like FIXME, XXX
     * encoding issues.
     """
@@ -118,9 +100,9 @@ def open(self):
 
         notes = "|".join(re.escape(note) for note in self.config.notes)
         if self.config.notes_rgx:
-            regex_string = fr"#\s*({notes}|{self.config.notes_rgx})\b"
+            regex_string = rf"#\s*({notes}|{self.config.notes_rgx})(?=(:|\s|\Z))"
         else:
-            regex_string = fr"#\s*({notes})\b"
+            regex_string = rf"#\s*({notes})(?=(:|\s|\Z))"
 
         self._fixme_pattern = re.compile(regex_string, re.I)
 
@@ -142,7 +124,7 @@ def _check_encoding(
         return None
 
     def process_module(self, node: nodes.Module) -> None:
-        """inspect the source file to find encoding problem"""
+        """Inspect the source file to find encoding problem."""
         encoding = node.file_encoding if node.file_encoding else "ascii"
 
         with node.stream() as stream:
@@ -150,7 +132,7 @@ def process_module(self, node: nodes.Module) -> None:
                 self._check_encoding(lineno + 1, line, encoding)
 
     def process_tokens(self, tokens):
-        """inspect the source to find fixme problems"""
+        """Inspect the source to find fixme problems."""
         if not self.config.notes:
             return
         comments = (
@@ -195,7 +177,6 @@ def process_tokens(self, tokens):
                 )
 
 
-def register(linter):
-    """required method to auto register this checker"""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(EncodingChecker(linter))
     linter.register_checker(ByIdManagedMessagesChecker(linter))
diff --git a/pylint/checkers/modified_iterating_checker.py b/pylint/checkers/modified_iterating_checker.py
new file mode 100644
index 0000000000..ca2a0c9000
--- /dev/null
+++ b/pylint/checkers/modified_iterating_checker.py
@@ -0,0 +1,156 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+from typing import TYPE_CHECKING, Union
+
+from astroid import nodes
+
+from pylint import checkers, interfaces
+from pylint.checkers import utils
+
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
+
+_LIST_MODIFIER_METHODS = {"append", "remove"}
+_SET_MODIFIER_METHODS = {"add", "remove"}
+
+
+class ModifiedIterationChecker(checkers.BaseChecker):
+    """Checks for modified iterators in for loops iterations.
+
+    Currently supports `for` loops for Sets, Dictionaries and Lists.
+    """
+
+    __implements__ = interfaces.IAstroidChecker
+
+    name = "modified_iteration"
+
+    msgs = {
+        "W4701": (
+            "Iterated list '%s' is being modified inside for loop body, consider iterating through a copy of it "
+            "instead.",
+            "modified-iterating-list",
+            "Emitted when items are added or removed to a list being iterated through. "
+            "Doing so can result in unexpected behaviour, that is why it is preferred to use a copy of the list.",
+        ),
+        "E4702": (
+            "Iterated dict '%s' is being modified inside for loop body, iterate through a copy of it instead.",
+            "modified-iterating-dict",
+            "Emitted when items are added or removed to a dict being iterated through. "
+            "Doing so raises a RuntimeError.",
+        ),
+        "E4703": (
+            "Iterated set '%s' is being modified inside for loop body, iterate through a copy of it instead.",
+            "modified-iterating-set",
+            "Emitted when items are added or removed to a set being iterated through. "
+            "Doing so raises a RuntimeError.",
+        ),
+    }
+
+    options = ()
+    priority = -2
+
+    @utils.check_messages(
+        "modified-iterating-list", "modified-iterating-dict", "modified-iterating-set"
+    )
+    def visit_for(self, node: nodes.For) -> None:
+        iter_obj = node.iter
+        if isinstance(iter_obj, nodes.Name):
+            for body_node in node.body:
+                self._modified_iterating_check_on_node_and_children(body_node, iter_obj)
+
+    def _modified_iterating_check_on_node_and_children(
+        self, body_node: nodes.NodeNG, iter_obj: nodes.NodeNG
+    ) -> None:
+        """See if node or any of its children raises modified iterating messages."""
+        self._modified_iterating_check(body_node, iter_obj)
+        for child in body_node.get_children():
+            self._modified_iterating_check_on_node_and_children(child, iter_obj)
+
+    def _modified_iterating_check(
+        self, node: nodes.NodeNG, iter_obj: nodes.NodeNG
+    ) -> None:
+        msg_id = None
+        if self._modified_iterating_list_cond(node, iter_obj):
+            msg_id = "modified-iterating-list"
+        elif self._modified_iterating_dict_cond(node, iter_obj):
+            msg_id = "modified-iterating-dict"
+        elif self._modified_iterating_set_cond(node, iter_obj):
+            msg_id = "modified-iterating-set"
+        if msg_id:
+            self.add_message(
+                msg_id,
+                node=node,
+                args=(iter_obj.name,),
+                confidence=interfaces.INFERENCE,
+            )
+
+    @staticmethod
+    def _is_node_expr_that_calls_attribute_name(node: nodes.NodeNG) -> bool:
+        return (
+            isinstance(node, nodes.Expr)
+            and isinstance(node.value, nodes.Call)
+            and isinstance(node.value.func, nodes.Attribute)
+            and isinstance(node.value.func.expr, nodes.Name)
+        )
+
+    @staticmethod
+    def _common_cond_list_set(
+        node: nodes.Expr,
+        iter_obj: nodes.NodeNG,
+        infer_val: Union[nodes.List, nodes.Set],
+    ) -> bool:
+        return (infer_val == utils.safe_infer(iter_obj)) and (
+            node.value.func.expr.name == iter_obj.name
+        )
+
+    @staticmethod
+    def _is_node_assigns_subscript_name(node: nodes.NodeNG) -> bool:
+        return isinstance(node, nodes.Assign) and (
+            isinstance(node.targets[0], nodes.Subscript)
+            and (isinstance(node.targets[0].value, nodes.Name))
+        )
+
+    def _modified_iterating_list_cond(
+        self, node: nodes.NodeNG, iter_obj: nodes.NodeNG
+    ) -> bool:
+        if not self._is_node_expr_that_calls_attribute_name(node):
+            return False
+        infer_val = utils.safe_infer(node.value.func.expr)
+        if not isinstance(infer_val, nodes.List):
+            return False
+        return (
+            self._common_cond_list_set(node, iter_obj, infer_val)
+            and node.value.func.attrname in _LIST_MODIFIER_METHODS
+        )
+
+    def _modified_iterating_dict_cond(
+        self, node: nodes.NodeNG, iter_obj: nodes.NodeNG
+    ) -> bool:
+        if not self._is_node_assigns_subscript_name(node):
+            return False
+        infer_val = utils.safe_infer(node.targets[0].value)
+        if not isinstance(infer_val, nodes.Dict):
+            return False
+        if infer_val != utils.safe_infer(iter_obj):
+            return False
+        return node.targets[0].value.name == iter_obj.name
+
+    def _modified_iterating_set_cond(
+        self, node: nodes.NodeNG, iter_obj: nodes.NodeNG
+    ) -> bool:
+        if not self._is_node_expr_that_calls_attribute_name(node):
+            return False
+        infer_val = utils.safe_infer(node.value.func.expr)
+        if not isinstance(infer_val, nodes.Set):
+            return False
+        return (
+            self._common_cond_list_set(node, iter_obj, infer_val)
+            and node.value.func.attrname in _SET_MODIFIER_METHODS
+        )
+
+
+def register(linter: "PyLinter") -> None:
+    linter.register_checker(ModifiedIterationChecker(linter))
diff --git a/pylint/checkers/newstyle.py b/pylint/checkers/newstyle.py
index 624f60bddf..15833f2937 100644
--- a/pylint/checkers/newstyle.py
+++ b/pylint/checkers/newstyle.py
@@ -1,27 +1,10 @@
-# Copyright (c) 2006, 2008-2011, 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2012-2014 Google, Inc.
-# Copyright (c) 2013-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Michal Nowikowski <godfryd@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Alexander Todorov <atodorov@otb.bg>
-# Copyright (c) 2016 Jakub Wilk <jwilk@jwilk.net>
-# Copyright (c) 2018 Lucas Cimon <lucas.cimon@gmail.com>
-# Copyright (c) 2018 Natalie Serebryakova <natalie.serebryakova@Natalies-MacBook-Pro.local>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2019 Robert Schweizer <robert_schweizer@gmx.de>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Check for new / old style related problems."""
+from typing import TYPE_CHECKING
 
-"""check for new / old style related problems
-"""
 import astroid
 from astroid import nodes
 
@@ -29,6 +12,9 @@
 from pylint.checkers.utils import check_messages, has_known_bases, node_frame_class
 from pylint.interfaces import IAstroidChecker
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 MSGS = {
     "E1003": (
         "Bad first argument %r given to super()",
@@ -40,8 +26,9 @@
 
 
 class NewStyleConflictChecker(BaseChecker):
-    """checks for usage of new style capabilities on old style classes and
-    other new/old styles conflicts problems
+    """Checks for usage of new style capabilities on old style classes and
+    other new/old styles conflicts problems.
+
     * use of property, __slots__, super
     * "super" usage
     """
@@ -58,11 +45,11 @@ class NewStyleConflictChecker(BaseChecker):
 
     @check_messages("bad-super-call")
     def visit_functiondef(self, node: nodes.FunctionDef) -> None:
-        """check use of super"""
+        """Check use of super."""
         # ignore actual functions or method within a new style class
         if not node.is_method():
             return
-        klass = node.parent.frame()
+        klass = node.parent.frame(future=True)
         for stmt in node.nodes_of_class(nodes.Call):
             if node_frame_class(stmt) != node_frame_class(node):
                 # Don't look down in other scopes.
@@ -132,6 +119,5 @@ def visit_functiondef(self, node: nodes.FunctionDef) -> None:
     visit_asyncfunctiondef = visit_functiondef
 
 
-def register(linter):
-    """required method to auto register this checker"""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(NewStyleConflictChecker(linter))
diff --git a/pylint/checkers/non_ascii_names.py b/pylint/checkers/non_ascii_names.py
new file mode 100644
index 0000000000..ece663ab4d
--- /dev/null
+++ b/pylint/checkers/non_ascii_names.py
@@ -0,0 +1,201 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""All alphanumeric unicode character are allowed in Python but due
+to similarities in how they look they can be confused.
+
+See: https://www.python.org/dev/peps/pep-0672/#confusable-characters-in-identifiers
+
+The following checkers are intended to make users are aware of these issues.
+"""
+
+import sys
+from typing import Optional, Union
+
+from astroid import nodes
+
+from pylint import constants, interfaces, lint
+from pylint.checkers import base_checker, utils
+
+if sys.version_info[:2] >= (3, 7):
+    # pylint: disable-next=fixme
+    # TODO: Remove after 3.6 has been deprecated
+    Py37Str = str
+else:
+
+    class Py37Str(str):
+        # Allow Python 3.6 compatibility
+        def isascii(self: str) -> bool:
+            return all("\u0000" <= x <= "\u007F" for x in self)
+
+
+NON_ASCII_HELP = (
+    "Used when the name contains at least one non-ASCII unicode character. "
+    "See https://www.python.org/dev/peps/pep-0672/#confusable-characters-in-identifiers"
+    " for a background why this could be bad. \n"
+    "If your programming guideline defines that you are programming in "
+    "English, then there should be no need for non ASCII characters in "
+    "Python Names. If not you can simply disable this check."
+)
+
+
+class NonAsciiNameChecker(base_checker.BaseChecker):
+    """A strict name checker only allowing ASCII.
+
+    Note: This check only checks Names, so it ignores the content of
+          docstrings and comments!
+    """
+
+    __implements__ = interfaces.IAstroidChecker
+    priority = -1
+
+    msgs = {
+        "C2401": (
+            '%s name "%s" contains a non-ASCII character, consider renaming it.',
+            "non-ascii-name",
+            NON_ASCII_HELP,
+            {"old_names": [("C0144", "old-non-ascii-name")]},
+        ),
+        # First %s will always be "file"
+        "W2402": (
+            (
+                '%s name "%s" contains a non-ASCII character. PEP 3131 only allows '
+                "non-ascii identifiers, not file names."
+            ),
+            "non-ascii-file-name",
+            (
+                # Some = PyCharm at the time of writing didn't display the non_ascii_name_loł
+                # files and had big troubles with git.
+                # Probably only a bug shows the problem quite good.
+                # That's also why this is a warning and not only a convention!
+                "Some editors don't support non-ASCII file names properly. "
+                "Even though Python supports UTF-8 files since Python 3.5 this isn't "
+                "recommended for interoperability. Further reading:\n"
+                "- https://www.python.org/dev/peps/pep-0489/#export-hook-name\n"
+                "- https://www.python.org/dev/peps/pep-0672/#confusable-characters-in-identifiers\n"
+                "- https://bugs.python.org/issue20485"
+            ),
+        ),
+        # First %s will always be "module"
+        "C2403": (
+            '%s name "%s" contains a non-ASCII character, use an ASCII-only alias for import.',
+            "non-ascii-module-import",
+            NON_ASCII_HELP,
+        ),
+    }
+
+    name = "NonASCII-Checker"
+
+    def _check_name(
+        self, node_type: str, name: Optional[str], node: nodes.NodeNG
+    ) -> None:
+        """Check whether a name is using non-ASCII characters."""
+
+        if name is None:
+            # For some nodes i.e. *kwargs from a dict, the name will be empty
+            return
+
+        if not (Py37Str(name).isascii()):
+            type_label = constants.HUMAN_READABLE_TYPES[node_type]
+            args = (type_label.capitalize(), name)
+
+            msg = "non-ascii-name"
+
+            # Some node types have customized messages
+            if node_type == "file":
+                msg = "non-ascii-file-name"
+            elif node_type == "module":
+                msg = "non-ascii-module-import"
+
+            self.add_message(msg, node=node, args=args, confidence=interfaces.HIGH)
+
+    @utils.check_messages("non-ascii-name")
+    def visit_module(self, node: nodes.Module) -> None:
+        self._check_name("file", node.name.split(".")[-1], node)
+
+    @utils.check_messages("non-ascii-name")
+    def visit_functiondef(
+        self, node: Union[nodes.FunctionDef, nodes.AsyncFunctionDef]
+    ) -> None:
+        self._check_name("function", node.name, node)
+
+        # Check argument names
+        arguments = node.args
+
+        # Check position only arguments
+        if arguments.posonlyargs:
+            for pos_only_arg in arguments.posonlyargs:
+                self._check_name("argument", pos_only_arg.name, pos_only_arg)
+
+        # Check "normal" arguments
+        if arguments.args:
+            for arg in arguments.args:
+                self._check_name("argument", arg.name, arg)
+
+        # Check key word only arguments
+        if arguments.kwonlyargs:
+            for kwarg in arguments.kwonlyargs:
+                self._check_name("argument", kwarg.name, kwarg)
+
+    visit_asyncfunctiondef = visit_functiondef
+
+    @utils.check_messages("non-ascii-name")
+    def visit_global(self, node: nodes.Global) -> None:
+        for name in node.names:
+            self._check_name("const", name, node)
+
+    @utils.check_messages("non-ascii-name")
+    def visit_assignname(self, node: nodes.AssignName) -> None:
+        """Check module level assigned names."""
+        # The NameChecker from which this Checker originates knows a lot of different
+        # versions of variables, i.e. constants, inline variables etc.
+        # To simplify we use only `variable` here, as we don't need to apply different
+        # rules to different types of variables.
+        frame = node.frame()
+
+        if isinstance(frame, nodes.FunctionDef):
+            if node.parent in frame.body:
+                # Only perform the check if the assignment was done in within the body
+                # of the function (and not the function parameter definition
+                # (will be handled in visit_functiondef)
+                # or within a decorator (handled in visit_call)
+                self._check_name("variable", node.name, node)
+        elif isinstance(frame, nodes.ClassDef):
+            self._check_name("attr", node.name, node)
+        else:
+            # Possibilities here:
+            # - isinstance(node.assign_type(), nodes.Comprehension) == inlinevar
+            # - isinstance(frame, nodes.Module) == variable (constant?)
+            # - some other kind of assigment missed but still most likely a variable
+            self._check_name("variable", node.name, node)
+
+    @utils.check_messages("non-ascii-name")
+    def visit_classdef(self, node: nodes.ClassDef) -> None:
+        self._check_name("class", node.name, node)
+        for attr, anodes in node.instance_attrs.items():
+            if not any(node.instance_attr_ancestors(attr)):
+                self._check_name("attr", attr, anodes[0])
+
+    def _check_module_import(self, node: Union[nodes.ImportFrom, nodes.Import]) -> None:
+        for module_name, alias in node.names:
+            name = alias or module_name
+            self._check_name("module", name, node)
+
+    @utils.check_messages("non-ascii-name")
+    def visit_import(self, node: nodes.Import) -> None:
+        self._check_module_import(node)
+
+    @utils.check_messages("non-ascii-name")
+    def visit_importfrom(self, node: nodes.ImportFrom) -> None:
+        self._check_module_import(node)
+
+    @utils.check_messages("non-ascii-name")
+    def visit_call(self, node: nodes.Call) -> None:
+        """Check if the used keyword args are correct."""
+        for keyword in node.keywords:
+            self._check_name("argument", keyword.arg, keyword)
+
+
+def register(linter: lint.PyLinter) -> None:
+    linter.register_checker(NonAsciiNameChecker(linter))
diff --git a/pylint/checkers/raw_metrics.py b/pylint/checkers/raw_metrics.py
index dc49834ef2..524ecbf854 100644
--- a/pylint/checkers/raw_metrics.py
+++ b/pylint/checkers/raw_metrics.py
@@ -1,24 +1,10 @@
-# Copyright (c) 2007, 2010, 2013, 2015 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2013 Google, Inc.
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Mike Frysinger <vapier@gentoo.org>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Glenn Matthews <glenn@e-dad.net>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020-2021 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 谭九鼎 <109224573@qq.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import sys
 import tokenize
-from typing import Any, Optional, cast
+from typing import TYPE_CHECKING, Any, Optional, cast
 
 from pylint.checkers import BaseTokenChecker
 from pylint.interfaces import ITokenChecker
@@ -30,13 +16,16 @@
 else:
     from typing_extensions import Literal
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 def report_raw_stats(
     sect,
     stats: LinterStats,
     old_stats: Optional[LinterStats],
 ) -> None:
-    """calculate percentage of code / doc / comment / empty"""
+    """Calculate percentage of code / doc / comment / empty."""
     total_lines = stats.code_type_count["total"]
     sect.description = f"{total_lines} lines have been analyzed"
     lines = ["type", "number", "%", "previous", "difference"]
@@ -57,7 +46,9 @@ def report_raw_stats(
 
 
 class RawMetricsChecker(BaseTokenChecker):
-    """does not check anything but gives some raw metrics :
+    """Checker that provides raw metrics instead of checking anything.
+
+    Provides:
     * total number of lines
     * total number of code lines
     * total number of docstring lines
@@ -80,11 +71,11 @@ def __init__(self, linter):
         super().__init__(linter)
 
     def open(self):
-        """init statistics"""
+        """Init statistics."""
         self.linter.stats.reset_code_count()
 
     def process_tokens(self, tokens):
-        """update stats"""
+        """Update stats."""
         i = 0
         tokens = list(tokens)
         while i < len(tokens):
@@ -97,7 +88,7 @@ def process_tokens(self, tokens):
 
 
 def get_type(tokens, start_index):
-    """return the line type : docstring, comment, code, empty"""
+    """Return the line type : docstring, comment, code, empty."""
     i = start_index
     start = tokens[i][2]
     pos = start
@@ -122,6 +113,5 @@ def get_type(tokens, start_index):
     return i, pos[0] - start[0] + 1, line_type
 
 
-def register(linter):
-    """required method to auto register this checker"""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(RawMetricsChecker(linter))
diff --git a/pylint/checkers/refactoring/__init__.py b/pylint/checkers/refactoring/__init__.py
index c43b6c3643..481845f925 100644
--- a/pylint/checkers/refactoring/__init__.py
+++ b/pylint/checkers/refactoring/__init__.py
@@ -1,43 +1,12 @@
-# Copyright (c) 2016-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2016-2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2016 Moises Lopez <moylop260@vauxoo.com>
-# Copyright (c) 2016 Alexander Todorov <atodorov@otb.bg>
-# Copyright (c) 2017-2018, 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2017-2018 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2017-2018 Bryce Guinta <bryce.paul.guinta@gmail.com>
-# Copyright (c) 2017 Hugo <hugovk@users.noreply.github.com>
-# Copyright (c) 2017 Łukasz Sznuk <ls@rdprojekt.pl>
-# Copyright (c) 2017 Alex Hearn <alex.d.hearn@gmail.com>
-# Copyright (c) 2017 Antonio Ossa <aaossa@uc.cl>
-# Copyright (c) 2018-2019 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Justin Li <justinnhli@gmail.com>
-# Copyright (c) 2018 Jim Robertson <jrobertson98atx@gmail.com>
-# Copyright (c) 2018 Lucas Cimon <lucas.cimon@gmail.com>
-# Copyright (c) 2018 Ben James <benjames1999@hotmail.co.uk>
-# Copyright (c) 2018 Tomer Chachamu <tomer.chachamu@gmail.com>
-# Copyright (c) 2018 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2018 Konstantin Manna <Konstantin@Manna.uno>
-# Copyright (c) 2018 Konstantin <Github@pheanex.de>
-# Copyright (c) 2018 Matej Marušák <marusak.matej@gmail.com>
-# Copyright (c) 2018 Mr. Senko <atodorov@mrsenko.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Rémi Cardona <remi.cardona@polyconseil.fr>
-# Copyright (c) 2019 Robert Schweizer <robert_schweizer@gmx.de>
-# Copyright (c) 2019 PHeanEX <github@pheanex.de>
-# Copyright (c) 2019 Paul Renvoise <PaulRenvoise@users.noreply.github.com>
-# Copyright (c) 2020 ethan-leba <ethanleba5@gmail.com>
-# Copyright (c) 2020 lrjball <50599110+lrjball@users.noreply.github.com>
-# Copyright (c) 2020 Yang Yang <y4n9squared@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Jaehoon Hwang <jaehoonhwang@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Looks for code which can be refactored."""
 
 
+from typing import TYPE_CHECKING
+
 from pylint.checkers.refactoring.implicit_booleaness_checker import (
     ImplicitBooleanessChecker,
 )
@@ -45,6 +14,9 @@
 from pylint.checkers.refactoring.recommendation_checker import RecommendationChecker
 from pylint.checkers.refactoring.refactoring_checker import RefactoringChecker
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 __all__ = [
     "ImplicitBooleanessChecker",
     "NotChecker",
@@ -53,8 +25,7 @@
 ]
 
 
-def register(linter):
-    """Required method to auto register this checker."""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(RefactoringChecker(linter))
     linter.register_checker(NotChecker(linter))
     linter.register_checker(RecommendationChecker(linter))
diff --git a/pylint/checkers/refactoring/implicit_booleaness_checker.py b/pylint/checkers/refactoring/implicit_booleaness_checker.py
index 02e5d82571..e52b972d8f 100644
--- a/pylint/checkers/refactoring/implicit_booleaness_checker.py
+++ b/pylint/checkers/refactoring/implicit_booleaness_checker.py
@@ -1,9 +1,11 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-from typing import List
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+from typing import List, Union
 
 import astroid
-from astroid import nodes
+from astroid import bases, nodes
 
 from pylint import checkers, interfaces
 from pylint.checkers import utils
@@ -107,7 +109,7 @@ def visit_call(self, node: nodes.Call) -> None:
         except astroid.InferenceError:
             # Probably undefined-variable, abort check
             return
-        mother_classes = self.base_classes_of_node(instance)
+        mother_classes = self.base_names_of_instance(instance)
         affected_by_pep8 = any(
             t in mother_classes for t in ("str", "tuple", "list", "set")
         )
@@ -128,8 +130,8 @@ def instance_has_bool(class_def: nodes.ClassDef) -> bool:
     @utils.check_messages("use-implicit-booleaness-not-len")
     def visit_unaryop(self, node: nodes.UnaryOp) -> None:
         """`not len(S)` must become `not S` regardless if the parent block
-        is a test condition or something else (boolean expression)
-        e.g. `if not len(S):`"""
+        is a test condition or something else (boolean expression) e.g. `if not len(S):`
+        """
         if (
             isinstance(node, nodes.UnaryOp)
             and node.op == "not"
@@ -144,12 +146,12 @@ def visit_compare(self, node: nodes.Compare) -> None:
     def _check_use_implicit_booleaness_not_comparison(
         self, node: nodes.Compare
     ) -> None:
-        """Check for left side and right side of the node for empty literals"""
+        """Check for left side and right side of the node for empty literals."""
         is_left_empty_literal = utils.is_base_container(
             node.left
         ) or utils.is_empty_dict_literal(node.left)
 
-        # Check both left hand side and right hand side for literals
+        # Check both left-hand side and right-hand side for literals
         for operator, comparator in node.ops:
             is_right_empty_literal = utils.is_base_container(
                 comparator
@@ -164,7 +166,7 @@ def _check_use_implicit_booleaness_not_comparison(
                 target_instance = utils.safe_infer(target_node)
                 if target_instance is None:
                     continue
-                mother_classes = self.base_classes_of_node(target_instance)
+                mother_classes = self.base_names_of_instance(target_instance)
                 is_base_comprehension_type = any(
                     t in mother_classes for t in ("tuple", "list", "dict", "set")
                 )
@@ -208,9 +210,13 @@ def _check_use_implicit_booleaness_not_comparison(
                     )
 
     @staticmethod
-    def base_classes_of_node(instance: nodes.ClassDef) -> List[str]:
-        """Return all the classes names that a ClassDef inherit from including 'object'."""
-        try:
-            return [instance.name] + [x.name for x in instance.ancestors()]
-        except TypeError:
-            return [instance.name]
+    def base_names_of_instance(
+        node: Union[bases.Uninferable, bases.Instance]
+    ) -> List[str]:
+        """Return all names inherited by a class instance or those returned by a function.
+
+        The inherited names include 'object'.
+        """
+        if isinstance(node, bases.Instance):
+            return [node.name] + [x.name for x in node.ancestors()]
+        return []
diff --git a/pylint/checkers/refactoring/not_checker.py b/pylint/checkers/refactoring/not_checker.py
index f8c670e96f..85d33bfdb6 100644
--- a/pylint/checkers/refactoring/not_checker.py
+++ b/pylint/checkers/refactoring/not_checker.py
@@ -1,6 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import astroid
 from astroid import nodes
@@ -10,7 +10,7 @@
 
 
 class NotChecker(checkers.BaseChecker):
-    """checks for too many not in comparison expressions
+    """Checks for too many not in comparison expressions.
 
     - "not not" should trigger a warning
     - "not" followed by a comparison should trigger a warning
@@ -62,7 +62,7 @@ def visit_unaryop(self, node: nodes.UnaryOp) -> None:
             if operator not in self.reverse_op:
                 return
             # Ignore __ne__ as function of __eq__
-            frame = node.frame()
+            frame = node.frame(future=True)
             if frame.name == "__ne__" and operator == "==":
                 return
             for _type in (utils.node_type(left), utils.node_type(right)):
diff --git a/pylint/checkers/refactoring/recommendation_checker.py b/pylint/checkers/refactoring/recommendation_checker.py
index 5424a765ce..1fb7e72375 100644
--- a/pylint/checkers/refactoring/recommendation_checker.py
+++ b/pylint/checkers/refactoring/recommendation_checker.py
@@ -1,5 +1,7 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 from typing import Union
 
 import astroid
@@ -113,7 +115,7 @@ def _check_use_maxsplit_arg(self, node: nodes.Call) -> None:
             return
 
         try:
-            utils.get_argument_from_call(node, 0, "sep")
+            sep = utils.get_argument_from_call(node, 0, "sep")
         except utils.NoSuchArgumentError:
             return
 
@@ -154,7 +156,7 @@ def _check_use_maxsplit_arg(self, node: nodes.Call) -> None:
                 new_name = (
                     node.func.as_string().rsplit(fn_name, maxsplit=1)[0]
                     + new_fn
-                    + f"({node.args[0].as_string()}, maxsplit=1)[{subscript_value}]"
+                    + f"({sep.as_string()}, maxsplit=1)[{subscript_value}]"
                 )
                 self.add_message("use-maxsplit-arg", node=node, args=(new_name,))
 
@@ -337,7 +339,8 @@ def visit_const(self, node: nodes.Const) -> None:
 
     def _detect_replacable_format_call(self, node: nodes.Const) -> None:
         """Check whether a string is used in a call to format() or '%' and whether it
-        can be replaced by a f-string"""
+        can be replaced by an f-string
+        """
         if (
             isinstance(node.parent, nodes.Attribute)
             and node.parent.attrname == "format"
diff --git a/pylint/checkers/refactoring/refactoring_checker.py b/pylint/checkers/refactoring/refactoring_checker.py
index 7568f3eeaa..8dc65f129d 100644
--- a/pylint/checkers/refactoring/refactoring_checker.py
+++ b/pylint/checkers/refactoring/refactoring_checker.py
@@ -1,9 +1,11 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import collections
 import copy
 import itertools
+import sys
 import tokenize
 from functools import reduce
 from typing import Dict, Iterator, List, NamedTuple, Optional, Tuple, Union
@@ -17,6 +19,11 @@
 from pylint.checkers import utils
 from pylint.checkers.utils import node_frame_class
 
+if sys.version_info >= (3, 8):
+    from functools import cached_property
+else:
+    from astroid.decorators import cachedproperty as cached_property
+
 KNOWN_INFINITE_ITERATORS = {"itertools.count"}
 BUILTIN_EXIT_FUNCS = frozenset(("quit", "exit"))
 CALLS_THAT_COULD_BE_REPLACED_BY_WITH = frozenset(
@@ -36,6 +43,7 @@
         "tempfile.NamedTemporaryFile",
         "tempfile.SpooledTemporaryFile",
         "tempfile.TemporaryDirectory",
+        "tempfile.TemporaryFile",
         "zipfile.ZipFile",
         "zipfile.PyZipFile",
         "zipfile.ZipFile.open",
@@ -53,7 +61,7 @@ def _if_statement_is_always_returning(if_node, returning_node_class) -> bool:
 
 
 def _is_trailing_comma(tokens: List[tokenize.TokenInfo], index: int) -> bool:
-    """Check if the given token is a trailing comma
+    """Check if the given token is a trailing comma.
 
     :param tokens: Sequence of modules tokens
     :type tokens: list[tokenize.TokenInfo]
@@ -65,27 +73,22 @@ def _is_trailing_comma(tokens: List[tokenize.TokenInfo], index: int) -> bool:
     if token.exact_type != tokenize.COMMA:
         return False
     # Must have remaining tokens on the same line such as NEWLINE
-    left_tokens = itertools.islice(tokens, index + 1, None)
-
-    def same_start_token(
-        other_token: tokenize.TokenInfo, _token: tokenize.TokenInfo = token
-    ) -> bool:
-        return other_token.start[0] == _token.start[0]
+    left_tokens = list(itertools.islice(tokens, index + 1, None))
+
+    more_tokens_on_line = False
+    for remaining_token in left_tokens:
+        if remaining_token.start[0] == token.start[0]:
+            more_tokens_on_line = True
+            # If one of the remaining same line tokens is not NEWLINE or COMMENT
+            # the comma is not trailing.
+            if remaining_token.type not in (tokenize.NEWLINE, tokenize.COMMENT):
+                return False
 
-    same_line_remaining_tokens = list(
-        itertools.takewhile(same_start_token, left_tokens)
-    )
-    # Note: If the newline is tokenize.NEWLINE and not tokenize.NL
-    # then the newline denotes the end of expression
-    is_last_element = all(
-        other_token.type in (tokenize.NEWLINE, tokenize.COMMENT)
-        for other_token in same_line_remaining_tokens
-    )
-    if not same_line_remaining_tokens or not is_last_element:
+    if not more_tokens_on_line:
         return False
 
     def get_curline_index_start():
-        """Get the index denoting the start of the current line"""
+        """Get the index denoting the start of the current line."""
         for subindex, token in enumerate(reversed(tokens[:index])):
             # See Lib/tokenize.py and Lib/token.py in cpython for more info
             if token.type == tokenize.NEWLINE:
@@ -101,7 +104,7 @@ def get_curline_index_start():
 
 
 def _is_inside_context_manager(node: nodes.Call) -> bool:
-    frame = node.frame()
+    frame = node.frame(future=True)
     if not isinstance(
         frame, (nodes.FunctionDef, astroid.BoundMethod, astroid.UnboundMethod)
     ):
@@ -112,7 +115,7 @@ def _is_inside_context_manager(node: nodes.Call) -> bool:
 
 
 def _is_a_return_statement(node: nodes.Call) -> bool:
-    frame = node.frame()
+    frame = node.frame(future=True)
     for parent in node.node_ancestors():
         if parent is frame:
             break
@@ -122,11 +125,10 @@ def _is_a_return_statement(node: nodes.Call) -> bool:
 
 
 def _is_part_of_with_items(node: nodes.Call) -> bool:
-    """
-    Checks if one of the node's parents is a ``nodes.With`` node and that the node itself is located
+    """Checks if one of the node's parents is a ``nodes.With`` node and that the node itself is located
     somewhere under its ``items``.
     """
-    frame = node.frame()
+    frame = node.frame(future=True)
     current = node
     while current != frame:
         if isinstance(current, nodes.With):
@@ -139,7 +141,8 @@ def _is_part_of_with_items(node: nodes.Call) -> bool:
 
 def _will_be_released_automatically(node: nodes.Call) -> bool:
     """Checks if a call that could be used in a ``with`` statement is used in an alternative
-    construct which would ensure that its __exit__ method is called."""
+    construct which would ensure that its __exit__ method is called.
+    """
     callables_taking_care_of_exit = frozenset(
         (
             "contextlib._BaseExitStack.enter_context",
@@ -156,7 +159,8 @@ def _will_be_released_automatically(node: nodes.Call) -> bool:
 
 class ConsiderUsingWithStack(NamedTuple):
     """Stack for objects that may potentially trigger a R1732 message
-    if they are not used in a ``with`` block later on."""
+    if they are not used in a ``with`` block later on.
+    """
 
     module_scope: Dict[str, nodes.NodeNG] = {}
     class_scope: Dict[str, nodes.NodeNG] = {}
@@ -176,13 +180,13 @@ def get_stack_for_frame(
         return self.module_scope
 
     def clear_all(self) -> None:
-        """Convenience method to clear all stacks"""
+        """Convenience method to clear all stacks."""
         for stack in self:
             stack.clear()
 
 
 class RefactoringChecker(checkers.BaseTokenChecker):
-    """Looks for code which can be refactored
+    """Looks for code which can be refactored.
 
     This checker also mixes the astroid and the token approaches
     in order to create knowledge about whether an "else if" node
@@ -230,7 +234,7 @@ class RefactoringChecker(checkers.BaseTokenChecker):
         "R1703": (
             "The if statement can be replaced with %s",
             "simplifiable-if-statement",
-            "Used when an if statement can be replaced with 'bool(test)'. ",
+            "Used when an if statement can be replaced with 'bool(test)'.",
             {"old_names": [("R0102", "old-simplifiable-if-statement")]},
         ),
         "R1704": (
@@ -242,7 +246,7 @@ class RefactoringChecker(checkers.BaseTokenChecker):
             "with statement assignment and exception handler assignment.",
         ),
         "R1705": (
-            'Unnecessary "%s" after "return"',
+            'Unnecessary "%s" after "return", %s',
             "no-else-return",
             "Used in order to highlight an unnecessary block of "
             "code following an if containing a return statement. "
@@ -339,10 +343,10 @@ class RefactoringChecker(checkers.BaseTokenChecker):
         "R1719": (
             "The if expression can be replaced with %s",
             "simplifiable-if-expression",
-            "Used when an if expression can be replaced with 'bool(test)'. ",
+            "Used when an if expression can be replaced with 'bool(test)'.",
         ),
         "R1720": (
-            'Unnecessary "%s" after "raise"',
+            'Unnecessary "%s" after "raise", %s',
             "no-else-raise",
             "Used in order to highlight an unnecessary block of "
             "code following an if containing a raise statement. "
@@ -363,7 +367,7 @@ class RefactoringChecker(checkers.BaseTokenChecker):
             "Instead of using exit() or quit(), consider using the sys.exit().",
         ),
         "R1723": (
-            'Unnecessary "%s" after "break"',
+            'Unnecessary "%s" after "break", %s',
             "no-else-break",
             "Used in order to highlight an unnecessary block of "
             "code following an if containing a break statement. "
@@ -372,7 +376,7 @@ class RefactoringChecker(checkers.BaseTokenChecker):
             "break statement.",
         ),
         "R1724": (
-            'Unnecessary "%s" after "continue"',
+            'Unnecessary "%s" after "continue", %s',
             "no-else-continue",
             "Used in order to highlight an unnecessary block of "
             "code following an if containing a continue statement. "
@@ -478,7 +482,7 @@ def open(self):
         # do this in open since config not fully initialized in __init__
         self._never_returning_functions = set(self.config.never_returning_functions)
 
-    @astroid.decorators.cachedproperty
+    @cached_property
     def _dummy_rgx(self):
         return lint_utils.get_global_option(self, "dummy-variables-rgx", default=None)
 
@@ -489,7 +493,7 @@ def _is_bool_const(node):
         )
 
     def _is_actual_elif(self, node):
-        """Check if the given node is an actual elif
+        """Check if the given node is an actual elif.
 
         This is a problem we're having with the builtin ast module,
         which splits `elif` branches into a separate if statement.
@@ -581,12 +585,12 @@ def process_tokens(self, tokens):
             token_string = token[1]
             if token_string == "elif":
                 # AST exists by the time process_tokens is called, so
-                # it's safe to assume tokens[index+1]
-                # exists. tokens[index+1][2] is the elif's position as
+                # it's safe to assume tokens[index+1] exists.
+                # tokens[index+1][2] is the elif's position as
                 # reported by CPython and PyPy,
-                # tokens[index][2] is the actual position and also is
+                # token[2] is the actual position and also is
                 # reported by IronPython.
-                self._elifs.extend([tokens[index][2], tokens[index + 1][2]])
+                self._elifs.extend([token[2], tokens[index + 1][2]])
             elif _is_trailing_comma(tokens, index):
                 if self.linter.is_message_enabled("trailing-comma-tuple"):
                     self.add_message("trailing-comma-tuple", line=token.start[0])
@@ -670,10 +674,11 @@ def _check_superfluous_else(self, node, msg_id, returning_node_class):
 
         if _if_statement_is_always_returning(node, returning_node_class):
             orelse = node.orelse[0]
-            followed_by_elif = (orelse.lineno, orelse.col_offset) in self._elifs
-            self.add_message(
-                msg_id, node=node, args="elif" if followed_by_elif else "else"
-            )
+            if (orelse.lineno, orelse.col_offset) in self._elifs:
+                args = ("elif", 'remove the leading "el" from "elif"')
+            else:
+                args = ("else", 'remove the "else" and de-indent the code inside it')
+            self.add_message(msg_id, node=node, args=args)
 
     def _check_superfluous_else_return(self, node):
         return self._check_superfluous_else(
@@ -912,8 +917,8 @@ def visit_raise(self, node: nodes.Raise) -> None:
         self._check_stop_iteration_inside_generator(node)
 
     def _check_stop_iteration_inside_generator(self, node):
-        """Check if an exception of type StopIteration is raised inside a generator"""
-        frame = node.frame()
+        """Check if an exception of type StopIteration is raised inside a generator."""
+        frame = node.frame(future=True)
         if not isinstance(frame, nodes.FunctionDef) or not frame.is_generator():
             return
         if utils.node_ignores_exception(node, StopIteration):
@@ -928,7 +933,7 @@ def _check_stop_iteration_inside_generator(self, node):
 
     @staticmethod
     def _check_exception_inherit_from_stopiteration(exc):
-        """Return True if the exception node in argument inherit from StopIteration"""
+        """Return True if the exception node in argument inherit from StopIteration."""
         stopiteration_qname = f"{utils.EXCEPTIONS_MODULE}.StopIteration"
         return any(_class.qname() == stopiteration_qname for _class in exc.mro())
 
@@ -938,9 +943,28 @@ def _check_consider_using_comprehension_constructor(self, node):
             and node.args
             and isinstance(node.args[0], nodes.ListComp)
         ):
-            if node.func.name == "dict" and not isinstance(
-                node.args[0].elt, nodes.Call
-            ):
+            if node.func.name == "dict":
+                element = node.args[0].elt
+                if isinstance(element, nodes.Call):
+                    return
+
+                # If we have an `IfExp` here where both the key AND value
+                # are different, then don't raise the issue. See #5588
+                if (
+                    isinstance(element, nodes.IfExp)
+                    and isinstance(element.body, (nodes.Tuple, nodes.List))
+                    and len(element.body.elts) == 2
+                    and isinstance(element.orelse, (nodes.Tuple, nodes.List))
+                    and len(element.orelse.elts) == 2
+                ):
+                    key1, value1 = element.body.elts
+                    key2, value2 = element.orelse.elts
+                    if (
+                        key1.as_string() != key2.as_string()
+                        and value1.as_string() != value2.as_string()
+                    ):
+                        return
+
                 message_name = "consider-using-dict-comprehension"
                 self.add_message(message_name, node=node)
             elif node.func.name == "set":
@@ -1033,7 +1057,7 @@ def _check_super_with_arguments(self, node):
         self.add_message("super-with-arguments", node=node)
 
     def _check_raising_stopiteration_in_generator_next_call(self, node):
-        """Check if a StopIteration exception is raised by the call to next function
+        """Check if a StopIteration exception is raised by the call to next function.
 
         If the next value has a default value, then do not add message.
 
@@ -1053,7 +1077,7 @@ def _looks_like_infinite_iterator(param):
 
         inferred = utils.safe_infer(node.func)
         if getattr(inferred, "name", "") == "next":
-            frame = node.frame()
+            frame = node.frame(future=True)
             # The next builtin can only have up to two
             # positional arguments and no keyword arguments
             has_sentinel_value = len(node.args) > 1
@@ -1067,7 +1091,7 @@ def _looks_like_infinite_iterator(param):
                 self.add_message("stop-iteration-return", node=node)
 
     def _check_nested_blocks(self, node):
-        """Update and check the number of nested blocks"""
+        """Update and check the number of nested blocks."""
         # only check block levels inside functions or methods
         if not isinstance(node.scope(), nodes.FunctionDef):
             return
@@ -1256,14 +1280,15 @@ def _find_lower_upper_bounds(comparison_node, uses):
 
     @staticmethod
     def _apply_boolean_simplification_rules(operator, values):
-        """Removes irrelevant values or returns shortcircuiting values
+        """Removes irrelevant values or returns shortcircuiting values.
 
         This function applies the following two rules:
         1) an OR expression with True in it will always be true, and the
            reverse for AND
 
         2) False values in OR expressions are only relevant if all values are
-           false, and the reverse for AND"""
+           false, and the reverse for AND
+        """
         simplified_values = []
 
         for subnode in values:
@@ -1281,10 +1306,11 @@ def _apply_boolean_simplification_rules(operator, values):
         return simplified_values or [nodes.Const(operator == "and")]
 
     def _simplify_boolean_operation(self, bool_op):
-        """Attempts to simplify a boolean operation
+        """Attempts to simplify a boolean operation.
 
         Recursively applies simplification on the operator terms,
-        and keeps track of whether reductions have been made."""
+        and keeps track of whether reductions have been made.
+        """
         children = list(bool_op.get_children())
         intermediate = [
             self._simplify_boolean_operation(child)
@@ -1305,7 +1331,8 @@ def _check_simplifiable_condition(self, node):
         """Check if a boolean condition can be simplified.
 
         Variables will not be simplified, even in the value can be inferred,
-        and expressions like '3 + 4' will remain expanded."""
+        and expressions like '3 + 4' will remain expanded.
+        """
         if not utils.is_test_condition(node):
             return
 
@@ -1432,7 +1459,9 @@ def _append_context_managers_to_stack(self, node: nodes.Assign) -> None:
                 or not isinstance(assignee, (nodes.AssignName, nodes.AssignAttr))
             ):
                 continue
-            stack = self._consider_using_with_stack.get_stack_for_frame(node.frame())
+            stack = self._consider_using_with_stack.get_stack_for_frame(
+                node.frame(future=True)
+            )
             varname = (
                 assignee.name
                 if isinstance(assignee, nodes.AssignName)
@@ -1460,7 +1489,7 @@ def _check_consider_using_with(self, node: nodes.Call):
         if (
             node
             in self._consider_using_with_stack.get_stack_for_frame(
-                node.frame()
+                node.frame(future=True)
             ).values()
         ):
             # the result of this call was already assigned to a variable and will be checked when leaving the scope.
@@ -1481,7 +1510,7 @@ def _check_consider_using_with(self, node: nodes.Call):
             self.add_message("consider-using-with", node=node)
 
     def _check_use_list_or_dict_literal(self, node: nodes.Call) -> None:
-        """Check if empty list or dict is created by using the literal [] or {}"""
+        """Check if empty list or dict is created by using the literal [] or {}."""
         if node.as_string() in {"list()", "dict()"}:
             inferred = utils.safe_infer(node.func)
             if isinstance(inferred, nodes.ClassDef) and not node.args:
@@ -1491,8 +1520,8 @@ def _check_use_list_or_dict_literal(self, node: nodes.Call) -> None:
                     self.add_message("use-dict-literal", node=node)
 
     def _check_consider_using_join(self, aug_assign):
-        """
-        We start with the augmented assignment and work our way upwards.
+        """We start with the augmented assignment and work our way upwards.
+
         Names of variables for nodes if match successful:
         result = ''  # assign
         for number in ['1', '2', '3']  # for_loop
@@ -1593,7 +1622,9 @@ def _check_unnecessary_comprehension(self, node: nodes.Comprehension) -> None:
             ):
                 args = (f"{node.iter.as_string()}",)
             if args:
-                self.add_message("unnecessary-comprehension", node=node, args=args)
+                self.add_message(
+                    "unnecessary-comprehension", node=node.parent, args=args
+                )
                 return
 
             if isinstance(node.parent, nodes.DictComp):
@@ -1607,14 +1638,13 @@ def _check_unnecessary_comprehension(self, node: nodes.Comprehension) -> None:
 
             self.add_message(
                 "unnecessary-comprehension",
-                node=node,
+                node=node.parent,
                 args=(f"{func}({node.iter.as_string()})",),
             )
 
     @staticmethod
     def _is_and_or_ternary(node):
-        """
-        Returns true if node is 'condition and true_value or false_value' form.
+        """Returns true if node is 'condition and true_value or false_value' form.
 
         All of: condition, true_value and false_value should not be a complex boolean expression
         """
@@ -1776,9 +1806,7 @@ def _is_node_return_ended(self, node: nodes.NodeNG) -> bool:
 
     @staticmethod
     def _has_return_in_siblings(node: nodes.NodeNG) -> bool:
-        """
-        Returns True if there is at least one return in the node's siblings
-        """
+        """Returns True if there is at least one return in the node's siblings."""
         next_sibling = node.next_sibling()
         while next_sibling:
             if isinstance(next_sibling, nodes.Return):
@@ -1787,7 +1815,7 @@ def _has_return_in_siblings(node: nodes.NodeNG) -> bool:
         return False
 
     def _is_function_def_never_returning(self, node: nodes.FunctionDef) -> bool:
-        """Return True if the function never returns. False otherwise.
+        """Return True if the function never returns, False otherwise.
 
         Args:
             node (nodes.FunctionDef): function definition node to be analyzed.
@@ -1809,7 +1837,9 @@ def _is_function_def_never_returning(self, node: nodes.FunctionDef) -> bool:
 
     def _check_return_at_the_end(self, node):
         """Check for presence of a *single* return statement at the end of a
-        function. "return" or "return None" are useless because None is the
+        function.
+
+        "return" or "return None" are useless because None is the
         default return type if they are missing.
 
         NOTE: produces a message only if there is a single return statement
@@ -1873,11 +1903,16 @@ def _check_unnecessary_dict_index_lookup(
                         # Ignore this subscript if it is the target of an assignment
                         # Early termination; after reassignment dict index lookup will be necessary
                         return
+                    if isinstance(subscript.parent, nodes.Delete):
+                        # Ignore this subscript if it's used with the delete keyword
+                        return
 
                     # Case where .items is assigned to k,v (i.e., for k, v in d.items())
                     if isinstance(value, nodes.Name):
                         if (
                             not isinstance(node.target, nodes.Tuple)
+                            # Ignore 1-tuples: for k, in d.items()
+                            or len(node.target.elts) < 2
                             or value.name != node.target.elts[0].name
                             or iterating_object_name != subscript.value.as_string()
                         ):
diff --git a/pylint/checkers/similar.py b/pylint/checkers/similar.py
index f9cb9edbc7..69b401fa45 100644
--- a/pylint/checkers/similar.py
+++ b/pylint/checkers/similar.py
@@ -1,36 +1,11 @@
-# Copyright (c) 2006, 2008-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2012 Ry4an Brase <ry4an-hg@ry4an.org>
-# Copyright (c) 2012 Google, Inc.
-# Copyright (c) 2012 Anthony VEREZ <anthony.verez.external@cassidian.com>
-# Copyright (c) 2014-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2017, 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2017 Mikhail Fesenko <proggga@gmail.com>
-# Copyright (c) 2018 Scott Worley <scottworley@scottworley.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2019 Taewon D. Kim <kimt33@mcmaster.ca>
-# Copyright (c) 2020-2021 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Frank Harrison <frank@doublethefish.com>
-# Copyright (c) 2020 Eli Fine <ejfine@gmail.com>
-# Copyright (c) 2020 Shiv Venkatasubrahmanyam <shvenkat@users.noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Maksym Humetskyi <Humetsky@gmail.com>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-# Copyright (c) 2021 Aditya Gupta <adityagupta1089@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""a similarities / code duplication command line tool and pylint checker
+"""A similarities / code duplication command line tool and pylint checker.
 
 The algorithm is based on comparing the hash value of n successive lines of a file.
-First the files are read and any line that doesn't fullfill requirement are removed (comments, docstrings...)
+First the files are read and any line that doesn't fulfill requirement are removed (comments, docstrings...)
 Those stripped lines are stored in the LineSet class which gives access to them.
 Then each index of the stripped lines collection is associated with the hash of n successive entries of the stripped lines starting at the current index
 (n is the minimum common lines option).
@@ -47,11 +22,13 @@
 import operator
 import re
 import sys
+import warnings
 from collections import defaultdict
 from getopt import getopt
 from io import BufferedIOBase, BufferedReader, BytesIO
 from itertools import chain, groupby
 from typing import (
+    TYPE_CHECKING,
     Any,
     Dict,
     FrozenSet,
@@ -75,6 +52,9 @@
 from pylint.reporters.ureports.nodes import Table
 from pylint.utils import LinterStats, decoding_stream
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 DEFAULT_MIN_SIMILARITY_LINE = 4
 
 REGEX_FOR_LINES_WITH_CONTENT = re.compile(r".*\w+")
@@ -104,10 +84,8 @@ class LineSpecifs(NamedTuple):
 
 
 class CplSuccessiveLinesLimits:
-    """
-    This class holds a couple of SuccessiveLinesLimits objects, one for each file compared,
-    and a counter on the number of common lines between both stripped lines collections extracted
-    from both files
+    """Holds a SuccessiveLinesLimits object for each file compared and a
+    counter on the number of common lines between both stripped lines collections extracted from both files
     """
 
     __slots__ = ("first_file", "second_file", "effective_cmn_lines_nb")
@@ -123,27 +101,25 @@ def __init__(
         self.effective_cmn_lines_nb = effective_cmn_lines_nb
 
 
-# Links the indices ot the starting line in both lineset's stripped lines to
+# Links the indices to the starting line in both lineset's stripped lines to
 # the start and end lines in both files
 CplIndexToCplLines_T = Dict["LineSetStartCouple", CplSuccessiveLinesLimits]
 
 
 class LinesChunk:
-    """
-    The LinesChunk object computes and stores the hash of some consecutive stripped lines of a lineset.
-    """
+    """The LinesChunk object computes and stores the hash of some consecutive stripped lines of a lineset."""
 
     __slots__ = ("_fileid", "_index", "_hash")
 
     def __init__(self, fileid: str, num_line: int, *lines: Iterable[str]) -> None:
         self._fileid: str = fileid
-        """The name of the file from which the LinesChunk object is generated """
+        """The name of the file from which the LinesChunk object is generated."""
 
         self._index: Index = Index(num_line)
-        """The index in the stripped lines that is the starting of consecutive lines"""
+        """The index in the stripped lines that is the starting of consecutive lines."""
 
         self._hash: int = sum(hash(lin) for lin in lines)
-        """The hash of some consecutive lines"""
+        """The hash of some consecutive lines."""
 
     def __eq__(self, o: Any) -> bool:
         if not isinstance(o, LinesChunk):
@@ -166,8 +142,7 @@ def __str__(self) -> str:
 
 
 class SuccessiveLinesLimits:
-    """
-    A class to handle the numbering of begin and end of successive lines.
+    """A class to handle the numbering of begin and end of successive lines.
 
     :note: Only the end line number can be updated.
     """
@@ -195,9 +170,7 @@ def __repr__(self) -> str:
 
 
 class LineSetStartCouple(NamedTuple):
-    """
-    Indices in both linesets that mark the beginning of successive lines
-    """
+    """Indices in both linesets that mark the beginning of successive lines."""
 
     fst_lineset_index: Index
     snd_lineset_index: Index
@@ -231,8 +204,9 @@ def increment(self, value: Index) -> "LineSetStartCouple":
 def hash_lineset(
     lineset: "LineSet", min_common_lines: int = DEFAULT_MIN_SIMILARITY_LINE
 ) -> Tuple[HashToIndex_T, IndexToLines_T]:
-    """
-    Return two dicts. The first associates the hash of successive stripped lines of a lineset
+    """Return two dicts.
+
+    The first associates the hash of successive stripped lines of a lineset
     to the indices of the starting lines.
     The second dict, associates the index of the starting line in the lineset's stripped lines to the
     couple [start, end] lines number in the corresponding file.
@@ -271,8 +245,7 @@ def hash_lineset(
 
 
 def remove_successives(all_couples: CplIndexToCplLines_T) -> None:
-    """
-    Removes all successive entries in the dictionary in argument
+    """Removes all successive entries in the dictionary in argument.
 
     :param all_couples: collection that has to be cleaned up from successives entries.
                         The keys are couples of indices that mark the beginning of common entries
@@ -321,10 +294,12 @@ def filter_noncode_lines(
     stindex_2: Index,
     common_lines_nb: int,
 ) -> int:
-    """
-    Return the effective number of common lines between lineset1 and lineset2 filtered from non code lines, that is to say the number of
-    common successive stripped lines except those that do not contain code (for example a ligne with only an
-    ending parathensis)
+    """Return the effective number of common lines between lineset1
+    and lineset2 filtered from non code lines.
+
+    That is to say the number of common successive stripped
+    lines except those that do not contain code (for example
+    a line with only an ending parathensis)
 
     :param ls_1: first lineset
     :param stindex_1: first lineset starting index
@@ -357,7 +332,7 @@ class Commonality(NamedTuple):
 
 
 class Similar:
-    """finds copy-pasted lines of code in a project"""
+    """Finds copy-pasted lines of code in a project."""
 
     def __init__(
         self,
@@ -377,7 +352,7 @@ def __init__(
     def append_stream(
         self, streamid: str, stream: STREAM_TYPES, encoding: Optional[str] = None
     ) -> None:
-        """append a file to search for similarities"""
+        """Append a file to search for similarities."""
         if isinstance(stream, BufferedIOBase):
             if encoding is None:
                 raise ValueError
@@ -385,10 +360,19 @@ def append_stream(
         else:
             readlines = stream.readlines  # type: ignore[assignment] # hint parameter is incorrectly typed as non-optional
         try:
+            active_lines: List[str] = []
+            if hasattr(self, "linter"):
+                # Remove those lines that should be ignored because of disables
+                for index, line in enumerate(readlines()):
+                    if self.linter._is_one_message_enabled("R0801", index + 1):  # type: ignore[attr-defined]
+                        active_lines.append(line)
+            else:
+                active_lines = readlines()
+
             self.linesets.append(
                 LineSet(
                     streamid,
-                    readlines(),
+                    active_lines,
                     self.ignore_comments,
                     self.ignore_docstrings,
                     self.ignore_imports,
@@ -399,13 +383,13 @@ def append_stream(
             pass
 
     def run(self) -> None:
-        """start looking for similarities and display results on stdout"""
+        """Start looking for similarities and display results on stdout."""
         if self.min_lines == 0:
             return
         self._display_sims(self._compute_sims())
 
     def _compute_sims(self) -> List[Tuple[int, Set[LinesChunkLimits_T]]]:
-        """compute similarities in appended files"""
+        """Compute similarities in appended files."""
         no_duplicates: Dict[int, List[Set[LinesChunkLimits_T]]] = defaultdict(list)
 
         for commonality in self._iter_sims():
@@ -446,14 +430,14 @@ def _compute_sims(self) -> List[Tuple[int, Set[LinesChunkLimits_T]]]:
     def _display_sims(
         self, similarities: List[Tuple[int, Set[LinesChunkLimits_T]]]
     ) -> None:
-        """Display computed similarities on stdout"""
+        """Display computed similarities on stdout."""
         report = self._get_similarity_report(similarities)
         print(report)
 
     def _get_similarity_report(
         self, similarities: List[Tuple[int, Set[LinesChunkLimits_T]]]
     ) -> str:
-        """Create a report from similarities"""
+        """Create a report from similarities."""
         report: str = ""
         duplicated_line_number: int = 0
         for number, couples in similarities:
@@ -473,8 +457,7 @@ def _get_similarity_report(
     def _find_common(
         self, lineset1: "LineSet", lineset2: "LineSet"
     ) -> Generator[Commonality, None, None]:
-        """
-        Find similarities in the two given linesets.
+        """Find similarities in the two given linesets.
 
         This the core of the algorithm.
         The idea is to compute the hashes of a minimal number of successive lines of each lineset and then compare the hashes.
@@ -540,7 +523,7 @@ def _find_common(
                 yield com
 
     def _iter_sims(self) -> Generator[Commonality, None, None]:
-        """iterate on similarities among all files, by making a cartesian
+        """Iterate on similarities among all files, by making a cartesian
         product
         """
         for idx, lineset in enumerate(self.linesets[:-1]):
@@ -548,7 +531,7 @@ def _iter_sims(self) -> Generator[Commonality, None, None]:
                 yield from self._find_common(lineset, lineset2)
 
     def get_map_data(self):
-        """Returns the data we can use for a map/reduce process
+        """Returns the data we can use for a map/reduce process.
 
         In this case we are returning this instance's Linesets, that is all file
         information that will later be used for vectorisation.
@@ -556,9 +539,10 @@ def get_map_data(self):
         return self.linesets
 
     def combine_mapreduce_data(self, linesets_collection):
-        """Reduces and recombines data into a format that we can report on
+        """Reduces and recombines data into a format that we can report on.
 
-        The partner function of get_map_data()"""
+        The partner function of get_map_data()
+        """
         self.linesets = [line for lineset in linesets_collection for line in lineset]
 
 
@@ -569,8 +553,7 @@ def stripped_lines(
     ignore_imports: bool,
     ignore_signatures: bool,
 ) -> List[LineSpecifs]:
-    """
-    Return tuples of line/line number/line type with leading/trailing whitespace and any ignored code features removed
+    """Return tuples of line/line number/line type with leading/trailing whitespace and any ignored code features removed.
 
     :param lines: a collection of lines
     :param ignore_comments: if true, any comment in the lines collection is removed from the result
@@ -660,8 +643,8 @@ def _get_functions(
 
 @functools.total_ordering
 class LineSet:
-    """
-    Holds and indexes all the lines of a single source file.
+    """Holds and indexes all the lines of a single source file.
+
     Allows for correspondence between real lines of the source file and stripped ones, which
     are the real ones from which undesired patterns have been removed.
     """
@@ -726,7 +709,7 @@ def report_similarities(
     stats: LinterStats,
     old_stats: Optional[LinterStats],
 ) -> None:
-    """make a layout with some stats about duplication"""
+    """Make a layout with some stats about duplication."""
     lines = ["", "now", "previous", "difference"]
     lines += table_lines_from_stats(stats, old_stats, "duplicated_lines")
     sect.append(Table(children=lines, cols=4, rheaders=1, cheaders=1))
@@ -734,9 +717,10 @@ def report_similarities(
 
 # wrapper to get a pylint checker from the similar class
 class SimilarChecker(BaseChecker, Similar, MapReduceMixin):
-    """checks for similarities and duplicated code. This computation may be
-    memory / CPU intensive, so you should disable it if you experiment some
-    problems.
+    """Checks for similarities and duplicated code.
+
+    This computation may be memory / CPU intensive, so you
+    should disable it if you experiment some problems.
     """
 
     __implements__ = (IRawChecker,)
@@ -808,7 +792,7 @@ def __init__(self, linter=None) -> None:
         )
 
     def set_option(self, optname, value, action=None, optdict=None):
-        """method called to set an option (registered in the options list)
+        """Method called to set an option (registered in the options list).
 
         Overridden to report options setting to Similar
         """
@@ -825,22 +809,30 @@ def set_option(self, optname, value, action=None, optdict=None):
             self.ignore_signatures = self.config.ignore_signatures
 
     def open(self):
-        """init the checkers: reset linesets and statistics information"""
+        """Init the checkers: reset linesets and statistics information."""
         self.linesets = []
         self.linter.stats.reset_duplicated_lines()
 
     def process_module(self, node: nodes.Module) -> None:
-        """process a module
+        """Process a module.
 
         the module's content is accessible via the stream object
 
         stream must implement the readlines method
         """
+        if self.linter.current_name is None:
+            warnings.warn(
+                (
+                    "In pylint 3.0 the current_name attribute of the linter object should be a string. "
+                    "If unknown it should be initialized as an empty string."
+                ),
+                DeprecationWarning,
+            )
         with node.stream() as stream:
-            self.append_stream(self.linter.current_name, stream, node.file_encoding)
+            self.append_stream(self.linter.current_name, stream, node.file_encoding)  # type: ignore[arg-type]
 
     def close(self):
-        """compute and display similarities on closing (i.e. end of parsing)"""
+        """Compute and display similarities on closing (i.e. end of parsing)."""
         total = sum(len(lineset) for lineset in self.linesets)
         duplicated = 0
         stats = self.linter.stats
@@ -861,13 +853,14 @@ def close(self):
         stats.percent_duplicated_lines += float(total and duplicated * 100.0 / total)
 
     def get_map_data(self):
-        """Passthru override"""
+        """Passthru override."""
         return Similar.get_map_data(self)
 
     def reduce_map_data(self, linter, data):
-        """Reduces and recombines data into a format that we can report on
+        """Reduces and recombines data into a format that we can report on.
 
-        The partner function of get_map_data()"""
+        The partner function of get_map_data()
+        """
         recombined = SimilarChecker(linter)
         recombined.min_lines = self.min_lines
         recombined.ignore_comments = self.ignore_comments
@@ -879,13 +872,12 @@ def reduce_map_data(self, linter, data):
         recombined.close()
 
 
-def register(linter):
-    """required method to auto register this checker"""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(SimilarChecker(linter))
 
 
 def usage(status=0):
-    """display command line usage information"""
+    """Display command line usage information."""
     print("finds copy pasted blocks in a set of files")
     print()
     print(
@@ -896,7 +888,7 @@ def usage(status=0):
 
 
 def Run(argv=None):
-    """standalone command line access point"""
+    """Standalone command line access point."""
     if argv is None:
         argv = sys.argv[1:]
 
diff --git a/pylint/checkers/spelling.py b/pylint/checkers/spelling.py
index ad6847478c..f0c5effeb6 100644
--- a/pylint/checkers/spelling.py
+++ b/pylint/checkers/spelling.py
@@ -1,39 +1,12 @@
-# Copyright (c) 2014-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Michal Nowikowski <godfryd@gmail.com>
-# Copyright (c) 2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2015 Pavel Roskin <proski@gnu.org>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016-2017, 2020 Pedro Algarvio <pedro@algarvio.me>
-# Copyright (c) 2016 Alexander Todorov <atodorov@otb.bg>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2017 Mikhail Fesenko <proggga@gmail.com>
-# Copyright (c) 2018, 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Mike Frysinger <vapier@gmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Peter Kolbus <peter.kolbus@gmail.com>
-# Copyright (c) 2019 agutole <toldo_carp@hotmail.com>
-# Copyright (c) 2020 Ganden Schaffner <gschaffner@pm.me>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Damien Baty <damien.baty@polyconseil.fr>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Tushar Sadhwani <tushar.sadhwani000@gmail.com>
-# Copyright (c) 2021 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-# Copyright (c) 2021 Eli Fine <ejfine@gmail.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""Checker for spelling errors in comments and docstrings.
-"""
+"""Checker for spelling errors in comments and docstrings."""
 import os
 import re
 import tokenize
-from typing import Pattern
+from typing import TYPE_CHECKING, Pattern
 
 from astroid import nodes
 
@@ -41,6 +14,9 @@
 from pylint.checkers.utils import check_messages
 from pylint.interfaces import IAstroidChecker, ITokenChecker
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 try:
     import enchant
     from enchant.tokenize import (
@@ -144,9 +120,7 @@ class SphinxDirectives(RegExFilter):
 
 
 class ForwardSlashChunker(Chunker):
-    """
-    This chunker allows splitting words like 'before/after' into 'before' and 'after'
-    """
+    """This chunker allows splitting words like 'before/after' into 'before' and 'after'."""
 
     def next(self):
         while True:
@@ -191,7 +165,8 @@ def _strip_code_flanked_in_backticks(line: str) -> str:
     """Alter line so code flanked in backticks is ignored.
 
     Pyenchant automatically strips backticks when parsing tokens,
-    so this cannot be done at the individual filter level."""
+    so this cannot be done at the individual filter level.
+    """
 
     def replace_code_but_leave_surrounding_characters(match_obj) -> str:
         return match_obj.group(1) + match_obj.group(5)
@@ -202,7 +177,7 @@ def replace_code_but_leave_surrounding_characters(match_obj) -> str:
 
 
 class SpellingChecker(BaseTokenChecker):
-    """Check spelling in comments and docstrings"""
+    """Check spelling in comments and docstrings."""
 
     __implements__ = (ITokenChecker, IAstroidChecker)
     name = "spelling"
@@ -408,7 +383,7 @@ def _check_spelling(self, msgid, line, line_num):
                 suggestions = self.spelling_dict.suggest(word)
                 del suggestions[self.config.max_spelling_suggestions :]
                 line_segment = line[word_start_at:]
-                match = re.search(fr"(\W|^)({word})(\W|$)", line_segment)
+                match = re.search(rf"(\W|^)({word})(\W|$)", line_segment)
                 if match:
                     # Start position of second group in regex.
                     col = match.regs[2][0]
@@ -458,18 +433,16 @@ def visit_functiondef(self, node: nodes.FunctionDef) -> None:
     visit_asyncfunctiondef = visit_functiondef
 
     def _check_docstring(self, node):
-        """check the node has any spelling errors"""
-        docstring = node.doc
-        if not docstring:
+        """Check the node has any spelling errors."""
+        if not node.doc_node:
             return
 
         start_line = node.lineno + 1
 
         # Go through lines of docstring
-        for idx, line in enumerate(docstring.splitlines()):
+        for idx, line in enumerate(node.doc_node.value.splitlines()):
             self._check_spelling("wrong-spelling-in-docstring", line, start_line + idx)
 
 
-def register(linter):
-    """required method to auto register this checker"""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(SpellingChecker(linter))
diff --git a/pylint/checkers/stdlib.py b/pylint/checkers/stdlib.py
index f77f7a2b3a..6eeaa20a90 100644
--- a/pylint/checkers/stdlib.py
+++ b/pylint/checkers/stdlib.py
@@ -1,52 +1,22 @@
-# Copyright (c) 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2013-2014 Google, Inc.
-# Copyright (c) 2014-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Cosmin Poieana <cmin@ropython.org>
-# Copyright (c) 2014 Vlad Temian <vladtemian@gmail.com>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Cezar <celnazli@bitdefender.com>
-# Copyright (c) 2015 Chris Rebert <code@rebertia.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Jared Garst <cultofjared@gmail.com>
-# Copyright (c) 2017 Renat Galimov <renat2017@gmail.com>
-# Copyright (c) 2017 Martin <MartinBasti@users.noreply.github.com>
-# Copyright (c) 2017 Christopher Zurcher <zurcher@users.noreply.github.com>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2018 Lucas Cimon <lucas.cimon@gmail.com>
-# Copyright (c) 2018 Banjamin Freeman <befreeman@users.noreply.github.com>
-# Copyright (c) 2018 Ioana Tagirta <ioana.tagirta@gmail.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Julien Palard <julien@palard.fr>
-# Copyright (c) 2019 laike9m <laike9m@users.noreply.github.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2019 Robert Schweizer <robert_schweizer@gmx.de>
-# Copyright (c) 2019 fadedDexofan <fadedDexofan@gmail.com>
-# Copyright (c) 2020 Sorin Sbarnea <ssbarnea@redhat.com>
-# Copyright (c) 2020 Federico Bond <federicobond@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 谭九鼎 <109224573@qq.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Yilei "Dolee" Yang <yileiyang@google.com>
-# Copyright (c) 2021 Matus Valo <matusvalo@users.noreply.github.com>
-# Copyright (c) 2021 victor <16359131+jiajunsu@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Checkers for various standard library functions."""
 
 import sys
 from collections.abc import Iterable
-from typing import Any, Dict, Optional, Set
+from typing import TYPE_CHECKING, Dict, List, Optional, Set, Tuple
 
 import astroid
 from astroid import nodes
 
+from pylint import interfaces
 from pylint.checkers import BaseChecker, DeprecatedMixin, utils
 from pylint.interfaces import IAstroidChecker
-from pylint.lint import PyLinter
+
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
 
 OPEN_FILES_MODE = ("open", "file")
 OPEN_FILES_ENCODING = ("open", "read_text", "write_text")
@@ -59,16 +29,24 @@
 SUBPROCESS_RUN = "subprocess.run"
 OPEN_MODULE = {"_io", "pathlib"}
 DEBUG_BREAKPOINTS = ("builtins.breakpoint", "sys.breakpointhook", "pdb.set_trace")
+LRU_CACHE = {
+    "functools.lru_cache",  # Inferred for @lru_cache
+    "functools._lru_cache_wrapper.wrapper",  # Inferred for @lru_cache() on >= Python 3.8
+    "functools.lru_cache.decorating_function",  # Inferred for @lru_cache() on <= Python 3.7
+}
+NON_INSTANCE_METHODS = {"builtins.staticmethod", "builtins.classmethod"}
 
 
 DEPRECATED_MODULES = {
     (0, 0, 0): {"tkinter.tix", "fpectl"},
     (3, 2, 0): {"optparse"},
+    (3, 3, 0): {"xml.etree.cElementTree"},
     (3, 4, 0): {"imp"},
     (3, 5, 0): {"formatter"},
     (3, 6, 0): {"asynchat", "asyncore"},
     (3, 7, 0): {"macpath"},
     (3, 9, 0): {"lib2to3", "parser", "symbol", "binhex"},
+    (3, 10, 0): {"distutils"},
 }
 
 DEPRECATED_ARGUMENTS = {
@@ -116,6 +94,7 @@
         "abc.abstractstaticmethod",
         "abc.abstractproperty",
     },
+    (3, 4, 0): {"importlib.util.module_for_loader"},
 }
 
 
@@ -195,6 +174,10 @@
         },
         (3, 4, 0): {
             "importlib.find_loader",
+            "importlib.abc.Loader.load_module",
+            "importlib.abc.Loader.module_repr",
+            "importlib.abc.PathEntryFinder.find_loader",
+            "importlib.abc.PathEntryFinder.find_module",
             "plistlib.readPlist",
             "plistlib.writePlist",
             "plistlib.readPlistFromBytes",
@@ -243,6 +226,7 @@
         },
         (3, 10, 0): {
             "_sqlite3.enable_shared_cache",
+            "importlib.abc.Finder.find_module",
             "pathlib.Path.link_to",
             "zipimport.zipimporter.load_module",
             "zipimport.zipimporter.find_module",
@@ -346,7 +330,7 @@ class StdlibChecker(DeprecatedMixin, BaseChecker):
             "bad-open-mode",
             "Python supports: r, w, a[, x] modes with b, +, "
             "and U (only with r) options. "
-            "See https://docs.python.org/2/library/functions.html#open",
+            "See https://docs.python.org/3/library/functions.html#open",
         ),
         "W1502": (
             "Using datetime.time in a boolean context.",
@@ -377,27 +361,27 @@ class StdlibChecker(DeprecatedMixin, BaseChecker):
             "bad-thread-instantiation",
             "The warning is emitted when a threading.Thread class "
             "is instantiated without the target function being passed. "
-            "By default, the first parameter is the group param, not the target param. ",
+            "By default, the first parameter is the group param, not the target param.",
         ),
         "W1507": (
             "Using copy.copy(os.environ). Use os.environ.copy() instead. ",
             "shallow-copy-environ",
             "os.environ is not a dict object but proxy object, so "
             "shallow copy has still effects on original object. "
-            "See https://bugs.python.org/issue15373 for reference. ",
+            "See https://bugs.python.org/issue15373 for reference.",
         ),
         "E1507": (
             "%s does not support %s type argument",
             "invalid-envvar-value",
             "Env manipulation functions support only string type arguments. "
-            "See https://docs.python.org/3/library/os.html#os.getenv. ",
+            "See https://docs.python.org/3/library/os.html#os.getenv.",
         ),
         "W1508": (
             "%s default type is %s. Expected str or None.",
             "invalid-envvar-default",
             "Env manipulation functions return None or str values. "
             "Supplying anything different as a default may cause bugs. "
-            "See https://docs.python.org/3/library/os.html#os.getenv. ",
+            "See https://docs.python.org/3/library/os.html#os.getenv.",
         ),
         "W1509": (
             "Using preexec_fn keyword which may be unsafe in the presence "
@@ -444,30 +428,40 @@ class StdlibChecker(DeprecatedMixin, BaseChecker):
             "Calls to breakpoint(), sys.breakpointhook() and pdb.set_trace() should be removed "
             "from code that is not actively being debugged.",
         ),
+        "W1517": (
+            "'lru_cache(maxsize=None)' will keep all method args alive indefinitely, including 'self'",
+            "cache-max-size-none",
+            "By decorating a method with lru_cache the 'self' argument will be linked to "
+            "the lru_cache function and therefore never garbage collected. Unless your instance "
+            "will never need to be garbage collected (singleton) it is recommended to refactor "
+            "code to avoid this pattern or add a maxsize to the cache."
+            "The default value for maxsize is 128.",
+            {"old_names": [("W1516", "lru-cache-decorating-method")]},
+        ),
     }
 
-    def __init__(
-        self, linter: Optional[PyLinter] = None
-    ):  # pylint: disable=super-init-not-called # See https://github.com/PyCQA/pylint/issues/4941
+    def __init__(self, linter: Optional["PyLinter"] = None) -> None:
         BaseChecker.__init__(self, linter)
-        self._deprecated_methods: Set[Any] = set()
-        self._deprecated_methods.update(DEPRECATED_METHODS[0])
+        self._deprecated_methods: Set[str] = set()
+        self._deprecated_arguments: Dict[
+            str, Tuple[Tuple[Optional[int], str], ...]
+        ] = {}
+        self._deprecated_classes: Dict[str, Set[str]] = {}
+        self._deprecated_modules: Set[str] = set()
+        self._deprecated_decorators: Set[str] = set()
+
         for since_vers, func_list in DEPRECATED_METHODS[sys.version_info[0]].items():
             if since_vers <= sys.version_info:
                 self._deprecated_methods.update(func_list)
-        self._deprecated_attributes = {}
         for since_vers, func_list in DEPRECATED_ARGUMENTS.items():
             if since_vers <= sys.version_info:
-                self._deprecated_attributes.update(func_list)
-        self._deprecated_classes = {}
+                self._deprecated_arguments.update(func_list)
         for since_vers, class_list in DEPRECATED_CLASSES.items():
             if since_vers <= sys.version_info:
                 self._deprecated_classes.update(class_list)
-        self._deprecated_modules = set()
         for since_vers, mod_list in DEPRECATED_MODULES.items():
             if since_vers <= sys.version_info:
                 self._deprecated_modules.update(mod_list)
-        self._deprecated_decorators = set()
         for since_vers, decorator_list in DEPRECATED_DECORATORS.items():
             if since_vers <= sys.version_info:
                 self._deprecated_decorators.update(decorator_list)
@@ -569,6 +563,44 @@ def visit_boolop(self, node: nodes.BoolOp) -> None:
         for value in node.values:
             self._check_datetime(value)
 
+    @utils.check_messages("cache-max-size-none")
+    def visit_functiondef(self, node: nodes.FunctionDef) -> None:
+        if node.decorators and isinstance(node.parent, nodes.ClassDef):
+            self._check_lru_cache_decorators(node.decorators)
+
+    def _check_lru_cache_decorators(self, decorators: nodes.Decorators) -> None:
+        """Check if instance methods are decorated with functools.lru_cache."""
+        lru_cache_nodes: List[nodes.NodeNG] = []
+        for d_node in decorators.nodes:
+            try:
+                for infered_node in d_node.infer():
+                    q_name = infered_node.qname()
+                    if q_name in NON_INSTANCE_METHODS or q_name not in LRU_CACHE:
+                        return
+
+                    # Check if there is a maxsize argument set to None in the call
+                    if isinstance(d_node, nodes.Call):
+                        try:
+                            arg = utils.get_argument_from_call(
+                                d_node, position=0, keyword="maxsize"
+                            )
+                        except utils.NoSuchArgumentError:
+                            return
+
+                        if not isinstance(arg, nodes.Const) or arg.value is not None:
+                            return
+
+                    lru_cache_nodes.append(d_node)
+                    break
+            except astroid.InferenceError:
+                pass
+        for lru_cache_node in lru_cache_nodes:
+            self.add_message(
+                "cache-max-size-none",
+                node=lru_cache_node,
+                confidence=interfaces.INFERENCE,
+            )
+
     def _check_redundant_assert(self, node, infer):
         if (
             isinstance(infer, astroid.BoundMethod)
@@ -583,9 +615,7 @@ def _check_redundant_assert(self, node, infer):
             )
 
     def _check_datetime(self, node):
-        """Check that a datetime was inferred.
-        If so, emit boolean-datetime warning.
-        """
+        """Check that a datetime was inferred, if so, emit boolean-datetime warning."""
         try:
             inferred = next(node.infer())
         except astroid.InferenceError:
@@ -607,7 +637,11 @@ def _check_open_mode(self, node):
             if isinstance(mode_arg, nodes.Const) and not _check_mode_str(
                 mode_arg.value
             ):
-                self.add_message("bad-open-mode", node=node, args=mode_arg.value)
+                self.add_message(
+                    "bad-open-mode",
+                    node=node,
+                    args=mode_arg.value or str(mode_arg.value),
+                )
 
     def _check_open_encoded(self, node: nodes.Call, open_module: str) -> None:
         """Check that the encoded argument of an open call is valid."""
@@ -630,17 +664,26 @@ def _check_open_encoded(self, node: nodes.Call, open_module: str) -> None:
         if (
             not mode_arg
             or isinstance(mode_arg, nodes.Const)
-            and "b" not in mode_arg.value
+            and (not mode_arg.value or "b" not in mode_arg.value)
         ):
             encoding_arg = None
             try:
-                if open_module == "pathlib" and node.func.attrname == "read_text":
-                    encoding_arg = utils.get_argument_from_call(
-                        node, position=0, keyword="encoding"
-                    )
+                if open_module == "pathlib":
+                    if node.func.attrname == "read_text":
+                        encoding_arg = utils.get_argument_from_call(
+                            node, position=0, keyword="encoding"
+                        )
+                    elif node.func.attrname == "write_text":
+                        encoding_arg = utils.get_argument_from_call(
+                            node, position=1, keyword="encoding"
+                        )
+                    else:
+                        encoding_arg = utils.get_argument_from_call(
+                            node, position=2, keyword="encoding"
+                        )
                 else:
                     encoding_arg = utils.get_argument_from_call(
-                        node, position=None, keyword="encoding"
+                        node, position=3, keyword="encoding"
                     )
             except utils.NoSuchArgumentError:
                 self.add_message("unspecified-encoding", node=node)
@@ -714,7 +757,7 @@ def deprecated_methods(self):
         return self._deprecated_methods
 
     def deprecated_arguments(self, method: str):
-        return self._deprecated_attributes.get(method, ())
+        return self._deprecated_arguments.get(method, ())
 
     def deprecated_classes(self, module: str):
         return self._deprecated_classes.get(module, ())
@@ -723,6 +766,5 @@ def deprecated_decorators(self) -> Iterable:
         return self._deprecated_decorators
 
 
-def register(linter):
-    """required method to auto register this checker"""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(StdlibChecker(linter))
diff --git a/pylint/checkers/strings.py b/pylint/checkers/strings.py
index bc573979f6..dd9f1887f4 100644
--- a/pylint/checkers/strings.py
+++ b/pylint/checkers/strings.py
@@ -1,47 +1,14 @@
-# Copyright (c) 2009-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2010 Daniel Harding <dharding@gmail.com>
-# Copyright (c) 2012-2014 Google, Inc.
-# Copyright (c) 2013-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Rene Zhang <rz99@cornell.edu>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016, 2018 Jakub Wilk <jwilk@jwilk.net>
-# Copyright (c) 2016 Peter Dawyndt <Peter.Dawyndt@UGent.be>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2017 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2018, 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2018-2019 Lucas Cimon <lucas.cimon@gmail.com>
-# Copyright (c) 2018 Alan Chan <achan961117@gmail.com>
-# Copyright (c) 2018 Yury Gribov <tetra2005@gmail.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Wes Turner <westurner@google.com>
-# Copyright (c) 2019 Djailla <bastien.vallet@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2020 Matthew Suozzo <msuozzo@google.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 谭九鼎 <109224573@qq.com>
-# Copyright (c) 2020 Anthony <tanant@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Tushar Sadhwani <tushar.sadhwani000@gmail.com>
-# Copyright (c) 2021 Jaehoon Hwang <jaehoonhwang@users.noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Peter Kolbus <peter.kolbus@garmin.com>
-
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""Checker for string formatting operations.
-"""
+"""Checker for string formatting operations."""
 
 import collections
 import numbers
 import re
 import tokenize
-from typing import Counter, Iterable
+from typing import TYPE_CHECKING, Counter, Iterable
 
 import astroid
 from astroid import nodes
@@ -50,6 +17,9 @@
 from pylint.checkers.utils import check_messages
 from pylint.interfaces import IAstroidChecker, IRawChecker, ITokenChecker
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 _AST_NODE_STR_TYPES = ("__builtin__.unicode", "__builtin__.str", "builtins.str")
 # Prefixes for both strings and bytes literals per
 # https://docs.python.org/3/reference/lexical_analysis.html#string-and-bytes-literals
@@ -150,7 +120,7 @@
     "E1310": (
         "Suspicious argument in %s.%s call",
         "bad-str-strip-call",
-        "The argument to a str.{l,r,}strip call contains a duplicate character, ",
+        "The argument to a str.{l,r,}strip call contains a duplicate character,",
     ),
     "W1302": (
         "Invalid format string",
@@ -518,7 +488,7 @@ def _check_new_format(self, node, func):
                     # only if the .format got at least one keyword argument.
                     # This means that the format strings accepts both
                     # positional and named fields and we should warn
-                    # when one of the them is missing or is extra.
+                    # when one of them is missing or is extra.
                     check_args = True
         else:
             check_args = True
@@ -537,8 +507,7 @@ def _check_new_format(self, node, func):
         self._check_new_format_specifiers(node, fields, named_arguments)
 
     def _check_new_format_specifiers(self, node, fields, named):
-        """
-        Check attribute and index access in the format
+        """Check attribute and index access in the format
         string ("{0.a}" and "{0[a]}").
         """
         for key, specifiers in fields:
@@ -634,7 +603,7 @@ def _check_new_format_specifiers(self, node, fields, named):
 
 
 class StringConstantChecker(BaseTokenChecker):
-    """Check string literals"""
+    """Check string literals."""
 
     __implements__ = (IAstroidChecker, ITokenChecker, IRawChecker)
     name = "string"
@@ -849,7 +818,7 @@ def process_string_token(self, token, start_row, start_col):
     def process_non_raw_string_token(
         self, prefix, string_body, start_row, string_start_col
     ):
-        """check for bad escapes in a non-raw string.
+        """Check for bad escapes in a non-raw string.
 
         prefix: lowercase string of eg 'ur' string prefix markers.
         string_body: the un-parsed body of the string, not including the quote
@@ -916,7 +885,7 @@ def visit_const(self, node: nodes.Const) -> None:
             self._detect_u_string_prefix(node)
 
     def _detect_u_string_prefix(self, node: nodes.Const):
-        """Check whether strings include a 'u' prefix like u'String'"""
+        """Check whether strings include a 'u' prefix like u'String'."""
         if node.kind == "u":
             self.add_message(
                 "redundant-u-string-prefix",
@@ -925,15 +894,14 @@ def _detect_u_string_prefix(self, node: nodes.Const):
             )
 
 
-def register(linter):
-    """required method to auto register this checker"""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(StringFormatChecker(linter))
     linter.register_checker(StringConstantChecker(linter))
 
 
 def str_eval(token):
-    """
-    Mostly replicate `ast.literal_eval(token)` manually to avoid any performance hit.
+    """Mostly replicate `ast.literal_eval(token)` manually to avoid any performance hit.
+
     This supports f-strings, contrary to `ast.literal_eval`.
     We have to support all string literal notations:
     https://docs.python.org/3/reference/lexical_analysis.html#string-and-bytes-literals
@@ -961,7 +929,7 @@ def _is_long_string(string_token: str) -> bool:
         string_token: The string token to be parsed.
 
     Returns:
-        A boolean representing whether or not this token matches a longstring
+        A boolean representing whether this token matches a longstring
         regex.
     """
     return bool(
@@ -973,15 +941,14 @@ def _is_long_string(string_token: str) -> bool:
 def _get_quote_delimiter(string_token: str) -> str:
     """Returns the quote character used to delimit this token string.
 
-    This function does little checking for whether the token is a well-formed
-    string.
+    This function checks whether the token is a well-formed string.
 
     Args:
         string_token: The token to be parsed.
 
     Returns:
-        A string containing solely the first quote delimiter character in the passed
-        string.
+        A string containing solely the first quote delimiter character in the
+        given string.
 
     Raises:
       ValueError: No quote delimiter characters are present.
diff --git a/pylint/checkers/threading_checker.py b/pylint/checkers/threading_checker.py
index b7ba91d419..6a720d334f 100644
--- a/pylint/checkers/threading_checker.py
+++ b/pylint/checkers/threading_checker.py
@@ -1,5 +1,8 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+from typing import TYPE_CHECKING
 
 from astroid import nodes
 
@@ -7,9 +10,12 @@
 from pylint.checkers import BaseChecker
 from pylint.checkers.utils import check_messages, safe_infer
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 class ThreadingChecker(BaseChecker):
-    """Checks for threading module
+    """Checks for threading module.
 
     - useless with lock - locking used in wrong way that has no effect (with threading.Lock():)
     """
@@ -50,6 +56,5 @@ def visit_with(self, node: nodes.With) -> None:
                     self.add_message("useless-with-lock", node=node, args=qname)
 
 
-def register(linter):
-    """required method to auto register this checker"""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(ThreadingChecker(linter))
diff --git a/pylint/checkers/typecheck.py b/pylint/checkers/typecheck.py
index f29f4f3e15..a967cd4da6 100644
--- a/pylint/checkers/typecheck.py
+++ b/pylint/checkers/typecheck.py
@@ -1,62 +1,8 @@
-# Copyright (c) 2006-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2009 James Lingard <jchl@aristanetworks.com>
-# Copyright (c) 2012-2014 Google, Inc.
-# Copyright (c) 2014-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 David Shea <dshea@redhat.com>
-# Copyright (c) 2014 Steven Myint <hg@stevenmyint.com>
-# Copyright (c) 2014 Holger Peters <email@holger-peters.de>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Anentropic <ego@anentropic.com>
-# Copyright (c) 2015 Dmitry Pribysh <dmand@yandex.ru>
-# Copyright (c) 2015 Rene Zhang <rz99@cornell.edu>
-# Copyright (c) 2015 Radu Ciorba <radu@devrandom.ro>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016, 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2016 Alexander Todorov <atodorov@otb.bg>
-# Copyright (c) 2016 Jürgen Hermann <jh@web.de>
-# Copyright (c) 2016 Jakub Wilk <jwilk@jwilk.net>
-# Copyright (c) 2016 Filipe Brandenburger <filbranden@google.com>
-# Copyright (c) 2017, 2021 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2017-2018, 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2017 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2018-2019, 2021 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2018 Pablo Galindo <Pablogsal@gmail.com>
-# Copyright (c) 2018 Jim Robertson <jrobertson98atx@gmail.com>
-# Copyright (c) 2018 Lucas Cimon <lucas.cimon@gmail.com>
-# Copyright (c) 2018 Mike Frysinger <vapier@gmail.com>
-# Copyright (c) 2018 Ben Green <benhgreen@icloud.com>
-# Copyright (c) 2018 Konstantin <Github@pheanex.de>
-# Copyright (c) 2018 Justin Li <justinnhli@users.noreply.github.com>
-# Copyright (c) 2018 Bryce Guinta <bryce.paul.guinta@gmail.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Andy Palmer <25123779+ninezerozeronine@users.noreply.github.com>
-# Copyright (c) 2019 mattlbeck <17108752+mattlbeck@users.noreply.github.com>
-# Copyright (c) 2019 Martin Vielsmaier <martin.vielsmaier@gmail.com>
-# Copyright (c) 2019 Santiago Castro <bryant@montevideo.com.uy>
-# Copyright (c) 2019 yory8 <39745367+yory8@users.noreply.github.com>
-# Copyright (c) 2019 Federico Bond <federicobond@gmail.com>
-# Copyright (c) 2019 Pascal Corpet <pcorpet@users.noreply.github.com>
-# Copyright (c) 2020 Peter Kolbus <peter.kolbus@gmail.com>
-# Copyright (c) 2020 Julien Palard <julien@palard.fr>
-# Copyright (c) 2020 Ram Rachum <ram@rachum.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2020 Anubhav <35621759+anubh-v@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Tushar Sadhwani <tushar.sadhwani000@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 David Liu <david@cs.toronto.edu>
-# Copyright (c) 2021 doranid <ddandd@gmail.com>
-# Copyright (c) 2021 Yu Shao, Pang <36848472+yushao2@users.noreply.github.com>
-# Copyright (c) 2021 Andrew Haigh <nelfin@gmail.com>
-# Copyright (c) 2021 Jens H. Nielsen <Jens.Nielsen@microsoft.com>
-# Copyright (c) 2021 Ikraduya Edian <ikraduya@gmail.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""try to find more bugs in the code using astroid inference capabilities
-"""
+"""Try to find more bugs in the code using astroid inference capabilities."""
 
 import fnmatch
 import heapq
@@ -69,9 +15,20 @@
 from collections import deque
 from collections.abc import Sequence
 from functools import singledispatch
-from typing import Any, Callable, Iterator, List, Optional, Pattern, Tuple
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Iterator,
+    List,
+    Optional,
+    Pattern,
+    Tuple,
+    Union,
+)
 
 import astroid
+import astroid.exceptions
 from astroid import bases, nodes
 
 from pylint.checkers import BaseChecker, utils
@@ -99,6 +56,22 @@
 from pylint.interfaces import INFERENCE, IAstroidChecker
 from pylint.utils import get_global_option
 
+if sys.version_info >= (3, 8):
+    from functools import cached_property
+else:
+    from astroid.decorators import cachedproperty as cached_property
+
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
+CallableObjects = Union[
+    bases.BoundMethod,
+    bases.UnboundMethod,
+    nodes.FunctionDef,
+    nodes.Lambda,
+    nodes.ClassDef,
+]
+
 STR_FORMAT = {"builtins.str.format"}
 ASYNCIO_COROUTINE = "asyncio.coroutines.coroutine"
 BUILTIN_TUPLE = "builtins.tuple"
@@ -128,7 +101,7 @@ def _flatten_container(iterable):
 
 
 def _is_owner_ignored(owner, attrname, ignored_classes, ignored_modules):
-    """Check if the given owner should be ignored
+    """Check if the given owner should be ignored.
 
     This will verify if the owner's module is in *ignored_modules*
     or the owner's module fully qualified name is in *ignored_modules*
@@ -152,7 +125,7 @@ def _is_owner_ignored(owner, attrname, ignored_classes, ignored_modules):
         if fnmatch.fnmatch(module_qname, ignore):
             return True
 
-        # Otherwise we might have a root module name being ignored,
+        # Otherwise, we might have a root module name being ignored,
         # and the qualified owner has more levels of depth.
         parts = deque(module_name.split("."))
         current_module = ""
@@ -212,7 +185,7 @@ def _string_distance(seq1, seq2):
 
 
 def _similar_names(owner, attrname, distance_threshold, max_choices):
-    """Given an owner and a name, try to find similar names
+    """Given an owner and a name, try to find similar names.
 
     The similar names are searched given a distance metric and only
     a given number of choices will be returned.
@@ -247,11 +220,11 @@ def _missing_member_hint(owner, attrname, distance_threshold, max_choices):
 
     names = [repr(name) for name in names]
     if len(names) == 1:
-        names = ", ".join(names)
+        names_hint = ", ".join(names)
     else:
-        names = f"one of {', '.join(names[:-1])} or {names[-1]}"
+        names_hint = f"one of {', '.join(names[:-1])} or {names[-1]}"
 
-    return f"; maybe {names}?"
+    return f"; maybe {names_hint}?"
 
 
 MSGS = {
@@ -558,16 +531,24 @@ def _emit_no_member(
     return True
 
 
-def _determine_callable(callable_obj):
+def _determine_callable(
+    callable_obj: nodes.NodeNG,
+) -> Tuple[CallableObjects, int, str]:
+    # pylint: disable=fixme
+    # TODO: The typing of the second return variable is actually Literal[0,1]
+    # We need typing on astroid.NodeNG.implicit_parameters for this
+    # TODO: The typing of the third return variable can be narrowed to a Literal
+    # We need typing on astroid.NodeNG.type for this
+
     # Ordering is important, since BoundMethod is a subclass of UnboundMethod,
     # and Function inherits Lambda.
     parameters = 0
     if hasattr(callable_obj, "implicit_parameters"):
         parameters = callable_obj.implicit_parameters()
-    if isinstance(callable_obj, astroid.BoundMethod):
+    if isinstance(callable_obj, bases.BoundMethod):
         # Bound methods have an extra implicit 'self' argument.
         return callable_obj, parameters, callable_obj.type
-    if isinstance(callable_obj, astroid.UnboundMethod):
+    if isinstance(callable_obj, bases.UnboundMethod):
         return callable_obj, parameters, "unbound method"
     if isinstance(callable_obj, nodes.FunctionDef):
         return callable_obj, parameters, callable_obj.type
@@ -615,7 +596,7 @@ def _has_parent_of_type(node, node_type, statement):
 
 
 def _no_context_variadic_keywords(node, scope):
-    statement = node.statement()
+    statement = node.statement(future=True)
     variadics = ()
 
     if isinstance(scope, nodes.Lambda) and not isinstance(scope, nodes.FunctionDef):
@@ -630,22 +611,12 @@ def _no_context_variadic_keywords(node, scope):
 
 
 def _no_context_variadic_positional(node, scope):
-    variadics = ()
-    if isinstance(scope, nodes.Lambda) and not isinstance(scope, nodes.FunctionDef):
-        variadics = node.starargs + node.kwargs
-    else:
-        statement = node.statement()
-        if isinstance(
-            statement, (nodes.Expr, nodes.Return, nodes.Assign)
-        ) and isinstance(statement.value, nodes.Call):
-            call = statement.value
-            variadics = call.starargs + call.kwargs
-
+    variadics = node.starargs + node.kwargs
     return _no_context_variadic(node, scope.args.vararg, nodes.Starred, variadics)
 
 
 def _no_context_variadic(node, variadic_name, variadic_type, variadics):
-    """Verify if the given call node has variadic nodes without context
+    """Verify if the given call node has variadic nodes without context.
 
     This is a workaround for handling cases of nested call functions
     which don't have the specific call context at hand.
@@ -659,7 +630,7 @@ def _no_context_variadic(node, variadic_name, variadic_type, variadics):
     is_in_lambda_scope = not isinstance(scope, nodes.FunctionDef) and isinstance(
         scope, nodes.Lambda
     )
-    statement = node.statement()
+    statement = node.statement(future=True)
     for name in statement.nodes_of_class(nodes.Name):
         if name.name != variadic_name:
             continue
@@ -677,7 +648,7 @@ def _no_context_variadic(node, variadic_name, variadic_type, variadics):
             # so we need to go the lambda instead
             inferred_statement = inferred.parent.parent
         else:
-            inferred_statement = inferred.statement()
+            inferred_statement = inferred.statement(future=True)
 
         if not length and isinstance(inferred_statement, nodes.Lambda):
             is_in_starred_context = _has_parent_of_type(node, variadic_type, statement)
@@ -703,7 +674,7 @@ def _is_invalid_metaclass(metaclass):
 
 
 def _infer_from_metaclass_constructor(cls, func: nodes.FunctionDef):
-    """Try to infer what the given *func* constructor is building
+    """Try to infer what the given *func* constructor is building.
 
     :param astroid.FunctionDef func:
         A metaclass constructor. Metaclass definitions can be
@@ -762,7 +733,7 @@ def _is_invalid_isinstance_type(arg):
 
 
 class TypeChecker(BaseChecker):
-    """try to find bugs in the code using type inference"""
+    """Try to find bugs in the code using type inference."""
 
     __implements__ = (IAstroidChecker,)
 
@@ -918,11 +889,11 @@ def open(self) -> None:
         self._py310_plus = py_version >= (3, 10)
         self._mixin_class_rgx = get_global_option(self, "mixin-class-rgx")
 
-    @astroid.decorators.cachedproperty
+    @cached_property
     def _suggestion_mode(self):
         return get_global_option(self, "suggestion-mode", default=True)
 
-    @astroid.decorators.cachedproperty
+    @cached_property
     def _compiled_generated_members(self) -> Tuple[Pattern, ...]:
         # do this lazily since config not fully initialized in __init__
         # generated_members may contain regular expressions
@@ -987,7 +958,7 @@ def visit_delattr(self, node: nodes.DelAttr) -> None:
 
     @check_messages("no-member", "c-extension-no-member")
     def visit_attribute(self, node: nodes.Attribute) -> None:
-        """check that the accessed attribute exists
+        """Check that the accessed attribute exists.
 
         to avoid too much false positives for now, we'll consider the code as
         correct if a single of the inferred nodes has the accessed attribute.
@@ -1039,10 +1010,12 @@ def visit_attribute(self, node: nodes.Attribute) -> None:
                 if not [
                     n
                     for n in owner.getattr(node.attrname)
-                    if not isinstance(n.statement(), nodes.AugAssign)
+                    if not isinstance(n.statement(future=True), nodes.AugAssign)
                 ]:
                     missingattr.add((owner, name))
                     continue
+            except astroid.exceptions.StatementMissing:
+                continue
             except AttributeError:
                 continue
             except astroid.DuplicateBasesError:
@@ -1115,17 +1088,13 @@ def _get_nomember_msgid_hint(self, node, owner):
         "non-str-assignment-to-dunder-name",
     )
     def visit_assign(self, node: nodes.Assign) -> None:
-        """
-        Process assignments in the AST.
-        """
+        """Process assignments in the AST."""
 
         self._check_assignment_from_function_call(node)
         self._check_dundername_is_string(node)
 
-    def _check_assignment_from_function_call(self, node):
-        """check that if assigning to a function call, the function is
-        possibly returning something valuable
-        """
+    def _check_assignment_from_function_call(self, node: nodes.Assign) -> None:
+        """When assigning to a function call, check that the function returns a valid value."""
         if not isinstance(node.value, nodes.Call):
             return
 
@@ -1134,7 +1103,7 @@ def _check_assignment_from_function_call(self, node):
         if not isinstance(function_node, funcs):
             return
 
-        # Unwrap to get the actual function object
+        # Unwrap to get the actual function node object
         if isinstance(function_node, astroid.BoundMethod) and isinstance(
             function_node._proxied, astroid.UnboundMethod
         ):
@@ -1142,47 +1111,67 @@ def _check_assignment_from_function_call(self, node):
 
         # Make sure that it's a valid function that we can analyze.
         # Ordered from less expensive to more expensive checks.
-        # pylint: disable=too-many-boolean-expressions
         if (
             not function_node.is_function
-            or isinstance(function_node, nodes.AsyncFunctionDef)
             or function_node.decorators
-            or function_node.is_generator()
-            or function_node.is_abstract(pass_is_abstract=False)
-            or utils.is_error(function_node)
-            or not function_node.root().fully_defined()
+            or self._is_ignored_function(function_node)
         ):
             return
 
-        returns = list(
+        # Fix a false-negative for list.sort(), see issue #5722
+        if self._is_list_sort_method(node.value):
+            self.add_message("assignment-from-none", node=node, confidence=INFERENCE)
+            return
+
+        if not function_node.root().fully_defined():
+            return
+
+        return_nodes = list(
             function_node.nodes_of_class(nodes.Return, skip_klass=nodes.FunctionDef)
         )
-        if not returns:
+        if not return_nodes:
             self.add_message("assignment-from-no-return", node=node)
         else:
-            for rnode in returns:
+            for ret_node in return_nodes:
                 if not (
-                    isinstance(rnode.value, nodes.Const)
-                    and rnode.value.value is None
-                    or rnode.value is None
+                    isinstance(ret_node.value, nodes.Const)
+                    and ret_node.value.value is None
+                    or ret_node.value is None
                 ):
                     break
             else:
                 self.add_message("assignment-from-none", node=node)
 
-    def _check_dundername_is_string(self, node):
-        """
-        Check a string is assigned to self.__name__
-        """
+    @staticmethod
+    def _is_ignored_function(
+        function_node: Union[nodes.FunctionDef, bases.UnboundMethod]
+    ) -> bool:
+        return (
+            isinstance(function_node, nodes.AsyncFunctionDef)
+            or utils.is_error(function_node)
+            or function_node.is_generator()
+            or function_node.is_abstract(pass_is_abstract=False)
+        )
+
+    @staticmethod
+    def _is_list_sort_method(node: nodes.Call) -> bool:
+        return (
+            isinstance(node.func, nodes.Attribute)
+            and node.func.attrname == "sort"
+            and isinstance(utils.safe_infer(node.func.expr), nodes.List)
+        )
+
+    def _check_dundername_is_string(self, node) -> None:
+        """Check a string is assigned to self.__name__."""
 
-        # Check the left hand side of the assignment is <something>.__name__
+        # Check the left-hand side of the assignment is <something>.__name__
         lhs = node.targets[0]
         if not isinstance(lhs, nodes.AssignAttr):
             return
         if not lhs.attrname == "__name__":
             return
 
-        # If the right hand side is not a string
+        # If the right-hand side is not a string
         rhs = node.value
         if isinstance(rhs, nodes.Const) and isinstance(rhs.value, str):
             return
@@ -1194,8 +1183,7 @@ def _check_dundername_is_string(self, node):
             self.add_message("non-str-assignment-to-dunder-name", node=node)
 
     def _check_uninferable_call(self, node):
-        """
-        Check that the given uninferable Call node does not
+        """Check that the given uninferable Call node does not
         call an actual function.
         """
         if not isinstance(node.func, nodes.Attribute):
@@ -1229,23 +1217,26 @@ def _check_uninferable_call(self, node):
             # Decorated, see if it is decorated with a property.
             # Also, check the returns and see if they are callable.
             if decorated_with_property(attr):
-
                 try:
-                    all_returns_are_callable = all(
-                        return_node.callable() or return_node is astroid.Uninferable
-                        for return_node in attr.infer_call_result(node)
-                    )
+                    call_results = list(attr.infer_call_result(node))
                 except astroid.InferenceError:
                     continue
 
-                if not all_returns_are_callable:
-                    self.add_message(
-                        "not-callable", node=node, args=node.func.as_string()
-                    )
-                    break
+                if all(
+                    return_node is astroid.Uninferable for return_node in call_results
+                ):
+                    # We were unable to infer return values of the call, skipping
+                    continue
+
+                if any(return_node.callable() for return_node in call_results):
+                    # Only raise this issue if *all* the inferred values are not callable
+                    continue
+
+                self.add_message("not-callable", node=node, args=node.func.as_string())
 
     def _check_argument_order(self, node, call_site, called, called_param_names):
         """Match the supplied argument names against the function parameters.
+
         Warn if some argument names are not in the same order as they are in
         the function signature.
         """
@@ -1262,7 +1253,7 @@ def _check_argument_order(self, node, call_site, called, called_param_names):
             # extract argument names, if they have names
             calling_parg_names = [p.name for p in call_site.positional_arguments]
 
-            # Additionally get names of keyword arguments to use in a full match
+            # Additionally, get names of keyword arguments to use in a full match
             # against parameters
             calling_kwarg_names = [
                 arg.name for arg in call_site.keyword_arguments.values()
@@ -1295,29 +1286,12 @@ def _check_isinstance_args(self, node):
     # pylint: disable=too-many-branches,too-many-locals
     @check_messages(*(list(MSGS.keys())))
     def visit_call(self, node: nodes.Call) -> None:
-        """check that called functions/methods are inferred to callable objects,
-        and that the arguments passed to the function match the parameters in
-        the inferred function's definition
+        """Check that called functions/methods are inferred to callable objects,
+        and that passed arguments match the parameters in the inferred function.
         """
         called = safe_infer(node.func)
-        # only function, generator and object defining __call__ are allowed
-        # Ignore instances of descriptors since astroid cannot properly handle them
-        # yet
-        if called and not called.callable():
-            if isinstance(called, astroid.Instance) and (
-                not has_known_bases(called)
-                or (
-                    called.parent is not None
-                    and isinstance(called.scope(), nodes.ClassDef)
-                    and "__get__" in called.locals
-                )
-            ):
-                # Don't emit if we can't make sure this object is callable.
-                pass
-            else:
-                self.add_message("not-callable", node=node, args=node.func.as_string())
-        else:
-            self._check_uninferable_call(node)
+
+        self._check_not_callable(node, called)
 
         try:
             called, implicit_args, callable_name = _determine_callable(called)
@@ -1464,6 +1438,10 @@ def visit_call(self, node: nodes.Call) -> None:
             elif called.args.kwarg is not None:
                 # The keyword argument gets assigned to the **kwargs parameter.
                 pass
+            elif isinstance(
+                called, nodes.FunctionDef
+            ) and self._keyword_argument_is_in_all_decorator_returns(called, keyword):
+                pass
             elif not overload_function:
                 # Unexpected keyword argument.
                 self.add_message(
@@ -1503,6 +1481,46 @@ def visit_call(self, node: nodes.Call) -> None:
             ):
                 self.add_message("missing-kwoa", node=node, args=(name, callable_name))
 
+    @staticmethod
+    def _keyword_argument_is_in_all_decorator_returns(
+        func: nodes.FunctionDef, keyword: str
+    ) -> bool:
+        """Check if the keyword argument exists in all signatures of the
+        return values of all decorators of the function.
+        """
+        if not func.decorators:
+            return False
+
+        for decorator in func.decorators.nodes:
+            inferred = safe_infer(decorator)
+
+            # If we can't infer the decorator we assume it satisfies consumes
+            # the keyword, so we don't raise false positives
+            if not inferred:
+                return True
+
+            # We only check arguments of function decorators
+            if not isinstance(inferred, nodes.FunctionDef):
+                return False
+
+            for return_value in inferred.infer_call_result():
+                # infer_call_result() returns nodes.Const.None for None return values
+                # so this also catches non-returning decorators
+                if not isinstance(return_value, nodes.FunctionDef):
+                    return False
+
+                # If the return value uses a kwarg the keyword will be consumed
+                if return_value.args.kwarg:
+                    continue
+
+                # Check if the keyword is another type of argument
+                if return_value.args.is_argument(keyword):
+                    continue
+
+                return False
+
+        return True
+
     def _check_invalid_sequence_index(self, subscript: nodes.Subscript):
         # Look for index operations where the parent is a sequence type.
         # If the types can be determined, only allow indices to be int,
@@ -1541,7 +1559,7 @@ def _check_invalid_sequence_index(self, subscript: nodes.Subscript):
             not isinstance(itemmethod, nodes.FunctionDef)
             or itemmethod.root().name != "builtins"
             or not itemmethod.parent
-            or itemmethod.parent.name not in SEQUENCE_TYPES
+            or itemmethod.parent.frame().name not in SEQUENCE_TYPES
         ):
             return None
 
@@ -1577,6 +1595,37 @@ def _check_invalid_sequence_index(self, subscript: nodes.Subscript):
         self.add_message("invalid-sequence-index", node=subscript)
         return None
 
+    def _check_not_callable(
+        self, node: nodes.Call, inferred_call: Optional[nodes.NodeNG]
+    ) -> None:
+        """Checks to see if the not-callable message should be emitted.
+
+        Only functions, generators and objects defining __call__ are "callable"
+        We ignore instances of descriptors since astroid cannot properly handle them yet
+        """
+        # Handle uninferable calls
+        if not inferred_call or inferred_call.callable():
+            self._check_uninferable_call(node)
+            return
+
+        if not isinstance(inferred_call, astroid.Instance):
+            self.add_message("not-callable", node=node, args=node.func.as_string())
+            return
+
+        # Don't emit if we can't make sure this object is callable.
+        if not has_known_bases(inferred_call):
+            return
+
+        if inferred_call.parent and isinstance(inferred_call.scope(), nodes.ClassDef):
+            # Ignore descriptor instances
+            if "__get__" in inferred_call.locals:
+                return
+            # NamedTuple instances are callable
+            if inferred_call.qname() == "typing.NamedTuple":
+                return
+
+        self.add_message("not-callable", node=node, args=node.func.as_string())
+
     @check_messages("invalid-sequence-index")
     def visit_extslice(self, node: nodes.ExtSlice) -> None:
         if not node.parent or not hasattr(node.parent, "value"):
@@ -1596,7 +1645,7 @@ def _check_invalid_slice_index(self, node: nodes.Slice) -> None:
             if index_type is None or index_type is astroid.Uninferable:
                 continue
 
-            # Constants must of type int or None
+            # Constants must be of type int or None
             if isinstance(index_type, nodes.Const):
                 if isinstance(index_type.value, (int, type(None))):
                     continue
@@ -1665,7 +1714,8 @@ def visit_with(self, node: nodes.With) -> None:
                 # See the test file for not_context_manager for a couple
                 # of self explaining tests.
 
-                # Retrieve node from all previusly visited nodes in the the inference history
+                # Retrieve node from all previously visited nodes in the
+                # inference history
                 context_path_names: Iterator[Any] = filter(
                     None, _unflatten(context.path)
                 )
@@ -1897,8 +1947,8 @@ def visit_for(self, node: nodes.For) -> None:
 
 
 class IterableChecker(BaseChecker):
-    """
-    Checks for non-iterables used in an iterable context.
+    """Checks for non-iterables used in an iterable context.
+
     Contexts include:
     - for-statement
     - starargs in function call
@@ -1946,10 +1996,10 @@ def _is_asyncio_coroutine(node):
         return False
 
     def _check_iterable(self, node, check_async=False):
-        if is_inside_abstract_class(node) or is_comprehension(node):
+        if is_inside_abstract_class(node):
             return
         inferred = safe_infer(node)
-        if not inferred:
+        if not inferred or is_comprehension(inferred):
             return
         if not is_iterable(inferred, check_async=check_async):
             self.add_message("not-an-iterable", args=node.as_string(), node=node)
@@ -2021,7 +2071,6 @@ def _check_await_outside_coroutine(self, node: nodes.Await) -> None:
         self.add_message("await-outside-async", node=node)
 
 
-def register(linter):
-    """required method to auto register this checker"""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(TypeChecker(linter))
     linter.register_checker(IterableChecker(linter))
diff --git a/pylint/checkers/unicode.py b/pylint/checkers/unicode.py
new file mode 100644
index 0000000000..8939524df2
--- /dev/null
+++ b/pylint/checkers/unicode.py
@@ -0,0 +1,536 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Unicode and some other ASCII characters can be used to create programs that run
+much different compared to what a human reader would expect from them.
+
+PEP 672 lists some examples.
+See: https://www.python.org/dev/peps/pep-0672/
+
+The following checkers are intended to make users are aware of these issues.
+"""
+import codecs
+import contextlib
+import io
+import re
+from collections import OrderedDict
+from functools import lru_cache
+from tokenize import detect_encoding
+from typing import Dict, Iterable, NamedTuple, Tuple, TypeVar
+
+from astroid import nodes
+
+import pylint.checkers
+import pylint.interfaces
+import pylint.lint
+
+_StrLike = TypeVar("_StrLike", str, bytes)
+
+# Based on:
+# https://golangexample.com/go-linter-which-checks-for-dangerous-unicode-character-sequences/
+# We use '\u' because it doesn't require a map lookup and is therefore faster
+BIDI_UNICODE = [
+    "\u202A",  # \N{LEFT-TO-RIGHT EMBEDDING}
+    "\u202B",  # \N{RIGHT-TO-LEFT EMBEDDING}
+    "\u202C",  # \N{POP DIRECTIONAL FORMATTING}
+    "\u202D",  # \N{LEFT-TO-RIGHT OVERRIDE}
+    "\u202E",  # \N{RIGHT-TO-LEFT OVERRIDE}
+    "\u2066",  # \N{LEFT-TO-RIGHT ISOLATE}
+    "\u2067",  # \N{RIGHT-TO-LEFT ISOLATE}
+    "\u2068",  # \N{FIRST STRONG ISOLATE}
+    "\u2069",  # \N{POP DIRECTIONAL ISOLATE}
+    # The following was part of PEP 672:
+    # https://www.python.org/dev/peps/pep-0672/
+    # so the list above might not be complete
+    "\u200F",  # \n{RIGHT-TO-LEFT MARK}
+    # We don't use
+    #   "\u200E" # \n{LEFT-TO-RIGHT MARK}
+    # as this is the default for latin files and can't be used
+    # to hide code
+]
+
+
+class _BadChar(NamedTuple):
+    """Representation of an ASCII char considered bad."""
+
+    name: str
+    unescaped: str
+    escaped: str
+    code: str
+    help_text: str
+
+    def description(self) -> str:
+        """Used for the detailed error message description."""
+        return (
+            f"Invalid unescaped character {self.name}, "
+            f'use "{self.escaped}" instead.'
+        )
+
+    def human_code(self) -> str:
+        """Used to generate the human readable error message."""
+        return f"invalid-character-{self.name}"
+
+
+# Based on https://www.python.org/dev/peps/pep-0672/
+BAD_CHARS = [
+    _BadChar(
+        "backspace",
+        "\b",
+        "\\b",
+        "E2510",
+        (
+            "Moves the cursor back, so the character after it will overwrite the "
+            "character before."
+        ),
+    ),
+    _BadChar(
+        "carriage-return",
+        "\r",
+        "\\r",
+        "E2511",
+        (
+            "Moves the cursor to the start of line, subsequent characters overwrite "
+            "the start of the line."
+        ),
+    ),
+    _BadChar(
+        "sub",
+        "\x1A",
+        "\\x1A",
+        "E2512",
+        (
+            "Ctrl+Z “End of text” on Windows. Some programs (such as type) ignore "
+            "the rest of the file after it."
+        ),
+    ),
+    _BadChar(
+        "esc",
+        "\x1B",
+        "\\x1B",
+        "E2513",
+        (
+            "Commonly initiates escape codes which allow arbitrary control "
+            "of the terminal."
+        ),
+    ),
+    _BadChar(
+        "nul",
+        "\0",
+        "\\0",
+        "E2514",
+        "Mostly end of input for python.",
+    ),
+    _BadChar(
+        # Zero Width with Space. At the time of writing not accepted by Python.
+        # But used in Trojan Source Examples, so still included and tested for.
+        "zero-width-space",
+        "\u200B",  # \n{ZERO WIDTH SPACE}
+        "\\u200B",
+        "E2515",
+        "Invisible space character could hide real code execution.",
+    ),
+]
+BAD_ASCII_SEARCH_DICT = {char.unescaped: char for char in BAD_CHARS}
+
+
+def _line_length(line: _StrLike, codec: str) -> int:
+    """Get the length of a string like line as displayed in an editor."""
+    if isinstance(line, bytes):
+        decoded = _remove_bom(line, codec).decode(codec, "replace")
+    else:
+        decoded = line
+
+    stripped = decoded.rstrip("\n")
+
+    if stripped != decoded:
+        stripped = stripped.rstrip("\r")
+
+    return len(stripped)
+
+
+def _map_positions_to_result(
+    line: _StrLike,
+    search_dict: Dict[_StrLike, _BadChar],
+    new_line: _StrLike,
+    byte_str_length: int = 1,
+) -> Dict[int, _BadChar]:
+    """Get all occurrences of search dict keys within line.
+
+    Ignores Windows end of line and can handle bytes as well as string.
+    Also takes care of encodings for which the length of an encoded code point does not
+    default to 8 Bit.
+    """
+
+    result: Dict[int, _BadChar] = {}
+
+    for search_for, char in search_dict.items():
+        if search_for not in line:
+            continue
+
+        # Special Handling for Windows '\r\n'
+        if char.unescaped == "\r" and line.endswith(new_line):
+            ignore_pos = len(line) - 2 * byte_str_length
+        else:
+            ignore_pos = None
+
+        start = 0
+        pos = line.find(search_for, start)
+        while pos > 0:
+            if pos != ignore_pos:
+                # Calculate the column
+                col = int(pos / byte_str_length)
+                result[col] = char
+            start = pos + 1
+            pos = line.find(search_for, start)
+
+    return result
+
+
+UNICODE_BOMS = {
+    "utf-8": codecs.BOM_UTF8,
+    "utf-16": codecs.BOM_UTF16,
+    "utf-32": codecs.BOM_UTF32,
+    "utf-16le": codecs.BOM_UTF16_LE,
+    "utf-16be": codecs.BOM_UTF16_BE,
+    "utf-32le": codecs.BOM_UTF32_LE,
+    "utf-32be": codecs.BOM_UTF32_BE,
+}
+BOM_SORTED_TO_CODEC = OrderedDict(
+    # Sorted by length of BOM of each codec
+    (UNICODE_BOMS[codec], codec)
+    for codec in ("utf-32le", "utf-32be", "utf-8", "utf-16le", "utf-16be")
+)
+
+UTF_NAME_REGEX_COMPILED = re.compile(
+    "utf[ -]?(8|16|32)[ -]?(le|be|)?(sig)?", flags=re.IGNORECASE
+)
+
+
+def _normalize_codec_name(codec: str) -> str:
+    """Make sure the codec name is always given as defined in the BOM dict."""
+    return UTF_NAME_REGEX_COMPILED.sub(r"utf-\1\2", codec).lower()
+
+
+def _remove_bom(encoded: bytes, encoding: str) -> bytes:
+    """Remove the bom if given from a line."""
+    if not encoding.startswith("utf"):
+        return encoded
+    bom = UNICODE_BOMS[encoding]
+    if encoded.startswith(bom):
+        return encoded[len(bom) :]
+    return encoded
+
+
+def _encode_without_bom(string: str, encoding: str) -> bytes:
+    """Encode a string but remove the BOM."""
+    return _remove_bom(string.encode(encoding), encoding)
+
+
+def _byte_to_str_length(codec: str) -> int:
+    """Return how many byte are usually(!) a character point."""
+    if codec.startswith("utf-32"):
+        return 4
+    if codec.startswith("utf-16"):
+        return 2
+
+    return 1
+
+
+@lru_cache(maxsize=1000)
+def _cached_encode_search(string: str, encoding: str) -> bytes:
+    """A cached version of encode used for search pattern."""
+    return _encode_without_bom(string, encoding)
+
+
+def _fix_utf16_32_line_stream(steam: Iterable[bytes], codec: str) -> Iterable[bytes]:
+    """Handle line ending for UTF16 and UTF32 correctly.
+
+    Currently Python simply strips the required zeros after \n after the
+    line ending. Leading to lines that can't be decoded propery
+    """
+    if not codec.startswith("utf-16") and not codec.startswith("utf-32"):
+        yield from steam
+    else:
+        # First we get all the bytes in memory
+        content = b"".join(line for line in steam)
+
+        new_line = _cached_encode_search("\n", codec)
+
+        # Now we split the line by the real new line in the correct encoding
+        # we can't use split as it would strip the \n that we need
+        start = 0
+        while True:
+            pos = content.find(new_line, start)
+            if pos >= 0:
+                yield content[start : pos + len(new_line)]
+            else:
+                # Yield the rest and finish
+                if content[start:]:
+                    yield content[start:]
+                break
+
+            start = pos + len(new_line)
+
+
+def extract_codec_from_bom(first_line: bytes) -> str:
+    """Try to extract the codec (unicode only) by checking for the BOM.
+
+    For details about BOM see https://unicode.org/faq/utf_bom.html#BOM
+
+    Args:
+        first_line: the first line of a file
+
+    Returns:
+        a codec name
+
+    Raises:
+        ValueError: if no codec was found
+    """
+    for bom, codec in BOM_SORTED_TO_CODEC.items():
+        if first_line.startswith(bom):
+            return codec
+
+    raise ValueError("No BOM found. Could not detect Unicode codec.")
+
+
+class UnicodeChecker(pylint.checkers.BaseChecker):
+    """Check characters that could be used to hide bad code to humans.
+
+    This includes:
+
+    - Bidirectional Unicode (see https://trojansource.codes/)
+
+    - Bad ASCII characters (see PEP672)
+
+        If a programmer requires to use such a character they should use the escaped
+        version, that is also much easier to read and does not depend on the editor used.
+
+    The Checker also includes a check that UTF-16 and UTF-32 are not used to encode
+    Python files.
+
+    At the time of writing Python supported only UTF-8. See
+    https://stackoverflow.com/questions/69897842/ and https://bugs.python.org/issue1503789
+    for background.
+    """
+
+    __implements__ = pylint.interfaces.IRawChecker
+    priority = -1
+
+    name = "unicode_checker"
+
+    msgs = {
+        "E2501": (
+            # This error will be only displayed to users once Python Supports
+            # UTF-16/UTF-32 (if at all)
+            "UTF-16 and UTF-32 aren't backward compatible. Use UTF-8 instead",
+            "invalid-unicode-codec",
+            (
+                "For compatibility use UTF-8 instead of UTF-16/UTF-32. "
+                "See also https://bugs.python.org/issue1503789 for a history "
+                "of this issue. And "
+                "https://softwareengineering.stackexchange.com/questions/102205/should-utf-16-be-considered-harmful "
+                "for some possible problems when using UTF-16 for instance."
+            ),
+        ),
+        "E2502": (
+            (
+                "Contains control characters that can permit obfuscated code "
+                "executed differently than displayed"
+            ),
+            "bidirectional-unicode",
+            (
+                "bidirectional unicode are typically not displayed characters required "
+                "to display right-to-left (RTL) script "
+                "(i.e. Chinese, Japanese, Arabic, Hebrew, ...) correctly. "
+                "So can you trust this code? "
+                "Are you sure it displayed correctly in all editors? "
+                "If you did not write it or your language is not RTL,"
+                " remove the special characters, as they could be used to trick you into executing code, "
+                "that does something else than what it looks like.\n"
+                "More Information:\n"
+                "https://en.wikipedia.org/wiki/Bidirectional_text\n"
+                "https://trojansource.codes/"
+            ),
+        ),
+        "C2503": (
+            "PEP8 recommends UTF-8 as encoding for Python files",
+            "bad-file-encoding",
+            (
+                "PEP8 recommends UTF-8 default encoding for Python files. See "
+                "https://www.python.org/dev/peps/pep-0008/#id20"
+            ),
+        ),
+        **{
+            bad_char.code: (
+                bad_char.description(),
+                bad_char.human_code(),
+                bad_char.help_text,
+            )
+            for bad_char in BAD_CHARS
+        },
+    }
+
+    @staticmethod
+    def _is_invalid_codec(codec: str) -> bool:
+        return codec.startswith("utf-16") or codec.startswith("utf-32")
+
+    @staticmethod
+    def _is_unicode(codec: str) -> bool:
+        return codec.startswith("utf")
+
+    @classmethod
+    def _find_line_matches(cls, line: bytes, codec: str) -> Dict[int, _BadChar]:
+        """Find all matches of BAD_CHARS within line.
+
+        Args:
+            line: the input
+            codec: that will be used to convert line/or search string into
+
+        Return:
+            A dictionary with the column offset and the BadASCIIChar
+        """
+        # We try to decode in Unicode to get the correct column offset
+        # if we would use bytes, it could be off because UTF-8 has no fixed length
+        try:
+            line_search = line.decode(codec, errors="strict")
+            search_dict = BAD_ASCII_SEARCH_DICT
+            return _map_positions_to_result(line_search, search_dict, "\n")
+        except UnicodeDecodeError:
+            # If we can't decode properly, we simply use bytes, even so the column offsets
+            # might be wrong a bit, but it is still better then nothing
+            line_search_byte = line
+            search_dict_byte: Dict[bytes, _BadChar] = {}
+            for char in BAD_CHARS:
+                # Some characters might not exist in all encodings
+                with contextlib.suppress(UnicodeDecodeError):
+                    search_dict_byte[
+                        _cached_encode_search(char.unescaped, codec)
+                    ] = char
+
+            return _map_positions_to_result(
+                line_search_byte,
+                search_dict_byte,
+                _cached_encode_search("\n", codec),
+                byte_str_length=_byte_to_str_length(codec),
+            )
+
+    @staticmethod
+    def _determine_codec(stream: io.BytesIO) -> Tuple[str, int]:
+        """Determine the codec from the given stream.
+
+        first tries https://www.python.org/dev/peps/pep-0263/
+        and if this fails also checks for BOMs of UTF-16 and UTF-32
+        to be future-proof.
+
+        Args:
+            stream: The byte stream to analyse
+
+        Returns: A tuple consisting of:
+                  - normalized codec name
+                  - the line in which the codec was found
+
+        Raises:
+            SyntaxError: if failing to detect codec
+        """
+        try:
+            # First try to detect encoding with PEP 263
+            # Doesn't work with UTF-16/32 at the time of writing
+            # see https://bugs.python.org/issue1503789
+            codec, lines = detect_encoding(stream.readline)
+
+            # lines are empty if UTF-8 BOM is found
+            codec_definition_line = len(lines) or 1
+        except SyntaxError as e:
+            # Codec could not be detected by Python, we try manually to check for
+            # UTF 16/32 BOMs, which aren't supported by Python at the time of writing.
+            # This is only included to be future save and handle these codecs as well
+            stream.seek(0)
+            try:
+                codec = extract_codec_from_bom(stream.readline())
+                codec_definition_line = 1
+            except ValueError as ve:
+                # Failed to detect codec, so the syntax error originated not from
+                # UTF16/32 codec usage. So simply raise the error again.
+                raise e from ve
+
+        return _normalize_codec_name(codec), codec_definition_line
+
+    def _check_codec(self, codec: str, codec_definition_line: int) -> None:
+        """Check validity of the codec."""
+        if codec != "utf-8":
+            msg = "bad-file-encoding"
+            if self._is_invalid_codec(codec):
+                msg = "invalid-unicode-codec"
+            self.add_message(
+                msg,
+                # Currently Nodes will lead to crashes of pylint
+                # node=node,
+                line=codec_definition_line,
+                end_lineno=codec_definition_line,
+                confidence=pylint.interfaces.HIGH,
+                col_offset=None,
+                end_col_offset=None,
+            )
+
+    def _check_invalid_chars(self, line: bytes, lineno: int, codec: str) -> None:
+        """Look for chars considered bad."""
+        matches = self._find_line_matches(line, codec)
+        for col, char in matches.items():
+            self.add_message(
+                char.human_code(),
+                # Currently Nodes will lead to crashes of pylint
+                # node=node,
+                line=lineno,
+                end_lineno=lineno,
+                confidence=pylint.interfaces.HIGH,
+                col_offset=col + 1,
+                end_col_offset=col + len(char.unescaped) + 1,
+            )
+
+    def _check_bidi_chars(self, line: bytes, lineno: int, codec: str) -> None:
+        """Look for Bidirectional Unicode, if we use unicode."""
+        if not self._is_unicode(codec):
+            return
+        for dangerous in BIDI_UNICODE:
+            if _cached_encode_search(dangerous, codec) in line:
+                # Note that we don't add a col_offset on purpose:
+                #   Using these unicode characters it depends on the editor
+                #   how it displays the location of characters in the line.
+                #   So we mark the complete line.
+                self.add_message(
+                    "bidirectional-unicode",
+                    # Currently Nodes will lead to crashes of pylint
+                    # node=node,
+                    line=lineno,
+                    end_lineno=lineno,
+                    # We mark the complete line, as bidi controls make it hard
+                    # to determine the correct cursor position within an editor
+                    col_offset=0,
+                    end_col_offset=_line_length(line, codec),
+                    confidence=pylint.interfaces.HIGH,
+                )
+                # We look for bidirectional unicode only once per line
+                # as we mark the complete line anyway
+                break
+
+    def process_module(self, node: nodes.Module) -> None:
+        """Perform the actual check by checking module stream."""
+        with node.stream() as stream:
+            codec, codec_line = self._determine_codec(stream)
+            self._check_codec(codec, codec_line)
+
+            stream.seek(0)
+
+            # Check for invalid content (controls/chars)
+            for (lineno, line) in enumerate(
+                _fix_utf16_32_line_stream(stream, codec), start=1
+            ):
+                if lineno == 1:
+                    line = _remove_bom(line, codec)
+                self._check_bidi_chars(line, lineno, codec)
+                self._check_invalid_chars(line, lineno, codec)
+
+
+def register(linter: pylint.lint.PyLinter) -> None:
+    linter.register_checker(UnicodeChecker(linter))
diff --git a/pylint/checkers/unsupported_version.py b/pylint/checkers/unsupported_version.py
index 52e0b5c757..d63d4fb20b 100644
--- a/pylint/checkers/unsupported_version.py
+++ b/pylint/checkers/unsupported_version.py
@@ -1,15 +1,14 @@
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2021 Mark Byrne <31762852+mbyrnepr2@users.noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Checker for features used that are not supported by all python versions
 indicated by the py-version setting.
 """
 
 
+from typing import TYPE_CHECKING
+
 from astroid import nodes
 
 from pylint.checkers import BaseChecker
@@ -19,9 +18,11 @@
     uninferable_final_decorators,
 )
 from pylint.interfaces import IAstroidChecker
-from pylint.lint import PyLinter
 from pylint.utils import get_global_option
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 class UnsupportedVersionChecker(BaseChecker):
     """Checker for features that are not supported by all python versions
@@ -31,13 +32,13 @@ class UnsupportedVersionChecker(BaseChecker):
     __implements__ = (IAstroidChecker,)
     name = "unsupported_version"
     msgs = {
-        "W1601": (
+        "W2601": (
             "F-strings are not supported by all versions included in the py-version setting",
             "using-f-string-in-unsupported-version",
             "Used when the py-version set by the user is lower than 3.6 and pylint encounters "
             "a f-string.",
         ),
-        "W1602": (
+        "W2602": (
             "typing.final is not supported by all versions included in the py-version setting",
             "using-final-decorator-in-unsupported-version",
             "Used when the py-version set by the user is lower than 3.8 and pylint encounters "
@@ -53,18 +54,19 @@ def open(self) -> None:
 
     @check_messages("using-f-string-in-unsupported-version")
     def visit_joinedstr(self, node: nodes.JoinedStr) -> None:
-        """Check f-strings"""
+        """Check f-strings."""
         if not self._py36_plus:
             self.add_message("using-f-string-in-unsupported-version", node=node)
 
     @check_messages("using-final-decorator-in-unsupported-version")
     def visit_decorators(self, node: nodes.Decorators) -> None:
-        """Check decorators"""
+        """Check decorators."""
         self._check_typing_final(node)
 
     def _check_typing_final(self, node: nodes.Decorators) -> None:
         """Add a message when the `typing.final` decorator is used and the
-        py-version is lower than 3.8"""
+        py-version is lower than 3.8
+        """
         if self._py38_plus:
             return
 
@@ -80,6 +82,5 @@ def _check_typing_final(self, node: nodes.Decorators) -> None:
             )
 
 
-def register(linter: PyLinter) -> None:
-    """Required method to auto register this checker"""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(UnsupportedVersionChecker(linter))
diff --git a/pylint/checkers/utils.py b/pylint/checkers/utils.py
index 5a03ca4f42..0267dfd582 100644
--- a/pylint/checkers/utils.py
+++ b/pylint/checkers/utils.py
@@ -1,64 +1,8 @@
-# Copyright (c) 2006-2007, 2009-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2009 Mads Kiilerich <mads@kiilerich.com>
-# Copyright (c) 2010 Daniel Harding <dharding@gmail.com>
-# Copyright (c) 2012-2014 Google, Inc.
-# Copyright (c) 2012 FELD Boris <lothiraldan@gmail.com>
-# Copyright (c) 2013-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Ricardo Gemignani <ricardo.gemignani@gmail.com>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Dmitry Pribysh <dmand@yandex.ru>
-# Copyright (c) 2015 Florian Bruhin <me@the-compiler.org>
-# Copyright (c) 2015 Radu Ciorba <radu@devrandom.ro>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016, 2018-2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2016-2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2016-2017 Moises Lopez <moylop260@vauxoo.com>
-# Copyright (c) 2016 Brian C. Lane <bcl@redhat.com>
-# Copyright (c) 2017-2018, 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2017 ttenhoeve-aa <ttenhoeve@appannie.com>
-# Copyright (c) 2018 Alan Chan <achan961117@gmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Yury Gribov <tetra2005@gmail.com>
-# Copyright (c) 2018 Caio Carrara <ccarrara@redhat.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Bryce Guinta <bryce.guinta@protonmail.com>
-# Copyright (c) 2018 Bryce Guinta <bryce.paul.guinta@gmail.com>
-# Copyright (c) 2018 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2018 Brian Shaginaw <brian.shaginaw@warbyparker.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Matthijs Blom <19817960+MatthijsBlom@users.noreply.github.com>
-# Copyright (c) 2019 Djailla <bastien.vallet@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2019 Nathan Marrow <nmarrow@google.com>
-# Copyright (c) 2019 Svet <svet@hyperscience.com>
-# Copyright (c) 2019 Pascal Corpet <pcorpet@users.noreply.github.com>
-# Copyright (c) 2020 Batuhan Taskaya <batuhanosmantaskaya@gmail.com>
-# Copyright (c) 2020 Luigi <luigi.cristofolini@q-ctrl.com>
-# Copyright (c) 2020 ethan-leba <ethanleba5@gmail.com>
-# Copyright (c) 2020 Damien Baty <damien.baty@polyconseil.fr>
-# Copyright (c) 2020 Andrew Simmons <anjsimmo@gmail.com>
-# Copyright (c) 2020 Ram Rachum <ram@rachum.com>
-# Copyright (c) 2020 Slavfox <slavfoxman@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-# Copyright (c) 2021 Yu Shao, Pang <36848472+yushao2@users.noreply.github.com>
-# Copyright (c) 2021 Mark Byrne <31762852+mbyrnepr2@users.noreply.github.com>
-# Copyright (c) 2021 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2021 Arianna Y <92831762+areveny@users.noreply.github.com>
-# Copyright (c) 2021 Jaehoon Hwang <jaehoonhwang@users.noreply.github.com>
-# Copyright (c) 2021 Samuel FORESTIER <HorlogeSkynet@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 David Liu <david@cs.toronto.edu>
-# Copyright (c) 2021 Matus Valo <matusvalo@users.noreply.github.com>
-# Copyright (c) 2021 Lorena B <46202743+lorena-b@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""some functions that may be useful for various checkers
-"""
+"""Some functions that may be useful for various checkers."""
 import builtins
 import itertools
 import numbers
@@ -86,6 +30,8 @@
 from astroid import TooManyLevelsError, nodes
 from astroid.context import InferenceContext
 
+from pylint.constants import TYPING_TYPE_CHECKS_GUARDS
+
 COMP_NODE_TYPES = (
     nodes.ListComp,
     nodes.SetComp,
@@ -119,7 +65,7 @@
 #
 # * None: variable number of parameters
 # * number: exactly that number of parameters
-# * tuple: this are the odd ones. Basically it means that the function
+# * tuple: these are the odd ones. Basically it means that the function
 #          can work with any number of arguments from that tuple,
 #          although it's best to implement it in order to accept
 #          all of them.
@@ -161,6 +107,8 @@
         "__aiter__",
         "__anext__",
         "__fspath__",
+        "__subclasses__",
+        "__init_subclass__",
     ),
     1: (
         "__format__",
@@ -294,7 +242,7 @@ class InferredTypeError(Exception):
 
 
 def is_inside_lambda(node: nodes.NodeNG) -> bool:
-    """Return whether the given node is inside a lambda"""
+    """Return whether the given node is inside a lambda."""
     warnings.warn(
         "utils.is_inside_lambda will be removed in favour of calling "
         "utils.get_node_first_ancestor_of_type(x, nodes.Lambda) in pylint 3.0",
@@ -315,14 +263,14 @@ def get_all_elements(
 
 
 def is_super(node: nodes.NodeNG) -> bool:
-    """return True if the node is referencing the "super" builtin function"""
+    """Return True if the node is referencing the "super" builtin function."""
     if getattr(node, "name", None) == "super" and node.root().name == "builtins":
         return True
     return False
 
 
 def is_error(node: nodes.FunctionDef) -> bool:
-    """Return true if the given function node only raises an exception"""
+    """Return true if the given function node only raises an exception."""
     return len(node.body) == 1 and isinstance(node.body[0], nodes.Raise)
 
 
@@ -336,8 +284,8 @@ def is_builtin_object(node: nodes.NodeNG) -> bool:
 
 
 def is_builtin(name: str) -> bool:
-    """return true if <name> could be considered as a builtin defined by python"""
-    return name in builtins or name in SPECIAL_BUILTINS  # type: ignore[operator]
+    """Return true if <name> could be considered as a builtin defined by python."""
+    return name in builtins or name in SPECIAL_BUILTINS  # type: ignore[attr-defined]
 
 
 def is_defined_in_scope(
@@ -389,7 +337,7 @@ def is_defined_in_scope(
 
 
 def is_defined_before(var_node: nodes.Name) -> bool:
-    """Check if the given variable node is defined before
+    """Check if the given variable node is defined before.
 
     Verify that the variable node is defined by a parent node
     (list, set, dict, or generator comprehension, lambda)
@@ -400,8 +348,8 @@ def is_defined_before(var_node: nodes.Name) -> bool:
     for parent in var_node.node_ancestors():
         if is_defined_in_scope(var_node, varname, parent):
             return True
-    # possibly multiple statements on the same line using semi colon separator
-    stmt = var_node.statement()
+    # possibly multiple statements on the same line using semicolon separator
+    stmt = var_node.statement(future=True)
     _node = stmt.previous_sibling()
     lineno = stmt.fromlineno
     while _node and _node.fromlineno == lineno:
@@ -418,7 +366,7 @@ def is_defined_before(var_node: nodes.Name) -> bool:
 def is_default_argument(
     node: nodes.NodeNG, scope: Optional[nodes.NodeNG] = None
 ) -> bool:
-    """return true if the given Name node is used in function or lambda
+    """Return true if the given Name node is used in function or lambda
     default argument's value
     """
     if not scope:
@@ -437,7 +385,7 @@ def is_default_argument(
 
 
 def is_func_decorator(node: nodes.NodeNG) -> bool:
-    """return true if the name is used in function decorator"""
+    """Return true if the name is used in function decorator."""
     for parent in node.node_ancestors():
         if isinstance(parent, nodes.Decorators):
             return True
@@ -454,7 +402,7 @@ def is_func_decorator(node: nodes.NodeNG) -> bool:
 
 
 def is_ancestor_name(frame: nodes.ClassDef, node: nodes.NodeNG) -> bool:
-    """return whether `frame` is an astroid.Class node with `node` in the
+    """Return whether `frame` is an astroid.Class node with `node` in the
     subtree of its bases attribute
     """
     if not isinstance(frame, nodes.ClassDef):
@@ -463,20 +411,21 @@ def is_ancestor_name(frame: nodes.ClassDef, node: nodes.NodeNG) -> bool:
 
 
 def is_being_called(node: nodes.NodeNG) -> bool:
-    """return True if node is the function being called in a Call node"""
+    """Return True if node is the function being called in a Call node."""
     return isinstance(node.parent, nodes.Call) and node.parent.func is node
 
 
 def assign_parent(node: nodes.NodeNG) -> nodes.NodeNG:
-    """return the higher parent which is not an AssignName, Tuple or List node"""
+    """Return the higher parent which is not an AssignName, Tuple or List node."""
     while node and isinstance(node, (nodes.AssignName, nodes.Tuple, nodes.List)):
         node = node.parent
     return node
 
 
 def overrides_a_method(class_node: nodes.ClassDef, name: str) -> bool:
-    """return True if <name> is a method overridden from an ancestor
-    which is not the base object class"""
+    """Return True if <name> is a method overridden from an ancestor
+    which is not the base object class
+    """
     for ancestor in class_node.ancestors():
         if ancestor.name == "object":
             continue
@@ -486,7 +435,7 @@ def overrides_a_method(class_node: nodes.ClassDef, name: str) -> bool:
 
 
 def check_messages(*messages: str) -> Callable:
-    """decorator to store messages that are handled by a checker method"""
+    """Decorator to store messages that are handled by a checker method."""
 
     def store_messages(func):
         func.checks_msgs = messages
@@ -501,7 +450,8 @@ class IncompleteFormatString(Exception):
 
 class UnsupportedFormatCharacter(Exception):
     """A format character in a format string is not one of the supported
-    format characters."""
+    format characters.
+    """
 
     def __init__(self, index):
         super().__init__(index)
@@ -511,11 +461,12 @@ def __init__(self, index):
 def parse_format_string(
     format_string: str,
 ) -> Tuple[Set[str], int, Dict[str, str], List[str]]:
-    """Parses a format string, returning a tuple of (keys, num_args), where keys
-    is the set of mapping keys in the format string, and num_args is the number
-    of arguments required by the format string.  Raises
-    IncompleteFormatString or UnsupportedFormatCharacter if a
-    parse error occurs."""
+    """Parses a format string, returning a tuple (keys, num_args).
+
+    Where 'keys' is the set of mapping keys in the format string, and 'num_args' is the number
+    of arguments required by the format string. Raises IncompleteFormatString or
+    UnsupportedFormatCharacter if a parse error occurs.
+    """
     keys = set()
     key_types = {}
     pos_types = []
@@ -592,8 +543,9 @@ def split_format_field_names(format_string) -> Tuple[str, Iterable[Tuple[bool, s
 
 def collect_string_fields(format_string) -> Iterable[Optional[str]]:
     """Given a format string, return an iterator
-    of all the valid format fields. It handles nested fields
-    as well.
+    of all the valid format fields.
+
+    It handles nested fields as well.
     """
     formatter = string.Formatter()
     try:
@@ -625,10 +577,10 @@ def collect_string_fields(format_string) -> Iterable[Optional[str]]:
 def parse_format_method_string(
     format_string: str,
 ) -> Tuple[List[Tuple[str, List[Tuple[bool, str]]]], int, int]:
-    """
-    Parses a PEP 3101 format string, returning a tuple of
-    (keyword_arguments, implicit_pos_args_cnt, explicit_pos_args),
-    where keyword_arguments is the set of mapping keys in the format string, implicit_pos_args_cnt
+    """Parses a PEP 3101 format string, returning a tuple of
+    (keyword_arguments, implicit_pos_args_cnt, explicit_pos_args).
+
+    keyword_arguments is the set of mapping keys in the format string, implicit_pos_args_cnt
     is the number of arguments required by the format string and
     explicit_pos_args is the number of arguments passed with the position.
     """
@@ -652,7 +604,7 @@ def parse_format_method_string(
 
 
 def is_attr_protected(attrname: str) -> bool:
-    """return True if attribute name is protected (start with _ and some other
+    """Return True if attribute name is protected (start with _ and some other
     details), False otherwise.
     """
     return (
@@ -663,12 +615,12 @@ def is_attr_protected(attrname: str) -> bool:
 
 
 def node_frame_class(node: nodes.NodeNG) -> Optional[nodes.ClassDef]:
-    """Return the class that is wrapping the given node
+    """Return the class that is wrapping the given node.
 
     The function returns a class for a method node (or a staticmethod or a
     classmethod), otherwise it returns `None`.
     """
-    klass = node.frame()
+    klass = node.frame(future=True)
     nodes_to_check = (
         nodes.NodeNG,
         astroid.UnboundMethod,
@@ -682,14 +634,14 @@ def node_frame_class(node: nodes.NodeNG) -> Optional[nodes.ClassDef]:
         if klass.parent is None:
             return None
 
-        klass = klass.parent.frame()
+        klass = klass.parent.frame(future=True)
 
     return klass
 
 
 def get_outer_class(class_node: astroid.ClassDef) -> Optional[astroid.ClassDef]:
-    """Return the class that is the outer class of given (nested) class_node"""
-    parent_klass = class_node.parent.frame()
+    """Return the class that is the outer class of given (nested) class_node."""
+    parent_klass = class_node.parent.frame(future=True)
 
     return parent_klass if isinstance(parent_klass, astroid.ClassDef) else None
 
@@ -733,8 +685,7 @@ def get_argument_from_call(
 
 
 def inherit_from_std_ex(node: nodes.NodeNG) -> bool:
-    """
-    Return whether the given class node is subclass of
+    """Return whether the given class node is subclass of
     exceptions.Exception.
     """
     ancestors = node.ancestors() if hasattr(node, "ancestors") else []
@@ -746,8 +697,7 @@ def inherit_from_std_ex(node: nodes.NodeNG) -> bool:
 
 
 def error_of_type(handler: nodes.ExceptHandler, error_type) -> bool:
-    """
-    Check if the given exception handler catches
+    """Check if the given exception handler catches
     the given error_type.
 
     The *handler* parameter is a node, representing an ExceptHandler node.
@@ -794,17 +744,17 @@ def _is_property_kind(node, *kinds):
 
 
 def is_property_setter(node: nodes.FunctionDef) -> bool:
-    """Check if the given node is a property setter"""
+    """Check if the given node is a property setter."""
     return _is_property_kind(node, "setter")
 
 
 def is_property_deleter(node: nodes.FunctionDef) -> bool:
-    """Check if the given node is a property deleter"""
+    """Check if the given node is a property deleter."""
     return _is_property_kind(node, "deleter")
 
 
 def is_property_setter_or_deleter(node: nodes.FunctionDef) -> bool:
-    """Check if the given node is either a property setter or a deleter"""
+    """Check if the given node is either a property setter or a deleter."""
     return _is_property_kind(node, "setter", "deleter")
 
 
@@ -876,7 +826,11 @@ def uninferable_final_decorators(
             except AttributeError:
                 continue
         elif isinstance(decorator, nodes.Name):
-            import_node = decorator.lookup(decorator.name)[1][0]
+            lookup_values = decorator.lookup(decorator.name)
+            if lookup_values[1]:
+                import_node = lookup_values[1][0]
+            else:
+                continue  # pragma: no cover # Covered on Python < 3.8
         else:
             continue
 
@@ -904,8 +858,7 @@ def uninferable_final_decorators(
 def unimplemented_abstract_methods(
     node: nodes.ClassDef, is_abstract_cb: nodes.FunctionDef = None
 ) -> Dict[str, nodes.NodeNG]:
-    """
-    Get the unimplemented abstract methods for the given *node*.
+    """Get the unimplemented abstract methods for the given *node*.
 
     A method can be considered abstract if the callback *is_abstract_cb*
     returns a ``True`` value. The check defaults to verifying that
@@ -924,8 +877,7 @@ def unimplemented_abstract_methods(
         # Old style class, it will not have a mro.
         return {}
     except astroid.ResolveError:
-        # Probably inconsistent hierarchy, don'try
-        # to figure this out here.
+        # Probably inconsistent hierarchy, don't try to figure this out here.
         return {}
     for ancestor in mro:
         for obj in ancestor.values():
@@ -1045,8 +997,8 @@ def get_exception_handlers(
 
 
 def is_node_inside_try_except(node: nodes.Raise) -> bool:
-    """Check if the node is directly under a Try/Except statement.
-    (but not under an ExceptHandler!)
+    """Check if the node is directly under a Try/Except statement
+    (but not under an ExceptHandler!).
 
     Args:
         node (nodes.Raise): the node raising the exception.
@@ -1071,7 +1023,7 @@ def node_ignores_exception(node: nodes.NodeNG, exception=Exception) -> bool:
 
 
 def class_is_abstract(node: nodes.ClassDef) -> bool:
-    """return true if the given class node should be considered as an abstract
+    """Return true if the given class node should be considered as an abstract
     class
     """
     # Only check for explicit metaclass=ABCMeta on this specific class
@@ -1086,7 +1038,7 @@ def class_is_abstract(node: nodes.ClassDef) -> bool:
             return True
 
     for method in node.methods():
-        if method.parent.frame() is node:
+        if method.parent.frame(future=True) is node:
             if method.is_abstract(pass_is_abstract=False):
                 return True
     return False
@@ -1186,6 +1138,11 @@ def _supports_protocol(
         if protocol_callback(value):
             return True
 
+    # pylint: disable-next=fixme
+    # TODO: Should be covered by https://github.com/PyCQA/astroid/pull/1475
+    if isinstance(value, nodes.ComprehensionScope):
+        return True
+
     if (
         isinstance(value, astroid.bases.Proxy)
         and isinstance(value._proxied, astroid.BaseInstance)
@@ -1231,7 +1188,7 @@ def supports_delitem(value: nodes.NodeNG, _: nodes.NodeNG) -> bool:
     return _supports_protocol(value, _supports_delitem_protocol)
 
 
-def _get_python_type_of_node(node):
+def _get_python_type_of_node(node: nodes.NodeNG) -> Optional[str]:
     pytype = getattr(node, "pytype", None)
     if callable(pytype):
         return pytype()
@@ -1239,13 +1196,15 @@ def _get_python_type_of_node(node):
 
 
 @lru_cache(maxsize=1024)
-def safe_infer(node: nodes.NodeNG, context=None) -> Optional[nodes.NodeNG]:
+def safe_infer(
+    node: nodes.NodeNG, context: Optional[InferenceContext] = None
+) -> Union[nodes.NodeNG, Type[astroid.Uninferable], None]:
     """Return the inferred value for the given node.
 
     Return None if inference failed or if there is some ambiguity (more than
     one node has been inferred of different types).
     """
-    inferred_types = set()
+    inferred_types: Set[Optional[str]] = set()
     try:
         infer_gen = node.infer(context=context)
         value = next(infer_gen)
@@ -1260,6 +1219,14 @@ def safe_infer(node: nodes.NodeNG, context=None) -> Optional[nodes.NodeNG]:
             inferred_type = _get_python_type_of_node(inferred)
             if inferred_type not in inferred_types:
                 return None  # If there is ambiguity on the inferred node.
+            if (
+                isinstance(inferred, nodes.FunctionDef)
+                and inferred.args.args is not None
+                and isinstance(value, nodes.FunctionDef)
+                and value.args.args is not None
+                and len(inferred.args.args) != len(value.args.args)
+            ):
+                return None  # Different number of arguments indicates ambiguity
     except astroid.InferenceError:
         return None  # There is some kind of ambiguity
     except StopIteration:
@@ -1305,7 +1272,7 @@ def is_none(node: nodes.NodeNG) -> bool:
 
 
 def node_type(node: nodes.NodeNG) -> Optional[nodes.NodeNG]:
-    """Return the inferred type for `node`
+    """Return the inferred type for `node`.
 
     If there is more than one possible type, or if inferred type is Uninferable or None,
     return None
@@ -1358,8 +1325,9 @@ def is_registered_in_singledispatch_function(node: nodes.FunctionDef) -> bool:
 
 
 def get_node_last_lineno(node: nodes.NodeNG) -> int:
-    """
-    Get the last lineno of the given node. For a simple statement this will just be node.lineno,
+    """Get the last lineno of the given node.
+
+    For a simple statement this will just be node.lineno,
     but for a node that has child statements (e.g. a method) this will be the lineno of the last
     child statement recursively.
     """
@@ -1381,7 +1349,7 @@ def get_node_last_lineno(node: nodes.NodeNG) -> int:
 
 
 def is_postponed_evaluation_enabled(node: nodes.NodeNG) -> bool:
-    """Check if the postponed evaluation of annotations is enabled"""
+    """Check if the postponed evaluation of annotations is enabled."""
     module = node.root()
     return "annotations" in module.future_imports
 
@@ -1430,8 +1398,8 @@ def is_node_in_type_annotation_context(node: nodes.NodeNG) -> bool:
 
 
 def is_subclass_of(child: nodes.ClassDef, parent: nodes.ClassDef) -> bool:
-    """
-    Check if first node is a subclass of second node.
+    """Check if first node is a subclass of second node.
+
     :param child: Node to check for subclass.
     :param parent: Node to check for superclass.
     :returns: True if child is derived from parent. False otherwise.
@@ -1450,7 +1418,7 @@ def is_subclass_of(child: nodes.ClassDef, parent: nodes.ClassDef) -> bool:
 
 @lru_cache(maxsize=1024)
 def is_overload_stub(node: nodes.NodeNG) -> bool:
-    """Check if a node if is a function stub decorated with typing.overload.
+    """Check if a node is a function stub decorated with typing.overload.
 
     :param node: Node to check.
     :returns: True if node is an overload function stub. False otherwise.
@@ -1460,7 +1428,7 @@ def is_overload_stub(node: nodes.NodeNG) -> bool:
 
 
 def is_protocol_class(cls: nodes.NodeNG) -> bool:
-    """Check if the given node represents a protocol class
+    """Check if the given node represents a protocol class.
 
     :param cls: The node to check
     :returns: True if the node is a typing protocol class, false otherwise.
@@ -1474,7 +1442,7 @@ def is_protocol_class(cls: nodes.NodeNG) -> bool:
 
 
 def is_call_of_name(node: nodes.NodeNG, name: str) -> bool:
-    """Checks if node is a function call with the given name"""
+    """Checks if node is a function call with the given name."""
     return (
         isinstance(node, nodes.Call)
         and isinstance(node.func, nodes.Name)
@@ -1486,7 +1454,7 @@ def is_test_condition(
     node: nodes.NodeNG,
     parent: Optional[nodes.NodeNG] = None,
 ) -> bool:
-    """Returns true if the given node is being tested for truthiness"""
+    """Returns true if the given node is being tested for truthiness."""
     parent = parent or node.parent
     if isinstance(parent, (nodes.While, nodes.If, nodes.IfExp, nodes.Assert)):
         return node is parent.test or parent.test.parent_of(node)
@@ -1578,8 +1546,7 @@ def get_iterating_dictionary_name(
 
 
 def get_subscript_const_value(node: nodes.Subscript) -> nodes.Const:
-    """
-    Returns the value 'subscript.slice' of a Subscript node.
+    """Returns the value 'subscript.slice' of a Subscript node.
 
     :param node: Subscript Node to extract value from
     :returns: Const Node containing subscript value
@@ -1595,7 +1562,7 @@ def get_subscript_const_value(node: nodes.Subscript) -> nodes.Const:
 def get_import_name(
     importnode: Union[nodes.Import, nodes.ImportFrom], modname: str
 ) -> str:
-    """Get a prepared module name from the given import node
+    """Get a prepared module name from the given import node.
 
     In the case of relative imports, this will return the
     absolute qualified module name, which might be useful
@@ -1651,8 +1618,14 @@ def is_typing_guard(node: nodes.If) -> bool:
     ) and node.test.as_string().endswith("TYPE_CHECKING")
 
 
+def is_node_in_typing_guarded_import_block(node: nodes.NodeNG) -> bool:
+    """Return True if node is part for guarded `typing.TYPE_CHECKING` if block."""
+    return isinstance(node.parent, nodes.If) and is_typing_guard(node.parent)
+
+
 def is_node_in_guarded_import_block(node: nodes.NodeNG) -> bool:
     """Return True if node is part for guarded if block.
+
     I.e. `sys.version_info` or `typing.TYPE_CHECKING`
     """
     return isinstance(node.parent, nodes.If) and (
@@ -1661,15 +1634,26 @@ def is_node_in_guarded_import_block(node: nodes.NodeNG) -> bool:
 
 
 def is_reassigned_after_current(node: nodes.NodeNG, varname: str) -> bool:
-    """Check if the given variable name is reassigned in the same scope after the current node"""
+    """Check if the given variable name is reassigned in the same scope after the current node."""
     return any(
         a.name == varname and a.lineno > node.lineno
-        for a in node.scope().nodes_of_class((nodes.AssignName, nodes.FunctionDef))
+        for a in node.scope().nodes_of_class(
+            (nodes.AssignName, nodes.ClassDef, nodes.FunctionDef)
+        )
+    )
+
+
+def is_deleted_after_current(node: nodes.NodeNG, varname: str) -> bool:
+    """Check if the given variable name is deleted in the same scope after the current node."""
+    return any(
+        getattr(target, "name", None) == varname and target.lineno > node.lineno
+        for del_node in node.scope().nodes_of_class(nodes.Delete)
+        for target in del_node.targets
     )
 
 
 def is_function_body_ellipsis(node: nodes.FunctionDef) -> bool:
-    """Checks whether a function body only consisst of a single Ellipsis"""
+    """Checks whether a function body only consists of a single Ellipsis."""
     return (
         len(node.body) == 1
         and isinstance(node.body[0], nodes.Expr)
@@ -1693,7 +1677,7 @@ def is_empty_str_literal(node: Optional[nodes.NodeNG]) -> bool:
 
 
 def returns_bool(node: nodes.NodeNG) -> bool:
-    """Returns true if a node is a return that returns a constant boolean"""
+    """Returns true if a node is a return that returns a constant boolean."""
     return (
         isinstance(node, nodes.Return)
         and isinstance(node.value, nodes.Const)
@@ -1702,10 +1686,36 @@ def returns_bool(node: nodes.NodeNG) -> bool:
 
 
 def get_node_first_ancestor_of_type(
-    node: nodes.NodeNG, ancestor_type: Union[Type[T_Node], Tuple[Type[T_Node]]]
+    node: nodes.NodeNG, ancestor_type: Union[Type[T_Node], Tuple[Type[T_Node], ...]]
 ) -> Optional[T_Node]:
-    """Return the first parent node that is any of the provided types (or None)"""
+    """Return the first parent node that is any of the provided types (or None)."""
     for ancestor in node.node_ancestors():
         if isinstance(ancestor, ancestor_type):
             return ancestor
     return None
+
+
+def get_node_first_ancestor_of_type_and_its_child(
+    node: nodes.NodeNG, ancestor_type: Union[Type[T_Node], Tuple[Type[T_Node], ...]]
+) -> Union[Tuple[None, None], Tuple[T_Node, nodes.NodeNG]]:
+    """Modified version of get_node_first_ancestor_of_type to also return the
+    descendant visited directly before reaching the sought ancestor
+
+    Useful for extracting whether a statement is guarded by a try, except, or finally
+    when searching for a TryFinally ancestor.
+    """
+    child = node
+    for ancestor in node.node_ancestors():
+        if isinstance(ancestor, ancestor_type):
+            return (ancestor, child)
+        child = ancestor
+    return None, None
+
+
+def in_type_checking_block(node: nodes.NodeNG) -> bool:
+    """Check if a node is guarded by a TYPE_CHECKS guard."""
+    return any(
+        isinstance(ancestor, nodes.If)
+        and ancestor.test.as_string() in TYPING_TYPE_CHECKS_GUARDS
+        for ancestor in node.node_ancestors()
+    )
diff --git a/pylint/checkers/variables.py b/pylint/checkers/variables.py
index f5605260a4..be30c05797 100644
--- a/pylint/checkers/variables.py
+++ b/pylint/checkers/variables.py
@@ -1,61 +1,8 @@
-# Copyright (c) 2006-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2009 Mads Kiilerich <mads@kiilerich.com>
-# Copyright (c) 2010 Daniel Harding <dharding@gmail.com>
-# Copyright (c) 2011-2014, 2017 Google, Inc.
-# Copyright (c) 2012 FELD Boris <lothiraldan@gmail.com>
-# Copyright (c) 2013-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Michal Nowikowski <godfryd@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Ricardo Gemignani <ricardo.gemignani@gmail.com>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Dmitry Pribysh <dmand@yandex.ru>
-# Copyright (c) 2015 Radu Ciorba <radu@devrandom.ro>
-# Copyright (c) 2015 Simu Toni <simutoni@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016, 2018-2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2016, 2018 Jakub Wilk <jwilk@jwilk.net>
-# Copyright (c) 2016-2017 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2016-2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2016 Grant Welch <gwelch925+github@gmail.com>
-# Copyright (c) 2017-2018, 2021 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2017-2018, 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2017 Dan Garrette <dhgarrette@gmail.com>
-# Copyright (c) 2018-2019 Jim Robertson <jrobertson98atx@gmail.com>
-# Copyright (c) 2018 Mike Miller <mtmiller@users.noreply.github.com>
-# Copyright (c) 2018 Lucas Cimon <lucas.cimon@gmail.com>
-# Copyright (c) 2018 Drew <drewrisinger@users.noreply.github.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Bryce Guinta <bryce.guinta@protonmail.com>
-# Copyright (c) 2018 Bryce Guinta <bryce.paul.guinta@gmail.com>
-# Copyright (c) 2018 Mike Frysinger <vapier@gmail.com>
-# Copyright (c) 2018 Marianna Polatoglou <mpolatoglou@bloomberg.net>
-# Copyright (c) 2018 mar-chi-pan <mar.polatoglou@gmail.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019, 2021 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2019 Djailla <bastien.vallet@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2020 Andrew Simmons <anjsimmo@gmail.com>
-# Copyright (c) 2020 Andrew Simmons <a.simmons@deakin.edu.au>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2020 Ashley Whetter <ashleyw@activestate.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Tushar Sadhwani <tushar.sadhwani000@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-# Copyright (c) 2021 David Liu <david@cs.toronto.edu>
-# Copyright (c) 2021 kasium <15907922+kasium@users.noreply.github.com>
-# Copyright (c) 2021 Marcin Kurczewski <rr-@sakuya.pl>
-# Copyright (c) 2021 Sergei Lebedev <185856+superbobry@users.noreply.github.com>
-# Copyright (c) 2021 Lorena B <46202743+lorena-b@users.noreply.github.com>
-# Copyright (c) 2021 haasea <44787650+haasea@users.noreply.github.com>
-# Copyright (c) 2021 Alexander Kapshuna <kapsh@kap.sh>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""variables checkers for Python code
-"""
+"""Variables checkers for Python code."""
 import collections
 import copy
 import itertools
@@ -64,21 +11,46 @@
 import sys
 from enum import Enum
 from functools import lru_cache
-from typing import Any, DefaultDict, List, Optional, Set, Tuple, Union
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    DefaultDict,
+    Dict,
+    Iterable,
+    Iterator,
+    List,
+    NamedTuple,
+    Optional,
+    Set,
+    Tuple,
+    Union,
+)
 
 import astroid
 from astroid import nodes
 
 from pylint.checkers import BaseChecker, utils
-from pylint.checkers.utils import is_postponed_evaluation_enabled
-from pylint.constants import PY39_PLUS
-from pylint.interfaces import HIGH, INFERENCE, INFERENCE_FAILURE, IAstroidChecker
+from pylint.checkers.utils import (
+    in_type_checking_block,
+    is_postponed_evaluation_enabled,
+)
+from pylint.constants import PY39_PLUS, TYPING_TYPE_CHECKS_GUARDS
+from pylint.interfaces import (
+    CONTROL_FLOW,
+    HIGH,
+    INFERENCE,
+    INFERENCE_FAILURE,
+    IAstroidChecker,
+)
 from pylint.utils import get_global_option
 
 if sys.version_info >= (3, 8):
-    from typing import Literal
+    from functools import cached_property
 else:
-    from typing_extensions import Literal
+    from astroid.decorators import cachedproperty as cached_property
+
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
 
 SPECIAL_OBJ = re.compile("^_{2}[a-z]+_{2}$")
 FUTURE = "__future__"
@@ -88,7 +60,6 @@
 # by astroid. Unfortunately this also messes up our explicit checks
 # for `abc`
 METACLASS_NAME_TRANSFORMS = {"_py_abc": "abc"}
-TYPING_TYPE_CHECKS_GUARDS = frozenset({"typing.TYPE_CHECKING", "TYPE_CHECKING"})
 BUILTIN_RANGE = "builtins.range"
 TYPING_MODULE = "typing"
 TYPING_NAMES = frozenset(
@@ -151,16 +122,15 @@
 
 
 class VariableVisitConsumerAction(Enum):
-    """Used after _visit_consumer to determine the action to be taken
+    """Reported by _check_consumer() and its sub-methods to determine the
+    subsequent action to take in _undefined_and_used_before_checker().
 
     Continue -> continue loop to next consumer
     Return -> return and thereby break the loop
-    Consume -> consume the found nodes (second return value) and return
     """
 
     CONTINUE = 0
     RETURN = 1
-    CONSUME = 2
 
 
 def _is_from_future_import(stmt, name):
@@ -185,7 +155,7 @@ def in_for_else_branch(parent, stmt):
 
 @lru_cache(maxsize=1000)
 def overridden_method(klass, name):
-    """get overridden method if any"""
+    """Get overridden method if any."""
     try:
         parent = next(klass.local_attr_ancestors(name))
     except (StopIteration, KeyError):
@@ -202,7 +172,7 @@ def overridden_method(klass, name):
 
 
 def _get_unpacking_extra_info(node, inferred):
-    """return extra information to add to the message for unpacking-non-sequence
+    """Return extra information to add to the message for unpacking-non-sequence
     and unbalanced-tuple-unpacking errors
     """
     more = ""
@@ -218,27 +188,41 @@ def _get_unpacking_extra_info(node, inferred):
 
 
 def _detect_global_scope(node, frame, defframe):
-    """Detect that the given frames shares a global
-    scope.
+    """Detect that the given frames share a global scope.
 
-    Two frames shares a global scope when neither
+    Two frames share a global scope when neither
     of them are hidden under a function scope, as well
-    as any of parent scope of them, until the root scope.
+    as any parent scope of them, until the root scope.
     In this case, depending from something defined later on
-    will not work, because it is still undefined.
+    will only work if guarded by a nested function definition.
 
     Example:
         class A:
             # B has the same global scope as `C`, leading to a NameError.
+            # Return True to indicate a shared scope.
             class B(C): ...
         class C: ...
 
+    Whereas this does not lead to a NameError:
+        class A:
+            def guard():
+                # Return False to indicate no scope sharing.
+                class B(C): ...
+        class C: ...
     """
     def_scope = scope = None
     if frame and frame.parent:
         scope = frame.parent.scope()
     if defframe and defframe.parent:
         def_scope = defframe.parent.scope()
+    if (
+        isinstance(frame, nodes.ClassDef)
+        and scope is not def_scope
+        and scope is utils.get_node_first_ancestor_of_type(node, nodes.FunctionDef)
+    ):
+        # If the current node's scope is a class nested under a function,
+        # and the def_scope is something else, then they aren't shared.
+        return False
     if isinstance(frame, nodes.FunctionDef):
         # If the parent of the current node is a
         # function, then it can be under its scope
@@ -272,12 +256,12 @@ class C: ...
     if break_scopes and len(set(break_scopes)) != 1:
         # Store different scopes than expected.
         # If the stored scopes are, in fact, the very same, then it means
-        # that the two frames (frame and defframe) shares the same scope,
+        # that the two frames (frame and defframe) share the same scope,
         # and we could apply our lineno analysis over them.
         # For instance, this works when they are inside a function, the node
         # that uses a definition and the definition itself.
         return False
-    # At this point, we are certain that frame and defframe shares a scope
+    # At this point, we are certain that frame and defframe share a scope
     # and the definition of the first depends on the second.
     return frame.lineno < defframe.lineno
 
@@ -290,7 +274,9 @@ def _infer_name_module(node, name):
 
 def _fix_dot_imports(not_consumed):
     """Try to fix imports with multiple dots, by returning a dictionary
-    with the import names expanded. The function unflattens root imports,
+    with the import names expanded.
+
+    The function unflattens root imports,
     like 'xml' (when we have both 'xml.etree' and 'xml.sax'), to 'xml.etree'
     and 'xml.sax' respectively.
     """
@@ -331,9 +317,9 @@ def _fix_dot_imports(not_consumed):
 
 
 def _find_frame_imports(name, frame):
-    """
-    Detect imports in the frame, with the required
-    *name*. Such imports can be considered assignments.
+    """Detect imports in the frame, with the required *name*.
+
+    Such imports can be considered assignments.
     Returns True if an import for the given name was found.
     """
     imports = frame.nodes_of_class((nodes.Import, nodes.ImportFrom))
@@ -361,28 +347,19 @@ def _import_name_is_global(stmt, global_names):
     return False
 
 
-def _flattened_scope_names(iterator):
+def _flattened_scope_names(
+    iterator: Iterator[Union[nodes.Global, nodes.Nonlocal]]
+) -> Set[str]:
     values = (set(stmt.names) for stmt in iterator)
     return set(itertools.chain.from_iterable(values))
 
 
 def _assigned_locally(name_node):
-    """
-    Checks if name_node has corresponding assign statement in same scope
-    """
+    """Checks if name_node has corresponding assign statement in same scope."""
     assign_stmts = name_node.scope().nodes_of_class(nodes.AssignName)
     return any(a.name == name_node.name for a in assign_stmts)
 
 
-def _is_type_checking_import(node: Union[nodes.Import, nodes.ImportFrom]) -> bool:
-    """Check if an import node is guarded by a TYPE_CHECKS guard"""
-    return any(
-        isinstance(ancestor, nodes.If)
-        and ancestor.test.as_string() in TYPING_TYPE_CHECKS_GUARDS
-        for ancestor in node.node_ancestors()
-    )
-
-
 def _has_locals_call_after_node(stmt, scope):
     skip_nodes = (
         nodes.FunctionDef,
@@ -405,7 +382,11 @@ def _has_locals_call_after_node(stmt, scope):
     "E0601": (
         "Using variable %r before assignment",
         "used-before-assignment",
-        "Used when a local variable is accessed before its assignment.",
+        "Emitted when a local variable is accessed before its assignment took place. "
+        "Assignments in try blocks are assumed not to have occurred when evaluating "
+        "associated except/finally blocks. Assignments in except blocks are assumed "
+        "not to have occurred when evaluating statements outside the block, except "
+        "when the associated try block contains a return statement.",
     ),
     "E0602": (
         "Undefined variable %r",
@@ -533,28 +514,37 @@ def _has_locals_call_after_node(stmt, scope):
 }
 
 
-ScopeConsumer = collections.namedtuple(
-    "ScopeConsumer", "to_consume consumed scope_type"
-)
+class ScopeConsumer(NamedTuple):
+    """Store nodes and their consumption states."""
+
+    to_consume: Dict[str, List[nodes.NodeNG]]
+    consumed: Dict[str, List[nodes.NodeNG]]
+    consumed_uncertain: DefaultDict[str, List[nodes.NodeNG]]
+    scope_type: str
 
 
 class NamesConsumer:
-    """
-    A simple class to handle consumed, to consume and scope type info of node locals
-    """
+    """A simple class to handle consumed, to consume and scope type info of node locals."""
 
     def __init__(self, node, scope_type):
-        self._atomic = ScopeConsumer(copy.copy(node.locals), {}, scope_type)
+        self._atomic = ScopeConsumer(
+            copy.copy(node.locals), {}, collections.defaultdict(list), scope_type
+        )
         self.node = node
 
     def __repr__(self):
         to_consumes = [f"{k}->{v}" for k, v in self._atomic.to_consume.items()]
         consumed = [f"{k}->{v}" for k, v in self._atomic.consumed.items()]
+        consumed_uncertain = [
+            f"{k}->{v}" for k, v in self._atomic.consumed_uncertain.items()
+        ]
         to_consumes = ", ".join(to_consumes)
         consumed = ", ".join(consumed)
+        consumed_uncertain = ", ".join(consumed_uncertain)
         return f"""
 to_consume : {to_consumes}
 consumed : {consumed}
+consumed_uncertain: {consumed_uncertain}
 scope_type : {self._atomic.scope_type}
 """
 
@@ -569,13 +559,24 @@ def to_consume(self):
     def consumed(self):
         return self._atomic.consumed
 
+    @property
+    def consumed_uncertain(self) -> DefaultDict[str, List[nodes.NodeNG]]:
+        """Retrieves nodes filtered out by get_next_to_consume() that may not
+        have executed, such as statements in except blocks, or statements
+
+        in try blocks (when evaluating their corresponding except and finally
+        blocks). Checkers that want to treat the statements as executed
+        (e.g. for unused-variable) may need to add them back.
+        """
+        return self._atomic.consumed_uncertain
+
     @property
     def scope_type(self):
         return self._atomic.scope_type
 
     def mark_as_consumed(self, name, consumed_nodes):
-        """
-        Mark the given nodes as consumed for the name.
+        """Mark the given nodes as consumed for the name.
+
         If all of the nodes for the name were consumed, delete the name from
         the to_consume dictionary
         """
@@ -587,14 +588,17 @@ def mark_as_consumed(self, name, consumed_nodes):
         else:
             del self.to_consume[name]
 
-    def get_next_to_consume(self, node):
-        """
-        Return a list of the nodes that define `node` from this scope.
+    def get_next_to_consume(self, node: nodes.Name) -> Optional[List[nodes.NodeNG]]:
+        """Return a list of the nodes that define `node` from this scope.
+
+        If it is uncertain whether a node will be consumed, such as for statements in
+        except blocks, add it to self.consumed_uncertain instead of returning it.
         Return None to indicate a special case that needs to be handled by the caller.
         """
         name = node.name
         parent_node = node.parent
         found_nodes = self.to_consume.get(name)
+        node_statement = node.statement(future=True)
         if (
             found_nodes
             and isinstance(parent_node, nodes.Assign)
@@ -612,21 +616,356 @@ def get_next_to_consume(self, node):
         ):
             found_nodes = None
 
+        # Before filtering, check that this node's name is not a nonlocal
+        if any(
+            isinstance(child, nodes.Nonlocal) and node.name in child.names
+            for child in node.frame(future=True).get_children()
+        ):
+            return found_nodes
+
+        # And no comprehension is under the node's frame
+        if VariablesChecker._comprehension_between_frame_and_node(node):
+            return found_nodes
+
         # Filter out assignments in ExceptHandlers that node is not contained in
         if found_nodes:
             found_nodes = [
                 n
                 for n in found_nodes
-                if not isinstance(n.statement(), nodes.ExceptHandler)
-                or n.statement().parent_of(node)
+                if not isinstance(n.statement(future=True), nodes.ExceptHandler)
+                or n.statement(future=True).parent_of(node)
             ]
 
+        # Filter out assignments in an Except clause that the node is not
+        # contained in, assuming they may fail
+        if found_nodes:
+            uncertain_nodes = self._uncertain_nodes_in_except_blocks(
+                found_nodes, node, node_statement
+            )
+            self.consumed_uncertain[node.name] += uncertain_nodes
+            uncertain_nodes_set = set(uncertain_nodes)
+            found_nodes = [n for n in found_nodes if n not in uncertain_nodes_set]
+
+        # If this node is in a Finally block of a Try/Finally,
+        # filter out assignments in the try portion, assuming they may fail
+        if found_nodes:
+            uncertain_nodes = (
+                self._uncertain_nodes_in_try_blocks_when_evaluating_finally_blocks(
+                    found_nodes, node_statement
+                )
+            )
+            self.consumed_uncertain[node.name] += uncertain_nodes
+            uncertain_nodes_set = set(uncertain_nodes)
+            found_nodes = [n for n in found_nodes if n not in uncertain_nodes_set]
+
+        # If this node is in an ExceptHandler,
+        # filter out assignments in the try portion, assuming they may fail
+        if found_nodes:
+            uncertain_nodes = (
+                self._uncertain_nodes_in_try_blocks_when_evaluating_except_blocks(
+                    found_nodes, node_statement
+                )
+            )
+            self.consumed_uncertain[node.name] += uncertain_nodes
+            uncertain_nodes_set = set(uncertain_nodes)
+            found_nodes = [n for n in found_nodes if n not in uncertain_nodes_set]
+
         return found_nodes
 
+    @staticmethod
+    def _uncertain_nodes_in_except_blocks(
+        found_nodes: List[nodes.NodeNG],
+        node: nodes.NodeNG,
+        node_statement: nodes.Statement,
+    ) -> List[nodes.NodeNG]:
+        """Return any nodes in ``found_nodes`` that should be treated as uncertain
+        because they are in an except block.
+        """
+        uncertain_nodes = []
+        for other_node in found_nodes:
+            other_node_statement = other_node.statement(future=True)
+            # Only testing for statements in the except block of TryExcept
+            closest_except_handler = utils.get_node_first_ancestor_of_type(
+                other_node_statement, nodes.ExceptHandler
+            )
+            if not closest_except_handler:
+                continue
+            # If the other node is in the same scope as this node, assume it executes
+            if closest_except_handler.parent_of(node):
+                continue
+            closest_try_except: nodes.TryExcept = closest_except_handler.parent
+            try_block_returns = any(
+                isinstance(try_statement, nodes.Return)
+                for try_statement in closest_try_except.body
+            )
+            # If the try block returns, assume the except blocks execute.
+            if try_block_returns:
+                # Exception: if this node is in the final block of the other_node_statement,
+                # it will execute before returning. Assume the except statements are uncertain.
+                if (
+                    isinstance(node_statement.parent, nodes.TryFinally)
+                    and node_statement in node_statement.parent.finalbody
+                    and closest_try_except.parent.parent_of(node_statement)
+                ):
+                    uncertain_nodes.append(other_node)
+                # Assume the except blocks execute, so long as each handler
+                # defines the name, raises, or returns.
+                elif all(
+                    NamesConsumer._defines_name_raises_or_returns(node.name, handler)
+                    for handler in closest_try_except.handlers
+                ):
+                    continue
+
+            if NamesConsumer._check_loop_finishes_via_except(node, closest_try_except):
+                continue
+
+            # Passed all tests for uncertain execution
+            uncertain_nodes.append(other_node)
+        return uncertain_nodes
+
+    @staticmethod
+    def _defines_name_raises_or_returns(
+        name: str, handler: nodes.ExceptHandler
+    ) -> bool:
+        """Return True if some child of `handler` defines the name `name`,
+        raises, or returns.
+        """
+
+        def _define_raise_or_return(stmt: nodes.NodeNG) -> bool:
+            if isinstance(stmt, (nodes.Raise, nodes.Return)):
+                return True
+            if isinstance(stmt, nodes.Assign):
+                for target in stmt.targets:
+                    for elt in utils.get_all_elements(target):
+                        if isinstance(elt, nodes.AssignName) and elt.name == name:
+                            return True
+            if isinstance(stmt, nodes.If):
+                # Check for assignments inside the test
+                if (
+                    isinstance(stmt.test, nodes.NamedExpr)
+                    and stmt.test.target.name == name
+                ):
+                    return True
+                if isinstance(stmt.test, nodes.Call):
+                    for arg_or_kwarg in stmt.test.args + [
+                        kw.value for kw in stmt.test.keywords
+                    ]:
+                        if (
+                            isinstance(arg_or_kwarg, nodes.NamedExpr)
+                            and arg_or_kwarg.target.name == name
+                        ):
+                            return True
+            return False
+
+        for stmt in handler.get_children():
+            if _define_raise_or_return(stmt):
+                return True
+            if isinstance(stmt, (nodes.If, nodes.With)):
+                if any(
+                    _define_raise_or_return(nested_stmt)
+                    for nested_stmt in stmt.get_children()
+                ):
+                    return True
+        return False
+
+    @staticmethod
+    def _check_loop_finishes_via_except(
+        node: nodes.NodeNG, other_node_try_except: nodes.TryExcept
+    ) -> bool:
+        """Check for a case described in https://github.com/PyCQA/pylint/issues/5683.
+
+        It consists of a specific control flow scenario where the only
+        non-break exit from a loop consists of the very except handler we are
+        examining, such that code in the `else` branch of the loop can depend on it
+        being assigned.
+
+        Example:
+
+        for _ in range(3):
+            try:
+                do_something()
+            except:
+                name = 1  <-- only non-break exit from loop
+            else:
+                break
+        else:
+            print(name)
+        """
+        if not other_node_try_except.orelse:
+            return False
+        closest_loop: Optional[
+            Union[nodes.For, nodes.While]
+        ] = utils.get_node_first_ancestor_of_type(node, (nodes.For, nodes.While))
+        if closest_loop is None:
+            return False
+        if not any(
+            else_statement is node or else_statement.parent_of(node)
+            for else_statement in closest_loop.orelse
+        ):
+            # `node` not guarded by `else`
+            return False
+        for inner_else_statement in other_node_try_except.orelse:
+            if isinstance(inner_else_statement, nodes.Break):
+                break_stmt = inner_else_statement
+                break
+        else:
+            # No break statement
+            return False
+
+        def _try_in_loop_body(
+            other_node_try_except: nodes.TryExcept, loop: Union[nodes.For, nodes.While]
+        ) -> bool:
+            """Return True if `other_node_try_except` is a descendant of `loop`."""
+            return any(
+                loop_body_statement is other_node_try_except
+                or loop_body_statement.parent_of(other_node_try_except)
+                for loop_body_statement in loop.body
+            )
+
+        if not _try_in_loop_body(other_node_try_except, closest_loop):
+            for ancestor in closest_loop.node_ancestors():
+                if isinstance(ancestor, (nodes.For, nodes.While)):
+                    if _try_in_loop_body(other_node_try_except, ancestor):
+                        break
+            else:
+                # `other_node_try_except` didn't have a shared ancestor loop
+                return False
+
+        for loop_stmt in closest_loop.body:
+            if NamesConsumer._recursive_search_for_continue_before_break(
+                loop_stmt, break_stmt
+            ):
+                break
+        else:
+            # No continue found, so we arrived at our special case!
+            return True
+        return False
+
+    @staticmethod
+    def _recursive_search_for_continue_before_break(
+        stmt: nodes.Statement, break_stmt: nodes.Break
+    ) -> bool:
+        """Return True if any Continue node can be found in descendants of `stmt`
+        before encountering `break_stmt`, ignoring any nested loops.
+        """
+        if stmt is break_stmt:
+            return False
+        if isinstance(stmt, nodes.Continue):
+            return True
+        for child in stmt.get_children():
+            if isinstance(stmt, (nodes.For, nodes.While)):
+                continue
+            if NamesConsumer._recursive_search_for_continue_before_break(
+                child, break_stmt
+            ):
+                return True
+        return False
+
+    @staticmethod
+    def _uncertain_nodes_in_try_blocks_when_evaluating_except_blocks(
+        found_nodes: List[nodes.NodeNG], node_statement: nodes.Statement
+    ) -> List[nodes.NodeNG]:
+        """Return any nodes in ``found_nodes`` that should be treated as uncertain because they
+        are in a try block and the ``node_statement`` being evaluated is in one of its except handlers.
+        """
+        uncertain_nodes: List[nodes.NodeNG] = []
+        closest_except_handler = utils.get_node_first_ancestor_of_type(
+            node_statement, nodes.ExceptHandler
+        )
+        if closest_except_handler is None:
+            return uncertain_nodes
+        for other_node in found_nodes:
+            other_node_statement = other_node.statement(future=True)
+            # If the other statement is the except handler guarding `node`, it executes
+            if other_node_statement is closest_except_handler:
+                continue
+            # Ensure other_node is in a try block
+            (
+                other_node_try_ancestor,
+                other_node_try_ancestor_visited_child,
+            ) = utils.get_node_first_ancestor_of_type_and_its_child(
+                other_node_statement, nodes.TryExcept
+            )
+            if other_node_try_ancestor is None:
+                continue
+            if (
+                other_node_try_ancestor_visited_child
+                not in other_node_try_ancestor.body
+            ):
+                continue
+            # Make sure nesting is correct -- there should be at least one
+            # except handler that is a sibling attached to the try ancestor,
+            # or is an ancestor of the try ancestor.
+            if not any(
+                closest_except_handler in other_node_try_ancestor.handlers
+                or other_node_try_ancestor_except_handler
+                in closest_except_handler.node_ancestors()
+                for other_node_try_ancestor_except_handler in other_node_try_ancestor.handlers
+            ):
+                continue
+            # Passed all tests for uncertain execution
+            uncertain_nodes.append(other_node)
+        return uncertain_nodes
+
+    @staticmethod
+    def _uncertain_nodes_in_try_blocks_when_evaluating_finally_blocks(
+        found_nodes: List[nodes.NodeNG], node_statement: nodes.Statement
+    ) -> List[nodes.NodeNG]:
+        uncertain_nodes: List[nodes.NodeNG] = []
+        (
+            closest_try_finally_ancestor,
+            child_of_closest_try_finally_ancestor,
+        ) = utils.get_node_first_ancestor_of_type_and_its_child(
+            node_statement, nodes.TryFinally
+        )
+        if closest_try_finally_ancestor is None:
+            return uncertain_nodes
+        if (
+            child_of_closest_try_finally_ancestor
+            not in closest_try_finally_ancestor.finalbody
+        ):
+            return uncertain_nodes
+        for other_node in found_nodes:
+            other_node_statement = other_node.statement(future=True)
+            (
+                other_node_try_finally_ancestor,
+                child_of_other_node_try_finally_ancestor,
+            ) = utils.get_node_first_ancestor_of_type_and_its_child(
+                other_node_statement, nodes.TryFinally
+            )
+            if other_node_try_finally_ancestor is None:
+                continue
+            # other_node needs to descend from the try of a try/finally.
+            if (
+                child_of_other_node_try_finally_ancestor
+                not in other_node_try_finally_ancestor.body
+            ):
+                continue
+            # If the two try/finally ancestors are not the same, then
+            # node_statement's closest try/finally ancestor needs to be in
+            # the final body of other_node's try/finally ancestor, or
+            # descend from one of the statements in that final body.
+            if (
+                other_node_try_finally_ancestor is not closest_try_finally_ancestor
+                and not any(
+                    other_node_final_statement is closest_try_finally_ancestor
+                    or other_node_final_statement.parent_of(
+                        closest_try_finally_ancestor
+                    )
+                    for other_node_final_statement in other_node_try_finally_ancestor.finalbody
+                )
+            ):
+                continue
+            # Passed all tests for uncertain execution
+            uncertain_nodes.append(other_node)
+        return uncertain_nodes
+
 
 # pylint: disable=too-many-public-methods
 class VariablesChecker(BaseChecker):
-    """checks for
+    """BaseChecker for variables.
+
+    Checks for
     * unused variables / imports
     * undefined variables
     * redefinition of variable from builtins or from an outer scope
@@ -735,16 +1074,17 @@ def __init__(self, linter=None):
         self._checking_mod_attr = None
         self._loop_variables = []
         self._type_annotation_names = []
+        self._except_handler_names_queue: List[
+            Tuple[nodes.ExceptHandler, nodes.AssignName]
+        ] = []
+        """This is a queue, last in first out."""
         self._postponed_evaluation_enabled = False
 
     def open(self) -> None:
-        """Called when loading the checker"""
+        """Called when loading the checker."""
         self._is_undefined_variable_enabled = self.linter.is_message_enabled(
             "undefined-variable"
         )
-        self._is_used_before_assignment_enabled = self.linter.is_message_enabled(
-            "used-before-assignment"
-        )
         self._is_undefined_loop_variable_enabled = self.linter.is_message_enabled(
             "undefined-loop-variable"
         )
@@ -777,7 +1117,7 @@ def leave_for(self, node: nodes.For) -> None:
         self._store_type_annotation_names(node)
 
     def visit_module(self, node: nodes.Module) -> None:
-        """visit module : update consumption analysis variable
+        """Visit module : update consumption analysis variable
         checks globals doesn't overrides builtins
         """
         self._to_consume = [NamesConsumer(node, "module")]
@@ -799,7 +1139,7 @@ def visit_module(self, node: nodes.Module) -> None:
         "unused-variable",
     )
     def leave_module(self, node: nodes.Module) -> None:
-        """leave module: check globals"""
+        """Leave module: check globals."""
         assert len(self._to_consume) == 1
 
         self._check_metaclasses(node)
@@ -818,52 +1158,52 @@ def leave_module(self, node: nodes.Module) -> None:
         self._check_imports(not_consumed)
 
     def visit_classdef(self, node: nodes.ClassDef) -> None:
-        """visit class: update consumption analysis variable"""
+        """Visit class: update consumption analysis variable."""
         self._to_consume.append(NamesConsumer(node, "class"))
 
     def leave_classdef(self, _: nodes.ClassDef) -> None:
-        """leave class: update consumption analysis variable"""
+        """Leave class: update consumption analysis variable."""
         # do not check for not used locals here (no sense)
         self._to_consume.pop()
 
     def visit_lambda(self, node: nodes.Lambda) -> None:
-        """visit lambda: update consumption analysis variable"""
+        """Visit lambda: update consumption analysis variable."""
         self._to_consume.append(NamesConsumer(node, "lambda"))
 
     def leave_lambda(self, _: nodes.Lambda) -> None:
-        """leave lambda: update consumption analysis variable"""
+        """Leave lambda: update consumption analysis variable."""
         # do not check for not used locals here
         self._to_consume.pop()
 
     def visit_generatorexp(self, node: nodes.GeneratorExp) -> None:
-        """visit genexpr: update consumption analysis variable"""
+        """Visit genexpr: update consumption analysis variable."""
         self._to_consume.append(NamesConsumer(node, "comprehension"))
 
     def leave_generatorexp(self, _: nodes.GeneratorExp) -> None:
-        """leave genexpr: update consumption analysis variable"""
+        """Leave genexpr: update consumption analysis variable."""
         # do not check for not used locals here
         self._to_consume.pop()
 
     def visit_dictcomp(self, node: nodes.DictComp) -> None:
-        """visit dictcomp: update consumption analysis variable"""
+        """Visit dictcomp: update consumption analysis variable."""
         self._to_consume.append(NamesConsumer(node, "comprehension"))
 
     def leave_dictcomp(self, _: nodes.DictComp) -> None:
-        """leave dictcomp: update consumption analysis variable"""
+        """Leave dictcomp: update consumption analysis variable."""
         # do not check for not used locals here
         self._to_consume.pop()
 
     def visit_setcomp(self, node: nodes.SetComp) -> None:
-        """visit setcomp: update consumption analysis variable"""
+        """Visit setcomp: update consumption analysis variable."""
         self._to_consume.append(NamesConsumer(node, "comprehension"))
 
     def leave_setcomp(self, _: nodes.SetComp) -> None:
-        """leave setcomp: update consumption analysis variable"""
+        """Leave setcomp: update consumption analysis variable."""
         # do not check for not used locals here
         self._to_consume.pop()
 
     def visit_functiondef(self, node: nodes.FunctionDef) -> None:
-        """visit function: update consumption analysis variable and check locals"""
+        """Visit function: update consumption analysis variable and check locals."""
         self._to_consume.append(NamesConsumer(node, "function"))
         if not (
             self.linter.is_message_enabled("redefined-outer-name")
@@ -905,7 +1245,7 @@ def visit_functiondef(self, node: nodes.FunctionDef) -> None:
                 self.add_message("redefined-builtin", args=name, node=stmt)
 
     def leave_functiondef(self, node: nodes.FunctionDef) -> None:
-        """leave function: check function's locals are consumed"""
+        """Leave function: check function's locals are consumed."""
         self._check_metaclasses(node)
 
         if node.type_comment_returns:
@@ -933,8 +1273,23 @@ def leave_functiondef(self, node: nodes.FunctionDef) -> None:
 
         global_names = _flattened_scope_names(node.nodes_of_class(nodes.Global))
         nonlocal_names = _flattened_scope_names(node.nodes_of_class(nodes.Nonlocal))
+        comprehension_target_names: List[str] = []
+
+        for comprehension_scope in node.nodes_of_class(nodes.ComprehensionScope):
+            for generator in comprehension_scope.generators:
+                self._find_assigned_names_recursive(
+                    generator.target, comprehension_target_names
+                )
+
         for name, stmts in not_consumed.items():
-            self._check_is_unused(name, node, stmts[0], global_names, nonlocal_names)
+            self._check_is_unused(
+                name,
+                node,
+                stmts[0],
+                global_names,
+                nonlocal_names,
+                comprehension_target_names,
+            )
 
     visit_asyncfunctiondef = visit_functiondef
     leave_asyncfunctiondef = leave_functiondef
@@ -947,8 +1302,8 @@ def leave_functiondef(self, node: nodes.FunctionDef) -> None:
         "redefined-builtin",
     )
     def visit_global(self, node: nodes.Global) -> None:
-        """check names imported exists in the global scope"""
-        frame = node.frame()
+        """Check names imported exists in the global scope."""
+        frame = node.frame(future=True)
         if isinstance(frame, nodes.Module):
             self.add_message("global-at-module-level", node=node)
             return
@@ -968,6 +1323,7 @@ def visit_global(self, node: nodes.Global) -> None:
             )
             if (
                 not utils.is_reassigned_after_current(node, name)
+                and not utils.is_deleted_after_current(node, name)
                 and not_defined_locally_by_import
             ):
                 self.add_message("global-variable-not-assigned", args=name, node=node)
@@ -981,10 +1337,13 @@ def visit_global(self, node: nodes.Global) -> None:
                 ):
                     self.add_message("redefined-builtin", args=name, node=node)
                     break
-                if anode.frame() is module:
+                if anode.frame(future=True) is module:
                     # module level assignment
                     break
-                if isinstance(anode, nodes.FunctionDef) and anode.parent is module:
+                if (
+                    isinstance(anode, (nodes.ClassDef, nodes.FunctionDef))
+                    and anode.parent is module
+                ):
                     # module level function assignment
                     break
             else:
@@ -1009,7 +1368,7 @@ def visit_name(self, node: nodes.Name) -> None:
         It's important that all 'Name' nodes are visited, otherwise the
         'NamesConsumers' won't be correct.
         """
-        stmt = node.statement()
+        stmt = node.statement(future=True)
         if stmt.fromlineno is None:
             # name node from an astroid built from live code, skip
             assert not stmt.root().file.endswith(".py")
@@ -1019,6 +1378,28 @@ def visit_name(self, node: nodes.Name) -> None:
         if self._is_undefined_loop_variable_enabled:
             self._loopvar_name(node)
 
+    @utils.check_messages("redefined-outer-name")
+    def visit_excepthandler(self, node: nodes.ExceptHandler) -> None:
+        if not node.name or not isinstance(node.name, nodes.AssignName):
+            return
+
+        for outer_except, outer_except_assign_name in self._except_handler_names_queue:
+            if node.name.name == outer_except_assign_name.name:
+                self.add_message(
+                    "redefined-outer-name",
+                    args=(outer_except_assign_name.name, outer_except.fromlineno),
+                    node=node,
+                )
+                break
+
+        self._except_handler_names_queue.append((node, node.name))
+
+    @utils.check_messages("redefined-outer-name")
+    def leave_excepthandler(self, node: nodes.ExceptHandler) -> None:
+        if not node.name or not isinstance(node.name, nodes.AssignName):
+            return
+        self._except_handler_names_queue.pop()
+
     def _undefined_and_used_before_checker(
         self, node: nodes.Name, stmt: nodes.NodeNG
     ) -> None:
@@ -1035,18 +1416,19 @@ def _undefined_and_used_before_checker(
             if self._should_node_be_skipped(node, current_consumer, i == start_index):
                 continue
 
-            action, found_nodes = self._check_consumer(
-                node, stmt, frame, current_consumer, i, base_scope_type
+            action, nodes_to_consume = self._check_consumer(
+                node, stmt, frame, current_consumer, base_scope_type
             )
-
+            if nodes_to_consume:
+                # Any nodes added to consumed_uncertain by get_next_to_consume()
+                # should be added back so that they are marked as used.
+                # They will have already had a chance to emit used-before-assignment.
+                # We check here instead of before every single return in _check_consumer()
+                nodes_to_consume += current_consumer.consumed_uncertain[node.name]
+                current_consumer.mark_as_consumed(node.name, nodes_to_consume)
             if action is VariableVisitConsumerAction.CONTINUE:
                 continue
-            if action is VariableVisitConsumerAction.CONSUME:
-                current_consumer.mark_as_consumed(node.name, found_nodes)
-            if action in {
-                VariableVisitConsumerAction.RETURN,
-                VariableVisitConsumerAction.CONSUME,
-            }:
+            if action is VariableVisitConsumerAction.RETURN:
                 return
 
         # we have not found the name, if it isn't a builtin, that's an
@@ -1106,6 +1488,20 @@ def _should_node_be_skipped(
 
         return False
 
+    def _find_assigned_names_recursive(
+        self,
+        target: Union[nodes.AssignName, nodes.BaseContainer],
+        target_names: List[str],
+    ) -> None:
+        """Update `target_names` in place with the names of assignment
+        targets, recursively (to account for nested assignments).
+        """
+        if isinstance(target, nodes.AssignName):
+            target_names.append(target.name)
+        elif isinstance(target, nodes.BaseContainer):
+            for elt in target.elts:
+                self._find_assigned_names_recursive(elt, target_names)
+
     # pylint: disable=too-many-return-statements
     def _check_consumer(
         self,
@@ -1113,18 +1509,16 @@ def _check_consumer(
         stmt: nodes.NodeNG,
         frame: nodes.LocalsDictNodeNG,
         current_consumer: NamesConsumer,
-        consumer_level: int,
         base_scope_type: Any,
-    ) -> Tuple[VariableVisitConsumerAction, Optional[Any]]:
-        """Checks a consumer for conditions that should trigger messages"""
+    ) -> Tuple[VariableVisitConsumerAction, Optional[List[nodes.NodeNG]]]:
+        """Checks a consumer for conditions that should trigger messages."""
         # If the name has already been consumed, only check it's not a loop
         # variable used outside the loop.
-        # Avoid the case where there are homonyms inside function scope and
-        # comprehension current scope (avoid bug #1731)
         if node.name in current_consumer.consumed:
-            if utils.is_func_decorator(current_consumer.node) or not (
-                current_consumer.scope_type == "comprehension"
-                and self._has_homonym_in_upper_function_scope(node, consumer_level)
+            # Avoid the case where there are homonyms inside function scope and
+            # comprehension current scope (avoid bug #1731)
+            if utils.is_func_decorator(current_consumer.node) or not isinstance(
+                node, nodes.ComprehensionScope
             ):
                 self._check_late_binding_closure(node)
                 self._loopvar_name(node)
@@ -1134,20 +1528,28 @@ def _check_consumer(
         if found_nodes is None:
             return (VariableVisitConsumerAction.CONTINUE, None)
         if not found_nodes:
-            self.add_message("used-before-assignment", args=node.name, node=node)
-            return (VariableVisitConsumerAction.RETURN, found_nodes)
+            if node.name in current_consumer.consumed_uncertain:
+                confidence = CONTROL_FLOW
+            else:
+                confidence = HIGH
+            self.add_message(
+                "used-before-assignment",
+                args=node.name,
+                node=node,
+                confidence=confidence,
+            )
+            # Mark for consumption any nodes added to consumed_uncertain by
+            # get_next_to_consume() because they might not have executed.
+            return (
+                VariableVisitConsumerAction.RETURN,
+                current_consumer.consumed_uncertain[node.name],
+            )
 
         self._check_late_binding_closure(node)
 
-        if not (
-            self._is_undefined_variable_enabled
-            or self._is_used_before_assignment_enabled
-        ):
-            return (VariableVisitConsumerAction.CONSUME, found_nodes)
-
         defnode = utils.assign_parent(found_nodes[0])
-        defstmt = defnode.statement()
-        defframe = defstmt.frame()
+        defstmt = defnode.statement(future=True)
+        defframe = defstmt.frame(future=True)
 
         # The class reuses itself in the class scope.
         is_recursive_klass = (
@@ -1233,10 +1635,9 @@ def _check_consumer(
                         )
                         and node.name in node.root().locals
                     ):
-                        self.add_message(
-                            "undefined-variable", args=node.name, node=node
-                        )
-                        return (VariableVisitConsumerAction.CONSUME, found_nodes)
+                        if defined_by_stmt:
+                            return (VariableVisitConsumerAction.CONTINUE, [node])
+                        return (VariableVisitConsumerAction.CONTINUE, None)
 
             elif base_scope_type != "lambda":
                 # E0601 may *not* occurs in lambda scope.
@@ -1247,9 +1648,12 @@ def _check_consumer(
                     and isinstance(stmt, (nodes.AnnAssign, nodes.FunctionDef))
                 ):
                     self.add_message(
-                        "used-before-assignment", args=node.name, node=node
+                        "used-before-assignment",
+                        args=node.name,
+                        node=node,
+                        confidence=HIGH,
                     )
-                    return (VariableVisitConsumerAction.CONSUME, found_nodes)
+                    return (VariableVisitConsumerAction.RETURN, found_nodes)
 
             elif base_scope_type == "lambda":
                 # E0601 can occur in class-level scope in lambdas, as in
@@ -1257,49 +1661,52 @@ def _check_consumer(
                 #   class A:
                 #      x = lambda attr: f + attr
                 #      f = 42
-                if isinstance(frame, nodes.ClassDef) and node.name in frame.locals:
-                    if isinstance(node.parent, nodes.Arguments):
-                        if stmt.fromlineno <= defstmt.fromlineno:
-                            # Doing the following is fine:
-                            #   class A:
-                            #      x = 42
-                            #      y = lambda attr=x: attr
-                            self.add_message(
-                                "used-before-assignment",
-                                args=node.name,
-                                node=node,
-                            )
-                    else:
-                        self.add_message(
-                            "undefined-variable", args=node.name, node=node
-                        )
-                        return (VariableVisitConsumerAction.CONSUME, found_nodes)
-                elif current_consumer.scope_type == "lambda":
-                    self.add_message("undefined-variable", args=node.name, node=node)
-                    return (VariableVisitConsumerAction.CONSUME, found_nodes)
+                # We check lineno because doing the following is fine:
+                #   class A:
+                #      x = 42
+                #      y = lambda attr: x + attr
+                if (
+                    isinstance(frame, nodes.ClassDef)
+                    and node.name in frame.locals
+                    and stmt.fromlineno <= defstmt.fromlineno
+                ):
+                    self.add_message(
+                        "used-before-assignment",
+                        args=node.name,
+                        node=node,
+                        confidence=HIGH,
+                    )
 
         elif self._is_only_type_assignment(node, defstmt):
-            self.add_message("undefined-variable", args=node.name, node=node)
-            return (VariableVisitConsumerAction.CONSUME, found_nodes)
+            if node.scope().locals.get(node.name):
+                self.add_message(
+                    "used-before-assignment", args=node.name, node=node, confidence=HIGH
+                )
+            else:
+                self.add_message(
+                    "undefined-variable", args=node.name, node=node, confidence=HIGH
+                )
+            return (VariableVisitConsumerAction.RETURN, found_nodes)
 
         elif isinstance(defstmt, nodes.ClassDef):
-            is_first_level_ref = self._is_first_level_self_reference(node, defstmt)
-            if is_first_level_ref == 2:
-                self.add_message("used-before-assignment", node=node, args=node.name)
-            if is_first_level_ref:
-                return (VariableVisitConsumerAction.RETURN, None)
+            return self._is_first_level_self_reference(node, defstmt, found_nodes)
 
         elif isinstance(defnode, nodes.NamedExpr):
             if isinstance(defnode.parent, nodes.IfExp):
                 if self._is_never_evaluated(defnode, defnode.parent):
-                    self.add_message("undefined-variable", args=node.name, node=node)
-                    return (VariableVisitConsumerAction.CONSUME, found_nodes)
+                    self.add_message(
+                        "undefined-variable",
+                        args=node.name,
+                        node=node,
+                        confidence=INFERENCE,
+                    )
+                    return (VariableVisitConsumerAction.RETURN, found_nodes)
 
-        return (VariableVisitConsumerAction.CONSUME, found_nodes)
+        return (VariableVisitConsumerAction.RETURN, found_nodes)
 
     @utils.check_messages("no-name-in-module")
     def visit_import(self, node: nodes.Import) -> None:
-        """check modules attribute accesses"""
+        """Check modules attribute accesses."""
         if not self._analyse_fallback_blocks and utils.is_from_fallback_block(node):
             # No need to verify this, since ImportError is already
             # handled by the client code.
@@ -1321,7 +1728,7 @@ def visit_import(self, node: nodes.Import) -> None:
 
     @utils.check_messages("no-name-in-module")
     def visit_importfrom(self, node: nodes.ImportFrom) -> None:
-        """check modules attribute accesses"""
+        """Check modules attribute accesses."""
         if not self._analyse_fallback_blocks and utils.is_from_fallback_block(node):
             # No need to verify this, since ImportError is already
             # handled by the client code.
@@ -1348,9 +1755,8 @@ def visit_importfrom(self, node: nodes.ImportFrom) -> None:
         "unbalanced-tuple-unpacking", "unpacking-non-sequence", "self-cls-assignment"
     )
     def visit_assign(self, node: nodes.Assign) -> None:
-        """Check unbalanced tuple unpacking for assignments
-        and unpacking non-sequences as well as in case self/cls
-        get assigned.
+        """Check unbalanced tuple unpacking for assignments and unpacking
+        non-sequences as well as in case self/cls get assigned.
         """
         self._check_self_cls_assign(node)
         if not isinstance(node.targets[0], (nodes.Tuple, nodes.List)):
@@ -1366,11 +1772,11 @@ def visit_assign(self, node: nodes.Assign) -> None:
 
     # listcomp have now also their scope
     def visit_listcomp(self, node: nodes.ListComp) -> None:
-        """visit dictcomp: update consumption analysis variable"""
+        """Visit dictcomp: update consumption analysis variable."""
         self._to_consume.append(NamesConsumer(node, "comprehension"))
 
     def leave_listcomp(self, _: nodes.ListComp) -> None:
-        """leave dictcomp: update consumption analysis variable"""
+        """Leave dictcomp: update consumption analysis variable."""
         # do not check for not used locals here
         self._to_consume.pop()
 
@@ -1385,22 +1791,25 @@ def visit_arguments(self, node: nodes.Arguments) -> None:
             self._store_type_annotation_node(annotation)
 
     # Relying on other checker's options, which might not have been initialized yet.
-    @astroid.decorators.cachedproperty
+    @cached_property
     def _analyse_fallback_blocks(self):
         return get_global_option(self, "analyse-fallback-blocks", default=False)
 
-    @astroid.decorators.cachedproperty
+    @cached_property
     def _ignored_modules(self):
         return get_global_option(self, "ignored-modules", default=[])
 
-    @astroid.decorators.cachedproperty
+    @cached_property
     def _allow_global_unused_variables(self):
         return get_global_option(self, "allow-global-unused-variables", default=True)
 
     @staticmethod
     def _defined_in_function_definition(node, frame):
         in_annotation_or_default_or_decorator = False
-        if isinstance(frame, nodes.FunctionDef) and node.statement() is frame:
+        if (
+            isinstance(frame, nodes.FunctionDef)
+            and node.statement(future=True) is frame
+        ):
             in_annotation_or_default_or_decorator = (
                 (
                     node in frame.args.annotations
@@ -1422,7 +1831,7 @@ def _defined_in_function_definition(node, frame):
     def _in_lambda_or_comprehension_body(
         node: nodes.NodeNG, frame: nodes.NodeNG
     ) -> bool:
-        """return True if node within a lambda/comprehension body (or similar) and thus should not have access to class attributes in frame"""
+        """Return True if node within a lambda/comprehension body (or similar) and thus should not have access to class attributes in frame."""
         child = node
         parent = node.parent
         while parent is not None:
@@ -1448,8 +1857,8 @@ def _in_lambda_or_comprehension_body(
     def _is_variable_violation(
         node: nodes.Name,
         defnode,
-        stmt,
-        defstmt,
+        stmt: nodes.Statement,
+        defstmt: nodes.Statement,
         frame,  # scope of statement of node
         defframe,
         base_scope_type,
@@ -1477,7 +1886,7 @@ def _is_variable_violation(
             # equivalent to frame.statement().scope()
             forbid_lookup = (
                 isinstance(frame, nodes.FunctionDef)
-                or isinstance(node.frame(), nodes.Lambda)
+                or isinstance(node.frame(future=True), nodes.Lambda)
             ) and _assigned_locally(node)
             if not forbid_lookup and defframe.root().lookup(node.name)[1]:
                 maybe_before_assign = False
@@ -1517,20 +1926,18 @@ def _is_variable_violation(
             frame, nodes.FunctionDef
         ):
             # Special rule for function return annotations,
-            # which uses the same name as the class where
-            # the function lives.
+            # using a name defined earlier in the class containing the function.
             if node is frame.returns and defframe.parent_of(frame.returns):
-                maybe_before_assign = annotation_return = True
-
-            if (
-                maybe_before_assign
-                and defframe.name in defframe.locals
-                and defframe.locals[node.name][0].lineno < frame.lineno
-            ):
-                # Detect class assignments with the same
-                # name as the class. In this case, no warning
-                # should be raised.
-                maybe_before_assign = False
+                annotation_return = True
+                if (
+                    frame.returns.name in defframe.locals
+                    and defframe.locals[node.name][0].lineno < frame.lineno
+                ):
+                    # Detect class assignments with a name defined earlier in the
+                    # class. In this case, no warning should be raised.
+                    maybe_before_assign = False
+                else:
+                    maybe_before_assign = True
             if isinstance(node.parent, nodes.Arguments):
                 maybe_before_assign = stmt.fromlineno <= defstmt.fromlineno
         elif is_recursive_klass:
@@ -1550,7 +1957,7 @@ def _is_variable_violation(
                     # same line as the function definition
                     maybe_before_assign = False
                 elif (
-                    isinstance(  # pylint: disable=too-many-boolean-expressions
+                    isinstance(
                         defstmt,
                         (
                             nodes.Assign,
@@ -1560,11 +1967,7 @@ def _is_variable_violation(
                             nodes.Return,
                         ),
                     )
-                    and (
-                        isinstance(defstmt.value, nodes.IfExp)
-                        or isinstance(defstmt.value, nodes.Lambda)
-                        and isinstance(defstmt.value.body, nodes.IfExp)
-                    )
+                    and VariablesChecker._maybe_used_and_assigned_at_once(defstmt)
                     and frame is defframe
                     and defframe.parent_of(node)
                     and stmt is defstmt
@@ -1638,22 +2041,53 @@ def _is_variable_violation(
 
         return maybe_before_assign, annotation_return, use_outer_definition
 
-    # pylint: disable-next=fixme
-    # TODO: The typing of `NodeNG.statement()` in astroid is non-specific
-    # After this has been updated the typing of `defstmt` should reflect this
-    # See: https://github.com/PyCQA/astroid/pull/1217
     @staticmethod
-    def _is_only_type_assignment(node: nodes.Name, defstmt: nodes.NodeNG) -> bool:
-        """Check if variable only gets assigned a type and never a value"""
+    def _maybe_used_and_assigned_at_once(defstmt: nodes.Statement) -> bool:
+        """Check if `defstmt` has the potential to use and assign a name in the
+        same statement.
+        """
+        if isinstance(defstmt.value, nodes.BaseContainer) and defstmt.value.elts:
+            # The assignment must happen as part of the first element
+            # e.g. "assert (x:= True), x"
+            # NOT "assert x, (x:= True)"
+            value = defstmt.value.elts[0]
+        else:
+            value = defstmt.value
+        if isinstance(value, nodes.IfExp):
+            return True
+        if isinstance(value, nodes.Lambda) and isinstance(value.body, nodes.IfExp):
+            return True
+        return isinstance(value, nodes.Call) and (
+            any(isinstance(kwarg.value, nodes.IfExp) for kwarg in value.keywords)
+            or any(isinstance(arg, nodes.IfExp) for arg in value.args)
+        )
+
+    @staticmethod
+    def _is_only_type_assignment(node: nodes.Name, defstmt: nodes.Statement) -> bool:
+        """Check if variable only gets assigned a type and never a value."""
         if not isinstance(defstmt, nodes.AnnAssign) or defstmt.value:
             return False
 
-        defstmt_frame = defstmt.frame()
-        node_frame = node.frame()
+        defstmt_frame = defstmt.frame(future=True)
+        node_frame = node.frame(future=True)
 
         parent = node
         while parent is not defstmt_frame.parent:
             parent_scope = parent.scope()
+
+            # Find out if any nonlocals receive values in nested functions
+            for inner_func in parent_scope.nodes_of_class(nodes.FunctionDef):
+                if inner_func is parent_scope:
+                    continue
+                if any(
+                    node.name in nl.names
+                    for nl in inner_func.nodes_of_class(nodes.Nonlocal)
+                ) and any(
+                    node.name == an.name
+                    for an in inner_func.nodes_of_class(nodes.AssignName)
+                ):
+                    return False
+
             local_refs = parent_scope.locals.get(node.name, [])
             for ref_node in local_refs:
                 # If local ref is in the same frame as our node, but on a later lineno
@@ -1661,10 +2095,10 @@ def _is_only_type_assignment(node: nodes.Name, defstmt: nodes.NodeNG) -> bool:
                 # Local refs are ordered, so we break.
                 #     print(var)
                 #     var = 1  # <- irrelevant
-                if defstmt_frame == node_frame and not ref_node.lineno < node.lineno:
+                if defstmt_frame == node_frame and ref_node.lineno > node.lineno:
                     break
 
-                # If the parent of the local refence is anything but a AnnAssign
+                # If the parent of the local reference is anything but an AnnAssign
                 # Or if the AnnAssign adds a value the variable will now have a value
                 #     var = 1  # OR
                 #     var: int = 1
@@ -1678,32 +2112,26 @@ def _is_only_type_assignment(node: nodes.Name, defstmt: nodes.NodeNG) -> bool:
 
     @staticmethod
     def _is_first_level_self_reference(
-        node: nodes.Name, defstmt: nodes.ClassDef
-    ) -> Literal[0, 1, 2]:
+        node: nodes.Name, defstmt: nodes.ClassDef, found_nodes: List[nodes.NodeNG]
+    ) -> Tuple[VariableVisitConsumerAction, Optional[List[nodes.NodeNG]]]:
         """Check if a first level method's annotation or default values
-        refers to its own class.
-
-        Return values correspond to:
-            0 = Continue
-            1 = Break
-            2 = Break + emit message
+        refers to its own class, and return a consumer action
         """
-        if (
-            node.frame().parent == defstmt
-            and node.statement(future=True) not in node.frame().body
-        ):
+        if node.frame(future=True).parent == defstmt and node.statement(
+            future=True
+        ) == node.frame(future=True):
             # Check if used as type annotation
-            # Break but don't emit message if postponed evaluation is enabled
+            # Break if postponed evaluation is enabled
             if utils.is_node_in_type_annotation_context(node):
                 if not utils.is_postponed_evaluation_enabled(node):
-                    return 2
-                return 1
+                    return (VariableVisitConsumerAction.CONTINUE, None)
+                return (VariableVisitConsumerAction.RETURN, None)
             # Check if used as default value by calling the class
             if isinstance(node.parent, nodes.Call) and isinstance(
                 node.parent.parent, nodes.Arguments
             ):
-                return 2
-        return 0
+                return (VariableVisitConsumerAction.CONTINUE, None)
+        return (VariableVisitConsumerAction.RETURN, found_nodes)
 
     @staticmethod
     def _is_never_evaluated(
@@ -1721,8 +2149,7 @@ def _is_never_evaluated(
         return False
 
     def _ignore_class_scope(self, node):
-        """
-        Return True if the node is in a local class scope, as an assignment.
+        """Return True if the node is in a local class scope, as an assignment.
 
         :param node: Node considered
         :type node: astroid.Node
@@ -1751,7 +2178,7 @@ def _ignore_class_scope(self, node):
         #        ...
 
         name = node.name
-        frame = node.statement().scope()
+        frame = node.statement(future=True).scope()
         in_annotation_or_default_or_decorator = self._defined_in_function_definition(
             node, frame
         )
@@ -1775,29 +2202,36 @@ def _loopvar_name(self, node: astroid.Name) -> None:
         # the variable is not defined.
         scope = node.scope()
         if isinstance(scope, nodes.FunctionDef) and any(
-            asmt.statement().parent_of(scope) for asmt in astmts
+            asmt.scope().parent_of(scope) for asmt in astmts
         ):
             return
-
-        # filter variables according their respective scope test is_statement
-        # and parent to avoid #74747. This is not a total fix, which would
+        # Filter variables according to their respective scope. Test parent
+        # and statement to avoid #74747. This is not a total fix, which would
         # introduce a mechanism similar to special attribute lookup in
         # modules. Also, in order to get correct inference in this case, the
         # scope lookup rules would need to be changed to return the initial
         # assignment (which does not exist in code per se) as well as any later
         # modifications.
+        # pylint: disable-next=too-many-boolean-expressions
         if (
             not astmts
-            or (astmts[0].is_statement or astmts[0].parent)
-            and astmts[0].statement().parent_of(node)
+            or (
+                astmts[0].parent == astmts[0].root()
+                and astmts[0].parent.parent_of(node)
+            )
+            or (
+                astmts[0].is_statement
+                or not isinstance(astmts[0].parent, nodes.Module)
+                and astmts[0].statement(future=True).parent_of(node)
+            )
         ):
             _astmts = []
         else:
             _astmts = astmts[:1]
         for i, stmt in enumerate(astmts[1:]):
-            if astmts[i].statement().parent_of(stmt) and not in_for_else_branch(
-                astmts[i].statement(), stmt
-            ):
+            if astmts[i].statement(future=True).parent_of(
+                stmt
+            ) and not in_for_else_branch(astmts[i].statement(future=True), stmt):
                 continue
             _astmts.append(stmt)
         astmts = _astmts
@@ -1807,7 +2241,7 @@ def _loopvar_name(self, node: astroid.Name) -> None:
         assign = astmts[0].assign_type()
         if not (
             isinstance(assign, (nodes.For, nodes.Comprehension, nodes.GeneratorExp))
-            and assign.statement() is not node.statement()
+            and assign.statement(future=True) is not node.statement(future=True)
         ):
             return
 
@@ -1844,7 +2278,15 @@ def _loopvar_name(self, node: astroid.Name) -> None:
             if not elements:
                 self.add_message("undefined-loop-variable", args=node.name, node=node)
 
-    def _check_is_unused(self, name, node, stmt, global_names, nonlocal_names):
+    def _check_is_unused(
+        self,
+        name,
+        node,
+        stmt,
+        global_names,
+        nonlocal_names: Iterable[str],
+        comprehension_target_names: List[str],
+    ) -> None:
         # Ignore some special names specified by user configuration.
         if self._is_name_ignored(stmt, name):
             return
@@ -1863,14 +2305,18 @@ def _check_is_unused(self, name, node, stmt, global_names, nonlocal_names):
             if global_names and _import_name_is_global(stmt, global_names):
                 return
 
-        argnames = list(
-            itertools.chain(node.argnames(), [arg.name for arg in node.args.kwonlyargs])
-        )
+        # Ignore names in comprehension targets
+        if name in comprehension_target_names:
+            return
+
+        argnames = node.argnames()
         # Care about functions with unknown argument (builtins)
         if name in argnames:
-            self._check_unused_arguments(name, node, stmt, argnames)
+            self._check_unused_arguments(name, node, stmt, argnames, nonlocal_names)
         else:
-            if stmt.parent and isinstance(stmt.parent, (nodes.Assign, nodes.AnnAssign)):
+            if stmt.parent and isinstance(
+                stmt.parent, (nodes.Assign, nodes.AnnAssign, nodes.Tuple)
+            ):
                 if name in nonlocal_names:
                     return
 
@@ -1933,9 +2379,11 @@ def _is_name_ignored(self, stmt, name):
             regex = authorized_rgx
         return regex and regex.match(name)
 
-    def _check_unused_arguments(self, name, node, stmt, argnames):
+    def _check_unused_arguments(
+        self, name, node, stmt, argnames, nonlocal_names: Iterable[str]
+    ):
         is_method = node.is_method()
-        klass = node.parent.frame()
+        klass = node.parent.frame(future=True)
         if is_method and isinstance(klass, nodes.ClassDef):
             confidence = (
                 INFERENCE if utils.has_known_bases(klass) else INFERENCE_FAILURE
@@ -1974,6 +2422,9 @@ def _check_unused_arguments(self, name, node, stmt, argnames):
         if utils.is_protocol_class(klass):
             return
 
+        if name in nonlocal_names:
+            return
+
         self.add_message("unused-argument", args=name, node=stmt, confidence=confidence)
 
     def _check_late_binding_closure(self, node: nodes.Name) -> None:
@@ -1986,12 +2437,12 @@ def _check_late_binding_closure(self, node: nodes.Name) -> None:
         if not self.linter.is_message_enabled("cell-var-from-loop"):
             return
 
-        node_scope = node.frame()
+        node_scope = node.frame(future=True)
 
         # If node appears in a default argument expression,
         # look at the next enclosing frame instead
         if utils.is_default_argument(node, node_scope):
-            node_scope = node_scope.parent.frame()
+            node_scope = node_scope.parent.frame(future=True)
 
         # Check if node is a cell var
         if (
@@ -2021,7 +2472,8 @@ def _check_late_binding_closure(self, node: nodes.Name) -> None:
                     maybe_for
                     and maybe_for.parent_of(node_scope)
                     and not utils.is_being_called(node_scope)
-                    and not isinstance(node_scope.statement(), nodes.Return)
+                    and node_scope.parent
+                    and not isinstance(node_scope.statement(future=True), nodes.Return)
                 ):
                     self.add_message("cell-var-from-loop", node=node, args=node.name)
 
@@ -2033,27 +2485,18 @@ def _should_ignore_redefined_builtin(self, stmt):
     def _allowed_redefined_builtin(self, name):
         return name in self.config.allowed_redefined_builtins
 
-    def _has_homonym_in_upper_function_scope(
-        self, node: nodes.Name, index: int
-    ) -> bool:
-        """
-        Return whether there is a node with the same name in the
-        to_consume dict of an upper scope and if that scope is a
-        function
-
-        :param node: node to check for
-        :param index: index of the current consumer inside self._to_consume
-        :return: True if there is a node with the same name in the
-                 to_consume dict of an upper scope and if that scope
-                 is a function, False otherwise
-        """
-        return any(
-            _consumer.scope_type == "function" and node.name in _consumer.to_consume
-            for _consumer in self._to_consume[index - 1 :: -1]
+    @staticmethod
+    def _comprehension_between_frame_and_node(node: nodes.Name) -> bool:
+        """Return True if a ComprehensionScope intervenes between `node` and its frame."""
+        closest_comprehension_scope = utils.get_node_first_ancestor_of_type(
+            node, nodes.ComprehensionScope
         )
+        return closest_comprehension_scope is not None and node.frame(
+            future=True
+        ).parent_of(closest_comprehension_scope)
 
     def _store_type_annotation_node(self, type_annotation):
-        """Given a type annotation, store all the name nodes it refers to"""
+        """Given a type annotation, store all the name nodes it refers to."""
         if isinstance(type_annotation, nodes.Name):
             self._type_annotation_names.append(type_annotation.name)
             return
@@ -2084,7 +2527,7 @@ def _store_type_annotation_names(self, node):
         self._store_type_annotation_node(node.type_annotation)
 
     def _check_self_cls_assign(self, node: nodes.Assign) -> None:
-        """Check that self/cls don't get assigned"""
+        """Check that self/cls don't get assigned."""
         assign_names: Set[Optional[str]] = set()
         for target in node.targets:
             if isinstance(target, nodes.AssignName):
@@ -2130,9 +2573,10 @@ def _check_unpacking(self, inferred, node, targets):
         ):
             # Variable-length argument, we can't determine the length.
             return
-        if isinstance(inferred, (nodes.Tuple, nodes.List)):
-            # attempt to check unpacking is properly balanced
-            values = inferred.itered()
+
+        # Attempt to check unpacking is properly balanced
+        values = self._nodes_to_unpack(inferred)
+        if values is not None:
             if len(targets) != len(values):
                 # Check if we have starred nodes.
                 if any(isinstance(target, nodes.Starred) for target in targets):
@@ -2154,10 +2598,20 @@ def _check_unpacking(self, inferred, node, targets):
                 args=(_get_unpacking_extra_info(node, inferred),),
             )
 
+    @staticmethod
+    def _nodes_to_unpack(node: nodes.NodeNG) -> Optional[List[nodes.NodeNG]]:
+        """Return the list of values of the `Assign` node."""
+        if isinstance(node, (nodes.Tuple, nodes.List)):
+            return node.itered()
+        if isinstance(node, astroid.Instance) and any(
+            ancestor.qname() == "typing.NamedTuple" for ancestor in node.ancestors()
+        ):
+            return [i for i in node.values() if isinstance(i, nodes.AssignName)]
+        return None
+
     def _check_module_attrs(self, node, module, module_names):
-        """check that module_names (list of string) are accessible through the
-        given module
-        if the latest access name corresponds to a module, return it
+        """Check that module_names (list of string) are accessible through the
+        given module, if the latest access name corresponds to a module, return it
         """
         while module_names:
             name = module_names.pop(0)
@@ -2287,7 +2741,7 @@ def _check_imports(self, not_consumed):
                         msg = f"import {imported_name}"
                     else:
                         msg = f"{imported_name} imported as {as_name}"
-                    if not _is_type_checking_import(stmt):
+                    if not in_type_checking_block(stmt):
                         self.add_message("unused-import", args=msg, node=stmt)
                 elif isinstance(stmt, nodes.ImportFrom) and stmt.modname != FUTURE:
                     if SPECIAL_OBJ.search(imported_name):
@@ -2311,7 +2765,7 @@ def _check_imports(self, not_consumed):
                             msg = f"{imported_name} imported from {stmt.modname}"
                         else:
                             msg = f"{imported_name} imported from {stmt.modname} as {as_name}"
-                        if not _is_type_checking_import(stmt):
+                        if not in_type_checking_block(stmt):
                             self.add_message("unused-import", args=msg, node=stmt)
 
         # Construct string for unused-wildcard-import message
@@ -2362,7 +2816,7 @@ def _check_classdef_metaclasses(self, klass, parent_node):
         name = METACLASS_NAME_TRANSFORMS.get(name, name)
         if name:
             # check enclosing scopes starting from most local
-            for scope_locals, _, _ in self._to_consume[::-1]:
+            for scope_locals, _, _, _ in self._to_consume[::-1]:
                 found_nodes = scope_locals.get(name, [])
                 for found_node in found_nodes:
                     if found_node.lineno <= klass.lineno:
@@ -2389,6 +2843,5 @@ def _check_classdef_metaclasses(self, klass, parent_node):
         return consumed
 
 
-def register(linter):
-    """required method to auto register this checker"""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(VariablesChecker(linter))
diff --git a/pylint/config/__init__.py b/pylint/config/__init__.py
index 2e378660fe..16df5fd893 100644
--- a/pylint/config/__init__.py
+++ b/pylint/config/__init__.py
@@ -1,38 +1,6 @@
-# Copyright (c) 2006-2010, 2012-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2008 pyves@crater.logilab.fr <pyves@crater.logilab.fr>
-# Copyright (c) 2013 Google, Inc.
-# Copyright (c) 2013 John McGehee <jmcgehee@altera.com>
-# Copyright (c) 2014-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Aru Sahni <arusahni@gmail.com>
-# Copyright (c) 2015 John Kirkham <jakirkham@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Erik <erik.eriksson@yahoo.com>
-# Copyright (c) 2016 Alexander Todorov <atodorov@otb.bg>
-# Copyright (c) 2016 Moises Lopez <moylop260@vauxoo.com>
-# Copyright (c) 2017, 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2017-2019 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2017 ahirnish <ahirnish@gmail.com>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2018, 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2018 Jim Robertson <jrobertson98atx@gmail.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Bryce Guinta <bryce.paul.guinta@gmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Gary Tyler McLeod <mail@garytyler.com>
-# Copyright (c) 2018 Konstantin <Github@pheanex.de>
-# Copyright (c) 2018 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019, 2021 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2019 Janne Rönkkö <jannero@users.noreply.github.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Eisuke Kawashima <e-kwsm@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import os
 import pathlib
@@ -103,11 +71,10 @@
             pathlib.Path(PYLINT_HOME).mkdir(parents=True, exist_ok=True)
             with open(spam_prevention_file, "w", encoding="utf8") as f:
                 f.write("")
-        except Exception:  # pylint: disable=broad-except
-            # Can't write in PYLINT_HOME ?
+        except Exception as exc:  # pylint: disable=broad-except
             print(
                 "Can't write the file that was supposed to "
-                f"prevent pylint.d deprecation spam in {PYLINT_HOME}."
+                f"prevent 'pylint.d' deprecation spam in {PYLINT_HOME} because of {exc}."
             )
 
 
diff --git a/pylint/config/config_initialization.py b/pylint/config/config_initialization.py
new file mode 100644
index 0000000000..6be0ab8b93
--- /dev/null
+++ b/pylint/config/config_initialization.py
@@ -0,0 +1,77 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+import sys
+from pathlib import Path
+from typing import TYPE_CHECKING, List, Optional, Union
+
+from pylint import reporters
+from pylint.utils import utils
+
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
+
+def _config_initialization(
+    linter: "PyLinter",
+    args_list: List[str],
+    reporter: Union[reporters.BaseReporter, reporters.MultiReporter, None] = None,
+    config_file: Union[None, str, Path] = None,
+    verbose_mode: Optional[bool] = None,
+) -> List[str]:
+    """Parse all available options, read config files and command line arguments and
+    set options accordingly.
+    """
+
+    # Read the config file. The parser is stored on linter.cfgfile_parser
+    try:
+        linter.read_config_file(config_file=config_file, verbose=verbose_mode)
+    except OSError as ex:
+        print(ex, file=sys.stderr)
+        sys.exit(32)
+    config_parser = linter.cfgfile_parser
+
+    # Run init hook, if present, before loading plugins
+    if config_parser.has_option("MASTER", "init-hook"):
+        exec(  # pylint: disable=exec-used
+            utils._unquote(config_parser.get("MASTER", "init-hook"))
+        )
+
+    # Load plugins if specified in the config file
+    if config_parser.has_option("MASTER", "load-plugins"):
+        plugins = utils._splitstrip(config_parser.get("MASTER", "load-plugins"))
+        linter.load_plugin_modules(plugins)
+
+    # Now we can load file config, plugins (which can
+    # provide options) have been registered
+    linter.load_config_file()
+
+    if reporter:
+        # If a custom reporter is provided as argument, it may be overridden
+        # by file parameters, so re-set it here, but before command line
+        # parsing, so it's still overridable by command line option
+        linter.set_reporter(reporter)
+
+    # Load command line arguments
+    try:
+        args_list = linter.load_command_line_configuration(args_list)
+    except SystemExit as exc:
+        if exc.code == 2:  # bad options
+            exc.code = 32
+        raise
+
+    # args_list should now only be a list of files/directories to lint. All options have
+    # been removed from the list
+    if not args_list:
+        print(linter.help())
+        sys.exit(32)
+
+    # We have loaded configuration from config file and command line. Now, we can
+    # load plugin specific configuration.
+    linter.load_plugin_configuration()
+
+    # Now that plugins are loaded, get list of all fail_on messages, and enable them
+    linter.enable_fail_on_messages()
+
+    return args_list
diff --git a/pylint/config/configuration_mixin.py b/pylint/config/configuration_mixin.py
index deca7f4bc9..3db9acaa1c 100644
--- a/pylint/config/configuration_mixin.py
+++ b/pylint/config/configuration_mixin.py
@@ -1,13 +1,15 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 from pylint.config.option_manager_mixin import OptionsManagerMixIn
 from pylint.config.options_provider_mixin import OptionsProviderMixIn
 
 
 class ConfigurationMixIn(OptionsManagerMixIn, OptionsProviderMixIn):
-    """basic mixin for simple configurations which don't need the
-    manager / providers model"""
+    """Basic mixin for simple configurations which don't need the
+    manager / providers model
+    """
 
     def __init__(self, *args, **kwargs):
         if not args:
diff --git a/pylint/config/find_default_config_files.py b/pylint/config/find_default_config_files.py
index dd051f9c60..7538f5b15e 100644
--- a/pylint/config/find_default_config_files.py
+++ b/pylint/config/find_default_config_files.py
@@ -1,19 +1,23 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import configparser
 import os
+import sys
 from typing import Iterator, Optional
 
-import toml
-from toml import TomlDecodeError
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import tomli as tomllib
 
 
 def _toml_has_config(path):
-    with open(path, encoding="utf-8") as toml_handle:
+    with open(path, mode="rb") as toml_handle:
         try:
-            content = toml.load(toml_handle)
-        except TomlDecodeError as error:
+            content = tomllib.load(toml_handle)
+        except tomllib.TOMLDecodeError as error:
             print(f"Failed to load '{path}': {error}")
             return False
 
@@ -71,7 +75,7 @@ def find_default_config_files() -> Iterator[str]:
 
 
 def find_pylintrc() -> Optional[str]:
-    """search the pylint rc file and return its path if it find it, else None"""
+    """Search the pylint rc file and return its path if it finds it, else return None."""
     for config_file in find_default_config_files():
         if config_file.endswith("pylintrc"):
             return config_file
diff --git a/pylint/config/man_help_formatter.py b/pylint/config/man_help_formatter.py
index b265d654c5..84837cc3c1 100644
--- a/pylint/config/man_help_formatter.py
+++ b/pylint/config/man_help_formatter.py
@@ -1,12 +1,12 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import optparse  # pylint: disable=deprecated-module
 import sys
 import time
 
 
-# pylint: disable=abstract-method; by design?
 class _ManHelpFormatter(optparse.HelpFormatter):
     def __init__(
         self, indent_increment=0, max_help_position=24, width=79, short_first=0
@@ -107,6 +107,10 @@ def format_tail(pkginfo):
 """
         return tail
 
+    def format_usage(self, usage):
+        """Taken from optparse.IndentedHelpFormatter."""
+        return f"Usage: {usage}\n"
+
 
 def _generate_manpage(optparser, pkginfo, section=1, stream=sys.stdout, level=0):
     formatter = _ManHelpFormatter()
diff --git a/pylint/config/option.py b/pylint/config/option.py
index 61384b8d41..260e0a2207 100644
--- a/pylint/config/option.py
+++ b/pylint/config/option.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import copy
 import optparse  # pylint: disable=deprecated-module
@@ -128,7 +129,7 @@ def _call_validator(opttype, optdict, option, value):
 
 
 def _validate(value, optdict, name=""):
-    """return a validated value for an option according to its type
+    """Return a validated value for an option according to its type.
 
     optional argument name is only used for error message formatting
     """
diff --git a/pylint/config/option_manager_mixin.py b/pylint/config/option_manager_mixin.py
index 13938feae3..44e1127379 100644
--- a/pylint/config/option_manager_mixin.py
+++ b/pylint/config/option_manager_mixin.py
@@ -1,6 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import collections
 import configparser
@@ -14,16 +14,19 @@
 from types import ModuleType
 from typing import Dict, List, Optional, TextIO, Tuple, Union
 
-import toml
-
 from pylint import utils
 from pylint.config.man_help_formatter import _ManHelpFormatter
 from pylint.config.option import Option
 from pylint.config.option_parser import OptionParser
 
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import tomli as tomllib
+
 
 def _expand_default(self, option):
-    """Patch OptionParser.expand_default with custom behaviour
+    """Patch OptionParser.expand_default with custom behaviour.
 
     This will handle defaults to avoid overriding values in the
     configuration file.
@@ -57,7 +60,7 @@ def _patch_optparse():
 
 
 class OptionsManagerMixIn:
-    """Handle configuration from both a configuration file and command line options"""
+    """Handle configuration from both a configuration file and command line options."""
 
     def __init__(self, usage, config_file=None):
         self.config_file = config_file
@@ -83,7 +86,7 @@ def reset_parsers(self, usage=""):
         self._optik_option_attrs = set(self.cmdline_parser.option_class.ATTRS)
 
     def register_options_provider(self, provider, own_group=True):
-        """register an options provider"""
+        """Register an options provider."""
         assert provider.priority <= 0, "provider's priority can't be >= 0"
         for i, options_provider in enumerate(self.options_providers):
             if provider.priority > options_provider.priority:
@@ -142,7 +145,7 @@ def add_optik_option(self, provider, optikcontainer, opt, optdict):
         self._maxlevel = max(self._maxlevel, option.level or 0)
 
     def optik_option(self, provider, opt, optdict):
-        """get our personal option definition and return a suitable form for
+        """Get our personal option definition and return a suitable form for
         use with optik/optparse
         """
         optdict = copy.copy(optdict)
@@ -173,7 +176,7 @@ def optik_option(self, provider, opt, optdict):
         return args, optdict
 
     def cb_set_provider_option(self, option, opt, value, parser):
-        """optik callback for option setting"""
+        """Optik callback for option setting."""
         if opt.startswith("--"):
             # remove -- on long option
             opt = opt[2:]
@@ -186,13 +189,13 @@ def cb_set_provider_option(self, option, opt, value, parser):
         self.global_set_option(opt, value)
 
     def global_set_option(self, opt, value):
-        """set option on the correct option provider"""
+        """Set option on the correct option provider."""
         self._all_options[opt].set_option(opt, value)
 
     def generate_config(
         self, stream: Optional[TextIO] = None, skipsections: Tuple[str, ...] = ()
     ) -> None:
-        """write a configuration file according to the current configuration
+        """Write a configuration file according to the current configuration
         into the given stream or stdout
         """
         options_by_section: Dict[str, List[Tuple]] = {}
@@ -212,8 +215,8 @@ def generate_config(
                     continue
                 if section not in sections:
                     sections.append(section)
-                alloptions = options_by_section.setdefault(section, [])
-                alloptions += options
+                all_options = options_by_section.setdefault(section, [])
+                all_options += options
         stream = stream or sys.stdout
         printed = False
         for section in sections:
@@ -239,13 +242,13 @@ def generate_manpage(
             print(formatter.format_tail(pkginfo), file=stream)
 
     def load_provider_defaults(self):
-        """initialize configuration using default values"""
+        """Initialize configuration using default values."""
         for provider in self.options_providers:
             provider.load_defaults()
 
     def read_config_file(self, config_file=None, verbose=None):
         """Read the configuration file but do not load it (i.e. dispatching
-        values to each options provider)
+        values to each option's provider)
         """
         for help_level in range(1, self._maxlevel + 1):
             opt = "-".join(["long"] * help_level) + "-help"
@@ -276,13 +279,13 @@ def read_config_file(self, config_file=None, verbose=None):
             if config_file.endswith(".toml"):
                 try:
                     self._parse_toml(config_file, parser)
-                except toml.TomlDecodeError as e:
+                except tomllib.TOMLDecodeError as e:
                     self.add_message("config-parse-error", line=0, args=str(e))
             else:
                 # Use this encoding in order to strip the BOM marker, if any.
                 with open(config_file, encoding="utf_8_sig") as fp:
                     parser.read_file(fp)
-                # normalize sections'title
+                # normalize each section's title
                 for sect, values in list(parser._sections.items()):
                     if sect.startswith("pylint."):
                         sect = sect[len("pylint.") :]
@@ -300,8 +303,8 @@ def _parse_toml(
         self, config_file: Union[Path, str], parser: configparser.ConfigParser
     ) -> None:
         """Parse and handle errors of a toml configuration file."""
-        with open(config_file, encoding="utf-8") as fp:
-            content = toml.load(fp)
+        with open(config_file, mode="rb") as fp:
+            content = tomllib.load(fp)
         try:
             sections_values = content["tool"]["pylint"]
         except KeyError:
@@ -332,7 +335,8 @@ def _parse_toml(
 
     def load_config_file(self):
         """Dispatch values previously read from a configuration file to each
-        options provider)"""
+        option's provider
+        """
         parser = self.cfgfile_parser
         for section in parser.sections():
             for option, value in parser.items(section):
@@ -342,7 +346,7 @@ def load_config_file(self):
                     continue
 
     def load_configuration(self, **kwargs):
-        """override configuration according to given parameters"""
+        """Override configuration according to given parameters."""
         return self.load_configuration_from_config(kwargs)
 
     def load_configuration_from_config(self, config):
@@ -352,7 +356,7 @@ def load_configuration_from_config(self, config):
             provider.set_option(opt, opt_value)
 
     def load_command_line_configuration(self, args=None) -> List[str]:
-        """Override configuration according to command line parameters
+        """Override configuration according to command line parameters.
 
         return additional arguments
         """
@@ -369,7 +373,7 @@ def load_command_line_configuration(self, args=None) -> List[str]:
             return args
 
     def add_help_section(self, title, description, level=0):
-        """add a dummy option section for help purpose"""
+        """Add a dummy option section for help purpose."""
         group = optparse.OptionGroup(
             self.cmdline_parser, title=title.capitalize(), description=description
         )
@@ -378,7 +382,7 @@ def add_help_section(self, title, description, level=0):
         self.cmdline_parser.add_option_group(group)
 
     def help(self, level=0):
-        """return the usage string for available options"""
+        """Return the usage string for available options."""
         self.cmdline_parser.formatter.output_level = level
         with _patch_optparse():
             return self.cmdline_parser.format_help()
diff --git a/pylint/config/option_parser.py b/pylint/config/option_parser.py
index 66b5737234..b5d228ec23 100644
--- a/pylint/config/option_parser.py
+++ b/pylint/config/option_parser.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import optparse  # pylint: disable=deprecated-module
 
diff --git a/pylint/config/options_provider_mixin.py b/pylint/config/options_provider_mixin.py
index d3872135cc..e937fee155 100644
--- a/pylint/config/options_provider_mixin.py
+++ b/pylint/config/options_provider_mixin.py
@@ -1,6 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import optparse  # pylint: disable=deprecated-module
 from typing import Any, Dict, Tuple
@@ -9,11 +9,11 @@
 
 
 class UnsupportedAction(Exception):
-    """raised by set_option when it doesn't know what to do for an action"""
+    """Raised by set_option when it doesn't know what to do for an action."""
 
 
 class OptionsProviderMixIn:
-    """Mixin to provide options to an OptionsManager"""
+    """Mixin to provide options to an OptionsManager."""
 
     # those attributes should be overridden
     priority = -1
@@ -26,7 +26,7 @@ def __init__(self):
         self.load_defaults()
 
     def load_defaults(self):
-        """initialize the provider using default values"""
+        """Initialize the provider using default values."""
         for opt, optdict in self.options:
             action = optdict.get("action")
             if action != "callback":
@@ -37,17 +37,17 @@ def load_defaults(self):
                 self.set_option(opt, default, action, optdict)
 
     def option_attrname(self, opt, optdict=None):
-        """get the config attribute corresponding to opt"""
+        """Get the config attribute corresponding to opt."""
         if optdict is None:
             optdict = self.get_option_def(opt)
         return optdict.get("dest", opt.replace("-", "_"))
 
     def option_value(self, opt):
-        """get the current value for the given option"""
+        """Get the current value for the given option."""
         return getattr(self.config, self.option_attrname(opt), None)
 
     def set_option(self, optname, value, action=None, optdict=None):
-        """method called to set an option (registered in the options list)"""
+        """Method called to set an option (registered in the options list)."""
         if optdict is None:
             optdict = self.get_option_def(optname)
         if value is not None:
@@ -80,7 +80,7 @@ def set_option(self, optname, value, action=None, optdict=None):
             raise UnsupportedAction(action)
 
     def get_option_def(self, opt):
-        """return the dictionary defining an option given its name"""
+        """Return the dictionary defining an option given its name."""
         assert self.options
         for option in self.options:
             if option[0] == opt:
@@ -90,7 +90,7 @@ def get_option_def(self, opt):
         )
 
     def options_by_section(self):
-        """return an iterator on options grouped by section
+        """Return an iterator on options grouped by section.
 
         (section, [list of (optname, optdict, optvalue)])
         """
diff --git a/pylint/constants.py b/pylint/constants.py
index d30b9dd56b..adb8f5ca1a 100644
--- a/pylint/constants.py
+++ b/pylint/constants.py
@@ -1,12 +1,16 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 import platform
 import sys
+from typing import Dict, List, NamedTuple, Tuple
 
 import astroid
 import platformdirs
 
 from pylint.__pkginfo__ import __version__
+from pylint.typing import MessageTypesFullName
 
 PY37_PLUS = sys.version_info[:2] >= (3, 7)
 PY38_PLUS = sys.version_info[:2] >= (3, 8)
@@ -24,7 +28,7 @@
 # The line/node distinction does not apply to fatal errors and reports.
 _SCOPE_EXEMPT = "FR"
 
-MSG_TYPES = {
+MSG_TYPES: Dict[str, MessageTypesFullName] = {
     "I": "info",
     "C": "convention",
     "R": "refactor",
@@ -32,7 +36,7 @@
     "E": "error",
     "F": "fatal",
 }
-MSG_TYPES_LONG = {v: k for k, v in MSG_TYPES.items()}
+MSG_TYPES_LONG: Dict[str, str] = {v: k for k, v in MSG_TYPES.items()}
 
 MSG_TYPES_STATUS = {"I": 0, "C": 16, "R": 8, "W": 4, "E": 2, "F": 1}
 
@@ -55,3 +59,140 @@ class WarningScope:
 full_version = f"""pylint {__version__}
 astroid {astroid.__version__}
 Python {sys.version}"""
+
+HUMAN_READABLE_TYPES = {
+    "file": "file",
+    "module": "module",
+    "const": "constant",
+    "class": "class",
+    "function": "function",
+    "method": "method",
+    "attr": "attribute",
+    "argument": "argument",
+    "variable": "variable",
+    "class_attribute": "class attribute",
+    "class_const": "class constant",
+    "inlinevar": "inline iteration",
+    "typevar": "type variable",
+}
+
+
+class DeletedMessage(NamedTuple):
+    msgid: str
+    symbol: str
+    old_names: List[Tuple[str, str]] = []
+
+
+DELETED_MSGID_PREFIXES: List[int] = []
+
+DELETED_MESSAGES = [
+    # Everything until the next comment is from the
+    # PY3K+ checker, see https://github.com/PyCQA/pylint/pull/4942
+    DeletedMessage("W1601", "apply-builtin"),
+    DeletedMessage("E1601", "print-statement"),
+    DeletedMessage("E1602", "parameter-unpacking"),
+    DeletedMessage(
+        "E1603", "unpacking-in-except", [("W0712", "old-unpacking-in-except")]
+    ),
+    DeletedMessage("E1604", "old-raise-syntax", [("W0121", "old-old-raise-syntax")]),
+    DeletedMessage("E1605", "backtick", [("W0333", "old-backtick")]),
+    DeletedMessage("E1609", "import-star-module-level"),
+    DeletedMessage("W1601", "apply-builtin"),
+    DeletedMessage("W1602", "basestring-builtin"),
+    DeletedMessage("W1603", "buffer-builtin"),
+    DeletedMessage("W1604", "cmp-builtin"),
+    DeletedMessage("W1605", "coerce-builtin"),
+    DeletedMessage("W1606", "execfile-builtin"),
+    DeletedMessage("W1607", "file-builtin"),
+    DeletedMessage("W1608", "long-builtin"),
+    DeletedMessage("W1609", "raw_input-builtin"),
+    DeletedMessage("W1610", "reduce-builtin"),
+    DeletedMessage("W1611", "standarderror-builtin"),
+    DeletedMessage("W1612", "unicode-builtin"),
+    DeletedMessage("W1613", "xrange-builtin"),
+    DeletedMessage("W1614", "coerce-method"),
+    DeletedMessage("W1615", "delslice-method"),
+    DeletedMessage("W1616", "getslice-method"),
+    DeletedMessage("W1617", "setslice-method"),
+    DeletedMessage("W1618", "no-absolute-import"),
+    DeletedMessage("W1619", "old-division"),
+    DeletedMessage("W1620", "dict-iter-method"),
+    DeletedMessage("W1621", "dict-view-method"),
+    DeletedMessage("W1622", "next-method-called"),
+    DeletedMessage("W1623", "metaclass-assignment"),
+    DeletedMessage(
+        "W1624", "indexing-exception", [("W0713", "old-indexing-exception")]
+    ),
+    DeletedMessage("W1625", "raising-string", [("W0701", "old-raising-string")]),
+    DeletedMessage("W1626", "reload-builtin"),
+    DeletedMessage("W1627", "oct-method"),
+    DeletedMessage("W1628", "hex-method"),
+    DeletedMessage("W1629", "nonzero-method"),
+    DeletedMessage("W1630", "cmp-method"),
+    DeletedMessage("W1632", "input-builtin"),
+    DeletedMessage("W1633", "round-builtin"),
+    DeletedMessage("W1634", "intern-builtin"),
+    DeletedMessage("W1635", "unichr-builtin"),
+    DeletedMessage(
+        "W1636", "map-builtin-not-iterating", [("W1631", "implicit-map-evaluation")]
+    ),
+    DeletedMessage("W1637", "zip-builtin-not-iterating"),
+    DeletedMessage("W1638", "range-builtin-not-iterating"),
+    DeletedMessage("W1639", "filter-builtin-not-iterating"),
+    DeletedMessage("W1640", "using-cmp-argument"),
+    DeletedMessage("W1642", "div-method"),
+    DeletedMessage("W1643", "idiv-method"),
+    DeletedMessage("W1644", "rdiv-method"),
+    DeletedMessage("W1645", "exception-message-attribute"),
+    DeletedMessage("W1646", "invalid-str-codec"),
+    DeletedMessage("W1647", "sys-max-int"),
+    DeletedMessage("W1648", "bad-python3-import"),
+    DeletedMessage("W1649", "deprecated-string-function"),
+    DeletedMessage("W1650", "deprecated-str-translate-call"),
+    DeletedMessage("W1651", "deprecated-itertools-function"),
+    DeletedMessage("W1652", "deprecated-types-field"),
+    DeletedMessage("W1653", "next-method-defined"),
+    DeletedMessage("W1654", "dict-items-not-iterating"),
+    DeletedMessage("W1655", "dict-keys-not-iterating"),
+    DeletedMessage("W1656", "dict-values-not-iterating"),
+    DeletedMessage("W1657", "deprecated-operator-function"),
+    DeletedMessage("W1658", "deprecated-urllib-function"),
+    DeletedMessage("W1659", "xreadlines-attribute"),
+    DeletedMessage("W1660", "deprecated-sys-function"),
+    DeletedMessage("W1661", "exception-escape"),
+    DeletedMessage("W1662", "comprehension-escape"),
+    # https://github.com/PyCQA/pylint/pull/3578
+    DeletedMessage("W0312", "mixed-indentation"),
+    # https://github.com/PyCQA/pylint/pull/3577
+    DeletedMessage(
+        "C0326",
+        "bad-whitespace",
+        [
+            ("C0323", "no-space-after-operator"),
+            ("C0324", "no-space-after-comma"),
+            ("C0322", "no-space-before-operator"),
+        ],
+    ),
+    # https://github.com/PyCQA/pylint/pull/3571
+    DeletedMessage("C0330", "bad-continuation"),
+]
+
+
+# ignore some messages when emitting useless-suppression:
+# - cyclic-import: can show false positives due to incomplete context
+# - deprecated-{module, argument, class, method, decorator}:
+#   can cause false positives for multi-interpreter projects
+#   when linting with an interpreter on a lower python version
+INCOMPATIBLE_WITH_USELESS_SUPPRESSION = frozenset(
+    [
+        "R0401",  # cyclic-import
+        "W0402",  # deprecated-module
+        "W1505",  # deprecated-method
+        "W1511",  # deprecated-argument
+        "W1512",  # deprecated-class
+        "W1513",  # deprecated-decorator
+    ]
+)
+
+
+TYPING_TYPE_CHECKS_GUARDS = frozenset({"typing.TYPE_CHECKING", "TYPE_CHECKING"})
diff --git a/pylint/epylint.py b/pylint/epylint.py
index 13842b440e..2eade40f9b 100755
--- a/pylint/epylint.py
+++ b/pylint/epylint.py
@@ -1,32 +1,9 @@
 # mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4
 # -*- vim:fenc=utf-8:ft=python:et:sw=4:ts=4:sts=4
 
-# Copyright (c) 2008-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2014 Jakob Normark <jakobnormark@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Manuel Vázquez Acosta <mva.led@gmail.com>
-# Copyright (c) 2014 Derek Harland <derek.harland@finq.co.nz>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Mihai Balint <balint.mihai@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2017, 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2017 Daniela Plascencia <daplascen@gmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Ryan McGuire <ryan@enigmacurry.com>
-# Copyright (c) 2018 thernstig <30827238+thernstig@users.noreply.github.com>
-# Copyright (c) 2018 Radostin Stoyanov <rst0git@users.noreply.github.com>
-# Copyright (c) 2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2020 Damien Baty <damien.baty@polyconseil.fr>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Emacs and Flymake compatible Pylint.
 
@@ -64,11 +41,13 @@
 import sys
 from io import StringIO
 from subprocess import PIPE, Popen
+from typing import Optional, Sequence
 
 
 def _get_env():
-    """Extracts the environment PYTHONPATH and appends the current sys.path to
-    those."""
+    """Extracts the environment PYTHONPATH and appends the current 'sys.path'
+    to it.
+    """
     env = dict(os.environ)
     env["PYTHONPATH"] = os.pathsep.join(sys.path)
     return env
@@ -125,7 +104,7 @@ def lint(filename, options=()):
             if line.startswith("No config file found"):
                 continue
 
-            # modify the file name thats output to reverse the path traversal we made
+            # modify the file name that's put out to reverse the path traversal we made
             parts = line.split(":")
             if parts and parts[0] == child_path:
                 line = ":".join([filename] + parts[1:])
@@ -136,7 +115,7 @@ def lint(filename, options=()):
 
 
 def py_run(command_options="", return_std=False, stdout=None, stderr=None):
-    """Run pylint from python
+    """Run pylint from python.
 
     ``command_options`` is a string containing ``pylint`` command line options;
     ``return_std`` (boolean) indicates return of created standard output
@@ -185,15 +164,17 @@ def py_run(command_options="", return_std=False, stdout=None, stderr=None):
         return None
 
 
-def Run():
-    if len(sys.argv) == 1:
+def Run(argv: Optional[Sequence[str]] = None):
+    if not argv and len(sys.argv) == 1:
         print(f"Usage: {sys.argv[0]} <filename> [options]")
         sys.exit(1)
-    elif not os.path.exists(sys.argv[1]):
-        print(f"{sys.argv[1]} does not exist")
+
+    argv = argv or sys.argv[1:]
+    if not os.path.exists(argv[0]):
+        print(f"{argv[0]} does not exist")
         sys.exit(1)
     else:
-        sys.exit(lint(sys.argv[1], sys.argv[2:]))
+        sys.exit(lint(argv[0], argv[1:]))
 
 
 if __name__ == "__main__":
diff --git a/pylint/exceptions.py b/pylint/exceptions.py
index ec1e513f7c..06ed21acd3 100644
--- a/pylint/exceptions.py
+++ b/pylint/exceptions.py
@@ -1,39 +1,29 @@
-# Copyright (c) 2016-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2016 Glenn Matthews <glenn@e-dad.net>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2018 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2019 Thomas Hisch <t.hisch@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Exception classes raised by various operations within pylint."""
 
 
 class InvalidMessageError(Exception):
-    """raised when a message creation, registration or addition is rejected"""
+    """Raised when a message creation, registration or addition is rejected."""
 
 
 class UnknownMessageError(Exception):
-    """raised when an unregistered message id is encountered"""
+    """Raised when an unregistered message id is encountered."""
 
 
 class EmptyReportError(Exception):
-    """raised when a report is empty and so should not be displayed"""
+    """Raised when a report is empty and so should not be displayed."""
 
 
 class InvalidReporterError(Exception):
-    """raised when selected reporter is invalid (e.g. not found)"""
+    """Raised when selected reporter is invalid (e.g. not found)."""
 
 
 class InvalidArgsError(ValueError):
-    """raised when passed arguments are invalid, e.g., have the wrong length"""
+    """Raised when passed arguments are invalid, e.g., have the wrong length."""
 
 
 class NoLineSuppliedError(Exception):
-    """raised when trying to disable a message on a next line without supplying a line number"""
+    """Raised when trying to disable a message on a next line without supplying a line number."""
diff --git a/pylint/extensions/__init__.py b/pylint/extensions/__init__.py
index 42477a4b39..393fe5e9e4 100644
--- a/pylint/extensions/__init__.py
+++ b/pylint/extensions/__init__.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 from typing import TYPE_CHECKING
 
@@ -10,8 +11,8 @@
 
 
 def initialize(linter: "PyLinter") -> None:
-    """Initialize linter with checkers in the extensions directory"""
-    register_plugins(linter, __path__[0])  # type: ignore[name-defined] # Fixed in https://github.com/python/mypy/pull/9454
+    """Initialize linter with checkers in the extensions' directory."""
+    register_plugins(linter, __path__[0])
 
 
 __all__ = ["initialize"]
diff --git a/pylint/extensions/_check_docs_utils.py b/pylint/extensions/_check_docs_utils.py
index 27c2a755ff..4853162c0f 100644
--- a/pylint/extensions/_check_docs_utils.py
+++ b/pylint/extensions/_check_docs_utils.py
@@ -1,31 +1,11 @@
-# Copyright (c) 2016-2019, 2021 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2016-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2016 Yuri Bochkarev <baltazar.bz@gmail.com>
-# Copyright (c) 2016 Glenn Matthews <glenn@e-dad.net>
-# Copyright (c) 2016 Moises Lopez <moylop260@vauxoo.com>
-# Copyright (c) 2017, 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2017 Mitar <mitar.github@tnode.com>
-# Copyright (c) 2018, 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2018 Jim Robertson <jrobertson98atx@gmail.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Mitchell T.H. Young <mitchelly@gmail.com>
-# Copyright (c) 2018 Adrian Chirieac <chirieacam@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2019 Danny Hermes <daniel.j.hermes@gmail.com>
-# Copyright (c) 2019 Zeb Nicholls <zebedee.nicholls@climate-energy-college.org>
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 allanc65 <95424144+allanc65@users.noreply.github.com>
-# Copyright (c) 2021 Konstantina Saketou <56515303+ksaketou@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Utility methods for docstring checking."""
 
 import re
-from typing import List, Set, Tuple
+from typing import List, Optional, Set, Tuple
 
 import astroid
 from astroid import nodes
@@ -34,7 +14,7 @@
 
 
 def space_indentation(s):
-    """The number of leading spaces in a string
+    """The number of leading spaces in a string.
 
     :param str s: input string
 
@@ -120,9 +100,8 @@ def _split_multiple_exc_types(target: str) -> List[str]:
     return re.split(delimiters, target)
 
 
-def possible_exc_types(node):
-    """
-    Gets all of the possible raised exception types for the given raise node.
+def possible_exc_types(node: nodes.NodeNG) -> Set[nodes.ClassDef]:
+    """Gets all the possible raised exception types for the given raise node.
 
     .. note::
 
@@ -130,49 +109,57 @@ def possible_exc_types(node):
 
 
     :param node: The raise node to find exception types for.
-    :type node: nodes.NodeNG
 
     :returns: A list of exception types possibly raised by :param:`node`.
-    :rtype: set(str)
     """
-    excs = []
+    exceptions = []
     if isinstance(node.exc, nodes.Name):
         inferred = utils.safe_infer(node.exc)
         if inferred:
-            excs = [inferred.name]
+            exceptions = [inferred]
     elif node.exc is None:
         handler = node.parent
         while handler and not isinstance(handler, nodes.ExceptHandler):
             handler = handler.parent
 
         if handler and handler.type:
-            inferred_excs = astroid.unpack_infer(handler.type)
-            excs = (exc.name for exc in inferred_excs if exc is not astroid.Uninferable)
+            try:
+                for exception in astroid.unpack_infer(handler.type):
+                    if exception is not astroid.Uninferable:
+                        exceptions.append(exception)
+            except astroid.InferenceError:
+                pass
     else:
         target = _get_raise_target(node)
         if isinstance(target, nodes.ClassDef):
-            excs = [target.name]
+            exceptions = [target]
         elif isinstance(target, nodes.FunctionDef):
             for ret in target.nodes_of_class(nodes.Return):
-                if ret.frame() != target:
+                if ret.frame(future=True) != target:
                     # return from inner function - ignore it
                     continue
 
                 val = utils.safe_infer(ret.value)
-                if (
-                    val
-                    and isinstance(val, (astroid.Instance, nodes.ClassDef))
-                    and utils.inherit_from_std_ex(val)
-                ):
-                    excs.append(val.name)
+                if val and utils.inherit_from_std_ex(val):
+                    if isinstance(val, nodes.ClassDef):
+                        exceptions.append(val)
+                    elif isinstance(val, astroid.Instance):
+                        exceptions.append(val.getattr("__class__")[0])
 
     try:
-        return {exc for exc in excs if not utils.node_ignores_exception(node, exc)}
+        return {
+            exc
+            for exc in exceptions
+            if not utils.node_ignores_exception(node, exc.name)
+        }
     except astroid.InferenceError:
         return set()
 
 
-def docstringify(docstring, default_type="default"):
+def docstringify(
+    docstring: Optional[nodes.Const], default_type: str = "default"
+) -> "Docstring":
+    best_match = (0, DOCSTRING_TYPES.get(default_type, Docstring)(docstring))
     for docstring_type in (
         SphinxDocstring,
         EpytextDocstring,
@@ -180,11 +167,11 @@ def docstringify(docstring, default_type="default"):
         NumpyDocstring,
     ):
         instance = docstring_type(docstring)
-        if instance.is_valid():
-            return instance
+        matching_sections = instance.matching_sections()
+        if matching_sections > best_match[0]:
+            best_match = (matching_sections, instance)
 
-    docstring_type = DOCSTRING_TYPES.get(default_type, Docstring)
-    return docstring_type(docstring)
+    return best_match[1]
 
 
 class Docstring:
@@ -203,15 +190,16 @@ class Docstring:
 
     # These methods are designed to be overridden
     # pylint: disable=no-self-use
-    def __init__(self, doc):
-        doc = doc or ""
-        self.doc = doc.expandtabs()
+    def __init__(self, doc: Optional[nodes.Const]) -> None:
+        docstring = doc.value if doc else ""
+        self.doc = docstring.expandtabs()
 
     def __repr__(self) -> str:
         return f"<{self.__class__.__name__}:'''{self.doc}'''>"
 
-    def is_valid(self):
-        return False
+    def matching_sections(self) -> int:
+        """Returns the number of matching docstring sections."""
+        return 0
 
     def exceptions(self):
         return set()
@@ -250,7 +238,7 @@ class SphinxDocstring(Docstring):
         \w(?:\w|\.[^\.])*    # Valid python name
         """
 
-    re_simple_container_type = fr"""
+    re_simple_container_type = rf"""
         {re_type}                     # a container type
         [\(\[] [^\n\s]+ [\)\]]        # with the contents of the container
     """
@@ -262,12 +250,12 @@ class SphinxDocstring(Docstring):
         type=re_type, container_type=re_simple_container_type
     )
 
-    re_xref = fr"""
+    re_xref = rf"""
         (?::\w+:)?                    # optional tag
         `{re_type}`                   # what to reference
         """
 
-    re_param_raw = fr"""
+    re_param_raw = rf"""
         :                       # initial colon
         (?:                     # Sphinx keywords
         param|parameter|
@@ -287,7 +275,7 @@ class SphinxDocstring(Docstring):
         """
     re_param_in_docstring = re.compile(re_param_raw, re.X | re.S)
 
-    re_type_raw = fr"""
+    re_type_raw = rf"""
         :type                           # Sphinx keyword
         \s+                             # whitespace
         ({re_multiple_simple_type})     # Parameter name
@@ -296,14 +284,14 @@ class SphinxDocstring(Docstring):
         """
     re_type_in_docstring = re.compile(re_type_raw, re.X | re.S)
 
-    re_property_type_raw = fr"""
+    re_property_type_raw = rf"""
         :type:                      # Sphinx keyword
         \s+                         # whitespace
         {re_multiple_simple_type}   # type declaration
         """
     re_property_type_in_docstring = re.compile(re_property_type_raw, re.X | re.S)
 
-    re_raise_raw = fr"""
+    re_raise_raw = rf"""
         :                               # initial colon
         (?:                             # Sphinx keyword
         raises?|
@@ -322,13 +310,17 @@ class SphinxDocstring(Docstring):
 
     supports_yields = False
 
-    def is_valid(self):
-        return bool(
-            self.re_param_in_docstring.search(self.doc)
-            or self.re_raise_in_docstring.search(self.doc)
-            or self.re_rtype_in_docstring.search(self.doc)
-            or self.re_returns_in_docstring.search(self.doc)
-            or self.re_property_type_in_docstring.search(self.doc)
+    def matching_sections(self) -> int:
+        """Returns the number of matching docstring sections."""
+        return sum(
+            bool(i)
+            for i in (
+                self.re_param_in_docstring.search(self.doc),
+                self.re_raise_in_docstring.search(self.doc),
+                self.re_rtype_in_docstring.search(self.doc),
+                self.re_returns_in_docstring.search(self.doc),
+                self.re_property_type_in_docstring.search(self.doc),
+            )
         )
 
     def exceptions(self):
@@ -390,8 +382,9 @@ def match_param_docs(self):
 
 
 class EpytextDocstring(SphinxDocstring):
-    """
-    Epytext is similar to Sphinx. See the docs:
+    """Epytext is similar to Sphinx.
+
+    See the docs:
         http://epydoc.sourceforge.net/epytext.html
         http://epydoc.sourceforge.net/fields.html#fields
 
@@ -447,7 +440,7 @@ class GoogleDocstring(Docstring):
 
     re_xref = SphinxDocstring.re_xref
 
-    re_container_type = fr"""
+    re_container_type = rf"""
         (?:{re_type}|{re_xref})       # a container type
         [\(\[] [^\n]+ [\)\]]          # with the contents of the container
     """
@@ -475,7 +468,7 @@ class GoogleDocstring(Docstring):
     )
 
     re_param_line = re.compile(
-        fr"""
+        rf"""
         \s*  (\*{{0,2}}\w+)             # identifier potentially with asterisks
         \s*  ( [(]
             {re_multiple_type}
@@ -491,7 +484,7 @@ class GoogleDocstring(Docstring):
     )
 
     re_raise_line = re.compile(
-        fr"""
+        rf"""
         \s*  ({re_multiple_type}) \s* :  # identifier
         \s*  (.*)                        # beginning of optional description
     """,
@@ -503,7 +496,7 @@ class GoogleDocstring(Docstring):
     )
 
     re_returns_line = re.compile(
-        fr"""
+        rf"""
         \s* ({re_multiple_type}:)?        # identifier
         \s* (.*)                          # beginning of description
     """,
@@ -511,8 +504,8 @@ class GoogleDocstring(Docstring):
     )
 
     re_property_returns_line = re.compile(
-        fr"""
-        ^{re_multiple_type}:           # indentifier
+        rf"""
+        ^{re_multiple_type}:           # identifier
         \s* (.*)                       # Summary line / description
     """,
         re.X | re.S | re.M,
@@ -526,13 +519,17 @@ class GoogleDocstring(Docstring):
 
     supports_yields = True
 
-    def is_valid(self):
-        return bool(
-            self.re_param_section.search(self.doc)
-            or self.re_raise_section.search(self.doc)
-            or self.re_returns_section.search(self.doc)
-            or self.re_yields_section.search(self.doc)
-            or self.re_property_returns_line.search(self._first_line())
+    def matching_sections(self) -> int:
+        """Returns the number of matching docstring sections."""
+        return sum(
+            bool(i)
+            for i in (
+                self.re_param_section.search(self.doc),
+                self.re_raise_section.search(self.doc),
+                self.re_returns_section.search(self.doc),
+                self.re_yields_section.search(self.doc),
+                self.re_property_returns_line.search(self._first_line()),
+            )
         )
 
     def has_params(self):
@@ -727,7 +724,7 @@ class NumpyDocstring(GoogleDocstring):
     )
 
     re_param_line = re.compile(
-        fr"""
+        rf"""
         \s*  (\*{{0,2}}\w+)(\s?(:|\n))                                      # identifier with potential asterisks
         \s*  (?:({GoogleDocstring.re_multiple_type})(?:,\s+optional)?\n)?   # optional type declaration
         \s* (.*)                                                            # optional description
@@ -740,7 +737,7 @@ class NumpyDocstring(GoogleDocstring):
     )
 
     re_raise_line = re.compile(
-        fr"""
+        rf"""
         \s* ({GoogleDocstring.re_type})$   # type declaration
         \s* (.*)                           # optional description
     """,
@@ -752,7 +749,7 @@ class NumpyDocstring(GoogleDocstring):
     )
 
     re_returns_line = re.compile(
-        fr"""
+        rf"""
         \s* (?:\w+\s+:\s+)? # optional name
         ({GoogleDocstring.re_multiple_type})$   # type declaration
         \s* (.*)                                # optional description
@@ -769,7 +766,7 @@ class NumpyDocstring(GoogleDocstring):
     supports_yields = True
 
     def match_param_docs(self) -> Tuple[Set[str], Set[str]]:
-        """Matches parameter documentation section to parameter documentation rules"""
+        """Matches parameter documentation section to parameter documentation rules."""
         params_with_doc = set()
         params_with_type = set()
 
diff --git a/pylint/extensions/bad_builtin.py b/pylint/extensions/bad_builtin.py
index b90ede1113..259df6e954 100644
--- a/pylint/extensions/bad_builtin.py
+++ b/pylint/extensions/bad_builtin.py
@@ -1,22 +1,19 @@
-# Copyright (c) 2016, 2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2020 Peter Kolbus <peter.kolbus@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Checker for deprecated builtins."""
+from typing import TYPE_CHECKING
+
 from astroid import nodes
 
 from pylint.checkers import BaseChecker
 from pylint.checkers.utils import check_messages
 from pylint.interfaces import IAstroidChecker
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 BAD_FUNCTIONS = ["map", "filter"]
 # Some hints regarding the use of bad builtins.
 BUILTIN_HINTS = {"map": "Using a list comprehension can be clearer."}
@@ -57,17 +54,12 @@ def visit_call(self, node: nodes.Call) -> None:
             name = node.func.name
             # ignore the name if it's not a builtin (i.e. not defined in the
             # locals nor globals scope)
-            if not (name in node.frame() or name in node.root()):
+            if not (name in node.frame(future=True) or name in node.root()):
                 if name in self.config.bad_functions:
                     hint = BUILTIN_HINTS.get(name)
                     args = f"{name!r}. {hint}" if hint else repr(name)
                     self.add_message("bad-builtin", node=node, args=args)
 
 
-def register(linter):
-    """Required method to auto register this checker.
-
-    :param linter: Main interface object for Pylint plugins
-    :type linter: Pylint object
-    """
+def register(linter: "PyLinter") -> None:
     linter.register_checker(BadBuiltinChecker(linter))
diff --git a/pylint/extensions/broad_try_clause.py b/pylint/extensions/broad_try_clause.py
index 4ccdf258d4..ddb7f75a38 100644
--- a/pylint/extensions/broad_try_clause.py
+++ b/pylint/extensions/broad_try_clause.py
@@ -1,20 +1,17 @@
-# Copyright (c) 2019-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2019-2020 Tyler Thieding <tyler@thieding.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Looks for try/except statements with too much code in the try clause."""
+from typing import TYPE_CHECKING, Union
 
 from astroid import nodes
 
 from pylint import checkers, interfaces
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 class BroadTryClauseChecker(checkers.BaseChecker):
     """Checks for try clauses with too many lines.
@@ -59,7 +56,7 @@ def _count_statements(self, try_node):
 
         return statement_count
 
-    def visit_tryexcept(self, node: nodes.TryExcept) -> None:
+    def visit_tryexcept(self, node: Union[nodes.TryExcept, nodes.TryFinally]) -> None:
         try_clause_statements = self._count_statements(node)
         if try_clause_statements > self.config.max_try_statements:
             msg = f"try clause contains {try_clause_statements} statements, expected at most {self.config.max_try_statements}"
@@ -71,6 +68,5 @@ def visit_tryfinally(self, node: nodes.TryFinally) -> None:
         self.visit_tryexcept(node)
 
 
-def register(linter):
-    """Required method to auto register this checker."""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(BroadTryClauseChecker(linter))
diff --git a/pylint/extensions/check_docs.py b/pylint/extensions/check_docs.py
deleted file mode 100644
index 96ea4311f5..0000000000
--- a/pylint/extensions/check_docs.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2014-2015 Bruno Daniel <bruno.daniel@blue-yonder.com>
-# Copyright (c) 2015-2016, 2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2016 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
-# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-
-import warnings
-
-from pylint.extensions import docparams
-
-
-def register(linter):
-    """Required method to auto register this checker.
-
-    :param linter: Main interface object for Pylint plugins
-    :type linter: Pylint object
-    """
-    warnings.warn(
-        "This plugin is deprecated, use pylint.extensions.docparams instead.",
-        DeprecationWarning,
-    )
-    linter.register_checker(docparams.DocstringParameterChecker(linter))
diff --git a/pylint/extensions/check_elif.py b/pylint/extensions/check_elif.py
index f70b436846..6ffc32009b 100644
--- a/pylint/extensions/check_elif.py
+++ b/pylint/extensions/check_elif.py
@@ -1,16 +1,8 @@
-# Copyright (c) 2015 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2016-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2016 Glenn Matthews <glmatthe@cisco.com>
-# Copyright (c) 2018 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+from typing import TYPE_CHECKING
 
 from astroid import nodes
 
@@ -18,15 +10,18 @@
 from pylint.checkers.utils import check_messages
 from pylint.interfaces import HIGH, IAstroidChecker, ITokenChecker
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 class ElseifUsedChecker(BaseTokenChecker):
-    """Checks for use of "else if" when an "elif" could be used"""
+    """Checks for use of "else if" when an "elif" could be used."""
 
     __implements__ = (ITokenChecker, IAstroidChecker)
     name = "else_if_used"
     msgs = {
         "R5501": (
-            'Consider using "elif" instead of "else if"',
+            'Consider using "elif" instead of "else" then "if" to remove one indentation level',
             "else-if-used",
             "Used when an else statement is immediately followed by "
             "an if statement and does not contain statements that "
@@ -42,7 +37,7 @@ def _init(self):
         self._elifs = {}
 
     def process_tokens(self, tokens):
-        """Process tokens and look for 'if' or 'elif'"""
+        """Process tokens and look for 'if' or 'elif'."""
         self._elifs = {
             begin: token for _, token, begin, _, _ in tokens if token in {"elif", "if"}
         }
@@ -52,7 +47,7 @@ def leave_module(self, _: nodes.Module) -> None:
 
     @check_messages("else-if-used")
     def visit_if(self, node: nodes.If) -> None:
-        """Current if node must directly follow an 'else'"""
+        """Current if node must directly follow an 'else'."""
         if (
             isinstance(node.parent, nodes.If)
             and node.parent.orelse == [node]
@@ -62,10 +57,5 @@ def visit_if(self, node: nodes.If) -> None:
             self.add_message("else-if-used", node=node, confidence=HIGH)
 
 
-def register(linter):
-    """Required method to auto register this checker.
-
-    :param linter: Main interface object for Pylint plugins
-    :type linter: Pylint object
-    """
+def register(linter: "PyLinter") -> None:
     linter.register_checker(ElseifUsedChecker(linter))
diff --git a/pylint/extensions/code_style.py b/pylint/extensions/code_style.py
index 8d789720ad..74e838ed20 100644
--- a/pylint/extensions/code_style.py
+++ b/pylint/extensions/code_style.py
@@ -1,14 +1,20 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 import sys
-from typing import List, Optional, Set, Tuple, Type, Union, cast
+from typing import TYPE_CHECKING, List, Optional, Set, Tuple, Type, Union, cast
 
 from astroid import nodes
 
 from pylint.checkers import BaseChecker, utils
 from pylint.checkers.utils import check_messages, safe_infer
 from pylint.interfaces import IAstroidChecker
-from pylint.lint import PyLinter
 from pylint.utils.utils import get_global_option
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 if sys.version_info >= (3, 10):
     from typing import TypeGuard
 else:
@@ -26,7 +32,7 @@ class CodeStyleChecker(BaseChecker):
        i.e. detect a common issue or improve performance
        => it should probably be part of the core checker classes
     2. Is it something that would improve code consistency,
-       maybe because it's slightly better with regards to performance
+       maybe because it's slightly better with regard to performance
        and therefore preferred => this is the right place
     3. Everything else should go into another extension
     """
@@ -72,7 +78,7 @@ class CodeStyleChecker(BaseChecker):
         ),
     )
 
-    def __init__(self, linter: PyLinter) -> None:
+    def __init__(self, linter: "PyLinter") -> None:
         """Initialize checker instance."""
         super().__init__(linter=linter)
 
@@ -250,6 +256,7 @@ def _check_prev_sibling_to_if_stmt(
         prev_sibling: Optional[nodes.NodeNG], name: Optional[str]
     ) -> TypeGuard[Union[nodes.Assign, nodes.AnnAssign]]:
         """Check if previous sibling is an assignment with the same name.
+
         Ignore statements which span multiple lines.
         """
         if prev_sibling is None or prev_sibling.tolineno - prev_sibling.fromlineno != 0:
@@ -274,7 +281,7 @@ def _check_prev_sibling_to_if_stmt(
     def _check_ignore_assignment_expr_suggestion(
         node: nodes.If, name: Optional[str]
     ) -> bool:
-        """Return True if suggestion for assignment expr should be ignore.
+        """Return True if suggestion for assignment expr should be ignored.
 
         E.g., in cases where a match statement would be a better fit
         (multiple conditions).
@@ -303,5 +310,5 @@ def _check_ignore_assignment_expr_suggestion(
         return False
 
 
-def register(linter: PyLinter) -> None:
+def register(linter: "PyLinter") -> None:
     linter.register_checker(CodeStyleChecker(linter))
diff --git a/pylint/extensions/comparetozero.py b/pylint/extensions/comparetozero.py
index ced62f0a60..a1db3e5312 100644
--- a/pylint/extensions/comparetozero.py
+++ b/pylint/extensions/comparetozero.py
@@ -1,19 +1,11 @@
-# Copyright (c) 2016 Alexander Todorov <atodorov@otb.bg>
-# Copyright (c) 2017-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 bernie gray <bfgray3@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Looks for comparisons to zero."""
 
 import itertools
-from typing import Any, Iterable
+from typing import TYPE_CHECKING, Any, Iterable
 
 import astroid
 from astroid import nodes
@@ -21,6 +13,9 @@
 from pylint import checkers, interfaces
 from pylint.checkers import utils
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 def _is_constant_zero(node):
     return isinstance(node, astroid.Const) and node.value == 0
@@ -28,7 +23,8 @@ def _is_constant_zero(node):
 
 class CompareToZeroChecker(checkers.BaseChecker):
     """Checks for comparisons to zero.
-    Most of the times you should use the fact that integers with a value of 0 are false.
+
+    Most of the time you should use the fact that integers with a value of 0 are false.
     An exception to this rule is when 0 is allowed in the program and has a
     different meaning than None!
     """
@@ -77,6 +73,5 @@ def visit_compare(self, node: nodes.Compare) -> None:
                 self.add_message("compare-to-zero", node=node)
 
 
-def register(linter):
-    """Required method to auto register this checker."""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(CompareToZeroChecker(linter))
diff --git a/pylint/extensions/comparison_placement.py b/pylint/extensions/comparison_placement.py
index 64c8dee5e9..8156f98b30 100644
--- a/pylint/extensions/comparison_placement.py
+++ b/pylint/extensions/comparison_placement.py
@@ -1,23 +1,28 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""
-Checks for yoda comparisons (variable before constant)
+"""Checks for yoda comparisons (variable before constant)
 See https://en.wikipedia.org/wiki/Yoda_conditions
 """
 
 
+from typing import TYPE_CHECKING
+
 from astroid import nodes
 
 from pylint.checkers import BaseChecker, utils
 from pylint.interfaces import IAstroidChecker
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 REVERSED_COMPS = {"<": ">", "<=": ">=", ">": "<", ">=": "<="}
 COMPARISON_OPERATORS = frozenset(("==", "!=", "<", ">", "<=", ">="))
 
 
 class MisplacedComparisonConstantChecker(BaseChecker):
-    """Checks the placement of constants in comparisons"""
+    """Checks the placement of constants in comparisons."""
 
     __implements__ = (IAstroidChecker,)
 
@@ -62,6 +67,5 @@ def visit_compare(self, node: nodes.Compare) -> None:
             self._check_misplaced_constant(node, left, right, operator)
 
 
-def register(linter):
-    """Required method to auto register this checker."""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(MisplacedComparisonConstantChecker(linter))
diff --git a/pylint/extensions/confusing_elif.py b/pylint/extensions/confusing_elif.py
index 7f81fceaae..9f815da96d 100644
--- a/pylint/extensions/confusing_elif.py
+++ b/pylint/extensions/confusing_elif.py
@@ -1,18 +1,17 @@
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+from typing import TYPE_CHECKING
 
 from astroid import nodes
 
 from pylint.checkers import BaseChecker
 from pylint.checkers.utils import check_messages
 from pylint.interfaces import IAstroidChecker
-from pylint.lint import PyLinter
+
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
 
 
 class ConfusingConsecutiveElifChecker(BaseChecker):
@@ -50,10 +49,5 @@ def _has_no_else_clause(node: nodes.If):
         return False
 
 
-def register(linter: PyLinter):
-    """This required method auto registers the checker.
-
-    :param linter: The linter to register the checker to.
-    :type linter: pylint.lint.PyLinter
-    """
+def register(linter: "PyLinter") -> None:
     linter.register_checker(ConfusingConsecutiveElifChecker(linter))
diff --git a/pylint/extensions/consider_ternary_expression.py b/pylint/extensions/consider_ternary_expression.py
index 3e3e87c6bb..aece514b77 100644
--- a/pylint/extensions/consider_ternary_expression.py
+++ b/pylint/extensions/consider_ternary_expression.py
@@ -1,10 +1,19 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 """Check for if / assign blocks that can be rewritten with if-expressions."""
 
+from typing import TYPE_CHECKING
+
 from astroid import nodes
 
 from pylint.checkers import BaseChecker
 from pylint.interfaces import IAstroidChecker
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 class ConsiderTernaryExpressionChecker(BaseChecker):
 
@@ -44,10 +53,5 @@ def visit_if(self, node: nodes.If) -> None:
         self.add_message("consider-ternary-expression", node=node)
 
 
-def register(linter):
-    """Required method to auto register this checker.
-
-    :param linter: Main interface object for Pylint plugins
-    :type linter: Pylint object
-    """
+def register(linter: "PyLinter") -> None:
     linter.register_checker(ConsiderTernaryExpressionChecker(linter))
diff --git a/pylint/extensions/docparams.py b/pylint/extensions/docparams.py
index 92e598c5d4..eff625b92d 100644
--- a/pylint/extensions/docparams.py
+++ b/pylint/extensions/docparams.py
@@ -1,33 +1,10 @@
-# Copyright (c) 2014-2015 Bruno Daniel <bruno.daniel@blue-yonder.com>
-# Copyright (c) 2015-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2016-2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2016 Glenn Matthews <glenn@e-dad.net>
-# Copyright (c) 2016 Glenn Matthews <glmatthe@cisco.com>
-# Copyright (c) 2016 Moises Lopez <moylop260@vauxoo.com>
-# Copyright (c) 2017 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2017 John Paraskevopoulos <io.paraskev@gmail.com>
-# Copyright (c) 2018, 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2018 Jim Robertson <jrobertson98atx@gmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Adam Dangoor <adamdangoor@gmail.com>
-# Copyright (c) 2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2020 Luigi <luigi.cristofolini@q-ctrl.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Damien Baty <damien.baty@polyconseil.fr>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Konstantina Saketou <56515303+ksaketou@users.noreply.github.com>
-# Copyright (c) 2021 SupImDos <62866982+SupImDos@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Logan Miller <14319179+komodo472@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""Pylint plugin for checking in Sphinx, Google, or Numpy style docstrings
-"""
+"""Pylint plugin for checking in Sphinx, Google, or Numpy style docstrings."""
 import re
-from typing import Optional
+from typing import TYPE_CHECKING, Optional
 
 import astroid
 from astroid import nodes
@@ -39,9 +16,12 @@
 from pylint.interfaces import IAstroidChecker
 from pylint.utils import get_global_option
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 class DocstringParameterChecker(BaseChecker):
-    """Checker for Sphinx, Google, or Numpy style docstrings
+    """Checker for Sphinx, Google, or Numpy style docstrings.
 
     * Check that all function, method and constructor parameters are mentioned
       in the params and types part of the docstring.  Constructor parameters
@@ -59,9 +39,6 @@ class DocstringParameterChecker(BaseChecker):
         load-plugins=pylint.extensions.docparams
 
     to the ``MASTER`` section of your ``.pylintrc``.
-
-    :param linter: linter object
-    :type linter: :class:`pylint.lint.PyLinter`
     """
 
     __implements__ = IAstroidChecker
@@ -220,7 +197,7 @@ def visit_functiondef(self, node: nodes.FunctionDef) -> None:
         :param node: Node for a function or method definition in the AST
         :type node: :class:`astroid.scoped_nodes.Function`
         """
-        node_doc = utils.docstringify(node.doc, self.config.default_docstring_type)
+        node_doc = utils.docstringify(node.doc_node, self.config.default_docstring_type)
 
         # skip functions that match the 'no-docstring-rgx' config option
         no_docstring_rgx = get_global_option(self, "no-docstring-rgx")
@@ -245,7 +222,7 @@ def check_functiondef_params(self, node, node_doc):
             class_node = checker_utils.node_frame_class(node)
             if class_node is not None:
                 class_doc = utils.docstringify(
-                    class_node.doc, self.config.default_docstring_type
+                    class_node.doc_node, self.config.default_docstring_type
                 )
                 self.check_single_constructor_params(class_doc, node_doc, class_node)
 
@@ -290,7 +267,7 @@ def check_functiondef_yields(self, node, node_doc):
             self.add_message("redundant-yields-doc", node=node)
 
     def visit_raise(self, node: nodes.Raise) -> None:
-        func_node = node.frame()
+        func_node = node.frame(future=True)
         if not isinstance(func_node, astroid.FunctionDef):
             return
 
@@ -299,24 +276,35 @@ def visit_raise(self, node: nodes.Raise) -> None:
         if not expected_excs:
             return
 
-        if not func_node.doc:
+        if not func_node.doc_node:
             # If this is a property setter,
             # the property should have the docstring instead.
             property_ = utils.get_setters_property(func_node)
             if property_:
                 func_node = property_
 
-        doc = utils.docstringify(func_node.doc, self.config.default_docstring_type)
-        if not doc.is_valid():
+        doc = utils.docstringify(func_node.doc_node, self.config.default_docstring_type)
+        if not doc.matching_sections():
             if doc.doc:
-                self._handle_no_raise_doc(expected_excs, func_node)
+                missing = {exc.name for exc in expected_excs}
+                self._handle_no_raise_doc(missing, func_node)
             return
 
         found_excs_full_names = doc.exceptions()
 
         # Extract just the class name, e.g. "error" from "re.error"
         found_excs_class_names = {exc.split(".")[-1] for exc in found_excs_full_names}
-        missing_excs = expected_excs - found_excs_class_names
+
+        missing_excs = set()
+        for expected in expected_excs:
+            for found_exc in found_excs_class_names:
+                if found_exc == expected.name:
+                    break
+                if any(found_exc == ancestor.name for ancestor in expected.ancestors()):
+                    break
+            else:
+                missing_excs.add(expected.name)
+
         self._add_raise_message(missing_excs, func_node)
 
     def visit_return(self, node: nodes.Return) -> None:
@@ -326,11 +314,11 @@ def visit_return(self, node: nodes.Return) -> None:
         if self.config.accept_no_return_doc:
             return
 
-        func_node = node.frame()
+        func_node = node.frame(future=True)
         if not isinstance(func_node, astroid.FunctionDef):
             return
 
-        doc = utils.docstringify(func_node.doc, self.config.default_docstring_type)
+        doc = utils.docstringify(func_node.doc_node, self.config.default_docstring_type)
 
         is_property = checker_utils.decorated_with_property(func_node)
 
@@ -347,11 +335,11 @@ def visit_yield(self, node: nodes.Yield) -> None:
         if self.config.accept_no_yields_doc:
             return
 
-        func_node = node.frame()
+        func_node = node.frame(future=True)
         if not isinstance(func_node, astroid.FunctionDef):
             return
 
-        doc = utils.docstringify(func_node.doc, self.config.default_docstring_type)
+        doc = utils.docstringify(func_node.doc_node, self.config.default_docstring_type)
 
         if doc.supports_yields:
             doc_has_yields = doc.has_yields()
@@ -482,10 +470,8 @@ def check_arguments_in_docstring(
         warning_node: astroid.NodeNG,
         accept_no_param_doc: Optional[bool] = None,
     ):
-        """Check that all parameters in a function, method or class constructor
-        on the one hand and the parameters mentioned in the parameter
-        documentation (e.g. the Sphinx tags 'param' and 'type') on the other
-        hand are consistent with each other.
+        """Check that all parameters are consistent with the parameters mentioned
+        in the parameter documentation (e.g. the Sphinx tags 'param' and 'type').
 
         * Undocumented parameters except 'self' are noticed.
         * Undocumented parameter types except for 'self' and the ``*<args>``
@@ -510,9 +496,8 @@ class constructor.
         :param warning_node: The node to assign the warnings to
         :type warning_node: :class:`astroid.scoped_nodes.Node`
 
-        :param accept_no_param_doc: Whether or not to allow no parameters
-            to be documented.
-            If None then this value is read from the configuration.
+        :param accept_no_param_doc: Whether to allow no parameters to be
+            documented. If None then this value is read from the configuration.
         :type accept_no_param_doc: bool or None
         """
         # Tolerate missing param or type declarations if there is a link to
@@ -578,7 +563,7 @@ class constructor.
             ):
                 self.add_message(
                     "missing-any-param-doc",
-                    args=(warning_node.name),
+                    args=(warning_node.name,),
                     node=warning_node,
                 )
             else:
@@ -632,8 +617,7 @@ def _handle_no_raise_doc(self, excs, node):
         self._add_raise_message(excs, node)
 
     def _add_raise_message(self, missing_excs, node):
-        """
-        Adds a message on :param:`node` for the missing exception type.
+        """Adds a message on :param:`node` for the missing exception type.
 
         :param missing_excs: A list of missing exception types.
         :type missing_excs: set(str)
@@ -655,10 +639,5 @@ def _add_raise_message(self, missing_excs, node):
         )
 
 
-def register(linter):
-    """Required method to auto register this checker.
-
-    :param linter: Main interface object for Pylint plugins
-    :type linter: Pylint object
-    """
+def register(linter: "PyLinter") -> None:
     linter.register_checker(DocstringParameterChecker(linter))
diff --git a/pylint/extensions/docstyle.py b/pylint/extensions/docstyle.py
index 7866312b21..537f110dc4 100644
--- a/pylint/extensions/docstyle.py
+++ b/pylint/extensions/docstyle.py
@@ -1,26 +1,23 @@
-# Copyright (c) 2016-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2016 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2016 Luis Escobar <lescobar@vauxoo.com>
-# Copyright (c) 2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import linecache
+from typing import TYPE_CHECKING
 
 from astroid import nodes
 
 from pylint import checkers
 from pylint.checkers.utils import check_messages
+from pylint.constants import PY38_PLUS
 from pylint.interfaces import HIGH, IAstroidChecker
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 class DocStringStyleChecker(checkers.BaseChecker):
-    """Checks format of docstrings based on PEP 0257"""
+    """Checks format of docstrings based on PEP 0257."""
 
     __implements__ = IAstroidChecker
     name = "docstyle"
@@ -29,7 +26,8 @@ class DocStringStyleChecker(checkers.BaseChecker):
         "C0198": (
             'Bad docstring quotes in %s, expected """, given %s',
             "bad-docstring-quotes",
-            "Used when a docstring does not have triple double quotes.",
+            "Used when a docstring does not have triple double quotes. "
+            "This checker only works on Python 3.8+.",
         ),
         "C0199": (
             "First line empty in %s docstring",
@@ -52,7 +50,7 @@ def visit_functiondef(self, node: nodes.FunctionDef) -> None:
     visit_asyncfunctiondef = visit_functiondef
 
     def _check_docstring(self, node_type, node):
-        docstring = node.doc
+        docstring = node.doc_node.value if node.doc_node else None
         if docstring and docstring[0] == "\n":
             self.add_message(
                 "docstring-first-line-empty",
@@ -77,7 +75,7 @@ def _check_docstring(self, node_type, node):
                 quotes = "'"
             else:
                 quotes = False
-            if quotes:
+            if quotes and PY38_PLUS:
                 self.add_message(
                     "bad-docstring-quotes",
                     node=node,
@@ -86,10 +84,5 @@ def _check_docstring(self, node_type, node):
                 )
 
 
-def register(linter):
-    """Required method to auto register this checker.
-
-    :param linter: Main interface object for Pylint plugins
-    :type linter: Pylint object
-    """
+def register(linter: "PyLinter") -> None:
     linter.register_checker(DocStringStyleChecker(linter))
diff --git a/pylint/extensions/empty_comment.py b/pylint/extensions/empty_comment.py
index 7b98416783..4308364bb6 100644
--- a/pylint/extensions/empty_comment.py
+++ b/pylint/extensions/empty_comment.py
@@ -1,11 +1,20 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+from typing import TYPE_CHECKING
+
 from astroid import nodes
 
 from pylint.checkers import BaseChecker
 from pylint.interfaces import IRawChecker
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 def is_line_commented(line):
-    """Checks if a `# symbol that is not part of a string was found in line"""
+    """Checks if a `# symbol that is not part of a string was found in line."""
 
     comment_idx = line.find(b"#")
     if comment_idx == -1:
@@ -16,7 +25,7 @@ def is_line_commented(line):
 
 
 def comment_part_of_string(line, comment_idx):
-    """checks if the symbol at comment_idx is part of a string"""
+    """Checks if the symbol at comment_idx is part of a string."""
 
     if (
         line[:comment_idx].count(b"'") % 2 == 1
@@ -54,5 +63,5 @@ def process_module(self, node: nodes.Module) -> None:
                         self.add_message("empty-comment", line=line_num + 1)
 
 
-def register(linter):
+def register(linter: "PyLinter") -> None:
     linter.register_checker(CommentChecker(linter))
diff --git a/pylint/extensions/emptystring.py b/pylint/extensions/emptystring.py
index 3e62937db1..68f086fb9b 100644
--- a/pylint/extensions/emptystring.py
+++ b/pylint/extensions/emptystring.py
@@ -1,29 +1,25 @@
-# Copyright (c) 2016 Alexander Todorov <atodorov@otb.bg>
-# Copyright (c) 2017-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Jaehoon Hwang <jaehoonhwang@users.noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Looks for  comparisons to empty string."""
 
 import itertools
-from typing import Any, Iterable
+from typing import TYPE_CHECKING, Any, Iterable
 
 from astroid import nodes
 
 from pylint import checkers, interfaces
 from pylint.checkers import utils
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 class CompareToEmptyStringChecker(checkers.BaseChecker):
     """Checks for comparisons to empty string.
-    Most of the times you should use the fact that empty strings are false.
+
+    Most of the time you should use the fact that empty strings are false.
     An exception to this rule is when an empty string value is allowed in the program
     and has a different meaning than None!
     """
@@ -72,6 +68,5 @@ def visit_compare(self, node: nodes.Compare) -> None:
                 self.add_message("compare-to-empty-string", node=node)
 
 
-def register(linter):
-    """Required method to auto register this checker."""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(CompareToEmptyStringChecker(linter))
diff --git a/pylint/extensions/eq_without_hash.py b/pylint/extensions/eq_without_hash.py
new file mode 100644
index 0000000000..9cbbb54522
--- /dev/null
+++ b/pylint/extensions/eq_without_hash.py
@@ -0,0 +1,41 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""This is the remnant of the python3 checker.
+
+It was removed because the transition from python 2 to python3 is
+behind us, but some checks are still useful in python3 after all.
+See https://github.com/PyCQA/pylint/issues/5025
+"""
+
+from astroid import nodes
+
+from pylint import checkers, interfaces
+from pylint.checkers import utils
+from pylint.lint import PyLinter
+
+
+class EqWithoutHash(checkers.BaseChecker):
+
+    __implements__ = interfaces.IAstroidChecker
+    name = "eq-without-hash"
+
+    msgs = {
+        "W1641": (
+            "Implementing __eq__ without also implementing __hash__",
+            "eq-without-hash",
+            "Used when a class implements __eq__ but not __hash__. Objects get "
+            "None as their default __hash__ implementation if they also implement __eq__.",
+        ),
+    }
+
+    @utils.check_messages("eq-without-hash")
+    def visit_classdef(self, node: nodes.ClassDef) -> None:
+        locals_and_methods = set(node.locals).union(x.name for x in node.mymethods())
+        if "__eq__" in locals_and_methods and "__hash__" not in locals_and_methods:
+            self.add_message("eq-without-hash", node=node, confidence=interfaces.HIGH)
+
+
+def register(linter: PyLinter) -> None:
+    linter.register_checker(EqWithoutHash(linter))
diff --git a/pylint/extensions/for_any_all.py b/pylint/extensions/for_any_all.py
index 2086fa4b11..078c204023 100644
--- a/pylint/extensions/for_any_all.py
+++ b/pylint/extensions/for_any_all.py
@@ -1,3 +1,7 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 """Check for use of for loops that only check for a condition."""
 from typing import TYPE_CHECKING
 
@@ -66,8 +70,4 @@ def _build_suggested_string(node: nodes.For, final_return_bool: bool) -> str:
 
 
 def register(linter: "PyLinter") -> None:
-    """Required method to auto register this checker.
-
-    :param linter: Main interface object for Pylint plugins
-    """
     linter.register_checker(ConsiderUsingAnyOrAllChecker(linter))
diff --git a/pylint/extensions/mccabe.py b/pylint/extensions/mccabe.py
index 27d246c1ef..5d2e2fc238 100644
--- a/pylint/extensions/mccabe.py
+++ b/pylint/extensions/mccabe.py
@@ -1,17 +1,10 @@
-# Copyright (c) 2016-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2016 Moises Lopez <moylop260@vauxoo.com>
-# Copyright (c) 2017, 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Module to add McCabe checker class for pylint."""
 
-"""Module to add McCabe checker class for pylint. """
+from typing import TYPE_CHECKING
 
 from astroid import nodes
 from mccabe import PathGraph as Mccabe_PathGraph
@@ -21,6 +14,9 @@
 from pylint.checkers.utils import check_messages
 from pylint.interfaces import HIGH, IAstroidChecker
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 class PathGraph(Mccabe_PathGraph):
     def __init__(self, node):
@@ -110,7 +106,7 @@ def _append_node(self, node):
         return node
 
     def _subgraph(self, node, name, extra_blocks=()):
-        """create the subgraphs representing any `if` and `for` statements"""
+        """Create the subgraphs representing any `if` and `for` statements."""
         if self.graph is None:
             # global loop
             self.graph = PathGraph(node)
@@ -122,7 +118,7 @@ def _subgraph(self, node, name, extra_blocks=()):
             self._subgraph_parse(node, node, extra_blocks)
 
     def _subgraph_parse(self, node, pathnode, extra_blocks):
-        """parse the body and any `else` block of `if` and `for` statements"""
+        """Parse the body and any `else` block of `if` and `for` statements."""
         loose_ends = []
         self.tail = node
         self.dispatch_list(node.body)
@@ -175,8 +171,9 @@ class McCabeMethodChecker(checkers.BaseChecker):
 
     @check_messages("too-complex")
     def visit_module(self, node: nodes.Module) -> None:
-        """visit an astroid.Module node to check too complex rating and
-        add message if is greater than max_complexity stored from options"""
+        """Visit an astroid.Module node to check too complex rating and
+        add message if is greater than max_complexity stored from options
+        """
         visitor = PathGraphingAstVisitor()
         for child in node.body:
             visitor.preorder(child, visitor)
@@ -194,10 +191,5 @@ def visit_module(self, node: nodes.Module) -> None:
             )
 
 
-def register(linter):
-    """Required method to auto register this checker.
-
-    :param linter: Main interface object for Pylint plugins
-    :type linter: Pylint object
-    """
+def register(linter: "PyLinter") -> None:
     linter.register_checker(McCabeMethodChecker(linter))
diff --git a/pylint/extensions/overlapping_exceptions.py b/pylint/extensions/overlapping_exceptions.py
index 470582b68d..17eaa6d3ac 100644
--- a/pylint/extensions/overlapping_exceptions.py
+++ b/pylint/extensions/overlapping_exceptions.py
@@ -1,9 +1,10 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Looks for overlapping exceptions."""
 
-from typing import Any, List, Tuple
+from typing import TYPE_CHECKING, Any, List, Tuple
 
 import astroid
 from astroid import nodes
@@ -12,11 +13,16 @@
 from pylint.checkers import utils
 from pylint.checkers.exceptions import _annotated_unpack_infer
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 class OverlappingExceptionsChecker(checkers.BaseChecker):
     """Checks for two or more exceptions in the same exception handler
     clause that are identical or parts of the same inheritance hierarchy
-    (i.e. overlapping)."""
+
+    (i.e. overlapping).
+    """
 
     __implements__ = interfaces.IAstroidChecker
 
@@ -33,7 +39,7 @@ class OverlappingExceptionsChecker(checkers.BaseChecker):
 
     @utils.check_messages("overlapping-except")
     def visit_tryexcept(self, node: nodes.TryExcept) -> None:
-        """check for empty except"""
+        """Check for empty except."""
         for handler in node.handlers:
             if handler.type is None:
                 continue
@@ -81,6 +87,5 @@ def visit_tryexcept(self, node: nodes.TryExcept) -> None:
                 handled_in_clause += [(part, exc)]
 
 
-def register(linter):
-    """Required method to auto register this checker."""
+def register(linter: "PyLinter") -> None:
     linter.register_checker(OverlappingExceptionsChecker(linter))
diff --git a/pylint/extensions/private_import.py b/pylint/extensions/private_import.py
new file mode 100644
index 0000000000..8d57eca837
--- /dev/null
+++ b/pylint/extensions/private_import.py
@@ -0,0 +1,252 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Check for imports on private external modules and names."""
+from pathlib import Path
+from typing import TYPE_CHECKING, Dict, List, Union
+
+from astroid import nodes
+
+from pylint.checkers import BaseChecker, utils
+from pylint.interfaces import HIGH, IAstroidChecker
+
+if TYPE_CHECKING:
+    from pylint.lint.pylinter import PyLinter
+
+
+class PrivateImportChecker(BaseChecker):
+
+    __implements__ = (IAstroidChecker,)
+    name = "import-private-name"
+    msgs = {
+        "C2701": (
+            "Imported private %s (%s)",
+            "import-private-name",
+            "Used when a private module or object prefixed with _ is imported. "
+            "PEP8 guidance on Naming Conventions states that public attributes with "
+            "leading underscores should be considered private.",
+        ),
+    }
+
+    def __init__(self, linter: "PyLinter") -> None:
+        BaseChecker.__init__(self, linter)
+
+        # A mapping of private names used as a type annotation to whether it is an acceptable import
+        self.all_used_type_annotations: Dict[str, bool] = {}
+        self.populated_annotations = False
+
+    @utils.check_messages("import-private-name")
+    def visit_import(self, node: nodes.Import) -> None:
+        if utils.is_node_in_typing_guarded_import_block(node):
+            return
+        names = [name[0] for name in node.names]
+        private_names = self._get_private_imports(names)
+        private_names = self._get_type_annotation_names(node, private_names)
+        if private_names:
+            imported_identifier = "modules" if len(private_names) > 1 else "module"
+            private_name_string = ", ".join(private_names)
+            self.add_message(
+                "import-private-name",
+                node=node,
+                args=(imported_identifier, private_name_string),
+                confidence=HIGH,
+            )
+
+    @utils.check_messages("import-private-name")
+    def visit_importfrom(self, node: nodes.ImportFrom) -> None:
+        if utils.is_node_in_typing_guarded_import_block(node):
+            return
+        # Only check imported names if the module is external
+        if self.same_root_dir(node, node.modname):
+            return
+
+        names = [n[0] for n in node.names]
+
+        # Check the imported objects first. If they are all valid type annotations, the package can be private
+        private_names = self._get_type_annotation_names(node, names)
+        if not private_names:
+            return
+
+        # There are invalid imported objects, so check the name of the package
+        private_module_imports = self._get_private_imports([node.modname])
+        private_module_imports = self._get_type_annotation_names(
+            node, private_module_imports
+        )
+        if private_module_imports:
+            self.add_message(
+                "import-private-name",
+                node=node,
+                args=("module", private_module_imports[0]),
+                confidence=HIGH,
+            )
+            return  # Do not emit messages on the objects if the package is private
+
+        private_names = self._get_private_imports(private_names)
+
+        if private_names:
+            imported_identifier = "objects" if len(private_names) > 1 else "object"
+            private_name_string = ", ".join(private_names)
+            self.add_message(
+                "import-private-name",
+                node=node,
+                args=(imported_identifier, private_name_string),
+                confidence=HIGH,
+            )
+
+    def _get_private_imports(self, names: List[str]) -> List[str]:
+        """Returns the private names from input names by a simple string check."""
+        return [name for name in names if self._name_is_private(name)]
+
+    @staticmethod
+    def _name_is_private(name: str) -> bool:
+        """Returns true if the name exists, starts with `_`, and if len(name) > 4
+        it is not a dunder, i.e. it does not begin and end with two underscores.
+        """
+        return (
+            bool(name)
+            and name[0] == "_"
+            and (len(name) <= 4 or name[1] != "_" or name[-2:] != "__")
+        )
+
+    def _get_type_annotation_names(
+        self, node: nodes.Import, names: List[str]
+    ) -> List[str]:
+        """Removes from names any names that are used as type annotations with no other illegal usages."""
+        if names and not self.populated_annotations:
+            self._populate_type_annotations(node.root(), self.all_used_type_annotations)
+            self.populated_annotations = True
+
+        return [
+            n
+            for n in names
+            if n not in self.all_used_type_annotations
+            or (
+                n in self.all_used_type_annotations
+                and not self.all_used_type_annotations[n]
+            )
+        ]
+
+    def _populate_type_annotations(
+        self, node: nodes.LocalsDictNodeNG, all_used_type_annotations: Dict[str, bool]
+    ) -> None:
+        """Adds into the dict `all_used_type_annotations` the names of all names ever used as a type annotation
+        in the scope and nested scopes of node and whether these names are only used for type checking.
+        """
+        for name in node.locals:
+            # If we find a private type annotation, make sure we do not mask illegal usages
+            private_name = None
+            # All the assignments using this variable that we might have to check for illegal usages later
+            name_assignments = []
+            for usage_node in node.locals[name]:
+                if isinstance(usage_node, nodes.AssignName) and isinstance(
+                    usage_node.parent, (nodes.AnnAssign, nodes.Assign)
+                ):
+                    assign_parent = usage_node.parent
+                    if isinstance(assign_parent, nodes.AnnAssign):
+                        name_assignments.append(assign_parent)
+                        private_name = self._populate_type_annotations_annotation(
+                            usage_node.parent.annotation, all_used_type_annotations
+                        )
+                    elif isinstance(assign_parent, nodes.Assign):
+                        name_assignments.append(assign_parent)
+
+                if isinstance(usage_node, nodes.FunctionDef):
+                    self._populate_type_annotations_function(
+                        usage_node, all_used_type_annotations
+                    )
+                if isinstance(usage_node, nodes.LocalsDictNodeNG):
+                    self._populate_type_annotations(
+                        usage_node, all_used_type_annotations
+                    )
+            if private_name is not None:
+                # Found a new private annotation, make sure we are not accessing it elsewhere
+                all_used_type_annotations[
+                    private_name
+                ] = self._assignments_call_private_name(name_assignments, private_name)
+
+    def _populate_type_annotations_function(
+        self, node: nodes.FunctionDef, all_used_type_annotations: Dict[str, bool]
+    ) -> None:
+        """Adds into the dict `all_used_type_annotations` the names of all names used as a type annotation
+        in the arguments and return type of the function node.
+        """
+        if node.args and node.args.annotations:
+            for annotation in node.args.annotations:
+                self._populate_type_annotations_annotation(
+                    annotation, all_used_type_annotations
+                )
+        if node.returns:
+            self._populate_type_annotations_annotation(
+                node.returns, all_used_type_annotations
+            )
+
+    def _populate_type_annotations_annotation(
+        self,
+        node: Union[nodes.Attribute, nodes.Subscript, nodes.Name],
+        all_used_type_annotations: Dict[str, bool],
+    ) -> Union[str, None]:
+        """Handles the possiblity of an annotation either being a Name, i.e. just type,
+        or a Subscript e.g. `Optional[type]` or an Attribute, e.g. `pylint.lint.linter`.
+        """
+        if isinstance(node, nodes.Name) and node.name not in all_used_type_annotations:
+            all_used_type_annotations[node.name] = True
+            return node.name
+        if isinstance(node, nodes.Subscript):  # e.g. Optional[List[str]]
+            # slice is the next nested type
+            self._populate_type_annotations_annotation(
+                node.slice, all_used_type_annotations
+            )
+            # value is the current type name: could be a Name or Attribute
+            return self._populate_type_annotations_annotation(
+                node.value, all_used_type_annotations
+            )
+        if isinstance(node, nodes.Attribute):
+            # An attribute is a type like `pylint.lint.pylinter`. node.expr is the next level up, could be another attribute
+            return self._populate_type_annotations_annotation(
+                node.expr, all_used_type_annotations
+            )
+        return None
+
+    @staticmethod
+    def _assignments_call_private_name(
+        assignments: List[Union[nodes.AnnAssign, nodes.Assign]], private_name: str
+    ) -> bool:
+        """Returns True if no assignments involve accessing `private_name`."""
+        if all(not assignment.value for assignment in assignments):
+            # Variable annotated but unassigned is unallowed because there may be a possible illegal access elsewhere
+            return False
+        for assignment in assignments:
+            current_attribute = None
+            if isinstance(assignment.value, nodes.Call):
+                current_attribute = assignment.value.func
+            elif isinstance(assignment.value, nodes.Attribute):
+                current_attribute = assignment.value
+            elif isinstance(assignment.value, nodes.Name):
+                current_attribute = assignment.value.name
+            if not current_attribute:
+                continue
+            while isinstance(current_attribute, (nodes.Attribute, nodes.Call)):
+                if isinstance(current_attribute, nodes.Call):
+                    current_attribute = current_attribute.func
+                current_attribute = current_attribute.expr
+            if (
+                isinstance(current_attribute, nodes.Name)
+                and current_attribute.name == private_name
+            ):
+                return False
+        return True
+
+    @staticmethod
+    def same_root_dir(node: nodes.Import, import_mod_name: str) -> bool:
+        """Does the node's file's path contain the base name of `import_mod_name`?"""
+        if not import_mod_name:  # from . import ...
+            return True
+
+        base_import_package = import_mod_name.split(".")[0]
+
+        return base_import_package in Path(node.root().file).parent.parts
+
+
+def register(linter: "PyLinter") -> None:
+    linter.register_checker(PrivateImportChecker(linter))
diff --git a/pylint/extensions/redefined_variable_type.py b/pylint/extensions/redefined_variable_type.py
index 864c50ddf5..41464630b9 100644
--- a/pylint/extensions/redefined_variable_type.py
+++ b/pylint/extensions/redefined_variable_type.py
@@ -1,17 +1,8 @@
-# Copyright (c) 2016-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2016 Glenn Matthews <glmatthe@cisco.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-from typing import List
+from typing import TYPE_CHECKING, List
 
 from astroid import nodes
 
@@ -19,9 +10,12 @@
 from pylint.checkers.utils import check_messages, is_none, node_type
 from pylint.interfaces import IAstroidChecker
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 class MultipleTypesChecker(BaseChecker):
-    """Checks for variable type redefinitions (NoneType excepted)
+    """Checks for variable type redefinitions (NoneType excepted).
 
     At a function, method, class or module scope
 
@@ -30,7 +24,7 @@ class MultipleTypesChecker(BaseChecker):
     - Currently, if an attribute is set to different types in 2 methods of a
       same class, it won't be detected (see functional test)
     - One could improve the support for inference on assignment with tuples,
-      ifexpr, etc. Also it would be great to have support for inference on
+      ifexpr, etc. Also, it would be great to have support for inference on
       str.split()
     """
 
@@ -111,10 +105,5 @@ def visit_assign(self, node: nodes.Assign) -> None:
             )
 
 
-def register(linter):
-    """Required method to auto register this checker.
-
-    :param linter: Main interface object for Pylint plugins
-    :type linter: Pylint object
-    """
+def register(linter: "PyLinter") -> None:
     linter.register_checker(MultipleTypesChecker(linter))
diff --git a/pylint/extensions/set_membership.py b/pylint/extensions/set_membership.py
index c63e268b3c..57089dc161 100644
--- a/pylint/extensions/set_membership.py
+++ b/pylint/extensions/set_membership.py
@@ -1,9 +1,17 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+from typing import TYPE_CHECKING
+
 from astroid import nodes
 
 from pylint.checkers import BaseChecker
 from pylint.checkers.utils import check_messages
 from pylint.interfaces import IAstroidChecker
-from pylint.lint import PyLinter
+
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
 
 
 class SetMembershipChecker(BaseChecker):
@@ -21,7 +29,7 @@ class SetMembershipChecker(BaseChecker):
         ),
     }
 
-    def __init__(self, linter: PyLinter) -> None:
+    def __init__(self, linter: "PyLinter") -> None:
         """Initialize checker instance."""
         super().__init__(linter=linter)
 
@@ -43,5 +51,5 @@ def _check_in_comparison(self, comparator: nodes.NodeNG) -> None:
             self.add_message("use-set-for-membership", node=comparator)
 
 
-def register(linter: PyLinter) -> None:
+def register(linter: "PyLinter") -> None:
     linter.register_checker(SetMembershipChecker(linter))
diff --git a/pylint/extensions/typing.py b/pylint/extensions/typing.py
index 01bfe1b285..ce25ff70d8 100644
--- a/pylint/extensions/typing.py
+++ b/pylint/extensions/typing.py
@@ -1,4 +1,8 @@
-from typing import Dict, List, NamedTuple, Set, Union
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+from typing import TYPE_CHECKING, Dict, List, NamedTuple, Set, Union
 
 import astroid.bases
 from astroid import nodes
@@ -6,13 +10,17 @@
 from pylint.checkers import BaseChecker
 from pylint.checkers.utils import (
     check_messages,
+    in_type_checking_block,
     is_node_in_type_annotation_context,
+    is_postponed_evaluation_enabled,
     safe_infer,
 )
-from pylint.interfaces import IAstroidChecker
-from pylint.lint import PyLinter
+from pylint.interfaces import INFERENCE, IAstroidChecker
 from pylint.utils.utils import get_global_option
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 class TypingAlias(NamedTuple):
     name: str
@@ -66,13 +74,19 @@ class TypingAlias(NamedTuple):
 
 ALIAS_NAMES = frozenset(key.split(".")[1] for key in DEPRECATED_TYPING_ALIASES)
 UNION_NAMES = ("Optional", "Union")
+TYPING_NORETURN = frozenset(
+    (
+        "typing.NoReturn",
+        "typing_extensions.NoReturn",
+    )
+)
 
 
 class DeprecatedTypingAliasMsg(NamedTuple):
     node: Union[nodes.Name, nodes.Attribute]
     qname: str
     alias: str
-    parent_subscript: bool
+    parent_subscript: bool = False
 
 
 class TypingChecker(BaseChecker):
@@ -101,6 +115,22 @@ class TypingChecker(BaseChecker):
             "Emitted when 'typing.Union' or 'typing.Optional' is used "
             "instead of the alternative Union syntax 'int | None'.",
         ),
+        "E6004": (
+            "'NoReturn' inside compound types is broken in 3.7.0 / 3.7.1",
+            "broken-noreturn",
+            "``typing.NoReturn`` inside compound types is broken in "
+            "Python 3.7.0 and 3.7.1. If not dependent on runtime introspection, "
+            "use string annotation instead. E.g. "
+            "``Callable[..., 'NoReturn']``. https://bugs.python.org/issue34921",
+        ),
+        "E6005": (
+            "'collections.abc.Callable' inside Optional and Union is broken in "
+            "3.9.0 / 3.9.1 (use 'typing.Callable' instead)",
+            "broken-collections-callable",
+            "``collections.abc.Callable`` inside Optional and Union is broken in "
+            "Python 3.9.0 and 3.9.1. Use ``typing.Callable`` for these cases instead. "
+            "https://bugs.python.org/issue42965",
+        ),
     }
     options = (
         (
@@ -132,10 +162,12 @@ class TypingChecker(BaseChecker):
     or Python 3.7+ with postponed evaluation.
     """
 
-    def __init__(self, linter: PyLinter) -> None:
+    def __init__(self, linter: "PyLinter") -> None:
         """Initialize checker instance."""
         super().__init__(linter=linter)
+        self._found_broken_callable_location: bool = False
         self._alias_name_collisions: Set[str] = set()
+        self._deprecated_typing_alias_msgs: List[DeprecatedTypingAliasMsg] = []
         self._consider_using_alias_msgs: List[DeprecatedTypingAliasMsg] = []
 
     def open(self) -> None:
@@ -151,7 +183,10 @@ def open(self) -> None:
             self._py37_plus and self.config.runtime_typing is False
         )
 
-    def _msg_postponed_eval_hint(self, node) -> str:
+        self._should_check_noreturn = py_version < (3, 7, 2)
+        self._should_check_callable = py_version < (3, 9, 2)
+
+    def _msg_postponed_eval_hint(self, node: nodes.NodeNG) -> str:
         """Message hint if postponed evaluation isn't enabled."""
         if self._py310_plus or "annotations" in node.root().future_imports:
             return ""
@@ -161,23 +196,35 @@ def _msg_postponed_eval_hint(self, node) -> str:
         "deprecated-typing-alias",
         "consider-using-alias",
         "consider-alternative-union-syntax",
+        "broken-noreturn",
+        "broken-collections-callable",
     )
     def visit_name(self, node: nodes.Name) -> None:
         if self._should_check_typing_alias and node.name in ALIAS_NAMES:
             self._check_for_typing_alias(node)
         if self._should_check_alternative_union_syntax and node.name in UNION_NAMES:
             self._check_for_alternative_union_syntax(node, node.name)
+        if self._should_check_noreturn and node.name == "NoReturn":
+            self._check_broken_noreturn(node)
+        if self._should_check_callable and node.name == "Callable":
+            self._check_broken_callable(node)
 
     @check_messages(
         "deprecated-typing-alias",
         "consider-using-alias",
         "consider-alternative-union-syntax",
+        "broken-noreturn",
+        "broken-collections-callable",
     )
     def visit_attribute(self, node: nodes.Attribute) -> None:
         if self._should_check_typing_alias and node.attrname in ALIAS_NAMES:
             self._check_for_typing_alias(node)
         if self._should_check_alternative_union_syntax and node.attrname in UNION_NAMES:
             self._check_for_alternative_union_syntax(node, node.attrname)
+        if self._should_check_noreturn and node.attrname == "NoReturn":
+            self._check_broken_noreturn(node)
+        if self._should_check_callable and node.attrname == "Callable":
+            self._check_broken_callable(node)
 
     def _check_for_alternative_union_syntax(
         self,
@@ -205,6 +252,7 @@ def _check_for_alternative_union_syntax(
             "consider-alternative-union-syntax",
             node=node,
             args=(name, self._msg_postponed_eval_hint(node)),
+            confidence=INFERENCE,
         )
 
     def _check_for_typing_alias(
@@ -218,7 +266,7 @@ def _check_for_typing_alias(
         - OR: Python 3.7+ with postponed evaluation in
               a type annotation context
 
-        For Python 3.7+: Only emitt message if change doesn't create
+        For Python 3.7+: Only emit message if change doesn't create
             any name collisions, only ever used in a type annotation
             context, and can safely be replaced.
         """
@@ -230,10 +278,16 @@ def _check_for_typing_alias(
             return
 
         if self._py39_plus:
-            self.add_message(
-                "deprecated-typing-alias",
-                node=node,
-                args=(inferred.qname(), alias.name),
+            if inferred.qname() == "typing.Callable" and self._broken_callable_location(
+                node
+            ):
+                self._found_broken_callable_location = True
+            self._deprecated_typing_alias_msgs.append(
+                DeprecatedTypingAliasMsg(
+                    node,
+                    inferred.qname(),
+                    alias.name,
+                )
             )
             return
 
@@ -256,10 +310,25 @@ def _check_for_typing_alias(
     @check_messages("consider-using-alias")
     def leave_module(self, node: nodes.Module) -> None:
         """After parsing of module is complete, add messages for
-        'consider-using-alias' check. Make sure results are safe
-        to recommend / collision free.
+        'consider-using-alias' check.
+
+        Make sure results are safe to recommend / collision free.
         """
-        if self._py37_plus and not self._py39_plus:
+        if self._py39_plus:
+            for msg in self._deprecated_typing_alias_msgs:
+                if (
+                    self._found_broken_callable_location
+                    and msg.qname == "typing.Callable"
+                ):
+                    continue
+                self.add_message(
+                    "deprecated-typing-alias",
+                    node=msg.node,
+                    args=(msg.qname, msg.alias),
+                    confidence=INFERENCE,
+                )
+
+        elif self._py37_plus:
             msg_future_import = self._msg_postponed_eval_hint(node)
             for msg in self._consider_using_alias_msgs:
                 if msg.qname in self._alias_name_collisions:
@@ -272,11 +341,96 @@ def leave_module(self, node: nodes.Module) -> None:
                         msg.alias,
                         msg_future_import if msg.parent_subscript else "",
                     ),
+                    confidence=INFERENCE,
                 )
+
         # Clear all module cache variables
+        self._found_broken_callable_location = False
+        self._deprecated_typing_alias_msgs.clear()
         self._alias_name_collisions.clear()
         self._consider_using_alias_msgs.clear()
 
+    def _check_broken_noreturn(self, node: Union[nodes.Name, nodes.Attribute]) -> None:
+        """Check for 'NoReturn' inside compound types."""
+        if not isinstance(node.parent, nodes.BaseContainer):
+            # NoReturn not part of a Union or Callable type
+            return
+
+        if (
+            in_type_checking_block(node)
+            or is_postponed_evaluation_enabled(node)
+            and is_node_in_type_annotation_context(node)
+        ):
+            return
+
+        for inferred in node.infer():
+            # To deal with typing_extensions, don't use safe_infer
+            if (
+                isinstance(inferred, (nodes.FunctionDef, nodes.ClassDef))
+                and inferred.qname() in TYPING_NORETURN
+                # In Python 3.6, NoReturn is alias of '_NoReturn'
+                # In Python 3.7 - 3.8, NoReturn is alias of '_SpecialForm'
+                or isinstance(inferred, astroid.bases.BaseInstance)
+                and isinstance(inferred._proxied, nodes.ClassDef)
+                and inferred._proxied.qname()
+                in {"typing._NoReturn", "typing._SpecialForm"}
+            ):
+                self.add_message("broken-noreturn", node=node, confidence=INFERENCE)
+                break
+
+    def _check_broken_callable(self, node: Union[nodes.Name, nodes.Attribute]) -> None:
+        """Check for 'collections.abc.Callable' inside Optional and Union."""
+        inferred = safe_infer(node)
+        if not (
+            isinstance(inferred, nodes.ClassDef)
+            and inferred.qname() == "_collections_abc.Callable"
+            and self._broken_callable_location(node)
+        ):
+            return
+
+        self.add_message("broken-collections-callable", node=node, confidence=INFERENCE)
+
+    def _broken_callable_location(  # pylint: disable=no-self-use
+        self, node: Union[nodes.Name, nodes.Attribute]
+    ) -> bool:
+        """Check if node would be a broken location for collections.abc.Callable."""
+        if (
+            in_type_checking_block(node)
+            or is_postponed_evaluation_enabled(node)
+            and is_node_in_type_annotation_context(node)
+        ):
+            return False
+
+        # Check first Callable arg is a list of arguments -> Callable[[int], None]
+        if not (
+            isinstance(node.parent, nodes.Subscript)
+            and isinstance(node.parent.slice, nodes.Tuple)
+            and len(node.parent.slice.elts) == 2
+            and isinstance(node.parent.slice.elts[0], nodes.List)
+        ):
+            return False
+
+        # Check nested inside Optional or Union
+        parent_subscript = node.parent.parent
+        if isinstance(parent_subscript, nodes.BaseContainer):
+            parent_subscript = parent_subscript.parent
+        if not (
+            isinstance(parent_subscript, nodes.Subscript)
+            and isinstance(parent_subscript.value, (nodes.Name, nodes.Attribute))
+        ):
+            return False
+
+        inferred_parent = safe_infer(parent_subscript.value)
+        if not (
+            isinstance(inferred_parent, nodes.FunctionDef)
+            and inferred_parent.qname() in {"typing.Optional", "typing.Union"}
+            or isinstance(inferred_parent, astroid.bases.Instance)
+            and inferred_parent.qname() == "typing._SpecialForm"
+        ):
+            return False
+
+        return True
+
 
-def register(linter: PyLinter) -> None:
+def register(linter: "PyLinter") -> None:
     linter.register_checker(TypingChecker(linter))
diff --git a/pylint/extensions/while_used.py b/pylint/extensions/while_used.py
index 8d05ace900..4c41510d4f 100644
--- a/pylint/extensions/while_used.py
+++ b/pylint/extensions/while_used.py
@@ -1,10 +1,19 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 """Check for use of while loops."""
+from typing import TYPE_CHECKING
+
 from astroid import nodes
 
 from pylint.checkers import BaseChecker
 from pylint.checkers.utils import check_messages
 from pylint.interfaces import IAstroidChecker
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 
 class WhileChecker(BaseChecker):
 
@@ -23,10 +32,5 @@ def visit_while(self, node: nodes.While) -> None:
         self.add_message("while-used", node=node)
 
 
-def register(linter):
-    """Required method to auto register this checker.
-
-    :param linter: Main interface object for Pylint plugins
-    :type linter: Pylint object
-    """
+def register(linter: "PyLinter") -> None:
     linter.register_checker(WhileChecker(linter))
diff --git a/pylint/graph.py b/pylint/graph.py
index 70a6186784..8191847249 100644
--- a/pylint/graph.py
+++ b/pylint/graph.py
@@ -1,20 +1,6 @@
-# Copyright (c) 2015-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Florian Bruhin <me@the-compiler.org>
-# Copyright (c) 2016 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Damien Baty <damien.baty@polyconseil.fr>
-# Copyright (c) 2020 谭九鼎 <109224573@qq.com>
-# Copyright (c) 2020 Benjamin Graham <benwilliamgraham@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-# Copyright (c) 2021 Andrew Howe <howeaj@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Graph manipulation utilities.
 
@@ -74,7 +60,7 @@ def __init__(
             self.emit("=".join(param))
 
     def get_source(self):
-        """returns self._source"""
+        """Returns self._source."""
         if self._source is None:
             self.emit("}\n")
             self._source = "\n".join(self.lines)
@@ -151,16 +137,18 @@ def emit(self, line):
         self.lines.append(line)
 
     def emit_edge(self, name1, name2, **props):
-        """emit an edge from <name1> to <name2>.
-        edge properties: see https://www.graphviz.org/doc/info/attrs.html
+        """Emit an edge from <name1> to <name2>.
+
+        For edge properties: see https://www.graphviz.org/doc/info/attrs.html
         """
         attrs = [f'{prop}="{value}"' for prop, value in props.items()]
         n_from, n_to = normalize_node_id(name1), normalize_node_id(name2)
         self.emit(f"{n_from} -> {n_to} [{', '.join(sorted(attrs))}];")
 
     def emit_node(self, name, **props):
-        """emit a node with given properties.
-        node properties: see https://www.graphviz.org/doc/info/attrs.html
+        """Emit a node with given properties.
+
+        For node properties: see https://www.graphviz.org/doc/info/attrs.html
         """
         attrs = [f'{prop}="{value}"' for prop, value in props.items()]
         self.emit(f"{normalize_node_id(name)} [{', '.join(sorted(attrs))}];")
@@ -172,9 +160,8 @@ def normalize_node_id(nid):
 
 
 def get_cycles(graph_dict, vertices=None):
-    """given a dictionary representing an ordered graph (i.e. key are vertices
-    and values is a list of destination vertices representing edges), return a
-    list of detected cycles
+    """Return a list of detected cycles in a dictionary representing an ordered graph
+    (i.e. key are vertices and values is a list of destination vertices representing edges)
     """
     if not graph_dict:
         return ()
@@ -187,7 +174,7 @@ def get_cycles(graph_dict, vertices=None):
 
 
 def _get_cycles(graph_dict, path, visited, result, vertice):
-    """recursive function doing the real work for get_cycles"""
+    """Recursive function doing the real work for get_cycles."""
     if vertice in path:
         cycle = [vertice]
         for node in path[::-1]:
diff --git a/pylint/interfaces.py b/pylint/interfaces.py
index a7b53e6036..7f6edbdf52 100644
--- a/pylint/interfaces.py
+++ b/pylint/interfaces.py
@@ -1,41 +1,44 @@
-# Copyright (c) 2009-2010, 2012-2013 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2013-2014 Google, Inc.
-# Copyright (c) 2014 Michal Nowikowski <godfryd@gmail.com>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Florian Bruhin <me@the-compiler.org>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2020-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""Interfaces for Pylint objects"""
+"""Interfaces for Pylint objects."""
 from collections import namedtuple
-from typing import TYPE_CHECKING, Tuple
+from typing import TYPE_CHECKING, Tuple, Type, Union
 
 from astroid import nodes
 
 if TYPE_CHECKING:
+    from pylint.checkers import BaseChecker
     from pylint.reporters.ureports.nodes import Section
 
+__all__ = (
+    "IRawChecker",
+    "IAstroidChecker",
+    "ITokenChecker",
+    "IReporter",
+    "IChecker",
+    "HIGH",
+    "CONTROL_FLOW",
+    "INFERENCE",
+    "INFERENCE_FAILURE",
+    "UNDEFINED",
+    "CONFIDENCE_LEVELS",
+)
+
 Confidence = namedtuple("Confidence", ["name", "description"])
 # Warning Certainties
-HIGH = Confidence("HIGH", "No false positive possible.")
+HIGH = Confidence("HIGH", "Warning that is not based on inference result.")
+CONTROL_FLOW = Confidence(
+    "CONTROL_FLOW", "Warning based on assumptions about control flow."
+)
 INFERENCE = Confidence("INFERENCE", "Warning based on inference result.")
 INFERENCE_FAILURE = Confidence(
     "INFERENCE_FAILURE", "Warning based on inference with failures."
 )
 UNDEFINED = Confidence("UNDEFINED", "Warning without any associated confidence level.")
 
-CONFIDENCE_LEVELS = [HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED]
+CONFIDENCE_LEVELS = [HIGH, CONTROL_FLOW, INFERENCE, INFERENCE_FAILURE, UNDEFINED]
 
 
 class Interface:
@@ -46,35 +49,34 @@ def is_implemented_by(cls, instance):
         return implements(instance, cls)
 
 
-def implements(obj: "Interface", interface: Tuple[type, type]) -> bool:
-    """Return whether the given object (maybe an instance or class) implements
-    the interface.
-    """
-    kimplements = getattr(obj, "__implements__", ())
-    if not isinstance(kimplements, (list, tuple)):
-        kimplements = (kimplements,)
-    return any(issubclass(i, interface) for i in kimplements)
+def implements(
+    obj: "BaseChecker",
+    interface: Union[Type["Interface"], Tuple[Type["Interface"], ...]],
+) -> bool:
+    """Does the given object (maybe an instance or class) implement the interface."""
+    implements_ = getattr(obj, "__implements__", ())
+    if not isinstance(implements_, (list, tuple)):
+        implements_ = (implements_,)
+    return any(issubclass(i, interface) for i in implements_)
 
 
 class IChecker(Interface):
-    """This is a base interface, not designed to be used elsewhere than for
-    sub interfaces definition.
-    """
+    """Base interface, to be used only for sub interfaces definition."""
 
     def open(self):
-        """called before visiting project (i.e set of modules)"""
+        """Called before visiting project (i.e. set of modules)."""
 
     def close(self):
-        """called after visiting project (i.e set of modules)"""
+        """Called after visiting project (i.e. set of modules)."""
 
 
 class IRawChecker(IChecker):
-    """interface for checker which need to parse the raw file"""
+    """Interface for checker which need to parse the raw file."""
 
     def process_module(self, node: nodes.Module) -> None:
-        """process a module
+        """Process a module.
 
-        the module's content is accessible via astroid.stream
+        The module's content is accessible via ``astroid.stream``
         """
 
 
@@ -84,24 +86,21 @@ class ITokenChecker(IChecker):
     def process_tokens(self, tokens):
         """Process a module.
 
-        tokens is a list of all source code tokens in the file.
+        Tokens is a list of all source code tokens in the file.
         """
 
 
 class IAstroidChecker(IChecker):
-    """interface for checker which prefers receive events according to
+    """Interface for checker which prefers receive events according to
     statement type
     """
 
 
 class IReporter(Interface):
-    """reporter collect messages and display results encapsulated in a layout"""
+    """Reporter collect messages and display results encapsulated in a layout."""
 
     def handle_message(self, msg) -> None:
         """Handle the given message object."""
 
     def display_reports(self, layout: "Section") -> None:
-        """display results encapsulated in the layout tree"""
-
-
-__all__ = ("IRawChecker", "IAstroidChecker", "ITokenChecker", "IReporter", "IChecker")
+        """Display results encapsulated in the layout tree."""
diff --git a/pylint/lint/__init__.py b/pylint/lint/__init__.py
index 69d0f95d14..7cfa7f59d8 100644
--- a/pylint/lint/__init__.py
+++ b/pylint/lint/__init__.py
@@ -1,65 +1,8 @@
-# Copyright (c) 2006-2015 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2008 Fabrice Douchant <Fabrice.Douchant@logilab.fr>
-# Copyright (c) 2009 Vincent
-# Copyright (c) 2009 Mads Kiilerich <mads@kiilerich.com>
-# Copyright (c) 2011-2014 Google, Inc.
-# Copyright (c) 2012 David Pursehouse <david.pursehouse@sonymobile.com>
-# Copyright (c) 2012 Kevin Jing Qiu <kevin.jing.qiu@gmail.com>
-# Copyright (c) 2012 FELD Boris <lothiraldan@gmail.com>
-# Copyright (c) 2012 JT Olds <jtolds@xnet5.com>
-# Copyright (c) 2014-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014-2015 Michal Nowikowski <godfryd@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Alexandru Coman <fcoman@bitdefender.com>
-# Copyright (c) 2014 Daniel Harding <dharding@living180.net>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2014 Dan Goldsmith <djgoldsmith@googlemail.com>
-# Copyright (c) 2015-2016 Florian Bruhin <me@the-compiler.org>
-# Copyright (c) 2015 Aru Sahni <arusahni@gmail.com>
-# Copyright (c) 2015 Steven Myint <hg@stevenmyint.com>
-# Copyright (c) 2015 Simu Toni <simutoni@gmail.com>
-# Copyright (c) 2015 Mihai Balint <balint.mihai@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016-2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2016 Glenn Matthews <glenn@e-dad.net>
-# Copyright (c) 2016 Alan Evangelista <alanoe@linux.vnet.ibm.com>
-# Copyright (c) 2017-2019 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2017-2018 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2017 Daniel Miller <millerdev@gmail.com>
-# Copyright (c) 2017 Roman Ivanov <me@roivanov.com>
-# Copyright (c) 2017 Ned Batchelder <ned@nedbatchelder.com>
-# Copyright (c) 2018-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2018, 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2018-2019 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2018 Matus Valo <matusvalo@users.noreply.github.com>
-# Copyright (c) 2018 Lucas Cimon <lucas.cimon@gmail.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Randall Leeds <randall@bleeds.info>
-# Copyright (c) 2018 Mike Frysinger <vapier@gmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Jason Owen <jason.a.owen@gmail.com>
-# Copyright (c) 2018 Gary Tyler McLeod <mail@garytyler.com>
-# Copyright (c) 2018 Yuval Langer <yuvallanger@mail.tau.ac.il>
-# Copyright (c) 2018 kapsh <kapsh@kap.sh>
-# Copyright (c) 2019 syutbai <syutbai@gmail.com>
-# Copyright (c) 2019 Thomas Hisch <t.hisch@gmail.com>
-# Copyright (c) 2019 Hugues <hugues.bruant@affirm.com>
-# Copyright (c) 2019 Janne Rönkkö <jannero@users.noreply.github.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2019 Trevor Bekolay <tbekolay@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2019 Robert Schweizer <robert_schweizer@gmx.de>
-# Copyright (c) 2019 Andres Perez Hortal <andresperezcba@gmail.com>
-# Copyright (c) 2019 Peter Kolbus <peter.kolbus@gmail.com>
-# Copyright (c) 2019 Nicolas Dickreuter <dickreuter@gmail.com>
-# Copyright (c) 2020 Frank Harrison <frank@doublethefish.com>
-# Copyright (c) 2020 anubh-v <anubhav@u.nus.edu>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-""" pylint [options] modules_or_packages
+"""Pylint [options] modules_or_packages.
 
   Check that module(s) satisfy a coding standard (and more !).
 
diff --git a/pylint/lint/expand_modules.py b/pylint/lint/expand_modules.py
index 8eaf98847b..184316e9bd 100644
--- a/pylint/lint/expand_modules.py
+++ b/pylint/lint/expand_modules.py
@@ -1,3 +1,7 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 import os
 import sys
 from typing import List, Pattern, Tuple
@@ -8,8 +12,8 @@
 
 
 def _modpath_from_file(filename, is_namespace, path=None):
-    def _is_package_cb(path, parts):
-        return modutils.check_modpath_has_init(path, parts) or is_namespace
+    def _is_package_cb(inner_path, parts):
+        return modutils.check_modpath_has_init(inner_path, parts) or is_namespace
 
     return modutils.modpath_from_file_with_callback(
         filename, path=path, is_package_cb=_is_package_cb
@@ -18,7 +22,10 @@ def _is_package_cb(path, parts):
 
 def get_python_path(filepath: str) -> str:
     """TODO This get the python path with the (bad) assumption that there is always
-    an __init__.py. This is not true since python 3.3 and is causing problem."""
+    an __init__.py
+
+    This is not true since python 3.3 and is causing problem.
+    """
     dirname = os.path.realpath(os.path.expanduser(filepath))
     if not os.path.isdir(dirname):
         dirname = os.path.dirname(dirname)
@@ -32,7 +39,7 @@ def get_python_path(filepath: str) -> str:
 
 
 def _is_in_ignore_list_re(element: str, ignore_list_re: List[Pattern]) -> bool:
-    """determines if the element is matched in a regex ignore-list"""
+    """Determines if the element is matched in a regex ignore-list."""
     return any(file_pattern.match(element) for file_pattern in ignore_list_re)
 
 
@@ -42,7 +49,7 @@ def expand_modules(
     ignore_list_re: List[Pattern],
     ignore_list_paths_re: List[Pattern[str]],
 ) -> Tuple[List[ModuleDescriptionDict], List[ErrorDescriptionDict]]:
-    """take a list of files/modules/packages and return the list of tuple
+    """Take a list of files/modules/packages and return the list of tuple
     (file, module name) which have to be actually checked
     """
     result: List[ModuleDescriptionDict] = []
diff --git a/pylint/lint/parallel.py b/pylint/lint/parallel.py
index 56cee9aa75..ea5d7abacc 100644
--- a/pylint/lint/parallel.py
+++ b/pylint/lint/parallel.py
@@ -1,9 +1,22 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import collections
 import functools
-from typing import Any, DefaultDict, Iterable, List, Tuple
+import warnings
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    DefaultDict,
+    Iterable,
+    List,
+    Sequence,
+    Tuple,
+    Union,
+)
+
+import dill
 
 from pylint import reporters
 from pylint.lint.utils import _patch_sys_path
@@ -16,6 +29,9 @@
 except ImportError:
     multiprocessing = None  # type: ignore[assignment]
 
+if TYPE_CHECKING:
+    from pylint.lint import PyLinter
+
 # PyLinter object used by worker processes when checking files using multiprocessing
 # should only be used by the worker processes
 _worker_linter = None
@@ -33,9 +49,16 @@ def _get_new_args(message):
     return (message.msg_id, message.symbol, location, message.msg, message.confidence)
 
 
-def _worker_initialize(linter, arguments=None):
+def _worker_initialize(
+    linter: bytes, arguments: Union[None, str, Sequence[str]] = None
+) -> None:
+    """Function called to initialize a worker for a Process within a multiprocessing Pool.
+
+    :param linter: A linter-class (PyLinter) instance pickled with dill
+    :param arguments: File or module name(s) to lint and to be added to sys.path
+    """
     global _worker_linter  # pylint: disable=global-statement
-    _worker_linter = linter
+    _worker_linter = dill.loads(linter)
 
     # On the worker process side the messages are just collected and passed back to
     # parent process as _worker_check_file function's return value
@@ -64,6 +87,14 @@ def _worker_check_single_file(
         mapreduce_data[checker.name].append(data)
     msgs = [_get_new_args(m) for m in _worker_linter.reporter.messages]
     _worker_linter.reporter.reset()
+    if _worker_linter.current_name is None:
+        warnings.warn(
+            (
+                "In pylint 3.0 the current_name attribute of the linter object should be a string. "
+                "If unknown it should be initialized as an empty string."
+            ),
+            DeprecationWarning,
+        )
     return (
         id(multiprocessing.current_process()),
         _worker_linter.current_name,
@@ -77,8 +108,8 @@ def _worker_check_single_file(
 
 
 def _merge_mapreduce_data(linter, all_mapreduce_data):
-    """Merges map/reduce data across workers, invoking relevant APIs on checkers"""
-    # First collate the data, preparing it so we can send it to the checkers for
+    """Merges map/reduce data across workers, invoking relevant APIs on checkers."""
+    # First collate the data and prepare it, so we can send it to the checkers for
     # validation. The intent here is to collect all the mapreduce data for all checker-
     # runs across processes - that will then be passed to a static method on the
     # checkers to be reduced and further processed.
@@ -97,28 +128,26 @@ def _merge_mapreduce_data(linter, all_mapreduce_data):
             checker.reduce_map_data(linter, collated_map_reduce_data[checker.name])
 
 
-def check_parallel(linter, jobs, files: Iterable[FileItem], arguments=None):
-    """Use the given linter to lint the files with given amount of workers (jobs)
+def check_parallel(
+    linter: "PyLinter",
+    jobs: int,
+    files: Iterable[FileItem],
+    arguments: Union[None, str, Sequence[str]] = None,
+) -> None:
+    """Use the given linter to lint the files with given amount of workers (jobs).
+
     This splits the work filestream-by-filestream. If you need to do work across
     multiple files, as in the similarity-checker, then inherit from MapReduceMixin and
-    implement the map/reduce mixin functionality"""
-    # The reporter does not need to be passed to worker processes, i.e. the reporter does
-    original_reporter = linter.reporter
-    linter.reporter = None
-
+    implement the map/reduce mixin functionality.
+    """
     # The linter is inherited by all the pool's workers, i.e. the linter
     # is identical to the linter object here. This is required so that
     # a custom PyLinter object can be used.
     initializer = functools.partial(_worker_initialize, arguments=arguments)
-    pool = multiprocessing.Pool(  # pylint: disable=consider-using-with
-        jobs, initializer=initializer, initargs=[linter]
-    )
-    # ..and now when the workers have inherited the linter, the actual reporter
-    # can be set back here on the parent process so that results get stored into
-    # correct reporter
-    linter.set_reporter(original_reporter)
-    linter.open()
-    try:
+    with multiprocessing.Pool(
+        jobs, initializer=initializer, initargs=[dill.dumps(linter)]
+    ) as pool:
+        linter.open()
         all_stats = []
         all_mapreduce_data = collections.defaultdict(list)
 
@@ -141,13 +170,10 @@ def check_parallel(linter, jobs, files: Iterable[FileItem], arguments=None):
                 msg = Message(
                     msg[0], msg[1], MessageLocationTuple(*msg[2]), msg[3], msg[4]
                 )
-                linter.reporter.handle_message(msg)  # type: ignore[attr-defined]  # linter.set_reporter() call above makes linter have a reporter attr
+                linter.reporter.handle_message(msg)
             all_stats.append(stats)
             all_mapreduce_data[worker_idx].append(mapreduce_data)
             linter.msg_status |= msg_status
-    finally:
-        pool.close()
-        pool.join()
 
     _merge_mapreduce_data(linter, all_mapreduce_data)
     linter.stats = merge_stats([linter.stats] + all_stats)
diff --git a/pylint/lint/pylinter.py b/pylint/lint/pylinter.py
index c95aa680ec..0bf8961c1e 100644
--- a/pylint/lint/pylinter.py
+++ b/pylint/lint/pylinter.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import collections
 import contextlib
@@ -11,7 +12,20 @@
 import traceback
 import warnings
 from io import TextIOWrapper
-from typing import Any, Dict, Iterable, Iterator, List, Optional, Sequence, Union
+from typing import (
+    Any,
+    DefaultDict,
+    Dict,
+    Iterable,
+    Iterator,
+    List,
+    Optional,
+    Sequence,
+    Set,
+    Tuple,
+    Type,
+    Union,
+)
 
 import astroid
 from astroid import AstroidError, nodes
@@ -39,6 +53,7 @@
     prepare_crash_report,
 )
 from pylint.message import Message, MessageDefinition, MessageDefinitionStore
+from pylint.reporters.text import TextReporter
 from pylint.reporters.ureports import nodes as report_nodes
 from pylint.typing import (
     FileItem,
@@ -59,6 +74,8 @@
 else:
     from typing_extensions import Literal
 
+OptionDict = Dict[str, Union[str, bool, int, Iterable[Union[str, int]]]]
+
 MANAGER = astroid.MANAGER
 
 
@@ -177,7 +194,7 @@ class PyLinter(
     reporters.ReportsHandlerMixIn,
     checkers.BaseTokenChecker,
 ):
-    """lint Python modules using external checkers.
+    """Lint Python modules using external checkers.
 
     This is the main checker controlling the other ones and the reports
     generation. It is itself both a raw checker and an astroid checker in order
@@ -203,7 +220,7 @@ class PyLinter(
     crash_file_path: str = "pylint-crash-%Y-%m-%d-%H.txt"
 
     @staticmethod
-    def make_options():
+    def make_options() -> Tuple[Tuple[str, OptionDict], ...]:
         return (
             (
                 "ignore",
@@ -222,9 +239,10 @@ def make_options():
                     "type": "regexp_csv",
                     "metavar": "<pattern>[,<pattern>...]",
                     "dest": "black_list_re",
-                    "default": (),
+                    "default": (r"^\.#",),
                     "help": "Files or directories matching the regex patterns are"
-                    " skipped. The regex matches against base names, not paths.",
+                    " skipped. The regex matches against base names, not paths. The default value "
+                    "ignores emacs file locks",
                 },
             ),
             (
@@ -293,11 +311,11 @@ def make_options():
                     "metavar": "<python_expression>",
                     "group": "Reports",
                     "level": 1,
-                    "default": "10.0 - ((float(5 * error + warning + refactor + "
-                    "convention) / statement) * 10)",
+                    "default": "max(0, 0 if fatal else 10.0 - ((float(5 * error + warning + refactor + "
+                    "convention) / statement) * 10))",
                     "help": "Python expression which should return a score less "
-                    "than or equal to 10. You have access to the variables "
-                    "'error', 'warning', 'refactor', and 'convention' which "
+                    "than or equal to 10. You have access to the variables 'fatal', "
+                    "'error', 'warning', 'refactor', 'convention', and 'info' which "
                     "contain the number of messages in each category, as well as "
                     "'statement' which is the total number of statements "
                     "analyzed. This score is used by the global "
@@ -375,7 +393,7 @@ def make_options():
                     "(only on the command line, not in the configuration file "
                     "where it should appear only once). "
                     'You can also use "--disable=all" to disable everything first '
-                    "and then reenable specific checks. For example, if you want "
+                    "and then re-enable specific checks. For example, if you want "
                     "to run only the similarities checker, you can use "
                     '"--disable=all --enable=similarities". '
                     "If you want to run only the classes checker, but have no "
@@ -498,6 +516,15 @@ def make_options():
                     ),
                 },
             ),
+            (
+                "recursive",
+                {
+                    "type": "yn",
+                    "metavar": "<yn>",
+                    "default": False,
+                    "help": "Discover python modules and packages in the file system subtree.",
+                },
+            ),
             (
                 "py-version",
                 {
@@ -512,31 +539,56 @@ def make_options():
             ),
         )
 
-    option_groups = (
+    base_option_groups = (
         ("Messages control", "Options controlling analysis messages"),
         ("Reports", "Options related to output formatting and reporting"),
     )
 
-    def __init__(self, options=(), reporter=None, option_groups=(), pylintrc=None):
+    def __init__(
+        self,
+        options: Tuple[Tuple[str, OptionDict], ...] = (),
+        reporter: Union[reporters.BaseReporter, reporters.MultiReporter, None] = None,
+        option_groups: Tuple[Tuple[str, str], ...] = (),
+        pylintrc: Optional[str] = None,
+    ) -> None:
         """Some stuff has to be done before ancestors initialization...
-        messages store / checkers / reporter / astroid manager"""
-        self.msgs_store = MessageDefinitionStore()
-        self.reporter = None
-        self._reporter_names = None
-        self._reporters = {}
-        self._checkers = collections.defaultdict(list)
-        self._pragma_lineno = {}
-        self._ignore_file = False
-        # visit variables
+        messages store / checkers / reporter / astroid manager
+        """
+        # Attributes for reporters
+        self.reporter: Union[reporters.BaseReporter, reporters.MultiReporter]
+        if reporter:
+            self.set_reporter(reporter)
+        else:
+            self.set_reporter(TextReporter())
+        self._reporters: Dict[str, Type[reporters.BaseReporter]] = {}
+        """Dictionary of possible but non-initialized reporters."""
+
+        # Attributes for checkers and plugins
+        self._checkers: DefaultDict[
+            str, List[checkers.BaseChecker]
+        ] = collections.defaultdict(list)
+        """Dictionary of registered and initialized checkers."""
+        self._dynamic_plugins: Set[str] = set()
+        """Set of loaded plugin names."""
+
+        # Attributes related to visiting files
         self.file_state = FileState()
         self.current_name: Optional[str] = None
-        self.current_file = None
+        self.current_file: Optional[str] = None
+        self._ignore_file = False
+        self._pragma_lineno: Dict[str, int] = {}
+
+        # Attributes related to stats
         self.stats = LinterStats()
-        self.fail_on_symbols = []
-        # init options
+
+        # Attributes related to (command-line) options and their parsing
         self._external_opts = options
-        self.options = options + PyLinter.make_options()
-        self.option_groups = option_groups + PyLinter.option_groups
+        self.options: Tuple[Tuple[str, OptionDict], ...] = (
+            options + PyLinter.make_options()
+        )
+        self.option_groups: Tuple[Tuple[str, str], ...] = (
+            option_groups + PyLinter.base_option_groups
+        )
         self._options_methods = {
             "enable": self.enable,
             "disable": self.disable,
@@ -546,8 +598,12 @@ def __init__(self, options=(), reporter=None, option_groups=(), pylintrc=None):
             "disable-msg": self._options_methods["disable"],
             "enable-msg": self._options_methods["enable"],
         }
+        self.fail_on_symbols: List[str] = []
+        """List of message symbols on which pylint should fail, set by --fail-on."""
+        self._error_mode = False
 
-        # Attributes related to message (state) handling
+        # Attributes related to messages (states) and their handling
+        self.msgs_store = MessageDefinitionStore()
         self.msg_status = 0
         self._msgs_state: Dict[str, bool] = {}
         self._by_id_managed_msgs: List[ManagedMessage] = []
@@ -569,22 +625,14 @@ def __init__(self, options=(), reporter=None, option_groups=(), pylintrc=None):
             ("RP0003", "Messages", report_messages_stats),
         )
         self.register_checker(self)
-        self._dynamic_plugins = set()
-        self._error_mode = False
         self.load_provider_defaults()
-        if reporter:
-            self.set_reporter(reporter)
 
     def load_default_plugins(self):
         checkers.initialize(self)
         reporters.initialize(self)
-        # Make sure to load the default reporter, because
-        # the option has been set before the plugins had been loaded.
-        if not self.reporter:
-            self._load_reporters()
 
     def load_plugin_modules(self, modnames):
-        """take a list of module names which are pylint plugins and load
+        """Take a list of module names which are pylint plugins and load
         and register them
         """
         for modname in modnames:
@@ -598,7 +646,7 @@ def load_plugin_modules(self, modnames):
                 pass
 
     def load_plugin_configuration(self):
-        """Call the configuration hook for plugins
+        """Call the configuration hook for plugins.
 
         This walks through the list of plugins, grabs the "load_configuration"
         hook, if exposed, and calls it to allow plugins to configure specific
@@ -612,19 +660,21 @@ def load_plugin_configuration(self):
             except ModuleNotFoundError as e:
                 self.add_message("bad-plugin-value", args=(modname, e), line=0)
 
-    def _load_reporters(self) -> None:
+    def _load_reporters(self, reporter_names: str) -> None:
+        """Load the reporters if they are available on _reporters."""
+        if not self._reporters:
+            return
         sub_reporters = []
         output_files = []
         with contextlib.ExitStack() as stack:
-            for reporter_name in self._reporter_names.split(","):
+            for reporter_name in reporter_names.split(","):
                 reporter_name, *reporter_output = reporter_name.split(":", 1)
 
                 reporter = self._load_reporter_by_name(reporter_name)
                 sub_reporters.append(reporter)
                 if reporter_output:
-                    (reporter_output,) = reporter_output
                     output_file = stack.enter_context(
-                        open(reporter_output, "w", encoding="utf-8")
+                        open(reporter_output[0], "w", encoding="utf-8")
                     )
                     reporter.out = output_file
                     output_files.append(output_file)
@@ -654,13 +704,15 @@ def _load_reporter_by_name(self, reporter_name: str) -> reporters.BaseReporter:
         else:
             return reporter_class()
 
-    def set_reporter(self, reporter):
-        """set the reporter used to display messages and reports"""
+    def set_reporter(
+        self, reporter: Union[reporters.BaseReporter, reporters.MultiReporter]
+    ) -> None:
+        """Set the reporter used to display messages and reports."""
         self.reporter = reporter
         reporter.linter = self
 
     def set_option(self, optname, value, action=None, optdict=None):
-        """overridden from config.OptionsProviderMixin to handle some
+        """Overridden from config.OptionsProviderMixin to handle some
         special options
         """
         if optname in self._options_methods or optname in self._bw_options_methods:
@@ -681,18 +733,17 @@ def set_option(self, optname, value, action=None, optdict=None):
                     meth(value)
                 return  # no need to call set_option, disable/enable methods do it
         elif optname == "output-format":
-            self._reporter_names = value
-            # If the reporters are already available, load
-            # the reporter class.
-            if self._reporters:
-                self._load_reporters()
-
+            assert isinstance(
+                value, str
+            ), "'output-format' should be a comma separated string of reporters"
+            self._load_reporters(value)
         try:
             checkers.BaseTokenChecker.set_option(self, optname, value, action, optdict)
         except config.UnsupportedAction:
             print(f"option {optname} can't be read from config file", file=sys.stderr)
 
-    def register_reporter(self, reporter_class):
+    def register_reporter(self, reporter_class: Type[reporters.BaseReporter]) -> None:
+        """Registers a reporter class on the _reporters attribute."""
         self._reporters[reporter_class.name] = reporter_class
 
     def report_order(self):
@@ -709,11 +760,8 @@ def report_order(self):
 
     # checkers manipulation methods ############################################
 
-    def register_checker(self, checker):
-        """register a new checker
-
-        checker is an object implementing IRawChecker or / and IAstroidChecker
-        """
+    def register_checker(self, checker: checkers.BaseChecker) -> None:
+        """This method auto registers the checker."""
         assert checker.priority <= 0, "checker priority can't be >= 0"
         self._checkers[checker.name].append(checker)
         for r_id, r_title, r_cb in checker.reports:
@@ -722,13 +770,12 @@ def register_checker(self, checker):
         if hasattr(checker, "msgs"):
             self.msgs_store.register_messages_from_checker(checker)
         checker.load_defaults()
-
         # Register the checker, but disable all of its messages.
         if not getattr(checker, "enabled", True):
             self.disable(checker.name)
 
     def enable_fail_on_messages(self):
-        """enable 'fail on' msgs
+        """Enable 'fail on' msgs.
 
         Convert values in config.fail_on (which might be msg category, msg id,
         or symbol) to specific msgs, then enable and flag them for later.
@@ -740,7 +787,7 @@ def enable_fail_on_messages(self):
         fail_on_cats = set()
         fail_on_msgs = set()
         for val in fail_on_vals:
-            # If value is a cateogry, add category, else add message
+            # If value is a category, add category, else add message
             if val in MSG_TYPES:
                 fail_on_cats.add(val)
             else:
@@ -755,7 +802,7 @@ def enable_fail_on_messages(self):
                         self.enable(msg.msgid)
                         self.fail_on_symbols.append(msg.symbol)
                     elif msg.msgid[0] in fail_on_cats:
-                        # message starts with a cateogry value, flag (but do not enable) it
+                        # message starts with a category value, flag (but do not enable) it
                         self.fail_on_symbols.append(msg.symbol)
 
     def any_fail_on_issues(self):
@@ -774,13 +821,13 @@ def disable_noerror_messages(self):
                     self.disable(msgid)
 
     def disable_reporters(self):
-        """disable all reporters"""
+        """Disable all reporters."""
         for _reporters in self._reports.values():
             for report_id, _, _ in _reporters:
                 self.disable_report(report_id)
 
     def error_mode(self):
-        """error mode: enable only errors; no reports, no persistent"""
+        """Error mode: enable only errors; no reports, no persistent."""
         self._error_mode = True
         self.disable_noerror_messages()
         self.disable("miscellaneous")
@@ -813,7 +860,8 @@ def list_messages_enabled(self):
 
     def process_tokens(self, tokens):
         """Process tokens from the current module to search for module/block level
-        options."""
+        options.
+        """
         control_pragmas = {"disable", "disable-next", "enable"}
         prev_line = None
         saw_newline = True
@@ -894,7 +942,7 @@ def process_tokens(self, tokens):
     # code checking methods ###################################################
 
     def get_checkers(self):
-        """return all available checkers as a list"""
+        """Return all available checkers as a list."""
         return [self] + [
             c
             for _checkers in self._checkers.values()
@@ -914,7 +962,7 @@ def get_checker_names(self):
         )
 
     def prepare_checkers(self):
-        """return checkers needed for activated messages and reports"""
+        """Return checkers needed for activated messages and reports."""
         if not self.config.reports:
             self.disable_reporters()
         # get needed checkers
@@ -932,7 +980,7 @@ def prepare_checkers(self):
     # pylint: disable=unused-argument
     @staticmethod
     def should_analyze_file(modname, path, is_argument=False):
-        """Returns whether or not a module should be checked.
+        """Returns whether a module should be checked.
 
         This implementation returns True for all python source file, indicating
         that all files should be linted.
@@ -955,7 +1003,7 @@ def should_analyze_file(modname, path, is_argument=False):
     # pylint: enable=unused-argument
 
     def initialize(self):
-        """Initialize linter for linting
+        """Initialize linter for linting.
 
         This method is called before any linting is done.
         """
@@ -965,8 +1013,35 @@ def initialize(self):
             if not msg.may_be_emitted():
                 self._msgs_state[msg.msgid] = False
 
+    @staticmethod
+    def _discover_files(files_or_modules: Sequence[str]) -> Iterator[str]:
+        """Discover python modules and packages in subdirectory.
+
+        Returns iterator of paths to discovered modules and packages.
+        """
+        for something in files_or_modules:
+            if os.path.isdir(something) and not os.path.isfile(
+                os.path.join(something, "__init__.py")
+            ):
+                skip_subtrees: List[str] = []
+                for root, _, files in os.walk(something):
+                    if any(root.startswith(s) for s in skip_subtrees):
+                        # Skip subtree of already discovered package.
+                        continue
+                    if "__init__.py" in files:
+                        skip_subtrees.append(root)
+                        yield root
+                    else:
+                        yield from (
+                            os.path.join(root, file)
+                            for file in files
+                            if file.endswith(".py")
+                        )
+            else:
+                yield something
+
     def check(self, files_or_modules: Union[Sequence[str], str]) -> None:
-        """main checking entry: check a list of files or modules from their name.
+        """Main checking entry: check a list of files or modules from their name.
 
         files_or_modules is either a string or list of strings presenting modules to check.
         """
@@ -979,6 +1054,8 @@ def check(self, files_or_modules: Union[Sequence[str], str]) -> None:
                 DeprecationWarning,
             )
             files_or_modules = (files_or_modules,)  # type: ignore[assignment]
+        if self.config.recursive:
+            files_or_modules = tuple(self._discover_files(files_or_modules))
         if self.config.from_stdin:
             if len(files_or_modules) != 1:
                 raise exceptions.InvalidArgsError(
@@ -1013,11 +1090,11 @@ def check_single_file(self, name: str, filepath: str, modname: str) -> None:
         self.check_single_file_item(FileItem(name, filepath, modname))
 
     def check_single_file_item(self, file: FileItem) -> None:
-        """Check single file item
+        """Check single file item.
 
         The arguments are the same that are documented in _check_files
 
-        The initialize() method should be called before calling this method
+        initialize() should be called before calling this method
         """
         with self._astroid_module_checker() as check_astroid_module:
             self._check_file(self.get_ast, check_astroid_module, file)
@@ -1027,7 +1104,7 @@ def _check_files(
         get_ast,
         file_descrs: Iterable[FileItem],
     ) -> None:
-        """Check all files from file_descrs"""
+        """Check all files from file_descrs."""
         with self._astroid_module_checker() as check_astroid_module:
             for file in file_descrs:
                 try:
@@ -1045,7 +1122,7 @@ def _check_files(
                         self.add_message(symbol, args=msg)
 
     def _check_file(self, get_ast, check_astroid_module, file: FileItem):
-        """Check a file using the passed utility functions (get_ast and check_astroid_module)
+        """Check a file using the passed utility functions (get_ast and check_astroid_module).
 
         :param callable get_ast: callable returning AST from defined file taking the following arguments
         - filepath: path to the file to check
@@ -1076,7 +1153,7 @@ def _check_file(self, get_ast, check_astroid_module, file: FileItem):
 
     @staticmethod
     def _get_file_descr_from_stdin(filepath: str) -> FileItem:
-        """Return file description (tuple of module name, file path, base name) from given file path
+        """Return file description (tuple of module name, file path, base name) from given file path.
 
         This method is used for creating suitable file description for _check_files when the
         source is standard input.
@@ -1092,7 +1169,7 @@ def _get_file_descr_from_stdin(filepath: str) -> FileItem:
         return FileItem(modname, filepath, filepath)
 
     def _iterate_file_descrs(self, files_or_modules) -> Iterator[FileItem]:
-        """Return generator yielding file descriptions (tuples of module name, file path, base name)
+        """Return generator yielding file descriptions (tuples of module name, file path, base name).
 
         The returned generator yield one item for each Python module that should be linted.
         """
@@ -1102,7 +1179,7 @@ def _iterate_file_descrs(self, files_or_modules) -> Iterator[FileItem]:
                 yield FileItem(name, filepath, descr["basename"])
 
     def _expand_files(self, modules) -> List[ModuleDescriptionDict]:
-        """get modules and errors from a list of modules and handle errors"""
+        """Get modules and errors from a list of modules and handle errors."""
         result, errors = expand_modules(
             modules,
             self.config.black_list,
@@ -1119,19 +1196,28 @@ def _expand_files(self, modules) -> List[ModuleDescriptionDict]:
         return result
 
     def set_current_module(self, modname, filepath: Optional[str] = None):
-        """set the name of the currently analyzed module and
+        """Set the name of the currently analyzed module and
         init statistics for it
         """
         if not modname and filepath is None:
             return
         self.reporter.on_set_current_module(modname, filepath)
+        if modname is None:
+            warnings.warn(
+                (
+                    "In pylint 3.0 modname should be a string so that it can be used to "
+                    "correctly set the current_name attribute of the linter instance. "
+                    "If unknown it should be initialized as an empty string."
+                ),
+                DeprecationWarning,
+            )
         self.current_name = modname
         self.current_file = filepath or modname
         self.stats.init_single_module(modname)
 
     @contextlib.contextmanager
     def _astroid_module_checker(self):
-        """Context manager for checking ASTs
+        """Context manager for checking ASTs.
 
         The value in the context is callable accepting AST as its only argument.
         """
@@ -1163,7 +1249,9 @@ def _astroid_module_checker(self):
         for checker in reversed(_checkers):
             checker.close()
 
-    def get_ast(self, filepath, modname, data=None):
+    def get_ast(
+        self, filepath: str, modname: str, data: Optional[str] = None
+    ) -> nodes.Module:
         """Return an ast(roid) representation of a module or a string.
 
         :param str filepath: path to checked file.
@@ -1171,6 +1259,7 @@ def get_ast(self, filepath, modname, data=None):
         :param str data: optional contents of the checked file.
         :returns: the AST
         :rtype: astroid.nodes.Module
+        :raises AstroidBuildingError: Whenever we encounter an unexpected exception
         """
         try:
             if data is None:
@@ -1186,11 +1275,17 @@ def get_ast(self, filepath, modname, data=None):
                 col_offset=getattr(ex.error, "offset", None),
                 args=str(ex.error),
             )
-        except astroid.AstroidBuildingException as ex:
+        except astroid.AstroidBuildingError as ex:
             self.add_message("parse-error", args=ex)
-        except Exception as ex:  # pylint: disable=broad-except
+        except Exception as ex:
             traceback.print_exc()
-            self.add_message("astroid-error", args=(ex.__class__, ex))
+            # We raise BuildingError here as this is essentially an astroid issue
+            # Creating an issue template and adding the 'astroid-error' message is handled
+            # by caller: _check_files
+            raise astroid.AstroidBuildingError(
+                "Building error when trying to create ast representation of module '{modname}'",
+                modname=modname,
+            ) from ex
         return None
 
     def check_astroid_module(self, ast_node, walker, rawcheckers, tokencheckers):
@@ -1213,7 +1308,7 @@ def check_astroid_module(self, ast_node, walker, rawcheckers, tokencheckers):
     def _check_astroid_module(
         self, node: nodes.Module, walker, rawcheckers, tokencheckers
     ):
-        """Check given AST node with given walker and checkers
+        """Check given AST node with given walker and checkers.
 
         :param astroid.nodes.Module node: AST node of the module to check
         :param pylint.utils.ast_walker.ASTWalker walker: AST walker
@@ -1253,7 +1348,7 @@ def _check_astroid_module(
     # IAstroidChecker interface #################################################
 
     def open(self):
-        """initialize counters"""
+        """Initialize counters."""
         self.stats = LinterStats()
         MANAGER.always_load_extensions = self.config.unsafe_load_any_extension
         MANAGER.max_inferable_values = self.config.limit_inference_results
@@ -1266,7 +1361,7 @@ def open(self):
         self._ignore_paths = get_global_option(self, "ignore-paths")
 
     def generate_reports(self):
-        """close the whole package /module, it's time to make reports !
+        """Close the whole package /module, it's time to make reports !
 
         if persistent run, pickle results for later comparison
         """
@@ -1294,7 +1389,7 @@ def generate_reports(self):
         return score_value
 
     def _report_evaluation(self):
-        """make the global evaluation report"""
+        """Make the global evaluation report."""
         # check with at least check 1 statements (usually 0 when there is a
         # syntax error preventing pylint from further processing)
         note = None
@@ -1306,6 +1401,7 @@ def _report_evaluation(self):
         evaluation = self.config.evaluation
         try:
             stats_dict = {
+                "fatal": self.stats.fatal,
                 "error": self.stats.error,
                 "warning": self.stats.warning,
                 "refactor": self.stats.refactor,
@@ -1350,7 +1446,11 @@ def _get_message_state_scope(
         return None
 
     def _is_one_message_enabled(self, msgid: str, line: Optional[int]) -> bool:
-        """Checks state of a single message"""
+        """Checks state of a single message for the current file.
+
+        This function can't be cached as it depends on self.file_state which can
+        change.
+        """
         if line is None:
             return self._msgs_state.get(msgid, True)
         try:
@@ -1365,8 +1465,8 @@ def _is_one_message_enabled(self, msgid: str, line: Optional[int]) -> bool:
                 fallback = True
                 lines = self.file_state._raw_module_msgs_state.get(msgid, {})
 
-                # Doesn't consider scopes, as a disable can be in a different scope
-                # than that of the current line.
+                # Doesn't consider scopes, as a 'disable' can be in a
+                # different scope than that of the current line.
                 closest_lines = reversed(
                     [
                         (message_line, enable)
@@ -1387,17 +1487,21 @@ def is_message_enabled(
         line: Optional[int] = None,
         confidence: Optional[interfaces.Confidence] = None,
     ) -> bool:
-        """return whether the message associated to the given message id is
-        enabled
+        """Return whether this message is enabled for the current file, line and confidence level.
+
+        This function can't be cached right now as the line is the line of
+        the currently analysed file (self.file_state), if it changes, then the
+        result for the same msg_descr/line might need to change.
 
-        msgid may be either a numeric or symbolic message id.
+        :param msg_descr: Either the msgid or the symbol for a MessageDefinition
+        :param line: The line of the currently analysed file
+        :param confidence: The confidence of the message
         """
         if self.config.confidence and confidence:
             if confidence.name not in self.config.confidence:
                 return False
         try:
-            message_definitions = self.msgs_store.get_message_definitions(msg_descr)
-            msgids = [md.msgid for md in message_definitions]
+            msgids = self.msgs_store.message_id_store.get_active_msgids(msg_descr)
         except exceptions.UnknownMessageError:
             # The linter checks for messages that are not registered
             # due to version mismatch, just treat them as message IDs
@@ -1417,26 +1521,30 @@ def _add_one_message(
         end_col_offset: Optional[int],
     ) -> None:
         """After various checks have passed a single Message is
-        passed to the reporter and added to stats"""
+        passed to the reporter and added to stats
+        """
         message_definition.check_message_definition(line, node)
 
         # Look up "location" data of node if not yet supplied
         if node:
-            if not line:
-                line = node.fromlineno
-            # pylint: disable=fixme
-            # TODO: Initialize col_offset on every node (can be None) -> astroid
-            if not col_offset and hasattr(node, "col_offset"):
-                col_offset = node.col_offset
-            # pylint: disable=fixme
-            # TODO: Initialize end_lineno on every node (can be None) -> astroid
-            # See https://github.com/PyCQA/astroid/issues/1273
-            if not end_lineno and hasattr(node, "end_lineno"):
-                end_lineno = node.end_lineno
-            # pylint: disable=fixme
-            # TODO: Initialize end_col_offset on every node (can be None) -> astroid
-            if not end_col_offset and hasattr(node, "end_col_offset"):
-                end_col_offset = node.end_col_offset
+            if node.position:
+                if not line:
+                    line = node.position.lineno
+                if not col_offset:
+                    col_offset = node.position.col_offset
+                if not end_lineno:
+                    end_lineno = node.position.end_lineno
+                if not end_col_offset:
+                    end_col_offset = node.position.end_col_offset
+            else:
+                if not line:
+                    line = node.fromlineno
+                if not col_offset:
+                    col_offset = node.col_offset
+                if not end_lineno:
+                    end_lineno = node.end_lineno
+                if not end_col_offset:
+                    end_col_offset = node.end_col_offset
 
         # should this message be displayed
         if not self.is_message_enabled(message_definition.msgid, line, confidence):
@@ -1453,7 +1561,11 @@ def _add_one_message(
         msg_cat = MSG_TYPES[message_definition.msgid[0]]
         self.msg_status |= MSG_TYPES_STATUS[message_definition.msgid[0]]
         self.stats.increase_single_message_count(msg_cat, 1)
-        self.stats.increase_single_module_message_count(self.current_name, msg_cat, 1)
+        self.stats.increase_single_module_message_count(
+            self.current_name,  # type: ignore[arg-type] # Should be removable after https://github.com/PyCQA/pylint/pull/5580
+            msg_cat,
+            1,
+        )
         try:
             self.stats.by_msg[message_definition.symbol] += 1
         except KeyError:
@@ -1479,7 +1591,7 @@ def _add_one_message(
                 message_definition.msgid,
                 message_definition.symbol,
                 MessageLocationTuple(
-                    abspath,
+                    abspath or "",
                     path,
                     module or "",
                     obj,
@@ -1534,7 +1646,7 @@ def add_ignored_message(
         node: Optional[nodes.NodeNG] = None,
         confidence: Optional[interfaces.Confidence] = interfaces.UNDEFINED,
     ) -> None:
-        """Prepares a message to be added to the ignored message storage
+        """Prepares a message to be added to the ignored message storage.
 
         Some checks return early in special cases and never reach add_message(),
         even though they would normally issue a message.
@@ -1555,7 +1667,7 @@ def add_ignored_message(
     # Setting the state (disabled/enabled) of messages and registering them
 
     def _message_symbol(self, msgid: str) -> List[str]:
-        """Get the message symbol of the given message id
+        """Get the message symbol of the given message id.
 
         Return the original message id if the message does not
         exist.
@@ -1568,8 +1680,10 @@ def _message_symbol(self, msgid: str) -> List[str]:
     def _set_one_msg_status(
         self, scope: str, msg: MessageDefinition, line: Optional[int], enable: bool
     ) -> None:
-        """Set the status of an individual message"""
+        """Set the status of an individual message."""
         if scope == "module":
+            assert isinstance(line, int)  # should always be int inside module scope
+
             self.file_state.set_msg_status(msg, line, enable)
             if not enable and msg.symbol != "locally-disabled":
                 self.add_message(
@@ -1578,30 +1692,18 @@ def _set_one_msg_status(
         else:
             msgs = self._msgs_state
             msgs[msg.msgid] = enable
-            # sync configuration object
-            self.config.enable = [
-                self._message_symbol(mid) for mid, val in sorted(msgs.items()) if val
-            ]
-            self.config.disable = [
-                self._message_symbol(mid)
-                for mid, val in sorted(msgs.items())
-                if not val
-            ]
 
-    def _set_msg_status(
-        self,
-        msgid: str,
-        enable: bool,
-        scope: str = "package",
-        line: Optional[int] = None,
-        ignore_unknown: bool = False,
-    ) -> None:
-        """Do some tests and then iterate over message defintions to set state"""
-        assert scope in {"package", "module"}
+    def _get_messages_to_set(
+        self, msgid: str, enable: bool, ignore_unknown: bool = False
+    ) -> List[MessageDefinition]:
+        """Do some tests and find the actual messages of which the status should be set."""
+        message_definitions = []
         if msgid == "all":
             for _msgid in MSG_TYPES:
-                self._set_msg_status(_msgid, enable, scope, line, ignore_unknown)
-            return
+                message_definitions.extend(
+                    self._get_messages_to_set(_msgid, enable, ignore_unknown)
+                )
+            return message_definitions
 
         # msgid is a category?
         category_id = msgid.upper()
@@ -1610,16 +1712,20 @@ def _set_msg_status(
         else:
             category_id_formatted = category_id
         if category_id_formatted is not None:
-            for _msgid in self.msgs_store._msgs_by_category.get(category_id_formatted):
-                self._set_msg_status(_msgid, enable, scope, line)
-            return
+            for _msgid in self.msgs_store._msgs_by_category[category_id_formatted]:
+                message_definitions.extend(
+                    self._get_messages_to_set(_msgid, enable, ignore_unknown)
+                )
+            return message_definitions
 
         # msgid is a checker name?
         if msgid.lower() in self._checkers:
             for checker in self._checkers[msgid.lower()]:
                 for _msgid in checker.msgs:
-                    self._set_msg_status(_msgid, enable, scope, line)
-            return
+                    message_definitions.extend(
+                        self._get_messages_to_set(_msgid, enable, ignore_unknown)
+                    )
+            return message_definitions
 
         # msgid is report id?
         if msgid.lower().startswith("rp"):
@@ -1627,23 +1733,47 @@ def _set_msg_status(
                 self.enable_report(msgid)
             else:
                 self.disable_report(msgid)
-            return
+            return message_definitions
 
         try:
             # msgid is a symbolic or numeric msgid.
             message_definitions = self.msgs_store.get_message_definitions(msgid)
         except exceptions.UnknownMessageError:
-            if ignore_unknown:
-                return
-            raise
+            if not ignore_unknown:
+                raise
+        return message_definitions
+
+    def _set_msg_status(
+        self,
+        msgid: str,
+        enable: bool,
+        scope: str = "package",
+        line: Optional[int] = None,
+        ignore_unknown: bool = False,
+    ) -> None:
+        """Do some tests and then iterate over message definitions to set state."""
+        assert scope in {"package", "module"}
+
+        message_definitions = self._get_messages_to_set(msgid, enable, ignore_unknown)
+
         for message_definition in message_definitions:
             self._set_one_msg_status(scope, message_definition, line, enable)
 
+        # sync configuration object
+        self.config.enable = []
+        self.config.disable = []
+        for mid, val in self._msgs_state.items():
+            if val:
+                self.config.enable.append(self._message_symbol(mid))
+            else:
+                self.config.disable.append(self._message_symbol(mid))
+
     def _register_by_id_managed_msg(
         self, msgid_or_symbol: str, line: Optional[int], is_disabled: bool = True
     ) -> None:
         """If the msgid is a numeric one, then register it to inform the user
-        it could furnish instead a symbolic msgid."""
+        it could furnish instead a symbolic msgid.
+        """
         if msgid_or_symbol[1:].isdigit():
             try:
                 symbol = self.msgs_store.message_id_store.get_symbol(
@@ -1663,7 +1793,7 @@ def disable(
         line: Optional[int] = None,
         ignore_unknown: bool = False,
     ) -> None:
-        """Disable a message for a scope"""
+        """Disable a message for a scope."""
         self._set_msg_status(
             msgid, enable=False, scope=scope, line=line, ignore_unknown=ignore_unknown
         )
@@ -1676,7 +1806,7 @@ def disable_next(
         line: Optional[int] = None,
         ignore_unknown: bool = False,
     ) -> None:
-        """Disable a message for the next line"""
+        """Disable a message for the next line."""
         if not line:
             raise exceptions.NoLineSuppliedError
         self._set_msg_status(
@@ -1695,7 +1825,7 @@ def enable(
         line: Optional[int] = None,
         ignore_unknown: bool = False,
     ) -> None:
-        """Enable a message for a scope"""
+        """Enable a message for a scope."""
         self._set_msg_status(
             msgid, enable=True, scope=scope, line=line, ignore_unknown=ignore_unknown
         )
diff --git a/pylint/lint/report_functions.py b/pylint/lint/report_functions.py
index 5e95354c45..f4c0a57106 100644
--- a/pylint/lint/report_functions.py
+++ b/pylint/lint/report_functions.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import collections
 from typing import DefaultDict, Dict, Union
@@ -14,7 +15,7 @@ def report_total_messages_stats(
     stats: LinterStats,
     previous_stats: LinterStats,
 ):
-    """make total errors / warnings report"""
+    """Make total errors / warnings report."""
     lines = ["type", "number", "previous", "difference"]
     lines += checkers.table_lines_from_stats(stats, previous_stats, "message_types")
     sect.append(Table(children=lines, cols=4, rheaders=1))
@@ -25,7 +26,7 @@ def report_messages_stats(
     stats: LinterStats,
     _: LinterStats,
 ):
-    """make messages type report"""
+    """Make messages type report."""
     by_msg_stats = stats.by_msg
     in_order = sorted(
         (value, msg_id)
@@ -44,7 +45,7 @@ def report_messages_by_module_stats(
     stats: LinterStats,
     _: LinterStats,
 ):
-    """make errors / warnings by modules report"""
+    """Make errors / warnings by modules report."""
     module_stats = stats.by_module
     if len(module_stats) == 1:
         # don't print this report when we are analysing a single module
diff --git a/pylint/lint/run.py b/pylint/lint/run.py
index 60d26badf5..2d28cc47f5 100644
--- a/pylint/lint/run.py
+++ b/pylint/lint/run.py
@@ -1,11 +1,13 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import os
 import sys
 import warnings
 
 from pylint import __pkginfo__, extensions, interfaces
+from pylint.config.config_initialization import _config_initialization
 from pylint.constants import DEFAULT_PYLINT_HOME, OLD_DEFAULT_PYLINT_HOME, full_version
 from pylint.lint.pylinter import PyLinter
 from pylint.lint.utils import ArgumentPreprocessingError, preprocess_options
@@ -30,7 +32,7 @@ def _cpu_count() -> int:
 
 
 def cb_list_extensions(option, optname, value, parser):
-    """List all the extensions under pylint.extensions"""
+    """List all the extensions under pylint.extensions."""
 
     for filename in os.listdir(os.path.dirname(extensions.__file__)):
         if filename.endswith(".py") and not filename.startswith("_"):
@@ -46,7 +48,7 @@ def cb_list_confidence_levels(option, optname, value, parser):
 
 
 def cb_init_hook(optname, value):
-    """exec arbitrary code to set sys.path for instance"""
+    """Execute arbitrary code to set 'sys.path' for instance."""
     exec(value)  # pylint: disable=exec-used
 
 
@@ -54,10 +56,7 @@ def cb_init_hook(optname, value):
 
 
 class Run:
-    """helper class to use as main for pylint :
-
-    run(*sys.argv[1:])
-    """
+    """Helper class to use as main for pylint with 'run(*sys.argv[1:])'."""
 
     LinterClass = PyLinter
     option_groups = (
@@ -327,40 +326,8 @@ def __init__(
         # read configuration
         linter.disable("I")
         linter.enable("c-extension-no-member")
-        try:
-            linter.read_config_file(verbose=self.verbose)
-        except OSError as ex:
-            print(ex, file=sys.stderr)
-            sys.exit(32)
 
-        config_parser = linter.cfgfile_parser
-        # run init hook, if present, before loading plugins
-        if config_parser.has_option("MASTER", "init-hook"):
-            cb_init_hook(
-                "init-hook", utils._unquote(config_parser.get("MASTER", "init-hook"))
-            )
-        # is there some additional plugins in the file configuration, in
-        if config_parser.has_option("MASTER", "load-plugins"):
-            plugins = utils._splitstrip(config_parser.get("MASTER", "load-plugins"))
-            linter.load_plugin_modules(plugins)
-        # now we can load file config and command line, plugins (which can
-        # provide options) have been registered
-        linter.load_config_file()
-
-        if reporter:
-            # if a custom reporter is provided as argument, it may be overridden
-            # by file parameters, so re-set it here, but before command line
-            # parsing so it's still overrideable by command line option
-            linter.set_reporter(reporter)
-        try:
-            args = linter.load_command_line_configuration(args)
-        except SystemExit as exc:
-            if exc.code == 2:  # bad options
-                exc.code = 32
-            raise
-        if not args:
-            print(linter.help())
-            sys.exit(32)
+        args = _config_initialization(linter, args, reporter, verbose_mode=self.verbose)
 
         if linter.config.jobs < 0:
             print(
@@ -378,13 +345,6 @@ def __init__(
             elif linter.config.jobs == 0:
                 linter.config.jobs = _cpu_count()
 
-        # We have loaded configuration from config file and command line. Now, we can
-        # load plugin specific configuration.
-        linter.load_plugin_configuration()
-
-        # Now that plugins are loaded, get list of all fail_on messages, and enable them
-        linter.enable_fail_on_messages()
-
         if self._output:
             try:
                 with open(self._output, "w", encoding="utf-8") as output:
@@ -423,23 +383,25 @@ def __init__(
                 sys.exit(self.linter.msg_status)
 
     def version_asked(self, _, __):
-        """callback for version (i.e. before option parsing)"""
+        """Callback for version (i.e. before option parsing)."""
         self._version_asked = True
 
     def cb_set_rcfile(self, name, value):
-        """callback for option preprocessing (i.e. before option parsing)"""
+        """Callback for option preprocessing (i.e. before option parsing)."""
         self._rcfile = value
 
     def cb_set_output(self, name, value):
-        """callback for option preprocessing (i.e. before option parsing)"""
+        """Callback for option preprocessing (i.e. before option parsing)."""
         self._output = value
 
     def cb_add_plugins(self, name, value):
-        """callback for option preprocessing (i.e. before option parsing)"""
+        """Callback for option preprocessing (i.e. before option parsing)."""
         self._plugins.extend(utils._splitstrip(value))
 
     def cb_error_mode(self, *args, **kwargs):
-        """error mode:
+        """Callback for --errors-only.
+
+        Error mode:
         * disable all but error messages
         * disable the 'miscellaneous' checker which can be safely deactivated in
           debug
@@ -449,37 +411,37 @@ def cb_error_mode(self, *args, **kwargs):
         self.linter.error_mode()
 
     def cb_generate_config(self, *args, **kwargs):
-        """optik callback for sample config file generation"""
+        """Optik callback for sample config file generation."""
         self.linter.generate_config(skipsections=("COMMANDS",))
         sys.exit(0)
 
     def cb_generate_manpage(self, *args, **kwargs):
-        """optik callback for sample config file generation"""
+        """Optik callback for sample config file generation."""
         self.linter.generate_manpage(__pkginfo__)
         sys.exit(0)
 
     def cb_help_message(self, option, optname, value, parser):
-        """optik callback for printing some help about a particular message"""
+        """Optik callback for printing some help about a particular message."""
         self.linter.msgs_store.help_message(utils._splitstrip(value))
         sys.exit(0)
 
     def cb_full_documentation(self, option, optname, value, parser):
-        """optik callback for printing full documentation"""
+        """Optik callback for printing full documentation."""
         print_full_documentation(self.linter)
         sys.exit(0)
 
     def cb_list_messages(self, option, optname, value, parser):
-        """optik callback for printing available messages"""
+        """Optik callback for printing available messages."""
         self.linter.msgs_store.list_messages()
         sys.exit(0)
 
     def cb_list_messages_enabled(self, option, optname, value, parser):
-        """optik callback for printing available messages"""
+        """Optik callback for printing available messages."""
         self.linter.list_messages_enabled()
         sys.exit(0)
 
     def cb_list_groups(self, *args, **kwargs):
-        """List all the check groups that pylint knows about
+        """List all the check groups that pylint knows about.
 
         These should be useful to know what check groups someone can disable
         or enable.
@@ -492,15 +454,9 @@ def cb_verbose_mode(self, *args, **kwargs):
         self.verbose = True
 
     def cb_enable_all_extensions(self, option_name: str, value: None) -> None:
-        """Callback to load and enable all available extensions"""
+        """Callback to load and enable all available extensions."""
         for filename in os.listdir(os.path.dirname(extensions.__file__)):
-            # pylint: disable=fixme
-            # TODO: Remove the check for deprecated check_docs after the extension has been removed
-            if (
-                filename.endswith(".py")
-                and not filename.startswith("_")
-                and not filename.startswith("check_docs")
-            ):
+            if filename.endswith(".py") and not filename.startswith("_"):
                 extension_name = f"pylint.extensions.{filename[:-3]}"
                 if extension_name not in self._plugins:
                     self._plugins.append(extension_name)
diff --git a/pylint/lint/utils.py b/pylint/lint/utils.py
index ed0cefb770..7d402a0088 100644
--- a/pylint/lint/utils.py
+++ b/pylint/lint/utils.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import contextlib
 import sys
@@ -50,13 +51,16 @@ def prepare_crash_report(ex: Exception, filepath: str, crash_file_path: str) ->
 pylint crashed with a ``{ex.__class__.__name__}`` and with the following stacktrace:
 ```
 """
+    template += traceback.format_exc()
+    template += "```\n"
     try:
         with open(issue_template_path, "a", encoding="utf8") as f:
             f.write(template)
-            traceback.print_exc(file=f)
-            f.write("```\n")
-    except FileNotFoundError:
-        print(f"Can't write the issue template for the crash in {issue_template_path}.")
+    except Exception as exc:  # pylint: disable=broad-except
+        print(
+            f"Can't write the issue template for the crash in {issue_template_path} "
+            f"because of: '{exc}'\nHere's the content anyway:\n{template}."
+        )
     return issue_template_path
 
 
@@ -69,7 +73,7 @@ def get_fatal_error_message(filepath: str, issue_template_path: Path) -> str:
 
 
 def preprocess_options(args, search_for):
-    """look for some options (keys of <search_for>) which have to be processed
+    """Look for some options (keys of <search_for>) which have to be processed
     before others
 
     values of <search_for> are callback functions to call when the option is
@@ -119,10 +123,10 @@ def _patch_sys_path(args):
 
 @contextlib.contextmanager
 def fix_import_path(args):
-    """Prepare sys.path for running the linter checks.
+    """Prepare 'sys.path' for running the linter checks.
 
     Within this context, each of the given arguments is importable.
-    Paths are added to sys.path in corresponding order to the arguments.
+    Paths are added to 'sys.path' in corresponding order to the arguments.
     We avoid adding duplicate directories to sys.path.
     `sys.path` is reset to its original value upon exiting this context.
     """
diff --git a/pylint/message/__init__.py b/pylint/message/__init__.py
index 68159bf342..11d2b17dce 100644
--- a/pylint/message/__init__.py
+++ b/pylint/message/__init__.py
@@ -1,42 +1,6 @@
-# Copyright (c) 2006-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2009 Vincent
-# Copyright (c) 2009 Mads Kiilerich <mads@kiilerich.com>
-# Copyright (c) 2012-2014 Google, Inc.
-# Copyright (c) 2014-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014-2015 Michal Nowikowski <godfryd@gmail.com>
-# Copyright (c) 2014 LCD 47 <lcd047@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2014 Damien Nozay <damien.nozay@gmail.com>
-# Copyright (c) 2015 Aru Sahni <arusahni@gmail.com>
-# Copyright (c) 2015 Florian Bruhin <me@the-compiler.org>
-# Copyright (c) 2015 Simu Toni <simutoni@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2016 Moises Lopez <moylop260@vauxoo.com>
-# Copyright (c) 2016 Glenn Matthews <glenn@e-dad.net>
-# Copyright (c) 2016 Glenn Matthews <glmatthe@cisco.com>
-# Copyright (c) 2016 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2016 xmo-odoo <xmo-odoo@users.noreply.github.com>
-# Copyright (c) 2017-2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2017-2018, 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2017, 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2017-2018 Bryce Guinta <bryce.paul.guinta@gmail.com>
-# Copyright (c) 2017 Chris Lamb <chris@chris-lamb.co.uk>
-# Copyright (c) 2017 Thomas Hisch <t.hisch@gmail.com>
-# Copyright (c) 2017 Mikhail Fesenko <proggga@gmail.com>
-# Copyright (c) 2017 Craig Citro <craigcitro@gmail.com>
-# Copyright (c) 2017 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Bryce Guinta <bryce.guinta@protonmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Reverb C <reverbc@users.noreply.github.com>
-# Copyright (c) 2018 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """All the classes related to Message handling."""
 
diff --git a/pylint/message/message.py b/pylint/message/message.py
index b431d502b7..297442e450 100644
--- a/pylint/message/message.py
+++ b/pylint/message/message.py
@@ -1,6 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import collections
 from typing import Optional, Tuple, Union, overload
@@ -32,7 +32,7 @@
 
 
 class Message(_MsgBase):
-    """This class represent a message to be issued by the reporters"""
+    """This class represent a message to be issued by the reporters."""
 
     @overload
     def __new__(
diff --git a/pylint/message/message_definition.py b/pylint/message/message_definition.py
index 8785e154d8..a729e595c7 100644
--- a/pylint/message/message_definition.py
+++ b/pylint/message/message_definition.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import sys
 from typing import TYPE_CHECKING, List, Optional, Tuple
@@ -58,7 +59,7 @@ def __str__(self) -> str:
         return f"{repr(self)}:\n{self.msg} {self.description}"
 
     def may_be_emitted(self) -> bool:
-        """return True if message may be emitted using the current interpreter"""
+        """Return True if message may be emitted using the current interpreter."""
         if self.minversion is not None and self.minversion > sys.version_info:
             return False
         if self.maxversion is not None and self.maxversion <= sys.version_info:
@@ -66,7 +67,7 @@ def may_be_emitted(self) -> bool:
         return True
 
     def format_help(self, checkerref: bool = False) -> str:
-        """return the help string for the given message id"""
+        """Return the help string for the given message id."""
         desc = self.description
         if checkerref:
             desc += f" This message belongs to the {self.checker_name} checker."
@@ -94,7 +95,7 @@ def format_help(self, checkerref: bool = False) -> str:
     def check_message_definition(
         self, line: Optional[int], node: Optional[nodes.NodeNG]
     ) -> None:
-        """Check MessageDefinition for possible errors"""
+        """Check MessageDefinition for possible errors."""
         if self.msgid[0] not in _SCOPE_EXEMPT:
             # Fatal messages and reports are special, the node/scope distinction
             # does not apply to them.
diff --git a/pylint/message/message_definition_store.py b/pylint/message/message_definition_store.py
index c160a85bab..8974517bf5 100644
--- a/pylint/message/message_definition_store.py
+++ b/pylint/message/message_definition_store.py
@@ -1,7 +1,9 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import collections
+import functools
 from typing import TYPE_CHECKING, Dict, List, Tuple, ValuesView
 
 from pylint.exceptions import UnknownMessageError
@@ -46,8 +48,18 @@ def register_message(self, message: MessageDefinition) -> None:
         self._messages_definitions[message.msgid] = message
         self._msgs_by_category[message.msgid[0]].append(message.msgid)
 
+    # Since MessageDefinitionStore is only initialized once
+    # and the arguments are relatively small in size we do not run the
+    # risk of creating a large memory leak.
+    # See discussion in: https://github.com/PyCQA/pylint/pull/5673
+    @functools.lru_cache(maxsize=None)  # pylint: disable=cache-max-size-none
     def get_message_definitions(self, msgid_or_symbol: str) -> List[MessageDefinition]:
-        """Returns the Message definition for either a numeric or symbolic id."""
+        """Returns the Message definition for either a numeric or symbolic id.
+
+        The cache has no limit as its size will likely stay minimal. For each message we store
+        about 1000 characters, so even if we would have 1000 messages the cache would only
+        take up ~= 1 Mb.
+        """
         return [
             self._messages_definitions[m]
             for m in self.message_id_store.get_active_msgids(msgid_or_symbol)
@@ -61,7 +73,7 @@ def get_msg_display_string(self, msgid_or_symbol: str) -> str:
         return repr([md.symbol for md in message_definitions])
 
     def help_message(self, msgids_or_symbols: List[str]) -> None:
-        """Display help messages for the given message identifiers"""
+        """Display help messages for the given message identifiers."""
         for msgids_or_symbol in msgids_or_symbols:
             try:
                 for message_definition in self.get_message_definitions(
@@ -88,7 +100,7 @@ def list_messages(self) -> None:
     def find_emittable_messages(
         self,
     ) -> Tuple[List[MessageDefinition], List[MessageDefinition]]:
-        """Finds all emittable and non-emittable messages"""
+        """Finds all emittable and non-emittable messages."""
         messages = sorted(self._messages_definitions.values(), key=lambda m: m.msgid)
         emittable = []
         non_emittable = []
diff --git a/pylint/message/message_id_store.py b/pylint/message/message_id_store.py
index 1fbe684712..d4ccbe6bc8 100644
--- a/pylint/message/message_id_store.py
+++ b/pylint/message/message_id_store.py
@@ -1,5 +1,7 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 from typing import Dict, List, NoReturn, Optional, Tuple
 
 from pylint.exceptions import InvalidMessageError, UnknownMessageError
@@ -13,6 +15,7 @@ def __init__(self) -> None:
         self.__msgid_to_symbol: Dict[str, str] = {}
         self.__symbol_to_msgid: Dict[str, str] = {}
         self.__old_names: Dict[str, List[str]] = {}
+        self.__active_msgids: Dict[str, List[str]] = {}
 
     def __len__(self) -> int:
         return len(self.__msgid_to_symbol)
@@ -51,7 +54,8 @@ def add_msgid_and_symbol(self, msgid: str, symbol: str) -> None:
         """Add valid message id.
 
         There is a little duplication with add_legacy_msgid_and_symbol to avoid a function call,
-        this is called a lot at initialization."""
+        this is called a lot at initialization.
+        """
         self.__msgid_to_symbol[msgid] = symbol
         self.__symbol_to_msgid[symbol] = msgid
 
@@ -61,7 +65,8 @@ def add_legacy_msgid_and_symbol(
         """Add valid legacy message id.
 
         There is a little duplication with add_msgid_and_symbol to avoid a function call,
-        this is called a lot at initialization."""
+        this is called a lot at initialization.
+        """
         self.__msgid_to_symbol[msgid] = symbol
         self.__symbol_to_msgid[symbol] = msgid
         existing_old_names = self.__old_names.get(msgid, [])
@@ -102,17 +107,29 @@ def _raise_duplicate_msgid(symbol: str, msgid: str, other_msgid: str) -> NoRetur
         raise InvalidMessageError(error_message)
 
     def get_active_msgids(self, msgid_or_symbol: str) -> List[str]:
-        """Return msgids but the input can be a symbol."""
-        # Only msgid can have a digit as second letter
-        is_msgid: bool = msgid_or_symbol[1:].isdigit()
-        msgid = None
-        if is_msgid:
+        """Return msgids but the input can be a symbol.
+
+        self.__active_msgids is used to implement a primitive cache for this function.
+        """
+        try:
+            return self.__active_msgids[msgid_or_symbol]
+        except KeyError:
+            pass
+
+        # If we don't have a cached value yet we compute it
+        msgid: Optional[str]
+        if msgid_or_symbol[1:].isdigit():
+            # Only msgid can have a digit as second letter
             msgid = msgid_or_symbol.upper()
             symbol = self.__msgid_to_symbol.get(msgid)
         else:
             msgid = self.__symbol_to_msgid.get(msgid_or_symbol)
             symbol = msgid_or_symbol
-        if msgid is None or symbol is None or not msgid or not symbol:
+        if not msgid or not symbol:
             error_msg = f"No such message id or symbol '{msgid_or_symbol}'."
             raise UnknownMessageError(error_msg)
-        return self.__old_names.get(msgid, [msgid])
+        ids = self.__old_names.get(msgid, [msgid])
+
+        # Add to cache
+        self.__active_msgids[msgid_or_symbol] = ids
+        return ids
diff --git a/pylint/pyreverse/__init__.py b/pylint/pyreverse/__init__.py
index fdbbe1e832..458c0f35db 100644
--- a/pylint/pyreverse/__init__.py
+++ b/pylint/pyreverse/__init__.py
@@ -1,8 +1,7 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""
-pyreverse.extensions
-"""
+"""Pyreverse.extensions."""
 
 __revision__ = "$Id $"
diff --git a/pylint/pyreverse/diadefslib.py b/pylint/pyreverse/diadefslib.py
index d8192946ae..b5dd3fb506 100644
--- a/pylint/pyreverse/diadefslib.py
+++ b/pylint/pyreverse/diadefslib.py
@@ -1,26 +1,8 @@
-# Copyright (c) 2006, 2008-2010, 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Florian Bruhin <me@the-compiler.org>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""handle diagram generation options for class diagram or default diagrams
-"""
+"""Handle diagram generation options for class diagram or default diagrams."""
 
 from typing import Any, Optional
 
@@ -35,24 +17,24 @@
 
 
 class DiaDefGenerator:
-    """handle diagram generation options"""
+    """Handle diagram generation options."""
 
     def __init__(self, linker, handler):
-        """common Diagram Handler initialization"""
+        """Common Diagram Handler initialization."""
         self.config = handler.config
         self._set_default_options()
         self.linker = linker
         self.classdiagram = None  # defined by subclasses
 
     def get_title(self, node):
-        """get title for objects"""
+        """Get title for objects."""
         title = node.name
         if self.module_names:
             title = f"{node.root().name}.{title}"
         return title
 
     def _set_option(self, option):
-        """activate some options if not explicitly deactivated"""
+        """Activate some options if not explicitly deactivated."""
         # if we have a class diagram, we want more information by default;
         # so if the option is None, we return True
         if option is None:
@@ -60,7 +42,7 @@ def _set_option(self, option):
         return option
 
     def _set_default_options(self):
-        """set different default options with _default dictionary"""
+        """Set different default options with _default dictionary."""
         self.module_names = self._set_option(self.config.module_names)
         all_ancestors = self._set_option(self.config.all_ancestors)
         all_associated = self._set_option(self.config.all_associated)
@@ -76,22 +58,22 @@ def _set_default_options(self):
         self.anc_level, self.association_level = anc_level, association_level
 
     def _get_levels(self):
-        """help function for search levels"""
+        """Help function for search levels."""
         return self.anc_level, self.association_level
 
     def show_node(self, node):
-        """true if builtins and not show_builtins"""
+        """True if builtins and not show_builtins."""
         if self.config.show_builtin:
             return True
         return node.root().name != "builtins"
 
     def add_class(self, node):
-        """visit one class and add it to diagram"""
+        """Visit one class and add it to diagram."""
         self.linker.visit(node)
         self.classdiagram.add_object(self.get_title(node), node)
 
     def get_ancestors(self, node, level):
-        """return ancestor nodes of a class node"""
+        """Return ancestor nodes of a class node."""
         if level == 0:
             return
         for ancestor in node.ancestors(recurs=False):
@@ -100,7 +82,7 @@ def get_ancestors(self, node, level):
             yield ancestor
 
     def get_associated(self, klass_node, level):
-        """return associated nodes of a class node"""
+        """Return associated nodes of a class node."""
         if level == 0:
             return
         for association_nodes in list(klass_node.instance_attrs_type.values()) + list(
@@ -114,7 +96,7 @@ def get_associated(self, klass_node, level):
                 yield node
 
     def extract_classes(self, klass_node, anc_level, association_level):
-        """extract recursively classes related to klass_node"""
+        """Extract recursively classes related to klass_node."""
         if self.classdiagram.has_node(klass_node) or not self.show_node(klass_node):
             return
         self.add_class(klass_node)
@@ -127,7 +109,7 @@ def extract_classes(self, klass_node, anc_level, association_level):
 
 
 class DefaultDiadefGenerator(LocalsVisitor, DiaDefGenerator):
-    """generate minimum diagram definition for the project :
+    """Generate minimum diagram definition for the project :
 
     * a package diagram including project's modules
     * a class diagram including project's classes
@@ -138,7 +120,7 @@ def __init__(self, linker, handler):
         LocalsVisitor.__init__(self)
 
     def visit_project(self, node: Project) -> None:
-        """visit a pyreverse.utils.Project node
+        """Visit a pyreverse.utils.Project node.
 
         create a diagram definition for packages
         """
@@ -152,7 +134,7 @@ def visit_project(self, node: Project) -> None:
         self.classdiagram = ClassDiagram(f"classes {node.name}", mode)
 
     def leave_project(self, _: Project) -> Any:
-        """leave the pyreverse.utils.Project node
+        """Leave the pyreverse.utils.Project node.
 
         return the generated diagram definition
         """
@@ -161,7 +143,7 @@ def leave_project(self, _: Project) -> Any:
         return (self.classdiagram,)
 
     def visit_module(self, node: nodes.Module) -> None:
-        """visit an astroid.Module node
+        """Visit an astroid.Module node.
 
         add this class to the package diagram definition
         """
@@ -170,7 +152,7 @@ def visit_module(self, node: nodes.Module) -> None:
             self.pkgdiagram.add_object(node.name, node)
 
     def visit_classdef(self, node: nodes.ClassDef) -> None:
-        """visit an astroid.Class node
+        """Visit an astroid.Class node.
 
         add this class to the class diagram definition
         """
@@ -178,18 +160,18 @@ def visit_classdef(self, node: nodes.ClassDef) -> None:
         self.extract_classes(node, anc_level, association_level)
 
     def visit_importfrom(self, node: nodes.ImportFrom) -> None:
-        """visit astroid.ImportFrom  and catch modules for package diagram"""
+        """Visit astroid.ImportFrom  and catch modules for package diagram."""
         if self.pkgdiagram:
             self.pkgdiagram.add_from_depend(node, node.modname)
 
 
 class ClassDiadefGenerator(DiaDefGenerator):
-    """generate a class diagram definition including all classes related to a
+    """Generate a class diagram definition including all classes related to a
     given class
     """
 
     def class_diagram(self, project, klass):
-        """return a class diagram definition for the given klass and its
+        """Return a class diagram definition for the given klass and its
         related klasses
         """
 
@@ -211,16 +193,13 @@ def class_diagram(self, project, klass):
 
 
 class DiadefsHandler:
-    """handle diagram definitions :
-
-    get it from user (i.e. xml files) or generate them
-    """
+    """Get diagram definitions from user (i.e. xml files) or generate them."""
 
     def __init__(self, config):
         self.config = config
 
     def get_diadefs(self, project, linker):
-        """Get the diagrams configuration data
+        """Get the diagram's configuration data.
 
         :param project:The pyreverse project
         :type project: pyreverse.utils.Project
diff --git a/pylint/pyreverse/diagrams.py b/pylint/pyreverse/diagrams.py
index 93ccf8ae8b..2ad50910dd 100644
--- a/pylint/pyreverse/diagrams.py
+++ b/pylint/pyreverse/diagrams.py
@@ -1,24 +1,8 @@
-# Copyright (c) 2006, 2008-2010, 2012-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2014-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Takahide Nojima <nozzy123nozzy@gmail.com>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-# Copyright (c) 2021 Mark Byrne <31762852+mbyrnepr2@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""diagram objects
-"""
-
+"""Diagram objects."""
 import astroid
 from astroid import nodes
 
@@ -27,11 +11,11 @@
 
 
 class Figure:
-    """base class for counter handling"""
+    """Base class for counter handling."""
 
 
 class Relationship(Figure):
-    """a relation ship from an object in the diagram to another"""
+    """A relationship from an object in the diagram to another."""
 
     def __init__(self, from_object, to_object, relation_type, name=None):
         super().__init__()
@@ -42,7 +26,7 @@ def __init__(self, from_object, to_object, relation_type, name=None):
 
 
 class DiagramEntity(Figure):
-    """a diagram object, i.e. a label associated to an astroid node"""
+    """A diagram object, i.e. a label associated to an astroid node."""
 
     def __init__(self, title="No name", node=None):
         super().__init__()
@@ -51,11 +35,11 @@ def __init__(self, title="No name", node=None):
 
 
 class PackageEntity(DiagramEntity):
-    """A diagram object representing a package"""
+    """A diagram object representing a package."""
 
 
 class ClassEntity(DiagramEntity):
-    """A diagram object representing a class"""
+    """A diagram object representing a class."""
 
     def __init__(self, title, node):
         super().__init__(title=title, node=node)
@@ -64,7 +48,7 @@ def __init__(self, title, node):
 
 
 class ClassDiagram(Figure, FilterMixIn):
-    """main class diagram handling"""
+    """Main class diagram handling."""
 
     TYPE = "class"
 
@@ -85,19 +69,19 @@ def get_relationships(self, role):
         )
 
     def add_relationship(self, from_object, to_object, relation_type, name=None):
-        """create a relation ship"""
+        """Create a relationship."""
         rel = Relationship(from_object, to_object, relation_type, name)
         self.relationships.setdefault(relation_type, []).append(rel)
 
     def get_relationship(self, from_object, relation_type):
-        """return a relation ship or None"""
+        """Return a relationship or None."""
         for rel in self.relationships.get(relation_type, ()):
             if rel.from_object is from_object:
                 return rel
         raise KeyError(relation_type)
 
     def get_attrs(self, node):
-        """return visible attributes, possibly with class name"""
+        """Return visible attributes, possibly with class name."""
         attrs = []
         properties = [
             (n, m)
@@ -118,7 +102,7 @@ def get_attrs(self, node):
         return sorted(attrs)
 
     def get_methods(self, node):
-        """return visible methods"""
+        """Return visible methods."""
         methods = [
             m
             for m in node.values()
@@ -130,14 +114,14 @@ def get_methods(self, node):
         return sorted(methods, key=lambda n: n.name)
 
     def add_object(self, title, node):
-        """create a diagram object"""
+        """Create a diagram object."""
         assert node not in self._nodes
         ent = DiagramEntity(title, node)
         self._nodes[node] = ent
         self.objects.append(ent)
 
     def class_names(self, nodes_lst):
-        """return class names if needed in diagram"""
+        """Return class names if needed in diagram."""
         names = []
         for node in nodes_lst:
             if isinstance(node, astroid.Instance):
@@ -153,30 +137,30 @@ def class_names(self, nodes_lst):
         return names
 
     def nodes(self):
-        """return the list of underlying nodes"""
+        """Return the list of underlying nodes."""
         return self._nodes.keys()
 
     def has_node(self, node):
-        """return true if the given node is included in the diagram"""
+        """Return true if the given node is included in the diagram."""
         return node in self._nodes
 
     def object_from_node(self, node):
-        """return the diagram object mapped to node"""
+        """Return the diagram object mapped to node."""
         return self._nodes[node]
 
     def classes(self):
-        """return all class nodes in the diagram"""
+        """Return all class nodes in the diagram."""
         return [o for o in self.objects if isinstance(o.node, nodes.ClassDef)]
 
     def classe(self, name):
-        """return a class by its name, raise KeyError if not found"""
+        """Return a class by its name, raise KeyError if not found."""
         for klass in self.classes():
             if klass.node.name == name:
                 return klass
         raise KeyError(name)
 
     def extract_relationships(self):
-        """extract relation ships between nodes in the diagram"""
+        """Extract relationships between nodes in the diagram."""
         for obj in self.classes():
             node = obj.node
             obj.attrs = self.get_attrs(node)
@@ -217,23 +201,23 @@ def extract_relationships(self):
 
 
 class PackageDiagram(ClassDiagram):
-    """package diagram handling"""
+    """Package diagram handling."""
 
     TYPE = "package"
 
     def modules(self):
-        """return all module nodes in the diagram"""
+        """Return all module nodes in the diagram."""
         return [o for o in self.objects if isinstance(o.node, nodes.Module)]
 
     def module(self, name):
-        """return a module by its name, raise KeyError if not found"""
+        """Return a module by its name, raise KeyError if not found."""
         for mod in self.modules():
             if mod.node.name == name:
                 return mod
         raise KeyError(name)
 
     def get_module(self, name, node):
-        """return a module by its name, looking also for relative imports;
+        """Return a module by its name, looking also for relative imports;
         raise KeyError if not found
         """
         for mod in self.modules():
@@ -249,14 +233,14 @@ def get_module(self, name, node):
         raise KeyError(name)
 
     def add_from_depend(self, node, from_module):
-        """add dependencies created by from-imports"""
+        """Add dependencies created by from-imports."""
         mod_name = node.root().name
         obj = self.module(mod_name)
         if from_module not in obj.node.depends:
             obj.node.depends.append(from_module)
 
     def extract_relationships(self):
-        """extract relation ships between nodes in the diagram"""
+        """Extract relationships between nodes in the diagram."""
         super().extract_relationships()
         for obj in self.classes():
             # ownership
diff --git a/pylint/pyreverse/dot_printer.py b/pylint/pyreverse/dot_printer.py
index c2fd62fb9b..0cca0ab619 100644
--- a/pylint/pyreverse/dot_printer.py
+++ b/pylint/pyreverse/dot_printer.py
@@ -1,16 +1,8 @@
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2021 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""
-Class to generate files in dot format and image formats supported by Graphviz.
-"""
+"""Class to generate files in dot format and image formats supported by Graphviz."""
 import os
 import subprocess
 import sys
@@ -21,7 +13,7 @@
 from astroid import nodes
 
 from pylint.pyreverse.printer import EdgeType, Layout, NodeProperties, NodeType, Printer
-from pylint.pyreverse.utils import check_graphviz_availability, get_annotation_label
+from pylint.pyreverse.utils import get_annotation_label
 
 ALLOWED_CHARSETS: FrozenSet[str] = frozenset(("utf-8", "iso-8859-1", "latin1"))
 SHAPES: Dict[NodeType, str] = {
@@ -53,7 +45,7 @@ def __init__(
         super().__init__(title, layout, use_automatic_namespace)
 
     def _open_graph(self) -> None:
-        """Emit the header lines"""
+        """Emit the header lines."""
         self.emit(f'digraph "{self.title}" {{')
         if self.layout:
             self.emit(f"rankdir={self.layout.value}")
@@ -69,7 +61,10 @@ def emit_node(
         type_: NodeType,
         properties: Optional[NodeProperties] = None,
     ) -> None:
-        """Create a new node. Nodes can be classes, packages, participants etc."""
+        """Create a new node.
+
+        Nodes can be classes, packages, participants etc.
+        """
         if properties is None:
             properties = NodeProperties(label=name)
         shape = SHAPES[type_]
@@ -107,7 +102,7 @@ def _build_label_for_node(
         methods: List[nodes.FunctionDef] = properties.methods or []
         for func in methods:
             args = self._get_method_arguments(func)
-            label += fr"{func.name}({', '.join(args)})"
+            label += rf"{func.name}({', '.join(args)})"
             if func.returns:
                 label += ": " + get_annotation_label(func.returns)
             label += r"\l"
@@ -151,7 +146,6 @@ def generate(self, outputfile: str) -> None:
         with open(dot_sourcepath, "w", encoding="utf8") as outfile:
             outfile.writelines(self.lines)
         if target not in graphviz_extensions:
-            check_graphviz_availability()
             use_shell = sys.platform == "win32"
             subprocess.call(
                 ["dot", "-T", target, dot_sourcepath, "-o", outputfile],
diff --git a/pylint/pyreverse/inspector.py b/pylint/pyreverse/inspector.py
index 25819f5aa4..91d2199f22 100644
--- a/pylint/pyreverse/inspector.py
+++ b/pylint/pyreverse/inspector.py
@@ -1,21 +1,9 @@
-# Copyright (c) 2015-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2021 Mark Byrne <31762852+mbyrnepr2@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Visitor doing some postprocessing on the astroid tree.
 
-"""
-Visitor doing some postprocessing on the astroid tree.
 Try to resolve definitions (namespace) dictionary, relationship...
 """
 import collections
@@ -50,7 +38,7 @@ def interfaces(node, herited=True, handler_func=_iface_hdlr):
         implements = astroid.bases.Instance(node).getattr("__implements__")[0]
     except astroid.exceptions.NotFoundError:
         return
-    if not herited and implements.frame() is not node:
+    if not herited and implements.frame(future=True) is not node:
         return
     found = set()
     missing = False
@@ -72,17 +60,17 @@ def __init__(self, start_value=0):
         self.id_count = start_value
 
     def init_counter(self, start_value=0):
-        """init the id counter"""
+        """Init the id counter."""
         self.id_count = start_value
 
     def generate_id(self):
-        """generate a new identifier"""
+        """Generate a new identifier."""
         self.id_count += 1
         return self.id_count
 
 
 class Project:
-    """a project handle a set of modules / packages"""
+    """A project handle a set of modules / packages."""
 
     def __init__(self, name=""):
         self.name = name
@@ -144,7 +132,7 @@ def __init__(self, project, inherited_interfaces=0, tag=False):
         self.project = project
 
     def visit_project(self, node: Project) -> None:
-        """visit a pyreverse.utils.Project node
+        """Visit a pyreverse.utils.Project node.
 
         * optionally tag the node with a unique id
         """
@@ -154,7 +142,7 @@ def visit_project(self, node: Project) -> None:
             self.visit(module)
 
     def visit_module(self, node: nodes.Module) -> None:
-        """visit an astroid.Module node
+        """Visit an astroid.Module node.
 
         * set the locals_type mapping
         * set the depends mapping
@@ -168,7 +156,7 @@ def visit_module(self, node: nodes.Module) -> None:
             node.uid = self.generate_id()
 
     def visit_classdef(self, node: nodes.ClassDef) -> None:
-        """visit an astroid.Class node
+        """Visit an astroid.Class node.
 
         * set the locals_type and instance_attrs_type mappings
         * set the implements list and build it
@@ -197,7 +185,7 @@ def visit_classdef(self, node: nodes.ClassDef) -> None:
             node.implements = []
 
     def visit_functiondef(self, node: nodes.FunctionDef) -> None:
-        """visit an astroid.Function node
+        """Visit an astroid.Function node.
 
         * set the locals_type mapping
         * optionally tag the node with a unique id
@@ -214,7 +202,7 @@ def visit_functiondef(self, node: nodes.FunctionDef) -> None:
     link_function = visit_functiondef
 
     def visit_assignname(self, node: nodes.AssignName) -> None:
-        """visit an astroid.AssignName node
+        """Visit an astroid.AssignName node.
 
         handle locals_type
         """
@@ -223,8 +211,8 @@ def visit_assignname(self, node: nodes.AssignName) -> None:
         if hasattr(node, "_handled"):
             return
         node._handled = True
-        if node.name in node.frame():
-            frame = node.frame()
+        if node.name in node.frame(future=True):
+            frame = node.frame(future=True)
         else:
             # the name has been defined as 'global' in the frame and belongs
             # there.
@@ -245,7 +233,7 @@ def visit_assignname(self, node: nodes.AssignName) -> None:
 
     @staticmethod
     def handle_assignattr_type(node, parent):
-        """handle an astroid.assignattr node
+        """Handle an astroid.assignattr node.
 
         handle instance_attrs_type
         """
@@ -255,7 +243,7 @@ def handle_assignattr_type(node, parent):
         )
 
     def visit_import(self, node: nodes.Import) -> None:
-        """visit an astroid.Import node
+        """Visit an astroid.Import node.
 
         resolve module dependencies
         """
@@ -265,7 +253,7 @@ def visit_import(self, node: nodes.Import) -> None:
             self._imported_module(node, name[0], relative)
 
     def visit_importfrom(self, node: nodes.ImportFrom) -> None:
-        """visit an astroid.ImportFrom node
+        """Visit an astroid.ImportFrom node.
 
         resolve module dependencies
         """
@@ -289,7 +277,7 @@ def visit_importfrom(self, node: nodes.ImportFrom) -> None:
                 self._imported_module(node, fullname, relative)
 
     def compute_module(self, context_name, mod_path):
-        """return true if the module should be added to dependencies"""
+        """Return true if the module should be added to dependencies."""
         package_dir = os.path.dirname(self.project.path)
         if context_name == mod_path:
             return 0
@@ -298,7 +286,7 @@ def compute_module(self, context_name, mod_path):
         return 0
 
     def _imported_module(self, node, mod_path, relative):
-        """Notify an imported module, used to analyze dependencies"""
+        """Notify an imported module, used to analyze dependencies."""
         module = node.root()
         context_name = module.name
         if relative:
@@ -315,7 +303,7 @@ def _imported_module(self, node, mod_path, relative):
 def project_from_files(
     files, func_wrapper=_astroid_wrapper, project_name="no name", black_list=("CVS",)
 ):
-    """return a Project from a list of files or modules"""
+    """Return a Project from a list of files or modules."""
     # build the project representation
     astroid_manager = astroid.manager.AstroidManager()
     project = Project(project_name)
diff --git a/pylint/pyreverse/main.py b/pylint/pyreverse/main.py
index fc302149a2..ceaa123511 100644
--- a/pylint/pyreverse/main.py
+++ b/pylint/pyreverse/main.py
@@ -1,27 +1,8 @@
-# Copyright (c) 2008-2010, 2012-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Alexander Pervakov <frost.nzcr4@jagmort.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2020 Peter Kolbus <peter.kolbus@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Antonio Quarta <sgheppy88@gmail.com>
-# Copyright (c) 2021 Tushar Sadhwani <tushar.sadhwani000@gmail.com>
-# Copyright (c) 2021 Mark Byrne <31762852+mbyrnepr2@users.noreply.github.com>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""
-  %prog [options] <packages>
+"""%prog [options] <packages>.
 
   create UML diagrams for classes and modules in <packages>
 """
@@ -33,7 +14,20 @@
 from pylint.pyreverse import writer
 from pylint.pyreverse.diadefslib import DiadefsHandler
 from pylint.pyreverse.inspector import Linker, project_from_files
-from pylint.pyreverse.utils import check_graphviz_availability, insert_default_options
+from pylint.pyreverse.utils import (
+    check_graphviz_availability,
+    check_if_graphviz_supports_format,
+    insert_default_options,
+)
+
+DIRECTLY_SUPPORTED_FORMATS = (
+    "dot",
+    "vcg",
+    "puml",
+    "plantuml",
+    "mmd",
+    "html",
+)
 
 OPTIONS = (
     (
@@ -140,7 +134,10 @@
             action="store",
             default="dot",
             metavar="<format>",
-            help="create a *.<format> output file if format available.",
+            help=(
+                f"create a *.<format> output file if format is available. Available formats are: {', '.join(DIRECTLY_SUPPORTED_FORMATS)}. "
+                f"Any other format will be tried to create by means of the 'dot' command line tool, which requires a graphviz installation."
+            ),
         ),
     ),
     (
@@ -198,7 +195,7 @@
 
 
 class Run(ConfigurationMixIn):
-    """base class providing common behaviour for pyreverse commands"""
+    """Base class providing common behaviour for pyreverse commands."""
 
     options = OPTIONS
 
@@ -206,13 +203,17 @@ def __init__(self, args: Iterable[str]):
         super().__init__(usage=__doc__)
         insert_default_options()
         args = self.load_command_line_configuration(args)
-        if self.config.output_format not in ("dot", "vcg", "puml", "plantuml"):
+        if self.config.output_format not in DIRECTLY_SUPPORTED_FORMATS:
             check_graphviz_availability()
+            print(
+                f"Format {self.config.output_format} is not supported natively. Pyreverse will try to generate it using Graphviz..."
+            )
+            check_if_graphviz_supports_format(self.config.output_format)
 
         sys.exit(self.run(args))
 
     def run(self, args):
-        """checking arguments and run project"""
+        """Checking arguments and run project."""
         if not args:
             print(self.help())
             return 1
diff --git a/pylint/pyreverse/mermaidjs_printer.py b/pylint/pyreverse/mermaidjs_printer.py
new file mode 100644
index 0000000000..b1b56fcd25
--- /dev/null
+++ b/pylint/pyreverse/mermaidjs_printer.py
@@ -0,0 +1,110 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Class to generate files in mermaidjs format."""
+from typing import Dict, Optional
+
+from pylint.pyreverse.printer import EdgeType, NodeProperties, NodeType, Printer
+from pylint.pyreverse.utils import get_annotation_label
+
+
+class MermaidJSPrinter(Printer):
+    """Printer for MermaidJS diagrams."""
+
+    DEFAULT_COLOR = "black"
+
+    NODES: Dict[NodeType, str] = {
+        NodeType.CLASS: "class",
+        NodeType.INTERFACE: "class",
+        NodeType.PACKAGE: "class",
+    }
+    ARROWS: Dict[EdgeType, str] = {
+        EdgeType.INHERITS: "--|>",
+        EdgeType.IMPLEMENTS: "..|>",
+        EdgeType.ASSOCIATION: "--*",
+        EdgeType.USES: "-->",
+    }
+
+    def _open_graph(self) -> None:
+        """Emit the header lines."""
+        self.emit("classDiagram")
+        self._inc_indent()
+
+    def emit_node(
+        self,
+        name: str,
+        type_: NodeType,
+        properties: Optional[NodeProperties] = None,
+    ) -> None:
+        """Create a new node.
+
+        Nodes can be classes, packages, participants etc.
+        """
+        if properties is None:
+            properties = NodeProperties(label=name)
+        stereotype = "~~Interface~~" if type_ is NodeType.INTERFACE else ""
+        nodetype = self.NODES[type_]
+        body = []
+        if properties.attrs:
+            body.extend(properties.attrs)
+        if properties.methods:
+            for func in properties.methods:
+                args = self._get_method_arguments(func)
+                line = f"{func.name}({', '.join(args)})"
+                if func.returns:
+                    line += " -> " + get_annotation_label(func.returns)
+                body.append(line)
+        name = name.split(".")[-1]
+        self.emit(f"{nodetype} {name}{stereotype} {{")
+        self._inc_indent()
+        for line in body:
+            self.emit(line)
+        self._dec_indent()
+        self.emit("}")
+
+    def emit_edge(
+        self,
+        from_node: str,
+        to_node: str,
+        type_: EdgeType,
+        label: Optional[str] = None,
+    ) -> None:
+        """Create an edge from one node to another to display relationships."""
+        from_node = from_node.split(".")[-1]
+        to_node = to_node.split(".")[-1]
+        edge = f"{from_node} {self.ARROWS[type_]} {to_node}"
+        if label:
+            edge += f" : {label}"
+        self.emit(edge)
+
+    def _close_graph(self) -> None:
+        """Emit the lines needed to properly close the graph."""
+        self._dec_indent()
+
+
+class HTMLMermaidJSPrinter(MermaidJSPrinter):
+    """Printer for MermaidJS diagrams wrapped in a html boilerplate."""
+
+    HTML_OPEN_BOILERPLATE = """<html>
+  <body>
+    <script src="https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js"></script>
+      <div class="mermaid">
+    """
+    HTML_CLOSE_BOILERPLATE = """
+       </div>
+  </body>
+</html>
+"""
+    GRAPH_INDENT_LEVEL = 4
+
+    def _open_graph(self) -> None:
+        self.emit(self.HTML_OPEN_BOILERPLATE)
+        for _ in range(self.GRAPH_INDENT_LEVEL):
+            self._inc_indent()
+        super()._open_graph()
+
+    def _close_graph(self) -> None:
+        for _ in range(self.GRAPH_INDENT_LEVEL):
+            self._dec_indent()
+        self.emit(self.HTML_CLOSE_BOILERPLATE)
diff --git a/pylint/pyreverse/plantuml_printer.py b/pylint/pyreverse/plantuml_printer.py
index c73cddd5e1..57fe3a9d06 100644
--- a/pylint/pyreverse/plantuml_printer.py
+++ b/pylint/pyreverse/plantuml_printer.py
@@ -1,11 +1,8 @@
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""
-Class to generate files in dot format and image formats supported by Graphviz.
-"""
+"""Class to generate files in dot format and image formats supported by Graphviz."""
 from typing import Dict, Optional
 
 from pylint.pyreverse.printer import EdgeType, Layout, NodeProperties, NodeType, Printer
@@ -13,7 +10,7 @@
 
 
 class PlantUmlPrinter(Printer):
-    """Printer for PlantUML diagrams"""
+    """Printer for PlantUML diagrams."""
 
     DEFAULT_COLOR = "black"
 
@@ -30,7 +27,7 @@ class PlantUmlPrinter(Printer):
     }
 
     def _open_graph(self) -> None:
-        """Emit the header lines"""
+        """Emit the header lines."""
         self.emit("@startuml " + self.title)
         if not self.use_automatic_namespace:
             self.emit("set namespaceSeparator none")
@@ -50,7 +47,10 @@ def emit_node(
         type_: NodeType,
         properties: Optional[NodeProperties] = None,
     ) -> None:
-        """Create a new node. Nodes can be classes, packages, participants etc."""
+        """Create a new node.
+
+        Nodes can be classes, packages, participants etc.
+        """
         if properties is None:
             properties = NodeProperties(label=name)
         stereotype = " << interface >>" if type_ is NodeType.INTERFACE else ""
diff --git a/pylint/pyreverse/printer.py b/pylint/pyreverse/printer.py
index 0a8715011e..43cc534e5e 100644
--- a/pylint/pyreverse/printer.py
+++ b/pylint/pyreverse/printer.py
@@ -1,15 +1,8 @@
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""
-Base class defining the interface for a printer.
-"""
+"""Base class defining the interface for a printer."""
 from abc import ABC, abstractmethod
 from enum import Enum
 from typing import List, NamedTuple, Optional
@@ -48,7 +41,7 @@ class NodeProperties(NamedTuple):
 
 
 class Printer(ABC):
-    """Base class defining the interface for a printer"""
+    """Base class defining the interface for a printer."""
 
     def __init__(
         self,
@@ -64,11 +57,11 @@ def __init__(
         self._open_graph()
 
     def _inc_indent(self) -> None:
-        """increment indentation"""
+        """Increment indentation."""
         self._indent += "  "
 
     def _dec_indent(self) -> None:
-        """decrement indentation"""
+        """Decrement indentation."""
         self._indent = self._indent[:-2]
 
     @abstractmethod
@@ -87,7 +80,10 @@ def emit_node(
         type_: NodeType,
         properties: Optional[NodeProperties] = None,
     ) -> None:
-        """Create a new node. Nodes can be classes, packages, participants etc."""
+        """Create a new node.
+
+        Nodes can be classes, packages, participants etc.
+        """
 
     @abstractmethod
     def emit_edge(
@@ -101,14 +97,13 @@ def emit_edge(
 
     @staticmethod
     def _get_method_arguments(method: nodes.FunctionDef) -> List[str]:
-        if method.args.args:
-            arguments: List[nodes.AssignName] = [
-                arg for arg in method.args.args if arg.name != "self"
-            ]
-        else:
-            arguments = []
-
-        annotations = dict(zip(arguments, method.args.annotations[1:]))
+        if method.args.args is None:
+            return []
+
+        first_arg = 0 if method.type in {"function", "staticmethod"} else 1
+        arguments: List[nodes.AssignName] = method.args.args[first_arg:]
+
+        annotations = dict(zip(arguments, method.args.annotations[first_arg:]))
         for arg in arguments:
             annotation_label = ""
             ann = annotations.get(arg)
diff --git a/pylint/pyreverse/printer_factory.py b/pylint/pyreverse/printer_factory.py
index 73200c35d5..29a406b01f 100644
--- a/pylint/pyreverse/printer_factory.py
+++ b/pylint/pyreverse/printer_factory.py
@@ -1,13 +1,11 @@
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 from typing import Dict, Type
 
 from pylint.pyreverse.dot_printer import DotPrinter
+from pylint.pyreverse.mermaidjs_printer import HTMLMermaidJSPrinter, MermaidJSPrinter
 from pylint.pyreverse.plantuml_printer import PlantUmlPrinter
 from pylint.pyreverse.printer import Printer
 from pylint.pyreverse.vcg_printer import VCGPrinter
@@ -16,6 +14,8 @@
     "vcg": VCGPrinter,
     "plantuml": PlantUmlPrinter,
     "puml": PlantUmlPrinter,
+    "mmd": MermaidJSPrinter,
+    "html": HTMLMermaidJSPrinter,
     "dot": DotPrinter,
 }
 
diff --git a/pylint/pyreverse/utils.py b/pylint/pyreverse/utils.py
index e220617816..8b279281e4 100644
--- a/pylint/pyreverse/utils.py
+++ b/pylint/pyreverse/utils.py
@@ -1,28 +1,12 @@
-# Copyright (c) 2006, 2008, 2010, 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2017, 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2020-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020 yeting li <liyt@ios.ac.cn>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2020 bernie gray <bfgray3@users.noreply.github.com>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Mark Byrne <31762852+mbyrnepr2@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""Generic classes/functions for pyreverse core/extensions. """
+"""Generic classes/functions for pyreverse core/extensions."""
 import os
 import re
 import shutil
+import subprocess
 import sys
 from typing import Optional, Union
 
@@ -47,7 +31,7 @@ def get_default_options():
 
 
 def insert_default_options():
-    """insert default options to sys.argv"""
+    """Insert default options to sys.argv."""
     options = get_default_options()
     options.reverse()
     for arg in options:
@@ -61,7 +45,7 @@ def insert_default_options():
 
 
 def get_visibility(name):
-    """return the visibility from a name: public, protected, private or special"""
+    """Return the visibility from a name: public, protected, private or special."""
     if SPECIAL.match(name):
         visibility = "special"
     elif PRIVATE.match(name):
@@ -79,14 +63,14 @@ def get_visibility(name):
 
 
 def is_abstract(node):
-    """return true if the given class node correspond to an abstract class
+    """Return true if the given class node correspond to an abstract class
     definition
     """
     return ABSTRACT.match(node.name)
 
 
 def is_final(node):
-    """return true if the given class/function node correspond to final
+    """Return true if the given class/function node correspond to final
     definition
     """
     return FINAL.match(node.name)
@@ -123,10 +107,10 @@ def is_exception(node):
 
 
 class FilterMixIn:
-    """filter nodes according to a mode and nodes' visibility"""
+    """Filter nodes according to a mode and nodes' visibility."""
 
     def __init__(self, mode):
-        "init filter modes"
+        """Init filter modes."""
         __mode = 0
         for nummod in mode.split("+"):
             try:
@@ -136,13 +120,13 @@ def __init__(self, mode):
         self.__mode = __mode
 
     def show_attr(self, node):
-        """return true if the node should be treated"""
+        """Return true if the node should be treated."""
         visibility = get_visibility(getattr(node, "name", node))
         return not self.__mode & VIS_MOD[visibility]
 
 
 class ASTWalker:
-    """a walker visiting a tree in preorder, calling on the handler:
+    """A walker visiting a tree in preorder, calling on the handler:.
 
     * visit_<class name> on entering a node, where class name is the class of
     the node in lower case
@@ -156,7 +140,7 @@ def __init__(self, handler):
         self._cache = {}
 
     def walk(self, node, _done=None):
-        """walk on the tree from <node>, getting callbacks from handler"""
+        """Walk on the tree from <node>, getting callbacks from handler."""
         if _done is None:
             _done = set()
         if node in _done:
@@ -170,7 +154,7 @@ def walk(self, node, _done=None):
         assert node.parent is not node
 
     def get_callbacks(self, node):
-        """get callbacks from handler for the visited node"""
+        """Get callbacks from handler for the visited node."""
         klass = node.__class__
         methods = self._cache.get(klass)
         if methods is None:
@@ -188,27 +172,27 @@ def get_callbacks(self, node):
         return e_method, l_method
 
     def visit(self, node):
-        """walk on the tree from <node>, getting callbacks from handler"""
+        """Walk on the tree from <node>, getting callbacks from handler."""
         method = self.get_callbacks(node)[0]
         if method is not None:
             method(node)
 
     def leave(self, node):
-        """walk on the tree from <node>, getting callbacks from handler"""
+        """Walk on the tree from <node>, getting callbacks from handler."""
         method = self.get_callbacks(node)[1]
         if method is not None:
             method(node)
 
 
 class LocalsVisitor(ASTWalker):
-    """visit a project by traversing the locals dictionary"""
+    """Visit a project by traversing the locals dictionary."""
 
     def __init__(self):
         super().__init__(self)
         self._visited = set()
 
     def visit(self, node):
-        """launch the visit starting from the given node"""
+        """Launch the visit starting from the given node."""
         if node in self._visited:
             return None
 
@@ -224,19 +208,18 @@ def visit(self, node):
         return None
 
 
-def get_annotation_label(ann: Union[nodes.Name, nodes.Subscript]) -> str:
-    label = ""
-    if isinstance(ann, nodes.Subscript):
-        label = ann.as_string()
-    elif isinstance(ann, nodes.Name):
-        label = ann.name
-    return label
+def get_annotation_label(ann: Union[nodes.Name, nodes.NodeNG]) -> str:
+    if isinstance(ann, nodes.Name) and ann.name is not None:
+        return ann.name
+    if isinstance(ann, nodes.NodeNG):
+        return ann.as_string()
+    return ""
 
 
 def get_annotation(
     node: Union[nodes.AssignAttr, nodes.AssignName]
 ) -> Optional[Union[nodes.Name, nodes.Subscript]]:
-    """return the annotation for `node`"""
+    """Return the annotation for `node`."""
     ann = None
     if isinstance(node.parent, nodes.AnnAssign):
         ann = node.parent.annotation
@@ -258,7 +241,7 @@ def get_annotation(
     label = get_annotation_label(ann)
     if ann:
         label = (
-            fr"Optional[{label}]"
+            rf"Optional[{label}]"
             if getattr(default, "value", "value") is None
             and not label.startswith("Optional")
             else label
@@ -270,7 +253,8 @@ def get_annotation(
 
 def infer_node(node: Union[nodes.AssignAttr, nodes.AssignName]) -> set:
     """Return a set containing the node annotation if it exists
-    otherwise return a set of the inferred types using the NodeNG.infer method"""
+    otherwise return a set of the inferred types using the NodeNG.infer method
+    """
 
     ann = get_annotation(node)
     try:
@@ -285,12 +269,38 @@ def infer_node(node: Union[nodes.AssignAttr, nodes.AssignName]) -> set:
 
 def check_graphviz_availability():
     """Check if the ``dot`` command is available on the machine.
+
     This is needed if image output is desired and ``dot`` is used to convert
-    from *.dot or *.gv into the final output format."""
+    from *.dot or *.gv into the final output format.
+    """
     if shutil.which("dot") is None:
+        print("'Graphviz' needs to be installed for your chosen output format.")
+        sys.exit(32)
+
+
+def check_if_graphviz_supports_format(output_format: str) -> None:
+    """Check if the ``dot`` command supports the requested output format.
+
+    This is needed if image output is desired and ``dot`` is used to convert
+    from *.gv into the final output format.
+    """
+    dot_output = subprocess.run(
+        ["dot", "-T?"], capture_output=True, check=False, encoding="utf-8"
+    )
+    match = re.match(
+        pattern=r".*Use one of: (?P<formats>(\S*\s?)+)",
+        string=dot_output.stderr.strip(),
+    )
+    if not match:
+        print(
+            "Unable to determine Graphviz supported output formats. "
+            "Pyreverse will continue, but subsequent error messages "
+            "regarding the output format may come from Graphviz directly."
+        )
+        return
+    supported_formats = match.group("formats")
+    if output_format not in supported_formats.split():
         print(
-            "The requested output format is currently not available.\n"
-            "Please install 'Graphviz' to have other output formats "
-            "than 'dot' or 'vcg'."
+            f"Format {output_format} is not supported by Graphviz. It supports: {supported_formats}"
         )
         sys.exit(32)
diff --git a/pylint/pyreverse/vcg_printer.py b/pylint/pyreverse/vcg_printer.py
index bbc131760d..fa5e90a29a 100644
--- a/pylint/pyreverse/vcg_printer.py
+++ b/pylint/pyreverse/vcg_printer.py
@@ -1,20 +1,10 @@
-# Copyright (c) 2015-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Florian Bruhin <me@the-compiler.org>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2020-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Ram Rachum <ram@rachum.com>
-# Copyright (c) 2020 谭九鼎 <109224573@qq.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Functions to generate files readable with Georg Sander's vcg
 (Visualization of Compiler Graphs).
+
 You can download vcg at https://rw4.cs.uni-sb.de/~sander/html/gshome.html
 Note that vcg exists as a debian package.
 See vcg's documentation for explanation about the different values that
@@ -187,7 +177,7 @@
 
 class VCGPrinter(Printer):
     def _open_graph(self) -> None:
-        """Emit the header lines"""
+        """Emit the header lines."""
         self.emit("graph:{\n")
         self._inc_indent()
         self._write_attributes(
@@ -212,7 +202,10 @@ def emit_node(
         type_: NodeType,
         properties: Optional[NodeProperties] = None,
     ) -> None:
-        """Create a new node. Nodes can be classes, packages, participants etc."""
+        """Create a new node.
+
+        Nodes can be classes, packages, participants etc.
+        """
         if properties is None:
             properties = NodeProperties(label=name)
         elif properties.label is None:
@@ -228,7 +221,7 @@ def emit_node(
     @staticmethod
     def _build_label_for_node(properties: NodeProperties) -> str:
         fontcolor = "\f09" if properties.fontcolor == "red" else ""
-        label = fr"\fb{fontcolor}{properties.label}\fn"
+        label = rf"\fb{fontcolor}{properties.label}\fn"
         if properties.attrs is None and properties.methods is None:
             # return a compact form which only displays the classname in a box
             return label
@@ -238,13 +231,13 @@ def _build_label_for_node(properties: NodeProperties) -> str:
         # box width for UML like diagram
         maxlen = max(len(name) for name in [properties.label] + method_names + attrs)
         line = "_" * (maxlen + 2)
-        label = fr"{label}\n\f{line}"
+        label = rf"{label}\n\f{line}"
         for attr in attrs:
-            label = fr"{label}\n\f08{attr}"
+            label = rf"{label}\n\f08{attr}"
         if attrs:
-            label = fr"{label}\n\f{line}"
+            label = rf"{label}\n\f{line}"
         for func in method_names:
-            label = fr"{label}\n\f10{func}()"
+            label = rf"{label}\n\f10{func}()"
         return label
 
     def emit_edge(
@@ -269,7 +262,7 @@ def emit_edge(
         self.emit("}")
 
     def _write_attributes(self, attributes_dict: Mapping[str, Any], **args) -> None:
-        """write graph, node or edge attributes"""
+        """Write graph, node or edge attributes."""
         for key, value in args.items():
             try:
                 _type = attributes_dict[key]
diff --git a/pylint/pyreverse/writer.py b/pylint/pyreverse/writer.py
index fa2ce18362..a3120e6d9c 100644
--- a/pylint/pyreverse/writer.py
+++ b/pylint/pyreverse/writer.py
@@ -1,22 +1,8 @@
-# Copyright (c) 2008-2010, 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Mike Frysinger <vapier@gentoo.org>
-# Copyright (c) 2015 Florian Bruhin <me@the-compiler.org>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2018, 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Kylian <development@goudcode.nl>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Mark Byrne <31762852+mbyrnepr2@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""Utilities for creating VCG and Dot diagrams"""
+"""Utilities for creating VCG and Dot diagrams."""
 
 import itertools
 import os
@@ -36,7 +22,7 @@
 
 
 class DiagramWriter:
-    """base class for writing project diagrams"""
+    """Base class for writing project diagrams."""
 
     def __init__(self, config):
         self.config = config
@@ -68,7 +54,7 @@ def __init__(self, config):
         self.used_colors = {}
 
     def write(self, diadefs):
-        """write files for <project> according to <diadefs>"""
+        """Write files for <project> according to <diadefs>."""
         for diagram in diadefs:
             basename = diagram.title.strip().replace(" ", "_")
             file_name = f"{basename}.{self.config.output_format}"
@@ -82,7 +68,7 @@ def write(self, diadefs):
             self.save()
 
     def write_packages(self, diagram: PackageDiagram) -> None:
-        """write a package diagram"""
+        """Write a package diagram."""
         # sorted to get predictable (hence testable) results
         for module in sorted(diagram.modules(), key=lambda x: x.title):
             module.fig_id = module.node.qname()
@@ -100,7 +86,7 @@ def write_packages(self, diagram: PackageDiagram) -> None:
             )
 
     def write_classes(self, diagram: ClassDiagram) -> None:
-        """write a class diagram"""
+        """Write a class diagram."""
         # sorted to get predictable (hence testable) results
         for obj in sorted(diagram.objects, key=lambda x: x.title):
             obj.fig_id = obj.node.qname()
@@ -132,19 +118,19 @@ def write_classes(self, diagram: ClassDiagram) -> None:
             )
 
     def set_printer(self, file_name: str, basename: str) -> None:
-        """set printer"""
+        """Set printer."""
         self.printer = self.printer_class(basename)
         self.file_name = file_name
 
     def get_package_properties(self, obj: PackageEntity) -> NodeProperties:
-        """get label and shape for packages."""
+        """Get label and shape for packages."""
         return NodeProperties(
             label=obj.title,
             color=self.get_shape_color(obj) if self.config.colorized else "black",
         )
 
     def get_class_properties(self, obj: ClassEntity) -> NodeProperties:
-        """get label and shape for classes."""
+        """Get label and shape for classes."""
         properties = NodeProperties(
             label=obj.title,
             attrs=obj.attrs if not self.config.only_classnames else None,
@@ -155,7 +141,7 @@ def get_class_properties(self, obj: ClassEntity) -> NodeProperties:
         return properties
 
     def get_shape_color(self, obj: DiagramEntity) -> str:
-        """get shape color"""
+        """Get shape color."""
         qualified_name = obj.node.qname()
         if modutils.is_standard_module(qualified_name.split(".", maxsplit=1)[0]):
             return "grey"
@@ -171,5 +157,5 @@ def get_shape_color(self, obj: DiagramEntity) -> str:
         return self.used_colors[base_name]
 
     def save(self) -> None:
-        """write to disk"""
+        """Write to disk."""
         self.printer.generate(self.file_name)
diff --git a/pylint/reporters/__init__.py b/pylint/reporters/__init__.py
index 271975bb58..47bb680b04 100644
--- a/pylint/reporters/__init__.py
+++ b/pylint/reporters/__init__.py
@@ -1,27 +1,8 @@
-# Copyright (c) 2006, 2010, 2012-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2012-2014 Google, Inc.
-# Copyright (c) 2012 FELD Boris <lothiraldan@gmail.com>
-# Copyright (c) 2014-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Ricardo Gemignani <ricardo.gemignani@gmail.com>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Simu Toni <simutoni@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2017 Kári Tristan Helgason <kthelgason@gmail.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 ruro <ruro.ruro@ya.ru>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""utilities methods and classes for reporters"""
+"""Utilities methods and classes for reporters."""
 from typing import TYPE_CHECKING
 
 from pylint import utils
@@ -36,8 +17,8 @@
 
 
 def initialize(linter: "PyLinter") -> None:
-    """initialize linter with reporters in this package"""
-    utils.register_plugins(linter, __path__[0])  # type: ignore[name-defined] # Fixed in https://github.com/python/mypy/pull/9454
+    """Initialize linter with reporters in this package."""
+    utils.register_plugins(linter, __path__[0])
 
 
 __all__ = [
diff --git a/pylint/reporters/base_reporter.py b/pylint/reporters/base_reporter.py
index 21549c943d..b45be0dc4f 100644
--- a/pylint/reporters/base_reporter.py
+++ b/pylint/reporters/base_reporter.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import os
 import sys
@@ -16,13 +17,16 @@
 
 
 class BaseReporter:
-    """base class for reporters
+    """Base class for reporters.
 
     symbols: show short symbolic names for messages.
     """
 
     extension = ""
 
+    name = "base"
+    """Name of the reporter."""
+
     def __init__(self, output: Optional[TextIO] = None) -> None:
         self.linter: "PyLinter"
         self.section = 0
@@ -36,7 +40,7 @@ def handle_message(self, msg: Message) -> None:
         self.messages.append(msg)
 
     def set_output(self, output: Optional[TextIO] = None) -> None:
-        """set output stream"""
+        """Set output stream."""
         # pylint: disable-next=fixme
         # TODO: Remove this method after depreciation
         warn(
@@ -46,11 +50,11 @@ def set_output(self, output: Optional[TextIO] = None) -> None:
         self.out = output or sys.stdout
 
     def writeln(self, string: str = "") -> None:
-        """write a line in the output buffer"""
+        """Write a line in the output buffer."""
         print(string, file=self.out)
 
     def display_reports(self, layout: "Section") -> None:
-        """display results encapsulated in the layout tree"""
+        """Display results encapsulated in the layout tree."""
         self.section = 0
         if layout.report_id:
             if isinstance(layout.children[0].children[0], Text):
@@ -60,11 +64,11 @@ def display_reports(self, layout: "Section") -> None:
         self._display(layout)
 
     def _display(self, layout: "Section") -> None:
-        """display the layout"""
+        """Display the layout."""
         raise NotImplementedError()
 
     def display_messages(self, layout: Optional["Section"]) -> None:
-        """Hook for displaying the messages of the reporter
+        """Hook for displaying the messages of the reporter.
 
         This will be called whenever the underlying messages
         needs to be displayed. For some reporters, it probably
diff --git a/pylint/reporters/collecting_reporter.py b/pylint/reporters/collecting_reporter.py
index 70f313bb35..1562ab15d2 100644
--- a/pylint/reporters/collecting_reporter.py
+++ b/pylint/reporters/collecting_reporter.py
@@ -1,5 +1,7 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 from typing import TYPE_CHECKING
 
 from pylint.reporters.base_reporter import BaseReporter
@@ -9,7 +11,7 @@
 
 
 class CollectingReporter(BaseReporter):
-    """collects messages"""
+    """Collects messages."""
 
     name = "collector"
 
diff --git a/pylint/reporters/json_reporter.py b/pylint/reporters/json_reporter.py
index 84d11d24ae..f7e782c9ac 100644
--- a/pylint/reporters/json_reporter.py
+++ b/pylint/reporters/json_reporter.py
@@ -1,18 +1,8 @@
-# Copyright (c) 2014 Vlad Temian <vladtemian@gmail.com>
-# Copyright (c) 2015-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2017 guillaume2 <guillaume.peillex@gmail.col>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Clément Pit-Claudel <cpitclaudel@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""JSON reporter"""
+"""JSON reporter."""
 import json
 from typing import TYPE_CHECKING, Optional
 
@@ -32,7 +22,7 @@ class JSONReporter(BaseReporter):
     extension = "json"
 
     def display_messages(self, layout: Optional["Section"]) -> None:
-        """Launch layouts display"""
+        """Launch layouts display."""
         json_dumpable = [
             {
                 "type": msg.category,
@@ -59,5 +49,4 @@ def _display(self, layout: "Section") -> None:
 
 
 def register(linter: "PyLinter") -> None:
-    """Register the reporter classes with the linter."""
     linter.register_reporter(JSONReporter)
diff --git a/pylint/reporters/multi_reporter.py b/pylint/reporters/multi_reporter.py
index f674a29e47..43822f05c2 100644
--- a/pylint/reporters/multi_reporter.py
+++ b/pylint/reporters/multi_reporter.py
@@ -1,6 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import os
 from typing import IO, TYPE_CHECKING, Any, AnyStr, Callable, List, Optional
@@ -18,7 +18,7 @@
 
 
 class MultiReporter:
-    """Reports messages and layouts in plain text"""
+    """Reports messages and layouts in plain text."""
 
     __implements__ = IReporter
     name = "_internal_multi_reporter"
@@ -41,6 +41,7 @@ def __init__(
         self._path_strip_prefix = os.getcwd() + os.sep
         self._linter: Optional[PyLinter] = None
         self.out = output
+        self.messages: List[Message] = []
 
     @property
     def out(self):
@@ -48,10 +49,10 @@ def out(self):
 
     @out.setter
     def out(self, output: Optional[AnyFile] = None):
-        """
-        MultiReporter doesn't have it's own output. This method is only
-        provided for API parity with BaseReporter and should not be called
-        with non-None values for 'output'.
+        """MultiReporter doesn't have its own output.
+
+        This method is only provided for API parity with BaseReporter
+        and should not be called with non-None values for 'output'.
         """
         self.__out = None
         if output is not None:
@@ -80,22 +81,22 @@ def handle_message(self, msg: Message) -> None:
             rep.handle_message(msg)
 
     def writeln(self, string: str = "") -> None:
-        """write a line in the output buffer"""
+        """Write a line in the output buffer."""
         for rep in self._sub_reporters:
             rep.writeln(string)
 
     def display_reports(self, layout: "Section") -> None:
-        """display results encapsulated in the layout tree"""
+        """Display results encapsulated in the layout tree."""
         for rep in self._sub_reporters:
             rep.display_reports(layout)
 
     def display_messages(self, layout: Optional["Section"]) -> None:
-        """hook for displaying the messages of the reporter"""
+        """Hook for displaying the messages of the reporter."""
         for rep in self._sub_reporters:
             rep.display_messages(layout)
 
     def on_set_current_module(self, module: str, filepath: Optional[str]) -> None:
-        """hook called when a module starts to be analysed"""
+        """Hook called when a module starts to be analysed."""
         for rep in self._sub_reporters:
             rep.on_set_current_module(module, filepath)
 
@@ -104,6 +105,6 @@ def on_close(
         stats: LinterStats,
         previous_stats: LinterStats,
     ) -> None:
-        """hook called when a module finished analyzing"""
+        """Hook called when a module finished analyzing."""
         for rep in self._sub_reporters:
             rep.on_close(stats, previous_stats)
diff --git a/pylint/reporters/reports_handler_mix_in.py b/pylint/reporters/reports_handler_mix_in.py
index 27af31027a..890d58660d 100644
--- a/pylint/reporters/reports_handler_mix_in.py
+++ b/pylint/reporters/reports_handler_mix_in.py
@@ -1,22 +1,32 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import collections
-from typing import TYPE_CHECKING, Callable, DefaultDict, Dict, List, Optional, Tuple
+from typing import (
+    TYPE_CHECKING,
+    Callable,
+    DefaultDict,
+    Dict,
+    List,
+    MutableSequence,
+    Optional,
+    Tuple,
+)
 
 from pylint.exceptions import EmptyReportError
-from pylint.interfaces import IChecker
 from pylint.reporters.ureports.nodes import Section
 from pylint.utils import LinterStats
 
 if TYPE_CHECKING:
+    from pylint.checkers import BaseChecker
     from pylint.lint.pylinter import PyLinter
 
-ReportsDict = DefaultDict[IChecker, List[Tuple[str, str, Callable]]]
+ReportsDict = DefaultDict["BaseChecker", List[Tuple[str, str, Callable]]]
 
 
 class ReportsHandlerMixIn:
-    """a mix-in class containing all the reports and stats manipulation
+    """A mix-in class containing all the reports and stats manipulation
     related methods for the main lint class
     """
 
@@ -24,37 +34,35 @@ def __init__(self) -> None:
         self._reports: ReportsDict = collections.defaultdict(list)
         self._reports_state: Dict[str, bool] = {}
 
-    def report_order(self) -> List[IChecker]:
-        """Return a list of reporters"""
+    def report_order(self) -> MutableSequence["BaseChecker"]:
+        """Return a list of reporters."""
         return list(self._reports)
 
     def register_report(
-        self, reportid: str, r_title: str, r_cb: Callable, checker: IChecker
+        self, reportid: str, r_title: str, r_cb: Callable, checker: "BaseChecker"
     ) -> None:
-        """register a report
+        """Register a report.
 
-        reportid is the unique identifier for the report
-        r_title the report's title
-        r_cb the method to call to make the report
-        checker is the checker defining the report
+        :param reportid: The unique identifier for the report
+        :param r_title: The report's title
+        :param r_cb: The method to call to make the report
+        :param checker: The checker defining the report
         """
         reportid = reportid.upper()
         self._reports[checker].append((reportid, r_title, r_cb))
 
     def enable_report(self, reportid: str) -> None:
-        """disable the report of the given id"""
+        """Enable the report of the given id."""
         reportid = reportid.upper()
         self._reports_state[reportid] = True
 
     def disable_report(self, reportid: str) -> None:
-        """disable the report of the given id"""
+        """Disable the report of the given id."""
         reportid = reportid.upper()
         self._reports_state[reportid] = False
 
     def report_is_enabled(self, reportid: str) -> bool:
-        """return true if the report associated to the given identifier is
-        enabled
-        """
+        """Is the report associated to the given identifier enabled ?"""
         return self._reports_state.get(reportid, True)
 
     def make_reports(  # type: ignore[misc] # ReportsHandlerMixIn is always mixed with PyLinter
@@ -62,7 +70,7 @@ def make_reports(  # type: ignore[misc] # ReportsHandlerMixIn is always mixed wi
         stats: LinterStats,
         old_stats: Optional[LinterStats],
     ) -> Section:
-        """render registered reports"""
+        """Render registered reports."""
         sect = Section("Report", f"{self.stats.statement} statements analysed.")
         for checker in self.report_order():
             for reportid, r_title, r_cb in self._reports[checker]:
diff --git a/pylint/reporters/text.py b/pylint/reporters/text.py
index 7b6e5e1a1d..d37de5b963 100644
--- a/pylint/reporters/text.py
+++ b/pylint/reporters/text.py
@@ -1,25 +1,8 @@
-# Copyright (c) 2006-2007, 2010-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2012-2014 Google, Inc.
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Florian Bruhin <me@the-compiler.org>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 y2kbugger <y2kbugger@users.noreply.github.com>
-# Copyright (c) 2018-2019 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Jace Browning <jacebrowning@gmail.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""Plain text reporters:
+"""Plain text reporters:.
 
 :text: the default one grouping messages by module
 :colorized: an ANSI colorized text reporter
@@ -53,15 +36,14 @@
 
 
 class MessageStyle(NamedTuple):
-    """Styling of a message"""
+    """Styling of a message."""
 
     color: Optional[str]
     """The color name (see `ANSI_COLORS` for available values)
     or the color number when 256 colors are available
     """
     style: Tuple[str, ...] = ()
-    """Tuple of style strings (see `ANSI_COLORS` for available values).
-    """
+    """Tuple of style strings (see `ANSI_COLORS` for available values)."""
 
 
 ColorMappingDict = Dict[str, MessageStyle]
@@ -94,7 +76,7 @@ class MessageStyle(NamedTuple):
 
 
 def _get_ansi_code(msg_style: MessageStyle) -> str:
-    """return ansi escape code corresponding to color and style
+    """Return ansi escape code corresponding to color and style.
 
     :param msg_style: the message style
 
@@ -174,7 +156,7 @@ def colorize_ansi(
 
 
 class TextReporter(BaseReporter):
-    """Reports messages and layouts in plain text"""
+    """Reports messages and layouts in plain text."""
 
     __implements__ = IReporter
     name = "text"
@@ -186,7 +168,7 @@ def __init__(self, output: Optional[TextIO] = None) -> None:
         self._modules: Set[str] = set()
         self._template = self.line_format
         self._fixed_template = self.line_format
-        """The output format template with any unrecognized arguments removed"""
+        """The output format template with any unrecognized arguments removed."""
 
     def on_set_current_module(self, module: str, filepath: Optional[str]) -> None:
         """Set the format template to be used and check for unrecognized arguments."""
@@ -211,7 +193,7 @@ def on_set_current_module(self, module: str, filepath: Optional[str]) -> None:
         self._fixed_template = template
 
     def write_message(self, msg: Message) -> None:
-        """Convenience method to write a formatted message with class default template"""
+        """Convenience method to write a formatted message with class default template."""
         self_dict = msg._asdict()
         for key in ("end_line", "end_column"):
             self_dict[key] = self_dict[key] or ""
@@ -219,7 +201,7 @@ def write_message(self, msg: Message) -> None:
         self.writeln(self._fixed_template.format(**self_dict))
 
     def handle_message(self, msg: Message) -> None:
-        """manage message of different type and in the context of path"""
+        """Manage message of different type and in the context of path."""
         if msg.module not in self._modules:
             if msg.module:
                 self.writeln(f"************* Module {msg.module}")
@@ -229,13 +211,13 @@ def handle_message(self, msg: Message) -> None:
         self.write_message(msg)
 
     def _display(self, layout: "Section") -> None:
-        """launch layouts display"""
+        """Launch layouts display."""
         print(file=self.out)
         TextWriter().format(layout, self.out)
 
 
 class ParseableTextReporter(TextReporter):
-    """a reporter very similar to TextReporter, but display messages in a form
+    """A reporter very similar to TextReporter, but display messages in a form
     recognized by most text editors :
 
     <filename>:<linenum>:<msg>
@@ -253,14 +235,14 @@ def __init__(self, output: Optional[TextIO] = None) -> None:
 
 
 class VSTextReporter(ParseableTextReporter):
-    """Visual studio text reporter"""
+    """Visual studio text reporter."""
 
     name = "msvs"
     line_format = "{path}({line}): [{msg_id}({symbol}){obj}] {msg}"
 
 
 class ColorizedTextReporter(TextReporter):
-    """Simple TextReporter that colorizes text output"""
+    """Simple TextReporter that colorizes text output."""
 
     name = "colorized"
     COLOR_MAPPING: ColorMappingDict = {
@@ -304,7 +286,7 @@ def __init__(
             list(color_mapping.values())[0], MessageStyle
         ):
             warnings.warn(
-                "In pylint 3.0, the ColoreziedTextReporter will only accept ColorMappingDict as color_mapping parameter",
+                "In pylint 3.0, the ColorizedTextReporter will only accept ColorMappingDict as color_mapping parameter",
                 DeprecationWarning,
             )
             temp_color_mapping: ColorMappingDict = {}
@@ -325,11 +307,11 @@ def __init__(
                 self.out = colorama.AnsiToWin32(self.out)
 
     def _get_decoration(self, msg_id: str) -> MessageStyle:
-        """Returns the message style as defined in self.color_mapping"""
+        """Returns the message style as defined in self.color_mapping."""
         return self.color_mapping.get(msg_id[0]) or MessageStyle(None)
 
     def handle_message(self, msg: Message) -> None:
-        """manage message of different types, and colorize output
+        """Manage message of different types, and colorize output
         using ansi escape codes
         """
         if msg.module not in self._modules:
@@ -352,7 +334,6 @@ def handle_message(self, msg: Message) -> None:
 
 
 def register(linter: "PyLinter") -> None:
-    """Register the reporter classes with the linter."""
     linter.register_reporter(TextReporter)
     linter.register_reporter(ParseableTextReporter)
     linter.register_reporter(VSTextReporter)
diff --git a/pylint/reporters/ureports/__init__.py b/pylint/reporters/ureports/__init__.py
index 29bc85d894..a6a0946af9 100644
--- a/pylint/reporters/ureports/__init__.py
+++ b/pylint/reporters/ureports/__init__.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 __all__ = ("BaseWriter",)
 
diff --git a/pylint/reporters/ureports/base_writer.py b/pylint/reporters/ureports/base_writer.py
index edf5885278..4f0ce55c81 100644
--- a/pylint/reporters/ureports/base_writer.py
+++ b/pylint/reporters/ureports/base_writer.py
@@ -1,15 +1,6 @@
-# Copyright (c) 2015-2016, 2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Universal report objects and some formatting drivers.
 
@@ -30,13 +21,13 @@
 
 
 class BaseWriter:
-    """base class for ureport writers"""
+    """Base class for ureport writers."""
 
     def format(self, layout, stream: TextIO = sys.stdout, encoding=None) -> None:
-        """format and write the given layout into the stream object
+        """Format and write the given layout into the stream object.
 
         unicode policy: unicode strings may be found in the layout;
-        try to call stream.write with it, but give it back encoded using
+        try to call 'stream.write' with it, but give it back encoded using
         the given encoding if it fails
         """
         if not encoding:
@@ -50,29 +41,29 @@ def format(self, layout, stream: TextIO = sys.stdout, encoding=None) -> None:
     def format_children(
         self, layout: Union["EvaluationSection", "Paragraph", "Section"]
     ) -> None:
-        """recurse on the layout children and call their accept method
+        """Recurse on the layout children and call their accept method
         (see the Visitor pattern)
         """
         for child in getattr(layout, "children", ()):
             child.accept(self)
 
     def writeln(self, string: str = "") -> None:
-        """write a line in the output buffer"""
+        """Write a line in the output buffer."""
         self.write(string + "\n")
 
     def write(self, string: str) -> None:
-        """write a string in the output buffer"""
+        """Write a string in the output buffer."""
         self.out.write(string)
 
     def begin_format(self) -> None:
-        """begin to format a layout"""
+        """Begin to format a layout."""
         self.section = 0
 
     def end_format(self) -> None:
-        """finished to format a layout"""
+        """Finished formatting a layout."""
 
     def get_table_content(self, table: "Table") -> List[List[str]]:
-        """trick to get table content without actually writing it
+        """Trick to get table content without actually writing it.
 
         return an aligned list of lists containing table cells values as string
         """
@@ -89,7 +80,7 @@ def get_table_content(self, table: "Table") -> List[List[str]]:
         return result
 
     def compute_content(self, layout) -> Iterator[str]:
-        """trick to compute the formatting of children layout before actually
+        """Trick to compute the formatting of children layout before actually
         writing it
 
         return an iterator on strings (one for each child element)
diff --git a/pylint/reporters/ureports/nodes.py b/pylint/reporters/ureports/nodes.py
index 4f7cde24d7..543082ae9a 100644
--- a/pylint/reporters/ureports/nodes.py
+++ b/pylint/reporters/ureports/nodes.py
@@ -1,15 +1,6 @@
-# Copyright (c) 2015-2016, 2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Micro reports objects.
 
@@ -39,7 +30,7 @@ def leave(self, visitor, *args, **kwargs):
 
 
 class BaseLayout(VNode):
-    """base container node
+    """Base container node.
 
     attributes
     * children : components in this table (i.e. the table's cells)
@@ -54,25 +45,25 @@ def __init__(self, children: Iterable[Union["Text", str]] = ()) -> None:
                 self.add_text(child)
 
     def append(self, child: VNode) -> None:
-        """add a node to children"""
+        """Add a node to children."""
         assert child not in self.parents()
         self.children.append(child)
         child.parent = self
 
     def insert(self, index: int, child: VNode) -> None:
-        """insert a child node"""
+        """Insert a child node."""
         self.children.insert(index, child)
         child.parent = self
 
     def parents(self) -> List["BaseLayout"]:
-        """return the ancestor nodes"""
+        """Return the ancestor nodes."""
         assert self.parent is not self
         if self.parent is None:
             return []
         return [self.parent] + self.parent.parents()
 
     def add_text(self, text: str) -> None:
-        """shortcut to add text data"""
+        """Shortcut to add text data."""
         self.children.append(Text(text))
 
 
@@ -80,7 +71,7 @@ def add_text(self, text: str) -> None:
 
 
 class Text(VNode):
-    """a text portion
+    """A text portion.
 
     attributes :
     * data : the text value as an encoded or unicode string
@@ -93,7 +84,7 @@ def __init__(self, data: str, escaped: bool = True) -> None:
 
 
 class VerbatimText(Text):
-    """a verbatim text, display the raw data
+    """A verbatim text, display the raw data.
 
     attributes :
     * data : the text value as an encoded or unicode string
@@ -104,7 +95,7 @@ class VerbatimText(Text):
 
 
 class Section(BaseLayout):
-    """a section
+    """A section.
 
     attributes :
     * BaseLayout attributes
@@ -143,17 +134,17 @@ def __init__(
 
 
 class Title(BaseLayout):
-    """a title
+    """A title.
 
     attributes :
     * BaseLayout attributes
 
-    A title must not contains a section nor a paragraph!
+    A title must not contain a section nor a paragraph!
     """
 
 
 class Paragraph(BaseLayout):
-    """a simple text paragraph
+    """A simple text paragraph.
 
     attributes :
     * BaseLayout attributes
@@ -163,7 +154,7 @@ class Paragraph(BaseLayout):
 
 
 class Table(BaseLayout):
-    """some tabular data
+    """Some tabular data.
 
     attributes :
     * BaseLayout attributes
diff --git a/pylint/reporters/ureports/text_writer.py b/pylint/reporters/ureports/text_writer.py
index 392c86cc89..fc4ce67df9 100644
--- a/pylint/reporters/ureports/text_writer.py
+++ b/pylint/reporters/ureports/text_writer.py
@@ -1,16 +1,8 @@
-# Copyright (c) 2015-2016, 2018-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2018, 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""Text formatting drivers for ureports"""
+"""Text formatting drivers for ureports."""
 
 from typing import TYPE_CHECKING, List
 
@@ -32,7 +24,7 @@
 
 
 class TextWriter(BaseWriter):
-    """format layouts as text
+    """Format layouts as text
     (ReStructured inspiration but not totally handled yet)
     """
 
@@ -41,7 +33,7 @@ def __init__(self):
         self.list_level = 0
 
     def visit_section(self, layout: "Section") -> None:
-        """display a section as text"""
+        """Display a section as text."""
         self.section += 1
         self.writeln()
         self.format_children(layout)
@@ -64,12 +56,12 @@ def visit_title(self, layout: "Title") -> None:
             print("FIXME TITLE TOO DEEP. TURNING TITLE INTO TEXT")
 
     def visit_paragraph(self, layout: "Paragraph") -> None:
-        """enter a paragraph"""
+        """Enter a paragraph."""
         self.format_children(layout)
         self.writeln()
 
     def visit_table(self, layout: "Table") -> None:
-        """display a table as text"""
+        """Display a table as text."""
         table_content = self.get_table_content(layout)
         # get columns width
         cols_width = [0] * len(table_content[0])
@@ -82,7 +74,7 @@ def visit_table(self, layout: "Table") -> None:
     def default_table(
         self, layout: "Table", table_content: List[List[str]], cols_width: List[int]
     ) -> None:
-        """format a table"""
+        """Format a table."""
         cols_width = [size + 1 for size in cols_width]
         format_strings = " ".join(["%%-%ss"] * len(cols_width))
         format_strings %= tuple(cols_width)
@@ -103,12 +95,12 @@ def default_table(
                 self.write(table_linesep)
 
     def visit_verbatimtext(self, layout: "VerbatimText") -> None:
-        """display a verbatim layout as text (so difficult ;)"""
+        """Display a verbatim layout as text (so difficult ;)."""
         self.writeln("::\n")
         for line in layout.data.splitlines():
             self.writeln("    " + line)
         self.writeln()
 
     def visit_text(self, layout: "Text") -> None:
-        """add some text"""
+        """Add some text."""
         self.write(f"{layout.data}")
diff --git a/pylint/testutils/__init__.py b/pylint/testutils/__init__.py
index 737940c8fc..0b55fc8e99 100644
--- a/pylint/testutils/__init__.py
+++ b/pylint/testutils/__init__.py
@@ -1,34 +1,8 @@
-# Copyright (c) 2012-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2012 FELD Boris <lothiraldan@gmail.com>
-# Copyright (c) 2013-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2013-2014 Google, Inc.
-# Copyright (c) 2013 buck@yelp.com <buck@yelp.com>
-# Copyright (c) 2014 LCD 47 <lcd047@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Ricardo Gemignani <ricardo.gemignani@gmail.com>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Pavel Roskin <proski@gnu.org>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2016 Roy Williams <roy.williams.iii@gmail.com>
-# Copyright (c) 2016 xmo-odoo <xmo-odoo@users.noreply.github.com>
-# Copyright (c) 2017 Bryce Guinta <bryce.paul.guinta@gmail.com>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Mr. Senko <atodorov@mrsenko.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 谭九鼎 <109224573@qq.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Lefteris Karapetsas <lefteris@refu.co>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""Functional/non regression tests for pylint"""
+"""Functional/non regression tests for pylint."""
 
 __all__ = [
     "_get_tests_info",
@@ -49,7 +23,7 @@
 from pylint.testutils.checker_test_case import CheckerTestCase
 from pylint.testutils.constants import UPDATE_FILE, UPDATE_OPTION
 from pylint.testutils.decorator import set_config
-from pylint.testutils.functional_test_file import FunctionalTestFile
+from pylint.testutils.functional import FunctionalTestFile
 from pylint.testutils.get_test_info import _get_tests_info
 from pylint.testutils.global_test_linter import linter
 from pylint.testutils.lint_module_test import LintModuleTest
diff --git a/pylint/testutils/checker_test_case.py b/pylint/testutils/checker_test_case.py
index 5c8815dabc..b6e10fb481 100644
--- a/pylint/testutils/checker_test_case.py
+++ b/pylint/testutils/checker_test_case.py
@@ -1,10 +1,14 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import contextlib
-from typing import Dict, Optional, Type
+import warnings
+from typing import Dict, Generator, Optional, Type
 
+from pylint.constants import PY38_PLUS
 from pylint.testutils.global_test_linter import linter
+from pylint.testutils.output_line import MessageTest
 from pylint.testutils.unittest_linter import UnittestLinter
 from pylint.utils import ASTWalker
 
@@ -29,12 +33,18 @@ def assertNoMessages(self):
             yield
 
     @contextlib.contextmanager
-    def assertAddsMessages(self, *messages):
+    def assertAddsMessages(
+        self, *messages: MessageTest, ignore_position: bool = False
+    ) -> Generator[None, None, None]:
         """Assert that exactly the given method adds the given messages.
 
         The list of messages must exactly match *all* the messages added by the
         method. Additionally, we check to see whether the args in each message can
         actually be substituted into the message string.
+
+        Using the keyword argument `ignore_position`, all checks for position
+        arguments (line, col_offset, ...) will be skipped. This can be used to
+        just test messages for the correct node.
         """
         yield
         got = self.linter.release_messages()
@@ -45,10 +55,41 @@ def assertAddsMessages(self, *messages):
             "Expected messages did not match actual.\n"
             f"\nExpected:\n{expected}\n\nGot:\n{got_str}\n"
         )
-        assert got == list(messages), msg
+
+        assert len(messages) == len(got), msg
+
+        for expected_msg, gotten_msg in zip(messages, got):
+            assert expected_msg.msg_id == gotten_msg.msg_id, msg
+            assert expected_msg.node == gotten_msg.node, msg
+            assert expected_msg.args == gotten_msg.args, msg
+            assert expected_msg.confidence == gotten_msg.confidence, msg
+
+            if ignore_position:
+                # Do not check for line, col_offset etc...
+                continue
+
+            assert expected_msg.line == gotten_msg.line, msg
+            assert expected_msg.col_offset == gotten_msg.col_offset, msg
+            if PY38_PLUS:
+                # pylint: disable=fixme
+                # TODO: Require end_line and end_col_offset and remove the warning
+                if not expected_msg.end_line == gotten_msg.end_line:
+                    warnings.warn(  # pragma: no cover
+                        f"The end_line attribute of {gotten_msg} does not match "
+                        f"the expected value in {expected_msg}. In pylint 3.0 correct end_line "
+                        "attributes will be required for MessageTest.",
+                        DeprecationWarning,
+                    )
+                if not expected_msg.end_col_offset == gotten_msg.end_col_offset:
+                    warnings.warn(  # pragma: no cover
+                        f"The end_col_offset attribute of {gotten_msg} does not match "
+                        f"the expected value in {expected_msg}. In pylint 3.0 correct end_col_offset "
+                        "attributes will be required for MessageTest.",
+                        DeprecationWarning,
+                    )
 
     def walk(self, node):
-        """recursive walk on the given node"""
+        """Recursive walk on the given node."""
         walker = ASTWalker(linter)
         walker.add_checker(self.checker)
         walker.walk(node)
diff --git a/pylint/testutils/configuration_test.py b/pylint/testutils/configuration_test.py
index 809fd4eb55..c6241f31ed 100644
--- a/pylint/testutils/configuration_test.py
+++ b/pylint/testutils/configuration_test.py
@@ -1,15 +1,18 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Utility functions for configuration testing."""
 import copy
 import json
 import logging
+import re
 import unittest
 from pathlib import Path
 from typing import Any, Dict, List, Tuple, Union
 from unittest.mock import Mock
 
+from pylint.constants import PY38_PLUS
 from pylint.lint import Run
 
 # We use Any in this typing because the configuration contains real objects and constants
@@ -18,10 +21,17 @@
 PylintConfiguration = Dict[str, ConfigurationValue]
 
 
+if not PY38_PLUS:
+    # We need to deepcopy a compiled regex pattern
+    # In python 3.6 and 3.7 this requires a hack
+    # See https://stackoverflow.com/a/56935186
+    copy._deepcopy_dispatch[type(re.compile(""))] = lambda r, _: r  # type: ignore[attr-defined]
+
+
 def get_expected_or_default(
     tested_configuration_file: Union[str, Path],
     suffix: str,
-    default: ConfigurationValue,
+    default: str,
 ) -> str:
     """Return the expected value from the file if it exists, or the given default."""
     expected = default
@@ -31,7 +41,7 @@ def get_expected_or_default(
         with open(expected_result_path, encoding="utf8") as f:
             expected = f.read()
         # logging is helpful to realize your file is not taken into
-        # account after a misspell of the file name. The output of the
+        # account after a misspelling of the file name. The output of the
         # program is checked during the test so printing messes with the result.
         logging.info("%s exists.", expected_result_path)
     else:
@@ -46,7 +56,7 @@ def get_expected_or_default(
 def get_expected_configuration(
     configuration_path: str, default_configuration: PylintConfiguration
 ) -> PylintConfiguration:
-    """Get the expected parsed configuration of a configuration functional test"""
+    """Get the expected parsed configuration of a configuration functional test."""
     result = copy.deepcopy(default_configuration)
     config_as_json = get_expected_or_default(
         configuration_path, suffix="result.json", default="{}"
@@ -139,7 +149,7 @@ def run_using_a_configuration_file(
     # would not be accessible outside the `with` block.
     with unittest.mock.patch("sys.exit") as mocked_exit:
         # Do not actually run checks, that could be slow. We don't mock
-        # `Pylinter.check`: it calls `Pylinter.initialize` which is
+        # `PyLinter.check`: it calls `PyLinter.initialize` which is
         # needed to properly set up messages inclusion/exclusion
         # in `_msg_states`, used by `is_message_enabled`.
         check = "pylint.lint.pylinter.check_parallel"
diff --git a/pylint/testutils/constants.py b/pylint/testutils/constants.py
index fc04d927d7..1c3c69d795 100644
--- a/pylint/testutils/constants.py
+++ b/pylint/testutils/constants.py
@@ -1,17 +1,16 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import operator
 import re
 import sys
-from os.path import abspath, dirname
 from pathlib import Path
 
 SYS_VERS_STR = (
     "%d%d%d" % sys.version_info[:3]  # pylint: disable=consider-using-f-string
 )
 TITLE_UNDERLINES = ["", "=", "-", "."]
-PREFIX = abspath(dirname(__file__))
 UPDATE_OPTION = "--update-functional-output"
 UPDATE_FILE = Path("pylint-functional-test-update")
 # Common sub-expressions.
diff --git a/pylint/testutils/decorator.py b/pylint/testutils/decorator.py
index 87fbd7afa0..b2a790c452 100644
--- a/pylint/testutils/decorator.py
+++ b/pylint/testutils/decorator.py
@@ -1,8 +1,10 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import functools
 import optparse  # pylint: disable=deprecated-module
+import warnings
 
 from pylint.lint import PyLinter
 from pylint.testutils.checker_test_case import CheckerTestCase
@@ -63,6 +65,14 @@ def set_config_directly(**kwargs):
     Passing the args and kwargs back to the test function itself
     allows this decorator to be used on parametrized test cases.
     """
+    # pylint: disable=fixme
+    # TODO: Remove this function in 2.14
+    warnings.warn(
+        "The set_config_directly decorator will be removed in 2.14. To decorate "
+        "unittests you can use set_config. If this causes a duplicate KeyError "
+        "you can consider writing the tests using the functional test framework.",
+        DeprecationWarning,
+    )
 
     def _wrapper(fun):
         @functools.wraps(fun)
diff --git a/pylint/testutils/functional/__init__.py b/pylint/testutils/functional/__init__.py
new file mode 100644
index 0000000000..4840e1ba64
--- /dev/null
+++ b/pylint/testutils/functional/__init__.py
@@ -0,0 +1,23 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+__all__ = [
+    "FunctionalTestFile",
+    "REASONABLY_DISPLAYABLE_VERTICALLY",
+    "get_functional_test_files_from_directory",
+    "NoFileError",
+    "parse_python_version",
+    "LintModuleOutputUpdate",
+]
+
+from pylint.testutils.functional.find_functional_tests import (
+    REASONABLY_DISPLAYABLE_VERTICALLY,
+    get_functional_test_files_from_directory,
+)
+from pylint.testutils.functional.lint_module_output_update import LintModuleOutputUpdate
+from pylint.testutils.functional.test_file import (
+    FunctionalTestFile,
+    NoFileError,
+    parse_python_version,
+)
diff --git a/pylint/testutils/functional/find_functional_tests.py b/pylint/testutils/functional/find_functional_tests.py
new file mode 100644
index 0000000000..78d821e319
--- /dev/null
+++ b/pylint/testutils/functional/find_functional_tests.py
@@ -0,0 +1,84 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+import os
+from pathlib import Path
+from typing import List, Set, Union
+
+from pylint.testutils.functional.test_file import FunctionalTestFile
+
+REASONABLY_DISPLAYABLE_VERTICALLY = 48
+"""'Wet finger' number of files that are reasonable to display by an IDE."""
+SHOULD_BE_IN_THE_SAME_DIRECTORY = 5
+"""'Wet finger' as in 'in my settings there are precisely this many'."""
+
+IGNORED_PARENT_DIRS = {
+    "deprecated_relative_import",
+    "ext",
+    "regression",
+    "regression_02",
+}
+"""Direct parent directories that should be ignored."""
+
+IGNORED_PARENT_PARENT_DIRS = {
+    "docparams",
+    "deprecated_relative_import",
+    "ext",
+}
+"""Parents of direct parent directories that should be ignored."""
+
+
+def get_functional_test_files_from_directory(
+    input_dir: Union[Path, str]
+) -> List[FunctionalTestFile]:
+    """Get all functional tests in the input_dir."""
+    suite = []
+
+    _check_functional_tests_structure(Path(input_dir))
+
+    for dirpath, _, filenames in os.walk(input_dir):
+        if dirpath.endswith("__pycache__"):
+            continue
+        for filename in filenames:
+            if filename != "__init__.py" and filename.endswith(".py"):
+                suite.append(FunctionalTestFile(dirpath, filename))
+    return suite
+
+
+def _check_functional_tests_structure(directory: Path) -> None:
+    """Check if test directories follow correct file/folder structure."""
+    # Ignore underscored directories
+    if Path(directory).stem.startswith("_"):
+        return
+
+    files: Set[Path] = set()
+    dirs: Set[Path] = set()
+
+    # Collect all subdirectories and files in directory
+    for file_or_dir in directory.iterdir():
+        if file_or_dir.is_file():
+            if file_or_dir.suffix == ".py" and not file_or_dir.stem.startswith("_"):
+                files.add(file_or_dir)
+        elif file_or_dir.is_dir():
+            dirs.add(file_or_dir)
+            _check_functional_tests_structure(file_or_dir)
+
+    assert len(files) <= REASONABLY_DISPLAYABLE_VERTICALLY, (
+        f"{directory} contains too many functional tests files "
+        + f"({len(files)} > {REASONABLY_DISPLAYABLE_VERTICALLY})."
+    )
+
+    for file in files:
+        possible_dir = file.parent / file.stem.split("_")[0]
+        assert not possible_dir.exists(), f"{file} should go in {possible_dir}."
+
+        # Exclude some directories as they follow a different structure
+        if (
+            not len(file.parent.stem) == 1  # First letter subdirectories
+            and file.parent.stem not in IGNORED_PARENT_DIRS
+            and file.parent.parent.stem not in IGNORED_PARENT_PARENT_DIRS
+        ):
+            assert file.stem.startswith(
+                file.parent.stem
+            ), f"{file} should not go in {file.parent}"
diff --git a/pylint/testutils/functional/lint_module_output_update.py b/pylint/testutils/functional/lint_module_output_update.py
new file mode 100644
index 0000000000..ae577911f4
--- /dev/null
+++ b/pylint/testutils/functional/lint_module_output_update.py
@@ -0,0 +1,55 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+import csv
+import os
+from typing import List, Optional
+
+from _pytest.config import Config
+
+from pylint.constants import PY38_PLUS
+from pylint.testutils.functional.test_file import FunctionalTestFile
+from pylint.testutils.lint_module_test import LintModuleTest, MessageCounter
+from pylint.testutils.output_line import OutputLine
+
+
+class LintModuleOutputUpdate(LintModuleTest):
+    """Class to be used if expected output files should be updated instead of checked."""
+
+    class TestDialect(csv.excel):
+        """Dialect used by the csv writer."""
+
+        delimiter = ":"
+        lineterminator = "\n"
+
+    csv.register_dialect("test", TestDialect)
+
+    def __init__(
+        self, test_file: FunctionalTestFile, config: Optional[Config] = None
+    ) -> None:
+        if not PY38_PLUS:
+            raise RuntimeError(
+                "You need at least python 3.8 for the functional test updater to work. "
+                "This is because python 3.8 includes a new AST parser, which amongst others "
+                "returns the end line and end column of most nodes."
+            )
+        super().__init__(test_file, config)
+
+    def _check_output_text(
+        self,
+        _: MessageCounter,
+        expected_output: List[OutputLine],
+        actual_output: List[OutputLine],
+    ) -> None:
+        """Overwrite or remove the expected output file based on actual output."""
+        # Remove the file if no output is actually expected and a file exists
+        if not expected_output and not actual_output:
+            if os.path.exists(self._test_file.expected_output):
+                os.remove(self._test_file.expected_output)
+            return
+        # Write file with expected output
+        with open(self._test_file.expected_output, "w", encoding="utf-8") as f:
+            writer = csv.writer(f, dialect="test")
+            for line in actual_output:
+                writer.writerow(line.to_csv())
diff --git a/pylint/testutils/functional/test_file.py b/pylint/testutils/functional/test_file.py
new file mode 100644
index 0000000000..ae8d0f2ce3
--- /dev/null
+++ b/pylint/testutils/functional/test_file.py
@@ -0,0 +1,111 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+import configparser
+import sys
+from os.path import basename, exists, join
+from typing import Callable, Dict, List, Tuple, Union
+
+
+def parse_python_version(ver_str: str) -> Tuple[int, ...]:
+    """Convert python version to a tuple of integers for easy comparison."""
+    return tuple(int(digit) for digit in ver_str.split("."))
+
+
+class NoFileError(Exception):
+    pass
+
+
+if sys.version_info >= (3, 8):
+    from typing import TypedDict
+else:
+    from typing_extensions import TypedDict
+
+
+class TestFileOptions(TypedDict):
+    min_pyver: Tuple[int, ...]
+    max_pyver: Tuple[int, ...]
+    min_pyver_end_position: Tuple[int, ...]
+    requires: List[str]
+    except_implementations: List[str]
+    exclude_platforms: List[str]
+
+
+# mypy need something literal, we can't create this dynamically from TestFileOptions
+POSSIBLE_TEST_OPTIONS = {
+    "min_pyver",
+    "max_pyver",
+    "min_pyver_end_position",
+    "requires",
+    "except_implementations",
+    "exclude_platforms",
+}
+
+
+class FunctionalTestFile:
+    """A single functional test case file with options."""
+
+    _CONVERTERS: Dict[str, Callable[[str], Union[Tuple[int, ...], List[str]]]] = {
+        "min_pyver": parse_python_version,
+        "max_pyver": parse_python_version,
+        "min_pyver_end_position": parse_python_version,
+        "requires": lambda s: [i.strip() for i in s.split(",")],
+        "except_implementations": lambda s: [i.strip() for i in s.split(",")],
+        "exclude_platforms": lambda s: [i.strip() for i in s.split(",")],
+    }
+
+    def __init__(self, directory: str, filename: str) -> None:
+        self._directory = directory
+        self.base = filename.replace(".py", "")
+        self.options: TestFileOptions = {
+            "min_pyver": (2, 5),
+            "max_pyver": (4, 0),
+            "min_pyver_end_position": (3, 8),
+            "requires": [],
+            "except_implementations": [],
+            "exclude_platforms": [],
+        }
+        self._parse_options()
+
+    def __repr__(self) -> str:
+        return f"FunctionalTest:{self.base}"
+
+    def _parse_options(self) -> None:
+        cp = configparser.ConfigParser()
+        cp.add_section("testoptions")
+        try:
+            cp.read(self.option_file)
+        except NoFileError:
+            pass
+
+        for name, value in cp.items("testoptions"):
+            conv = self._CONVERTERS.get(name, lambda v: v)
+
+            assert (
+                name in POSSIBLE_TEST_OPTIONS
+            ), f"[testoptions]' can only contains one of {POSSIBLE_TEST_OPTIONS}"
+            self.options[name] = conv(value)  # type: ignore[literal-required]
+
+    @property
+    def option_file(self) -> str:
+        return self._file_type(".rc")
+
+    @property
+    def module(self) -> str:
+        package = basename(self._directory)
+        return ".".join([package, self.base])
+
+    @property
+    def expected_output(self) -> str:
+        return self._file_type(".txt", check_exists=False)
+
+    @property
+    def source(self) -> str:
+        return self._file_type(".py")
+
+    def _file_type(self, ext: str, check_exists: bool = True) -> str:
+        name = join(self._directory, self.base + ext)
+        if not check_exists or exists(name):
+            return name
+        raise NoFileError(f"Cannot find '{name}'.")
diff --git a/pylint/testutils/functional_test_file.py b/pylint/testutils/functional_test_file.py
index 4bf0777f80..fc1cdcbb14 100644
--- a/pylint/testutils/functional_test_file.py
+++ b/pylint/testutils/functional_test_file.py
@@ -1,75 +1,23 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-
-import configparser
-from os.path import basename, exists, join
-
-
-def parse_python_version(ver_str):
-    return tuple(int(digit) for digit in ver_str.split("."))
-
-
-class NoFileError(Exception):
-    pass
-
-
-class FunctionalTestFile:
-    """A single functional test case file with options."""
-
-    _CONVERTERS = {
-        "min_pyver": parse_python_version,
-        "max_pyver": parse_python_version,
-        "min_pyver_end_position": parse_python_version,
-        "requires": lambda s: s.split(","),
-    }
-
-    def __init__(self, directory, filename):
-        self._directory = directory
-        self.base = filename.replace(".py", "")
-        self.options = {
-            "min_pyver": (2, 5),
-            "max_pyver": (4, 0),
-            "min_pyver_end_position": (3, 8),
-            "requires": [],
-            "except_implementations": [],
-            "exclude_platforms": [],
-        }
-        self._parse_options()
-
-    def __repr__(self):
-        return f"FunctionalTest:{self.base}"
-
-    def _parse_options(self):
-        cp = configparser.ConfigParser()
-        cp.add_section("testoptions")
-        try:
-            cp.read(self.option_file)
-        except NoFileError:
-            pass
-
-        for name, value in cp.items("testoptions"):
-            conv = self._CONVERTERS.get(name, lambda v: v)
-            self.options[name] = conv(value)
-
-    @property
-    def option_file(self):
-        return self._file_type(".rc")
-
-    @property
-    def module(self):
-        package = basename(self._directory)
-        return ".".join([package, self.base])
-
-    @property
-    def expected_output(self):
-        return self._file_type(".txt", check_exists=False)
-
-    @property
-    def source(self):
-        return self._file_type(".py")
-
-    def _file_type(self, ext, check_exists=True):
-        name = join(self._directory, self.base + ext)
-        if not check_exists or exists(name):
-            return name
-        raise NoFileError(f"Cannot find '{name}'.")
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+__all__ = [
+    "FunctionalTestFile",
+    "NoFileError",
+    "parse_python_version",
+]
+
+import warnings
+
+from pylint.testutils.functional import (
+    FunctionalTestFile,
+    NoFileError,
+    parse_python_version,
+)
+
+warnings.warn(
+    "'pylint.testutils.functional_test_file' will be accessible from"
+    " the 'pylint.testutils.functional' namespace in pylint 3.0.",
+    DeprecationWarning,
+)
diff --git a/pylint/testutils/get_test_info.py b/pylint/testutils/get_test_info.py
index 3b63a8e555..d0bf8f4e3f 100644
--- a/pylint/testutils/get_test_info.py
+++ b/pylint/testutils/get_test_info.py
@@ -1,14 +1,18 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 from glob import glob
 from os.path import basename, join, splitext
+from typing import List, Tuple
 
 from pylint.testutils.constants import SYS_VERS_STR
 
 
-def _get_tests_info(input_dir, msg_dir, prefix, suffix):
-    """get python input examples and output messages
+def _get_tests_info(
+    input_dir: str, msg_dir: str, prefix: str, suffix: str
+) -> List[Tuple[str, str]]:
+    """Get python input examples and output messages.
 
     We use following conventions for input files and messages:
     for different inputs:
diff --git a/pylint/testutils/global_test_linter.py b/pylint/testutils/global_test_linter.py
index 2e6028e302..f6f421dab2 100644
--- a/pylint/testutils/global_test_linter.py
+++ b/pylint/testutils/global_test_linter.py
@@ -1,6 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 from pylint import checkers
 from pylint.lint import PyLinter
diff --git a/pylint/testutils/lint_module_test.py b/pylint/testutils/lint_module_test.py
index 8edc638760..3bac0785d7 100644
--- a/pylint/testutils/lint_module_test.py
+++ b/pylint/testutils/lint_module_test.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import csv
 import operator
@@ -7,27 +8,30 @@
 import sys
 from collections import Counter
 from io import StringIO
+from pathlib import Path
 from typing import Counter as CounterType
-from typing import Dict, List, Optional, TextIO, Tuple
+from typing import Dict, List, Optional, TextIO, Tuple, Union
 
 import pytest
 from _pytest.config import Config
 
 from pylint import checkers
+from pylint.config.config_initialization import _config_initialization
 from pylint.lint import PyLinter
 from pylint.message.message import Message
 from pylint.testutils.constants import _EXPECTED_RE, _OPERATORS, UPDATE_OPTION
-from pylint.testutils.functional_test_file import (
+from pylint.testutils.functional.test_file import (  # need to import from functional.test_file to avoid cyclic import
     FunctionalTestFile,
     NoFileError,
     parse_python_version,
 )
 from pylint.testutils.output_line import OutputLine
 from pylint.testutils.reporter_for_tests import FunctionalTestReporter
-from pylint.utils import utils
 
 MessageCounter = CounterType[Tuple[int, str]]
 
+PYLINTRC = Path(__file__).parent / "testing_pylintrc"
+
 
 class LintModuleTest:
     maxDiff = None
@@ -37,22 +41,27 @@ def __init__(
     ) -> None:
         _test_reporter = FunctionalTestReporter()
         self._linter = PyLinter()
-        self._linter.set_reporter(_test_reporter)
         self._linter.config.persistent = 0
         checkers.initialize(self._linter)
-        self._linter.disable("suppressed-message")
-        self._linter.disable("locally-disabled")
-        self._linter.disable("useless-suppression")
+
+        # See if test has its own .rc file, if so we use that one
+        rc_file: Union[Path, str] = PYLINTRC
         try:
-            self._linter.read_config_file(test_file.option_file)
-            if self._linter.cfgfile_parser.has_option("MASTER", "load-plugins"):
-                plugins = utils._splitstrip(
-                    self._linter.cfgfile_parser.get("MASTER", "load-plugins")
-                )
-                self._linter.load_plugin_modules(plugins)
-            self._linter.load_config_file()
+            rc_file = test_file.option_file
+            self._linter.disable("suppressed-message")
+            self._linter.disable("locally-disabled")
+            self._linter.disable("useless-suppression")
         except NoFileError:
             pass
+
+        try:
+            args = [test_file.source]
+        except NoFileError:
+            # If we're still raising NoFileError the actual source file doesn't exist
+            args = [""]
+        _config_initialization(
+            self._linter, args_list=args, config_file=rc_file, reporter=_test_reporter
+        )
         self._test_file = test_file
         self._config = config
         self._check_end_position = (
@@ -74,14 +83,12 @@ def setUp(self) -> None:
             pytest.skip(f"Requires {','.join(missing)} to be present.")
         except_implementations = self._test_file.options["except_implementations"]
         if except_implementations:
-            implementations = [i.strip() for i in except_implementations.split(",")]
-            if platform.python_implementation() in implementations:
+            if platform.python_implementation() in except_implementations:
                 msg = "Test cannot run with Python implementation %r"
                 pytest.skip(msg % platform.python_implementation())
         excluded_platforms = self._test_file.options["exclude_platforms"]
         if excluded_platforms:
-            platforms = [p.strip() for p in excluded_platforms.split(",")]
-            if sys.platform.lower() in platforms:
+            if sys.platform.lower() in excluded_platforms:
                 pytest.skip(f"Test cannot run on platform {sys.platform!r}")
 
     def runTest(self) -> None:
@@ -136,7 +143,8 @@ def multiset_difference(
     ) -> Tuple[MessageCounter, Dict[Tuple[int, str], int]]:
         """Takes two multisets and compares them.
 
-        A multiset is a dict with the cardinality of the key as the value."""
+        A multiset is a dict with the cardinality of the key as the value.
+        """
         missing = expected_entries.copy()
         missing.subtract(actual_entries)
         unexpected = {}
@@ -252,7 +260,7 @@ def _check_output_text(
         expected_output: List[OutputLine],
         actual_output: List[OutputLine],
     ) -> None:
-        """This is a function because we want to be able to update the text in LintModuleOutputUpdate"""
+        """This is a function because we want to be able to update the text in LintModuleOutputUpdate."""
         assert expected_output == actual_output, self.error_msg_for_unequal_output(
             expected_output, actual_output
         )
diff --git a/pylint/testutils/output_line.py b/pylint/testutils/output_line.py
index 420b58c882..f6461adc7a 100644
--- a/pylint/testutils/output_line.py
+++ b/pylint/testutils/output_line.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import warnings
 from typing import Any, NamedTuple, Optional, Sequence, Tuple, TypeVar, Union
@@ -21,7 +22,12 @@ class MessageTest(NamedTuple):
     args: Optional[Any] = None
     confidence: Optional[Confidence] = UNDEFINED
     col_offset: Optional[int] = None
-    """Used to test messages produced by pylint. Class name cannot start with Test as pytest doesn't allow constructors in test classes."""
+    end_line: Optional[int] = None
+    end_col_offset: Optional[int] = None
+    """Used to test messages produced by pylint.
+
+    Class name cannot start with Test as pytest doesn't allow constructors in test classes.
+    """
 
 
 class MalformedOutputLineException(Exception):
@@ -74,7 +80,7 @@ class OutputLine(NamedTuple):
 
     @classmethod
     def from_msg(cls, msg: Message, check_endline: bool = True) -> "OutputLine":
-        """Create an OutputLine from a Pylint Message"""
+        """Create an OutputLine from a Pylint Message."""
         column = cls._get_column(msg.column)
         end_line = cls._get_py38_none_value(msg.end_line, check_endline)
         end_column = cls._get_py38_none_value(msg.end_column, check_endline)
@@ -91,8 +97,9 @@ def from_msg(cls, msg: Message, check_endline: bool = True) -> "OutputLine":
 
     @staticmethod
     def _get_column(column: str) -> int:
-        """Handle column numbers with the exception of pylint < 3.8 not having them
-        in the ast parser.
+        """Handle column numbers except for python < 3.8.
+
+        The ast parser in those versions doesn't return them.
         """
         if not PY38_PLUS:
             # We check the column only for the new better ast parser introduced in python 3.8
@@ -102,7 +109,8 @@ def _get_column(column: str) -> int:
     @staticmethod
     def _get_py38_none_value(value: T, check_endline: bool) -> Optional[T]:
         """Used to make end_line and end_column None as indicated by our version compared to
-        `min_pyver_end_position`."""
+        `min_pyver_end_position`.
+        """
         if not check_endline:
             return None  # pragma: no cover
         return value
@@ -114,49 +122,50 @@ def from_csv(
         """Create an OutputLine from a comma separated list (the functional tests expected
         output .txt files).
         """
+        if isinstance(row, str):
+            row = row.split(",")
         try:
-            if isinstance(row, Sequence):
-                column = cls._get_column(row[2])
-                if len(row) == 5:
-                    warnings.warn(
-                        "In pylint 3.0 functional tests expected output should always include the "
-                        "expected confidence level, expected end_line and expected end_column. "
-                        "An OutputLine should thus have a length of 8.",
-                        DeprecationWarning,
-                    )
-                    return cls(
-                        row[0],
-                        int(row[1]),
-                        column,
-                        None,
-                        None,
-                        row[3],
-                        row[4],
-                        UNDEFINED.name,
-                    )
-                if len(row) == 6:
-                    warnings.warn(
-                        "In pylint 3.0 functional tests expected output should always include the "
-                        "expected end_line and expected end_column. An OutputLine should thus have "
-                        "a length of 8.",
-                        DeprecationWarning,
-                    )
-                    return cls(
-                        row[0], int(row[1]), column, None, None, row[3], row[4], row[5]
-                    )
-                if len(row) == 8:
-                    end_line = cls._get_py38_none_value(row[3], check_endline)
-                    end_column = cls._get_py38_none_value(row[4], check_endline)
-                    return cls(
-                        row[0],
-                        int(row[1]),
-                        column,
-                        cls._value_to_optional_int(end_line),
-                        cls._value_to_optional_int(end_column),
-                        row[5],
-                        row[6],
-                        row[7],
-                    )
+            column = cls._get_column(row[2])
+            if len(row) == 5:
+                warnings.warn(
+                    "In pylint 3.0 functional tests expected output should always include the "
+                    "expected confidence level, expected end_line and expected end_column. "
+                    "An OutputLine should thus have a length of 8.",
+                    DeprecationWarning,
+                )
+                return cls(
+                    row[0],
+                    int(row[1]),
+                    column,
+                    None,
+                    None,
+                    row[3],
+                    row[4],
+                    UNDEFINED.name,
+                )
+            if len(row) == 6:
+                warnings.warn(
+                    "In pylint 3.0 functional tests expected output should always include the "
+                    "expected end_line and expected end_column. An OutputLine should thus have "
+                    "a length of 8.",
+                    DeprecationWarning,
+                )
+                return cls(
+                    row[0], int(row[1]), column, None, None, row[3], row[4], row[5]
+                )
+            if len(row) == 8:
+                end_line = cls._get_py38_none_value(row[3], check_endline)
+                end_column = cls._get_py38_none_value(row[4], check_endline)
+                return cls(
+                    row[0],
+                    int(row[1]),
+                    column,
+                    cls._value_to_optional_int(end_line),
+                    cls._value_to_optional_int(end_column),
+                    row[5],
+                    row[6],
+                    row[7],
+                )
             raise IndexError
         except Exception as e:
             raise MalformedOutputLineException(row, e) from e
@@ -178,7 +187,7 @@ def to_csv(self) -> Tuple[str, str, str, str, str, str, str, str]:
 
     @staticmethod
     def _value_to_optional_int(value: Optional[str]) -> Optional[int]:
-        """Checks if a (stringified) value should be None or a Python integer"""
+        """Checks if a (stringified) value should be None or a Python integer."""
         if value == "None" or not value:
             return None
         return int(value)
diff --git a/pylint/testutils/primer.py b/pylint/testutils/primer.py
index 30fa841ade..e0f6f2e4d0 100644
--- a/pylint/testutils/primer.py
+++ b/pylint/testutils/primer.py
@@ -1,3 +1,7 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 import logging
 from pathlib import Path
 from typing import Dict, List, Optional, Union
@@ -8,25 +12,25 @@
 
 
 class PackageToLint:
-    """Represents data about a package to be tested during primer tests"""
+    """Represents data about a package to be tested during primer tests."""
 
     url: str
-    """URL of the repository to clone"""
+    """URL of the repository to clone."""
 
     branch: str
-    """Branch of the repository to clone"""
+    """Branch of the repository to clone."""
 
     directories: List[str]
-    """Directories within the repository to run pylint over"""
+    """Directories within the repository to run pylint over."""
 
     commit: Optional[str]
-    """Commit hash to pin the repository on"""
+    """Commit hash to pin the repository on."""
 
     pylint_additional_args: List[str]
-    """Arguments to give to pylint"""
+    """Arguments to give to pylint."""
 
     pylintrc_relpath: Optional[str]
-    """Path relative to project's main directory to the pylintrc if it exists"""
+    """Path relative to project's main directory to the pylintrc if it exists."""
 
     def __init__(
         self,
@@ -52,25 +56,25 @@ def pylintrc(self) -> Optional[Path]:
 
     @property
     def clone_directory(self) -> Path:
-        """Directory to clone repository into"""
+        """Directory to clone repository into."""
         clone_name = "/".join(self.url.split("/")[-2:]).replace(".git", "")
         return PRIMER_DIRECTORY_PATH / clone_name
 
     @property
     def paths_to_lint(self) -> List[str]:
-        """The paths we need to lint"""
+        """The paths we need to lint."""
         return [str(self.clone_directory / path) for path in self.directories]
 
     @property
     def pylint_args(self) -> List[str]:
         options: List[str] = []
         if self.pylintrc is not None:
-            # There is an error if rcfile is given but does not exists
+            # There is an error if rcfile is given but does not exist
             options += [f"--rcfile={self.pylintrc}"]
         return self.paths_to_lint + options + self.pylint_additional_args
 
     def lazy_clone(self) -> None:  # pragma: no cover
-        """Concatenates the target directory and clones the file
+        """Concatenates the target directory and clones the file.
 
         Not expected to be tested as the primer won't work if it doesn't.
         It's tested in the continuous integration primers, only the coverage
diff --git a/pylint/testutils/pyreverse.py b/pylint/testutils/pyreverse.py
index 15c5de4cb0..f4e9bc7fc9 100644
--- a/pylint/testutils/pyreverse.py
+++ b/pylint/testutils/pyreverse.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 from typing import List, Optional, Tuple
 
@@ -8,7 +9,9 @@
 # A NamedTuple is not possible as some tests need to modify attributes during the test.
 class PyreverseConfig:  # pylint: disable=too-many-instance-attributes, too-many-arguments
     """Holds the configuration options for Pyreverse.
-    The default values correspond to the defaults of the options parser."""
+
+    The default values correspond to the defaults of the options' parser.
+    """
 
     def __init__(
         self,
diff --git a/pylint/testutils/reporter_for_tests.py b/pylint/testutils/reporter_for_tests.py
index 1487774068..47c12a3d2f 100644
--- a/pylint/testutils/reporter_for_tests.py
+++ b/pylint/testutils/reporter_for_tests.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 from io import StringIO
 from os import getcwd, sep
@@ -14,7 +15,7 @@
 
 
 class GenericTestReporter(BaseReporter):
-    """reporter storing plain text messages"""
+    """Reporter storing plain text messages."""
 
     __implements__ = interfaces.IReporter
     out: StringIO
@@ -30,11 +31,11 @@ def reset(self) -> None:
         self.messages: List[Message] = []
 
     def handle_message(self, msg: Message) -> None:
-        """Append messages to the list of messages of the reporter"""
+        """Append messages to the list of messages of the reporter."""
         self.messages.append(msg)
 
     def finalize(self) -> str:
-        """Format and print messages in the context of the path"""
+        """Format and print messages in the context of the path."""
         messages: List[str] = []
         for msg in self.messages:
             obj = ""
@@ -56,7 +57,7 @@ def on_set_current_module(self, module: str, filepath: Optional[str]) -> None:
     # pylint: enable=unused-argument
 
     def display_reports(self, layout: "Section") -> None:
-        """ignore layouts"""
+        """Ignore layouts."""
 
     def _display(self, layout: "Section") -> None:
         pass
diff --git a/pylint/testutils/testing_pylintrc b/pylint/testutils/testing_pylintrc
new file mode 100644
index 0000000000..ba5318b510
--- /dev/null
+++ b/pylint/testutils/testing_pylintrc
@@ -0,0 +1,9 @@
+# A bare minimum pylintrc used for the functional tests that don't specify
+# their own settings.
+
+[MESSAGES CONTROL]
+
+disable=
+    suppressed-message,
+    locally-disabled,
+    useless-suppression,
diff --git a/pylint/testutils/tokenize_str.py b/pylint/testutils/tokenize_str.py
index 2c4f31acb5..0b478c32cb 100644
--- a/pylint/testutils/tokenize_str.py
+++ b/pylint/testutils/tokenize_str.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import tokenize
 from io import StringIO
diff --git a/pylint/testutils/unittest_linter.py b/pylint/testutils/unittest_linter.py
index d37f17099e..a7d7fc02df 100644
--- a/pylint/testutils/unittest_linter.py
+++ b/pylint/testutils/unittest_linter.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 from typing import Any, Optional
 
@@ -30,6 +31,8 @@ def add_message(
         self,
         msg_id: str,
         line: Optional[int] = None,
+        # pylint: disable=fixme
+        # TODO: Make node non optional
         node: Optional[nodes.NodeNG] = None,
         args: Any = None,
         confidence: Optional[Confidence] = None,
@@ -41,16 +44,39 @@ def add_message(
         # If confidence is None we set it to UNDEFINED as well in PyLinter
         if confidence is None:
             confidence = UNDEFINED
-        # pylint: disable=fixme
-        # TODO: Test col_offset
-        # pylint: disable=fixme
-        # TODO: Initialize col_offset on every node (can be None) -> astroid
-        # if col_offset is None and hasattr(node, "col_offset"):
-        #     col_offset = node.col_offset
-        # pylint: disable=fixme
-        # TODO: Test end_lineno and end_col_offset :)
+
+        # Look up "location" data of node if not yet supplied
+        if node:
+            if node.position:
+                if not line:
+                    line = node.position.lineno
+                if not col_offset:
+                    col_offset = node.position.col_offset
+                if not end_lineno:
+                    end_lineno = node.position.end_lineno
+                if not end_col_offset:
+                    end_col_offset = node.position.end_col_offset
+            else:
+                if not line:
+                    line = node.fromlineno
+                if not col_offset:
+                    col_offset = node.col_offset
+                if not end_lineno:
+                    end_lineno = node.end_lineno
+                if not end_col_offset:
+                    end_col_offset = node.end_col_offset
+
         self._messages.append(
-            MessageTest(msg_id, line, node, args, confidence, col_offset)
+            MessageTest(
+                msg_id,
+                line,
+                node,
+                args,
+                confidence,
+                col_offset,
+                end_lineno,
+                end_col_offset,
+            )
         )
 
     @staticmethod
diff --git a/pylint/typing.py b/pylint/typing.py
index 5f1524180c..32b2ac4190 100644
--- a/pylint/typing.py
+++ b/pylint/typing.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """A collection of typing utilities."""
 import sys
@@ -12,7 +13,7 @@
 
 
 class FileItem(NamedTuple):
-    """Represents data about a file handled by pylint
+    """Represents data about a file handled by pylint.
 
     Each file item has:
     - name: full name of the module
@@ -26,7 +27,7 @@ class FileItem(NamedTuple):
 
 
 class ModuleDescriptionDict(TypedDict):
-    """Represents data about a checked module"""
+    """Represents data about a checked module."""
 
     path: str
     name: str
@@ -36,7 +37,7 @@ class ModuleDescriptionDict(TypedDict):
 
 
 class ErrorDescriptionDict(TypedDict):
-    """Represents data about errors collected during checking of a module"""
+    """Represents data about errors collected during checking of a module."""
 
     key: Literal["fatal"]
     mod: str
@@ -44,7 +45,7 @@ class ErrorDescriptionDict(TypedDict):
 
 
 class MessageLocationTuple(NamedTuple):
-    """Tuple with information about the location of a to-be-displayed message"""
+    """Tuple with information about the location of a to-be-displayed message."""
 
     abspath: str
     path: str
@@ -57,10 +58,16 @@ class MessageLocationTuple(NamedTuple):
 
 
 class ManagedMessage(NamedTuple):
-    """Tuple with information ahout a managed message of the linter"""
+    """Tuple with information about a managed message of the linter."""
 
     name: Optional[str]
     msgid: str
     symbol: str
     line: Optional[int]
     is_disabled: bool
+
+
+MessageTypesFullName = Literal[
+    "convention", "error", "fatal", "info", "refactor", "statement", "warning"
+]
+"""All possible message categories."""
diff --git a/pylint/utils/__init__.py b/pylint/utils/__init__.py
index 58072eece6..51813f994a 100644
--- a/pylint/utils/__init__.py
+++ b/pylint/utils/__init__.py
@@ -1,46 +1,8 @@
-# Copyright (c) 2006-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2009 Vincent
-# Copyright (c) 2009 Mads Kiilerich <mads@kiilerich.com>
-# Copyright (c) 2012-2014 Google, Inc.
-# Copyright (c) 2014-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014-2015 Michal Nowikowski <godfryd@gmail.com>
-# Copyright (c) 2014 LCD 47 <lcd047@gmail.com>
-# Copyright (c) 2014 Brett Cannon <brett@python.org>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2014 Damien Nozay <damien.nozay@gmail.com>
-# Copyright (c) 2015 Aru Sahni <arusahni@gmail.com>
-# Copyright (c) 2015 Florian Bruhin <me@the-compiler.org>
-# Copyright (c) 2015 Simu Toni <simutoni@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2016 Moises Lopez <moylop260@vauxoo.com>
-# Copyright (c) 2016 Glenn Matthews <glenn@e-dad.net>
-# Copyright (c) 2016 Glenn Matthews <glmatthe@cisco.com>
-# Copyright (c) 2016 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2016 xmo-odoo <xmo-odoo@users.noreply.github.com>
-# Copyright (c) 2017-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2017-2018, 2020-2021 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2017, 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2017-2018 Bryce Guinta <bryce.paul.guinta@gmail.com>
-# Copyright (c) 2017 Chris Lamb <chris@chris-lamb.co.uk>
-# Copyright (c) 2017 Thomas Hisch <t.hisch@gmail.com>
-# Copyright (c) 2017 Mikhail Fesenko <proggga@gmail.com>
-# Copyright (c) 2017 Craig Citro <craigcitro@gmail.com>
-# Copyright (c) 2017 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2018 ssolanki <sushobhitsolanki@gmail.com>
-# Copyright (c) 2018 Bryce Guinta <bryce.guinta@protonmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Reverb C <reverbc@users.noreply.github.com>
-# Copyright (c) 2018 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2020 Peter Kolbus <peter.kolbus@gmail.com>
-# Copyright (c) 2020 Damien Baty <damien.baty@polyconseil.fr>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""some various utilities and helper classes, most of them used in the
+"""Some various utilities and helper classes, most of them used in the
 main pylint class
 """
 
diff --git a/pylint/utils/ast_walker.py b/pylint/utils/ast_walker.py
index 4f76a9805e..415bd97ddb 100644
--- a/pylint/utils/ast_walker.py
+++ b/pylint/utils/ast_walker.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import collections
 import traceback
@@ -22,7 +23,7 @@ def _is_method_enabled(self, method):
         return any(self.linter.is_message_enabled(m) for m in method.checks_msgs)
 
     def add_checker(self, checker):
-        """walk to the checker's dir and collect visit and leave methods"""
+        """Walk to the checker's dir and collect visit and leave methods."""
         vcids = set()
         lcids = set()
         visits = self.visit_events
@@ -49,10 +50,10 @@ def add_checker(self, checker):
                 cid = cls.__name__.lower()
                 if cid not in vcids:
                     visits[cid].append(visit_default)
-        # for now we have no "leave_default" method in Pylint
+        # For now, we have no "leave_default" method in Pylint
 
     def walk(self, astroid):
-        """call visit events of astroid checkers for the given node, recurse on
+        """Call visit events of astroid checkers for the given node, recurse on
         its children, then leave events.
         """
         cid = astroid.__class__.__name__.lower()
diff --git a/pylint/utils/docs.py b/pylint/utils/docs.py
index 5b46a0bc1b..b6fb877f0f 100644
--- a/pylint/utils/docs.py
+++ b/pylint/utils/docs.py
@@ -1,6 +1,8 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-"""Various helper functions to create the docs of a linter object"""
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Various helper functions to create the docs of a linter object."""
 
 import sys
 from typing import TYPE_CHECKING, Dict, TextIO
@@ -13,7 +15,7 @@
 
 
 def _get_checkers_infos(linter: "PyLinter") -> Dict[str, Dict]:
-    """Get info from a checker and handle KeyError"""
+    """Get info from a checker and handle KeyError."""
     by_checker: Dict[str, Dict] = {}
     for checker in linter.get_checkers():
         name = checker.name
@@ -34,7 +36,7 @@ def _get_checkers_infos(linter: "PyLinter") -> Dict[str, Dict]:
 
 
 def _get_checkers_documentation(linter: "PyLinter") -> str:
-    """Get documentation for individual checkers"""
+    """Get documentation for individual checkers."""
     result = get_rst_title("Pylint global options and switches", "-")
     result += """
 Pylint provides global options and switches.
@@ -73,5 +75,5 @@ def _get_checkers_documentation(linter: "PyLinter") -> str:
 
 
 def print_full_documentation(linter: "PyLinter", stream: TextIO = sys.stdout) -> None:
-    """Output a full documentation in ReST format"""
+    """Output a full documentation in ReST format."""
     print(_get_checkers_documentation(linter)[:-1], file=stream)
diff --git a/pylint/utils/file_state.py b/pylint/utils/file_state.py
index 8527031eab..b820affccd 100644
--- a/pylint/utils/file_state.py
+++ b/pylint/utils/file_state.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import collections
 import sys
@@ -16,7 +17,11 @@
 
 from astroid import nodes
 
-from pylint.constants import MSG_STATE_SCOPE_MODULE, WarningScope
+from pylint.constants import (
+    INCOMPATIBLE_WITH_USELESS_SUPPRESSION,
+    MSG_STATE_SCOPE_MODULE,
+    WarningScope,
+)
 
 if sys.version_info >= (3, 8):
     from typing import Literal
@@ -31,7 +36,7 @@
 
 
 class FileState:
-    """Hold internal state specific to the currently analyzed file"""
+    """Hold internal state specific to the currently analyzed file."""
 
     def __init__(self, modname: Optional[str] = None) -> None:
         self.base_name = modname
@@ -122,7 +127,7 @@ def _collect_block_lines(
                 del lines[lineno]
 
     def set_msg_status(self, msg: "MessageDefinition", line: int, status: bool) -> None:
-        """Set status (enabled/disable) for a given message at a given line"""
+        """Set status (enabled/disable) for a given message at a given line."""
         assert line > 0
         try:
             self._module_msgs_state[msg.msgid][line] = status
@@ -130,7 +135,7 @@ def set_msg_status(self, msg: "MessageDefinition", line: int, status: bool) -> N
             self._module_msgs_state[msg.msgid] = {line: status}
 
     def handle_ignored_message(
-        self, state_scope: Optional[Literal[0, 1, 2]], msgid: str, line: int
+        self, state_scope: Optional[Literal[0, 1, 2]], msgid: str, line: Optional[int]
     ) -> None:
         """Report an ignored message.
 
@@ -139,6 +144,8 @@ def handle_ignored_message(
         or globally.
         """
         if state_scope == MSG_STATE_SCOPE_MODULE:
+            assert isinstance(line, int)  # should always be int inside module scope
+
             try:
                 orig_line = self._suppression_mapping[(msgid, line)]
                 self._ignored_msgs[(msgid, orig_line)].add(line)
@@ -157,13 +164,14 @@ def iter_spurious_suppression_messages(
     ]:
         for warning, lines in self._raw_module_msgs_state.items():
             for line, enable in lines.items():
-                if not enable and (warning, line) not in self._ignored_msgs:
-                    # ignore cyclic-import check which can show false positives
-                    # here due to incomplete context
-                    if warning != "R0401":
-                        yield "useless-suppression", line, (
-                            msgs_store.get_msg_display_string(warning),
-                        )
+                if (
+                    not enable
+                    and (warning, line) not in self._ignored_msgs
+                    and warning not in INCOMPATIBLE_WITH_USELESS_SUPPRESSION
+                ):
+                    yield "useless-suppression", line, (
+                        msgs_store.get_msg_display_string(warning),
+                    )
         # don't use iteritems here, _ignored_msgs may be modified by add_message
         for (warning, from_), ignored_lines in list(self._ignored_msgs.items()):
             for line in ignored_lines:
diff --git a/pylint/utils/linterstats.py b/pylint/utils/linterstats.py
index cb20853522..82895ec879 100644
--- a/pylint/utils/linterstats.py
+++ b/pylint/utils/linterstats.py
@@ -1,9 +1,12 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import sys
 from typing import Dict, List, Optional, Set, cast
 
+from pylint.typing import MessageTypesFullName
+
 if sys.version_info >= (3, 8):
     from typing import Literal, TypedDict
 else:
@@ -11,7 +14,7 @@
 
 
 class BadNames(TypedDict):
-    """TypedDict to store counts of node types with bad names"""
+    """TypedDict to store counts of node types with bad names."""
 
     argument: int
     attr: int
@@ -24,10 +27,11 @@ class BadNames(TypedDict):
     method: int
     module: int
     variable: int
+    typevar: int
 
 
 class CodeTypeCount(TypedDict):
-    """TypedDict to store counts of lines of code types"""
+    """TypedDict to store counts of lines of code types."""
 
     code: int
     comment: int
@@ -37,14 +41,14 @@ class CodeTypeCount(TypedDict):
 
 
 class DuplicatedLines(TypedDict):
-    """TypedDict to store counts of lines of duplicated code"""
+    """TypedDict to store counts of lines of duplicated code."""
 
     nb_duplicated_lines: int
     percent_duplicated_lines: float
 
 
 class NodeCount(TypedDict):
-    """TypedDict to store counts of different types of nodes"""
+    """TypedDict to store counts of different types of nodes."""
 
     function: int
     klass: int
@@ -53,7 +57,7 @@ class NodeCount(TypedDict):
 
 
 class UndocumentedNodes(TypedDict):
-    """TypedDict to store counts of undocumented node types"""
+    """TypedDict to store counts of undocumented node types."""
 
     function: int
     klass: int
@@ -62,7 +66,7 @@ class UndocumentedNodes(TypedDict):
 
 
 class ModuleStats(TypedDict):
-    """TypedDict to store counts of types of messages and statements"""
+    """TypedDict to store counts of types of messages and statements."""
 
     convention: int
     error: int
@@ -73,14 +77,9 @@ class ModuleStats(TypedDict):
     warning: int
 
 
-ModuleStatsAttribute = Literal[
-    "convention", "error", "fatal", "info", "refactor", "statement", "warning"
-]
-
-
 # pylint: disable-next=too-many-instance-attributes
 class LinterStats:
-    """Class used to linter stats"""
+    """Class used to linter stats."""
 
     def __init__(
         self,
@@ -105,6 +104,7 @@ def __init__(
             method=0,
             module=0,
             variable=0,
+            typevar=0,
         )
         self.by_module: Dict[str, ModuleStats] = by_module or {}
         self.by_msg: Dict[str, int] = by_msg or {}
@@ -155,7 +155,7 @@ def __str__(self) -> str:
         {self.percent_duplicated_lines}"""
 
     def init_single_module(self, module_name: str) -> None:
-        """Use through Pylinter.set_current_module so Pyliner.current_name is consistent."""
+        """Use through PyLinter.set_current_module so PyLinter.current_name is consistent."""
         self.by_module[module_name] = ModuleStats(
             convention=0, error=0, fatal=0, info=0, refactor=0, statement=0, warning=0
         )
@@ -174,15 +174,16 @@ def get_bad_names(
             "method",
             "module",
             "variable",
+            "typevar",
         ],
     ) -> int:
-        """Get a bad names node count"""
+        """Get a bad names node count."""
         if node_name == "class":
             return self.bad_names.get("klass", 0)
         return self.bad_names.get(node_name, 0)
 
     def increase_bad_name(self, node_name: str, increase: int) -> None:
-        """Increase a bad names node count"""
+        """Increase a bad names node count."""
         if node_name not in {
             "argument",
             "attr",
@@ -195,6 +196,7 @@ def increase_bad_name(self, node_name: str, increase: int) -> None:
             "method",
             "module",
             "variable",
+            "typevar",
         }:
             raise ValueError("Node type not part of the bad_names stat")
 
@@ -211,6 +213,7 @@ def increase_bad_name(self, node_name: str, increase: int) -> None:
                 "method",
                 "module",
                 "variable",
+                "typevar",
             ],
             node_name,
         )
@@ -220,7 +223,7 @@ def increase_bad_name(self, node_name: str, increase: int) -> None:
             self.bad_names[node_name] += increase
 
     def reset_bad_names(self) -> None:
-        """Resets the bad_names attribute"""
+        """Resets the bad_names attribute."""
         self.bad_names = BadNames(
             argument=0,
             attr=0,
@@ -233,22 +236,23 @@ def reset_bad_names(self) -> None:
             method=0,
             module=0,
             variable=0,
+            typevar=0,
         )
 
     def get_code_count(
         self, type_name: Literal["code", "comment", "docstring", "empty", "total"]
     ) -> int:
-        """Get a code type count"""
+        """Get a code type count."""
         return self.code_type_count.get(type_name, 0)
 
     def reset_code_count(self) -> None:
-        """Resets the code_type_count attribute"""
+        """Resets the code_type_count attribute."""
         self.code_type_count = CodeTypeCount(
             code=0, comment=0, docstring=0, empty=0, total=0
         )
 
     def reset_duplicated_lines(self) -> None:
-        """Resets the duplicated_lines attribute"""
+        """Resets the duplicated_lines attribute."""
         self.duplicated_lines = DuplicatedLines(
             nb_duplicated_lines=0, percent_duplicated_lines=0.0
         )
@@ -256,47 +260,47 @@ def reset_duplicated_lines(self) -> None:
     def get_node_count(
         self, node_name: Literal["function", "class", "method", "module"]
     ) -> int:
-        """Get a node count while handling some extra conditions"""
+        """Get a node count while handling some extra conditions."""
         if node_name == "class":
             return self.node_count.get("klass", 0)
         return self.node_count.get(node_name, 0)
 
     def reset_node_count(self) -> None:
-        """Resets the node count attribute"""
+        """Resets the node count attribute."""
         self.node_count = NodeCount(function=0, klass=0, method=0, module=0)
 
     def get_undocumented(
         self, node_name: Literal["function", "class", "method", "module"]
     ) -> float:
-        """Get a undocumented node count"""
+        """Get a undocumented node count."""
         if node_name == "class":
             return self.undocumented["klass"]
         return self.undocumented[node_name]
 
     def reset_undocumented(self) -> None:
-        """Resets the undocumented attribute"""
+        """Resets the undocumented attribute."""
         self.undocumented = UndocumentedNodes(function=0, klass=0, method=0, module=0)
 
     def get_global_message_count(self, type_name: str) -> int:
-        """Get a global message count"""
+        """Get a global message count."""
         return getattr(self, type_name, 0)
 
     def get_module_message_count(self, modname: str, type_name: str) -> int:
-        """Get a module message count"""
+        """Get a module message count."""
         return getattr(self.by_module[modname], type_name, 0)
 
     def increase_single_message_count(self, type_name: str, increase: int) -> None:
-        """Increase the message type count of an individual message type"""
+        """Increase the message type count of an individual message type."""
         setattr(self, type_name, getattr(self, type_name) + increase)
 
     def increase_single_module_message_count(
-        self, modname: str, type_name: ModuleStatsAttribute, increase: int
+        self, modname: str, type_name: MessageTypesFullName, increase: int
     ) -> None:
-        """Increase the message type count of an individual message type of a module"""
+        """Increase the message type count of an individual message type of a module."""
         self.by_module[modname][type_name] += increase
 
     def reset_message_count(self) -> None:
-        """Resets the message type count of the stats object"""
+        """Resets the message type count of the stats object."""
         self.convention = 0
         self.error = 0
         self.fatal = 0
@@ -306,7 +310,7 @@ def reset_message_count(self) -> None:
 
 
 def merge_stats(stats: List[LinterStats]):
-    """Used to merge multiple stats objects into a new one when pylint is run in parallel mode"""
+    """Used to merge multiple stats objects into a new one when pylint is run in parallel mode."""
     merged = LinterStats()
     for stat in stats:
         merged.bad_names["argument"] += stat.bad_names["argument"]
@@ -320,6 +324,7 @@ def merge_stats(stats: List[LinterStats]):
         merged.bad_names["method"] += stat.bad_names["method"]
         merged.bad_names["module"] += stat.bad_names["module"]
         merged.bad_names["variable"] += stat.bad_names["variable"]
+        merged.bad_names["typevar"] += stat.bad_names["typevar"]
 
         for mod_key, mod_value in stat.by_module.items():
             merged.by_module[mod_key] = mod_value
diff --git a/pylint/utils/pragma_parser.py b/pylint/utils/pragma_parser.py
index 02ad254930..01cdf440af 100644
--- a/pylint/utils/pragma_parser.py
+++ b/pylint/utils/pragma_parser.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import re
 from collections import namedtuple
@@ -9,17 +10,18 @@
 # so that an option can be continued with the reasons
 # why it is active or disabled.
 OPTION_RGX = r"""
-    \s*                # Any number of whithespace
-    \#?                # One or zero hash
-    .*                 # Anything (as much as possible)
-    (\s*               # Beginning of first matched group and any number of whitespaces
-    \#                 # Beginning of comment
-    .*?                # Anything (as little as possible)
-    \bpylint:          # pylint word and column
-    \s*                # Any number of whitespaces
-    ([^;#\n]+))        # Anything except semicolon or hash or newline (it is the second matched group)
-                       # and end of the first matched group
-    [;#]{0,1}"""  # From 0 to 1 repetition of semicolon or hash
+    (?:^\s*\#.*|\s*|               # Comment line, or whitespaces,
+       \s*\#.*(?=\#.*?\bpylint:))  # or a beginning of an inline comment
+                                   # followed by "pylint:" pragma
+    (\#                            # Beginning of comment
+    .*?                            # Anything (as little as possible)
+    \bpylint:                      # pylint word and column
+    \s*                            # Any number of whitespaces
+    ([^;#\n]+))                    # Anything except semicolon or hash or
+                                   # newline (it is the second matched group)
+                                   # and end of the first matched group
+    [;#]{0,1}                      # From 0 to 1 repetition of semicolon or hash
+"""
 OPTION_PO = re.compile(OPTION_RGX, re.VERBOSE)
 
 
@@ -40,7 +42,7 @@
 
 
 TOKEN_SPECIFICATION = [
-    ("KEYWORD", fr"\b({ALL_KEYWORDS:s})\b"),
+    ("KEYWORD", rf"\b({ALL_KEYWORDS:s})\b"),
     ("MESSAGE_STRING", r"[0-9A-Za-z\-\_]{2,}"),  # Identifiers
     ("ASSIGN", r"="),  # Assignment operator
     ("MESSAGE_NUMBER", r"[CREIWF]{1}\d*"),
@@ -61,13 +63,10 @@ def emit_pragma_representer(action: str, messages: List[str]) -> PragmaRepresent
 
 
 class PragmaParserError(Exception):
-    """
-    A class for exceptions thrown by pragma_parser module
-    """
+    """A class for exceptions thrown by pragma_parser module."""
 
     def __init__(self, message: str, token: str) -> None:
-        """
-        :args message: explain the reason why the exception has been thrown
+        """:args message: explain the reason why the exception has been thrown
         :args token: token concerned by the exception
         """
         self.message = message
@@ -76,15 +75,11 @@ def __init__(self, message: str, token: str) -> None:
 
 
 class UnRecognizedOptionError(PragmaParserError):
-    """
-    Thrown in case the of a valid but unrecognized option
-    """
+    """Thrown in case the of a valid but unrecognized option."""
 
 
 class InvalidPragmaError(PragmaParserError):
-    """
-    Thrown in case the pragma is invalid
-    """
+    """Thrown in case the pragma is invalid."""
 
 
 def parse_pragma(pylint_pragma: str) -> Generator[PragmaRepresenter, None, None]:
diff --git a/pylint/utils/utils.py b/pylint/utils/utils.py
index bf37734fd2..6a60cd8e96 100644
--- a/pylint/utils/utils.py
+++ b/pylint/utils/utils.py
@@ -1,6 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 try:
     import isort.api
@@ -98,7 +98,7 @@ def cmp(a, b):
 
 
 def diff_string(old, new):
-    """given an old and new int value, return a string representing the
+    """Given an old and new int value, return a string representing the
     difference
     """
     diff = abs(old - new)
@@ -107,8 +107,8 @@ def diff_string(old, new):
 
 
 def get_module_and_frameid(node):
-    """return the module name and the frame id in the module"""
-    frame = node.frame()
+    """Return the module name and the frame id in the module."""
+    frame = node.frame(future=True)
     module, obj = "", []
     while frame:
         if isinstance(frame, Module):
@@ -116,7 +116,7 @@ def get_module_and_frameid(node):
         else:
             obj.append(getattr(frame, "name", "<lambda>"))
         try:
-            frame = frame.parent.frame()
+            frame = frame.parent.frame(future=True)
         except AttributeError:
             break
     obj.reverse()
@@ -129,7 +129,7 @@ def get_rst_title(title, character):
 
 
 def get_rst_section(section, options, doc=None):
-    """format an options section using as a ReStructuredText formatted output"""
+    """Format an option's section using as a ReStructuredText formatted output."""
     result = ""
     if section:
         result += get_rst_title(section, "'")
@@ -167,7 +167,7 @@ def tokenize_module(node: nodes.Module) -> List[tokenize.TokenInfo]:
 
 
 def register_plugins(linter, directory):
-    """load all module and package in the given directory, looking for a
+    """Load all module and package in the given directory, looking for a
     'register' function in each one, used to register pylint checkers
     """
     imported = {}
@@ -276,8 +276,8 @@ def get_global_option(
 
 
 def _splitstrip(string, sep=","):
-    """return a list of stripped string by splitting the string given as
-    argument on `sep` (',' by default). Empty string are discarded.
+    """Return a list of stripped string by splitting the string given as
+    argument on `sep` (',' by default), empty strings are discarded.
 
     >>> _splitstrip('a, b, c   ,  4,,')
     ['a', 'b', 'c', '4']
@@ -299,7 +299,7 @@ def _splitstrip(string, sep=","):
 
 
 def _unquote(string):
-    """remove optional quotes (simple or double) from the string
+    """Remove optional quotes (simple or double) from the string.
 
     :type string: str or unicode
     :param string: an optionally quoted string
@@ -323,14 +323,14 @@ def _check_csv(value):
 
 
 def _comment(string: str) -> str:
-    """return string as a comment"""
+    """Return string as a comment."""
     lines = [line.strip() for line in string.splitlines()]
     sep = "\n"
     return "# " + f"{sep}# ".join(lines)
 
 
 def _format_option_value(optdict, value):
-    """return the user input's value from a 'compiled' value"""
+    """Return the user input's value from a 'compiled' value."""
     if optdict.get("type", None) == "py_version":
         value = ".".join(str(item) for item in value)
     elif isinstance(value, (list, tuple)):
@@ -350,7 +350,7 @@ def _format_option_value(optdict, value):
 def format_section(
     stream: TextIO, section: str, options: List[Tuple], doc: Optional[str] = None
 ) -> None:
-    """format an options section using the INI format"""
+    """Format an option's section using the INI format."""
     if doc:
         print(_comment(doc), file=stream)
     print(f"[{section}]", file=stream)
@@ -358,7 +358,7 @@ def format_section(
 
 
 def _ini_format(stream: TextIO, options: List[Tuple]) -> None:
-    """format options using the INI format"""
+    """Format options using the INI format."""
     for optname, optdict, value in options:
         value = _format_option_value(optdict, value)
         help_opt = optdict.get("help")
@@ -386,9 +386,9 @@ class IsortDriver:
     def __init__(self, config):
         if HAS_ISORT_5:
             self.isort5_config = isort.api.Config(
-                # There is not typo here. EXTRA_standard_library is
+                # There is no typo here. EXTRA_standard_library is
                 # what most users want. The option has been named
-                # KNOWN_standard_library for ages in pylint and we
+                # KNOWN_standard_library for ages in pylint, and we
                 # don't want to break compatibility.
                 extra_standard_library=config.known_standard_library,
                 known_third_party=config.known_third_party,
diff --git a/pylintrc b/pylintrc
index a38a35aedf..1cacac6c71 100644
--- a/pylintrc
+++ b/pylintrc
@@ -11,6 +11,14 @@
 # paths.
 ignore=CVS
 
+# Add files or directories matching the regex patterns to the ignore-list. The
+# regex matches against paths and can be in Posix or Windows format.
+ignore-paths=
+
+# Files or directories matching the regex patterns are skipped. The regex
+# matches against base names, not paths.
+ignore-patterns=^\.#
+
 # Pickle collected data for later comparisons.
 persistent=yes
 
@@ -27,7 +35,8 @@ load-plugins=
     pylint.extensions.redefined_variable_type,
     pylint.extensions.comparison_placement,
 
-# Use multiple processes to speed up Pylint.
+# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
+# number of processors available to use.
 jobs=1
 
 # When enabled, pylint would attempt to guess common misconfiguration and emit
@@ -46,6 +55,19 @@ extension-pkg-allow-list=
 # Minimum supported python version
 py-version = 3.6.2
 
+# Control the amount of potential inferred values when inferring a single
+# object. This can help the performance when dealing with large functions or
+# complex, nested conditions.
+limit-inference-results=100
+
+# Specify a score threshold to be exceeded before program exits with error.
+fail-under=10.0
+
+# Return non-zero exit code if any of these messages/categories are detected,
+# even if score is above --fail-under value. Syntax same as enable. Messages
+# specified are enabled, while categories only check already-enabled messages.
+fail-on=
+
 
 [MESSAGES CONTROL]
 
@@ -55,7 +77,8 @@ confidence=
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option
-# multiple time. See also the "--disable" option for examples.
+# multiple time (only on the command line, not in the configuration file where
+# it should appear only once). See also the "--disable" option for examples.
 enable=
     use-symbolic-message-instead,
     useless-suppression,
@@ -65,7 +88,7 @@ enable=
 # can either give multiple identifiers separated by comma (,) or put this
 # option multiple times (only on the command line, not in the configuration
 # file where it should appear only once).You can also use "--disable=all" to
-# disable everything first and then reenable specific checks. For example, if
+# disable everything first and then re-enable specific checks. For example, if
 # you want to run only the similarities checker, you can use "--disable=all
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
@@ -89,25 +112,23 @@ disable=
 # mypackage.mymodule.MyReporterClass.
 output-format=text
 
-# Put messages in a separate file for each module / package specified on the
-# command line instead of printing them on stdout. Reports (if any) will be
-# written in a file name "pylint_global.[txt|html]".
-files-output=no
-
 # Tells whether to display a full report or only the messages
 reports=no
 
 # Python expression which should return a note less than 10 (10 is the highest
-# note). You have access to the variables errors warning, statement which
-# respectively contain the number of errors / warnings messages and the total
-# number of statements analyzed. This is used by the global evaluation report
-# (RP0004).
-evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+# note). You have access to the variables 'fatal', 'error', 'warning', 'refactor', 'convention'
+# and 'info', which contain the number of messages in each category, as
+# well as 'statement', which is the total number of statements analyzed. This
+# score is used by the global evaluation report (RP0004).
+evaluation=max(0, 0 if fatal else 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10))
 
 # Template used to display messages. This is a python new-style format string
 # used to format the message information. See doc for all details
 #msg-template=
 
+# Activate the evaluation score.
+score=yes
+
 
 [LOGGING]
 
@@ -115,12 +136,19 @@ evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / stateme
 # function parameter format
 logging-modules=logging
 
+# The type of string formatting that logging methods do. `old` means using %
+# formatting, `new` is for `{}` formatting.
+logging-format-style=old
+
 
 [MISCELLANEOUS]
 
 # List of note tags to take in consideration, separated by a comma.
 notes=FIXME,XXX,TODO
 
+# Regular expression of note tags to take in consideration.
+#notes-rgx=
+
 
 [SIMILARITIES]
 
@@ -136,6 +164,9 @@ ignore-docstrings=yes
 # Ignore imports when computing similarities.
 ignore-imports=no
 
+# Signatures are removed from the similarity computation
+ignore-signatures=no
+
 
 [VARIABLES]
 
@@ -154,6 +185,20 @@ additional-builtins=
 # name must start or end with one of those strings.
 callbacks=cb_,_cb
 
+# Tells whether unused global variables should be treated as a violation.
+allow-global-unused-variables=yes
+
+# List of names allowed to shadow builtins
+allowed-redefined-builtins=
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore.
+ignored-argument-names=_.*
+
+# List of qualified module names which can have objects that can redefine
+# builtins.
+redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
+
 
 [FORMAT]
 
@@ -167,6 +212,10 @@ ignore-long-lines=^\s*(# )?<?https?://\S+>?$
 # else.
 single-line-if-stmt=no
 
+# Allow the body of a class to be on the same line as the declaration if body
+# contains single statement.
+single-line-class-stmt=no
+
 # List of optional constructs for which whitespace checking is disabled
 no-space-check=trailing-comma,dict-separator
 
@@ -189,9 +238,17 @@ expected-line-ending-format=
 # Good variable names which should always be accepted, separated by a comma
 good-names=i,j,k,ex,Run,_
 
+# Good variable names regexes, separated by a comma. If names match any regex,
+# they will always be accepted
+good-names-rgxs=
+
 # Bad variable names which should always be refused, separated by a comma
 bad-names=foo,bar,baz,toto,tutu,tata
 
+# Bad variable names regexes, separated by a comma. If names match any regex,
+# they will always be refused
+bad-names-rgxs=
+
 # Colon-delimited sets of names that determine each other's naming style when
 # the name regexes allow several styles.
 name-group=
@@ -199,66 +256,106 @@ name-group=
 # Include a hint for the correct naming format with invalid-name
 include-naming-hint=no
 
+# Naming style matching correct function names.
+function-naming-style=snake_case
+
 # Regular expression matching correct function names
 function-rgx=[a-z_][a-z0-9_]{2,30}$
 
 # Naming hint for function names
 function-name-hint=[a-z_][a-z0-9_]{2,30}$
 
+# Naming style matching correct variable names.
+variable-naming-style=snake_case
+
 # Regular expression matching correct variable names
 variable-rgx=[a-z_][a-z0-9_]{2,30}$
 
 # Naming hint for variable names
 variable-name-hint=[a-z_][a-z0-9_]{2,30}$
 
+# Naming style matching correct constant names.
+const-naming-style=UPPER_CASE
+
 # Regular expression matching correct constant names
 const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
 
 # Naming hint for constant names
 const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$
 
+# Naming style matching correct attribute names.
+attr-naming-style=snake_case
+
 # Regular expression matching correct attribute names
 attr-rgx=[a-z_][a-z0-9_]{2,}$
 
 # Naming hint for attribute names
 attr-name-hint=[a-z_][a-z0-9_]{2,}$
 
+# Naming style matching correct argument names.
+argument-naming-style=snake_case
+
 # Regular expression matching correct argument names
 argument-rgx=[a-z_][a-z0-9_]{2,30}$
 
 # Naming hint for argument names
 argument-name-hint=[a-z_][a-z0-9_]{2,30}$
 
+# Naming style matching correct class attribute names.
+class-attribute-naming-style=any
+
 # Regular expression matching correct class attribute names
 class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
 
 # Naming hint for class attribute names
 class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
 
+# Naming style matching correct class constant names.
+class-const-naming-style=UPPER_CASE
+
+# Regular expression matching correct class constant names. Overrides class-
+# const-naming-style.
+#class-const-rgx=
+
+# Naming style matching correct inline iteration names.
+inlinevar-naming-style=any
+
 # Regular expression matching correct inline iteration names
 inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
 
 # Naming hint for inline iteration names
 inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$
 
+# Naming style matching correct class names.
+class-naming-style=PascalCase
+
 # Regular expression matching correct class names
 class-rgx=[A-Z_][a-zA-Z0-9]+$
 
 # Naming hint for class names
 class-name-hint=[A-Z_][a-zA-Z0-9]+$
 
+# Naming style matching correct module names.
+module-naming-style=snake_case
+
 # Regular expression matching correct module names
 module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
 
 # Naming hint for module names
 module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
 
+# Naming style matching correct method names.
+method-naming-style=snake_case
+
 # Regular expression matching correct method names
 method-rgx=[a-z_][a-z0-9_]{2,}$
 
 # Naming hint for method names
 method-name-hint=[a-z_][a-z0-9_]{2,}$
 
+# Regular expression which can overwrite the naming style set by typevar-naming-style.
+#typevar-rgx=
+
 # Regular expression which should only match function or class names that do
 # not require a docstring. Use ^(?!__init__$)_ to also check __init__.
 no-docstring-rgx=__.*__
@@ -277,16 +374,19 @@ property-classes=abc.abstractproperty
 # A class is considered mixin if its name matches the mixin-class-rgx option.
 ignore-mixin-members=yes
 
-# Regex pattern to define which classes are considered mixins.
+# Regex pattern to define which classes are considered mixins if ignore-mixin-
+# members is set to 'yes'
 mixin-class-rgx=.*MixIn
 
 # List of module names for which member attributes should not be checked
 # (useful for modules/projects where namespaces are manipulated during runtime
-# and thus existing member attributes cannot be deduced by static analysis)
+# and thus existing member attributes cannot be deduced by static analysis). It
+# supports qualified module names, as well as Unix pattern matching.
 ignored-modules=
 
-# List of classes names for which member attributes should not be checked
-# (useful for classes with attributes dynamically set).
+# List of class names for which member attributes should not be checked (useful
+# for classes with dynamically set attributes). This supports the use of
+# qualified names.
 ignored-classes=SQLObject, optparse.Values, thread._local, _thread._local
 
 # List of members which are set dynamically and missed by pylint inference
@@ -298,6 +398,29 @@ generated-members=REQUEST,acl_users,aq_parent
 # contextlib.contextmanager.
 contextmanager-decorators=contextlib.contextmanager
 
+# Tells whether to warn about missing members when the owner of the attribute
+# is inferred to be None.
+ignore-none=yes
+
+# This flag controls whether pylint should warn about no-member and similar
+# checks whenever an opaque object is returned when inferring. The inference
+# can return multiple potential results while evaluating a Python object, but
+# some branches might not be evaluated, which results in partial inference. In
+# that case, it might be useful to still emit no-member and other checks for
+# the rest of the inferred objects.
+ignore-on-opaque-inference=yes
+
+# Show a hint with possible names when a member name was not found. The aspect
+# of finding the hint is based on edit distance.
+missing-member-hint=yes
+
+# The minimum edit distance a name should have in order to be considered a
+# similar match for a missing member name.
+missing-member-hint-distance=1
+
+# The total number of similar names that should be taken in consideration when
+# showing a hint for a missing member.
+missing-member-max-choices=1
 
 [SPELLING]
 
@@ -308,6 +431,10 @@ spelling-dict=
 # List of comma separated words that should not be checked.
 spelling-ignore-words=
 
+# List of comma separated words that should be considered directives if they
+# appear and the beginning of a comment and should not be checked.
+spelling-ignore-comment-directives=fmt: on,fmt: off,noqa:,noqa,nosec,isort:skip,mypy:
+
 # A path to a file that contains private dictionary; one word per line.
 spelling-private-dict-file=
 
@@ -315,16 +442,15 @@ spelling-private-dict-file=
 # --spelling-private-dict-file option instead of raising a message.
 spelling-store-unknown-words=no
 
+# Limits count of emitted suggestions for spelling mistakes.
+max-spelling-suggestions=4
+
 
 [DESIGN]
 
 # Maximum number of arguments for function / method
 max-args=10
 
-# Argument names that match this expression will be ignored. Default to name
-# with leading underscore
-ignored-argument-names=_.*
-
 # Maximum number of locals for function / method body
 max-locals=25
 
@@ -332,7 +458,7 @@ max-locals=25
 max-returns=11
 
 # Maximum number of branch for function / method body
-max-branches=26
+max-branches=27
 
 # Maximum number of statements in function / method body
 max-statements=100
@@ -352,6 +478,9 @@ min-public-methods=2
 # Maximum number of public methods for a class (see R0904).
 max-public-methods=25
 
+# Maximum number of boolean expressions in an if statement (see R0916).
+max-bool-expr=5
+
 # List of regular expressions of class ancestor names to
 # ignore when counting public methods (see R0903).
 exclude-too-few-public-methods=
@@ -371,9 +500,23 @@ valid-metaclass-classmethod-first-arg=mcs
 # warning.
 exclude-protected=_asdict,_fields,_replace,_source,_make
 
+# Warn about protected attribute access inside special methods
+check-protected-access-in-special-methods=no
 
 [IMPORTS]
 
+# List of modules that can be imported at any level, not just the top level
+# one.
+allow-any-import-level=
+
+# Allow wildcard imports from modules that define __all__.
+allow-wildcard-with-all=no
+
+# Analyse import fallback blocks. This can be used to support both Python 2 and
+# 3 compatible code, which means that the block might have code that exists
+# only in one or another interpreter, leading to false positives when analysed.
+analyse-fallback-blocks=no
+
 # Deprecated modules which should not be used, separated by a comma
 deprecated-modules=regsub,TERMIOS,Bastion,rexec
 
@@ -389,6 +532,16 @@ ext-import-graph=
 # not be disabled)
 int-import-graph=
 
+# Force import order to recognize a module as part of the standard
+# compatibility libraries.
+known-standard-library=
+
+# Force import order to recognize a module as part of a third party library.
+known-third-party=enchant
+
+# Couples of modules and preferred modules, separated by a comma.
+preferred-modules=
+
 
 [EXCEPTIONS]
 
@@ -399,11 +552,47 @@ overgeneral-exceptions=Exception
 
 [TYPING]
 
-# Annotations are used exclusively for type checking
+# Set to ``no`` if the app / library does **NOT** need to support runtime
+# introspection of type annotations. If you use type annotations
+# **exclusively** for type checking of an application, you're probably fine.
+# For libraries, evaluate if some users what to access the type hints at
+# runtime first, e.g., through ``typing.get_type_hints``. Applies to Python
+# versions 3.7 - 3.9
 runtime-typing = no
 
 
-[pylint.DEPRECATED_BUILTINS]
+[DEPRECATED_BUILTINS]
 
 # List of builtins function names that should not be used, separated by a comma
 bad-functions=map,input
+
+
+[REFACTORING]
+
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=5
+
+# Complete name of functions that never returns. When checking for
+# inconsistent-return-statements if a never returning function is called then
+# it will be considered as an explicit return statement and no message will be
+# printed.
+never-returning-functions=sys.exit,argparse.parse_error
+
+
+[STRING]
+
+# This flag controls whether inconsistent-quotes generates a warning when the
+# character used as a quote delimiter is used inconsistently within a module.
+check-quote-consistency=no
+
+# This flag controls whether the implicit-str-concat should generate a warning
+# on implicit string concatenation in sequences defined over several lines.
+check-str-concat-over-line-jumps=no
+
+
+[CODE_STYLE]
+
+# Max line length for which to sill emit suggestions. Used to prevent optional
+# suggestions which would get split by a code formatter (e.g., black). Will
+# default to the setting for ``max-line-length``.
+#max-line-length-suggestions=
diff --git a/requirements_test.txt b/requirements_test.txt
index 3afe3a5d97..2e35f584d2 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -2,12 +2,12 @@
 -r requirements_test_min.txt
 coveralls~=3.3
 coverage~=6.2
-pre-commit~=2.15;python_full_version>="3.6.2"
+pre-commit~=2.17;python_full_version>="3.6.2"
 tbump~=6.6.0
+contributors-txt>=0.7.3
 pyenchant~=3.2
 pytest-cov~=3.0
 pytest-profiling~=1.7
-pytest-xdist~=2.4
+pytest-xdist~=2.5
 # Type packages for mypy
 types-pkg_resources==0.1.3
-types-toml==0.10.1
diff --git a/requirements_test_min.txt b/requirements_test_min.txt
index a0e339897d..10e6ce2e0e 100644
--- a/requirements_test_min.txt
+++ b/requirements_test_min.txt
@@ -1,6 +1,7 @@
--e .
+-e .[testutil]
 # astroid dependency is also defined in setup.cfg
-astroid==2.9.0  # Pinned to a specific version for tests
-pytest~=6.2
+astroid==2.11.2  # Pinned to a specific version for tests
+typing-extensions~=4.1
+pytest~=7.0
 pytest-benchmark~=3.4
-gitpython>3
+pytest-timeout~=2.1
diff --git a/requirements_test_pre_commit.txt b/requirements_test_pre_commit.txt
index 4a380d6e8d..8a7badad7b 100644
--- a/requirements_test_pre_commit.txt
+++ b/requirements_test_pre_commit.txt
@@ -1,7 +1,7 @@
 # Everything in this file should reflect the pre-commit configuration
 # in .pre-commit-config.yaml
-black==21.11b1
+black==22.3.0
 flake8==4.0.1
-flake8-typing-imports==1.11.0
+flake8-typing-imports==1.12.0
 isort==5.10.1
-mypy==0.910
+mypy==0.941
diff --git a/script/.contributors_aliases.json b/script/.contributors_aliases.json
new file mode 100644
index 0000000000..50f879ed06
--- /dev/null
+++ b/script/.contributors_aliases.json
@@ -0,0 +1,567 @@
+{
+  "13665637+DanielNoord@users.noreply.github.com": {
+    "mails": ["13665637+DanielNoord@users.noreply.github.com"],
+    "name": "Daniël van Noord",
+    "team": "Maintainers"
+  },
+  "15907922+kasium@users.noreply.github.com": {
+    "mails": ["15907922+kasium@users.noreply.github.com"],
+    "name": "Kai Mueller"
+  },
+  "16359131+jiajunsu@users.noreply.github.com": {
+    "mails": ["16359131+jiajunsu@users.noreply.github.com"],
+    "name": "Victor Jiajunsu"
+  },
+  "17108752+mattlbeck@users.noreply.github.com": {
+    "mails": ["17108752+mattlbeck@users.noreply.github.com"],
+    "name": "Matthew Beckers"
+  },
+  "30130371+cdce8p@users.noreply.github.com": {
+    "mails": ["30130371+cdce8p@users.noreply.github.com"],
+    "name": "Marc Mueller",
+    "team": "Maintainers"
+  },
+  "30827238+thernstig@users.noreply.github.com": {
+    "mails": ["30827238+thernstig@users.noreply.github.com"],
+    "name": "Tobias Hernstig"
+  },
+  "31448155+melvio@users.noreply.github.com": {
+    "mails": ["31448155+melvio@users.noreply.github.com"],
+    "name": "Melvin Hazeleger"
+  },
+  "31762852+mbyrnepr2@users.noreply.github.com": {
+    "mails": ["31762852+mbyrnepr2@users.noreply.github.com", "mbyrnepr2@gmail.com"],
+    "name": "Mark Byrne"
+  },
+  "31987769+sushobhit27@users.noreply.github.com": {
+    "mails": [
+      "sushobhitsolanki@gmail.com",
+      "31987769+sushobhit27@users.noreply.github.com"
+    ],
+    "name": "Sushobhit"
+  },
+  "35621759+anubh-v@users.noreply.github.com": {
+    "mails": ["35621759+anubh-v@users.noreply.github.com", "anubhav@u.nus.edu"],
+    "name": "Anubhav"
+  },
+  "36848472+yushao2@users.noreply.github.com": {
+    "mails": ["36848472+yushao2@users.noreply.github.com", "p.yushao2@gmail.com"],
+    "name": "Yu Shao, Pang",
+    "team": "Maintainers"
+  },
+  "37377066+harshil21@users.noreply.github.com": {
+    "mails": ["37377066+harshil21@users.noreply.github.com"],
+    "name": "Harshil"
+  },
+  "3929834+DudeNr33@users.noreply.github.com": {
+    "mails": ["andi.finkler@gmail.com", "3929834+DudeNr33@users.noreply.github.com"],
+    "name": "Andreas Finkler",
+    "team": "Maintainers"
+  },
+  "39745367+yory8@users.noreply.github.com": {
+    "mails": ["39745367+yory8@users.noreply.github.com"],
+    "name": "Yory"
+  },
+  "44787650+haasea@users.noreply.github.com": {
+    "mails": ["44787650+haasea@users.noreply.github.com"],
+    "name": "Aidan Haase"
+  },
+  "46202743+lorena-b@users.noreply.github.com": {
+    "mails": ["46202743+lorena-b@users.noreply.github.com"],
+    "name": "Lorena Buciu"
+  },
+  "53625739+dbrookman@users.noreply.github.com": {
+    "mails": ["53625739+dbrookman@users.noreply.github.com"],
+    "name": "Daniel Brookman"
+  },
+  "61059243+tiagohonorato@users.noreply.github.com": {
+    "mails": [
+      "tiagohonorato1@gmail.com",
+      "61059243+tiagohonorato@users.noreply.github.com"
+    ],
+    "name": "Tiago Honorato"
+  },
+  "62866982+SupImDos@users.noreply.github.com": {
+    "mails": ["62866982+SupImDos@users.noreply.github.com"],
+    "name": "Hayden Richards"
+  },
+  "80432516+jpy-git@users.noreply.github.com": {
+    "mails": ["80432516+jpy-git@users.noreply.github.com"],
+    "name": "Joseph Young"
+  },
+  "88253337+PaaEl@users.noreply.github.com": {
+    "mails": ["88253337+PaaEl@users.noreply.github.com"],
+    "name": "Sam Vermeiren"
+  },
+  "95424144+allanc65@users.noreply.github.com": {
+    "mails": ["95424144+allanc65@users.noreply.github.com"],
+    "name": "Allan Chandler"
+  },
+  "Adrien.DiMascio@logilab.fr": {
+    "mails": ["Adrien.DiMascio@logilab.fr"],
+    "name": "Adrien Di Mascio"
+  },
+  "Github@pheanex.de": {
+    "mails": ["Github@pheanex.de"],
+    "name": "Konstantin"
+  },
+  "Mariatta@users.noreply.github.com": {
+    "mails": ["Mariatta@users.noreply.github.com", "mariatta@python.org"],
+    "name": "Mariatta Wijaya"
+  },
+  "MartinBasti@users.noreply.github.com": {
+    "mails": ["MartinBasti@users.noreply.github.com"],
+    "name": "Martin Bašti"
+  },
+  "Pablogsal@gmail.com": {
+    "mails": ["Pablogsal@gmail.com"],
+    "name": "Pablo Galindo Salgado"
+  },
+  "PaulRenvoise@users.noreply.github.com": {
+    "mails": ["renvoisepaul@gmail.com", "PaulRenvoise@users.noreply.github.com"],
+    "name": "Paul Renvoisé"
+  },
+  "ahirnish@gmail.com": {
+    "mails": ["ahirnish@gmail.com"],
+    "name": "Ahirnish Pareek"
+  },
+  "alexandre.fayolle@logilab.fr": {
+    "mails": ["alexandre.fayolle@logilab.fr", "afayolle.ml@free.fr"],
+    "name": "Alexandre Fayolle"
+  },
+  "anjsimmo@gmail.com": {
+    "mails": ["anjsimmo@gmail.com", "a.simmons@deakin.edu.au"],
+    "name": "Andrew J. Simmons"
+  },
+  "areveny@protonmail.com": {
+    "mails": [
+      "areveny@protonmail.com",
+      "self@areveny.com",
+      "92831762+areveny@users.noreply.github.com"
+    ],
+    "name": "Arianna Yang",
+    "team": "Maintainers"
+  },
+  "arusahni@gmail.com": {
+    "mails": ["arusahni@gmail.com", "aru@thehumangeo.com"],
+    "name": "Aru Sahni"
+  },
+  "ashley@awhetter.co.uk": {
+    "mails": [
+      "ashleyw@activestate.com",
+      "ashley@awhetter.co.uk",
+      "awhetter.2011@my.bristol.ac.uk",
+      "asw@dneg.com",
+      "AWhetter@users.noreply.github.com"
+    ],
+    "name": "Ashley Whetter",
+    "team": "Maintainers"
+  },
+  "balint.mihai@gmail.com": {
+    "mails": ["balint.mihai@gmail.com", "mihai@cs.upt.ro"],
+    "name": "Mihai Balint"
+  },
+  "bastien.vallet@gmail.com": {
+    "mails": ["bastien.vallet@gmail.com"],
+    "name": "Bastien Vallet"
+  },
+  "benny.mueller91@gmail.com": {
+    "mails": ["benny.mueller91@gmail.com"],
+    "name": "Benny Mueller"
+  },
+  "bitbucket@carlcrowder.com": {
+    "mails": ["bitbucket@carlcrowder.com"],
+    "name": "Carl Crowder"
+  },
+  "bot@noreply.github.com": {
+    "mails": [
+      "66853113+pre-commit-ci[bot]@users.noreply.github.com",
+      "49699333+dependabot[bot]@users.noreply.github.com"
+    ],
+    "name": "bot"
+  },
+  "bruno.daniel@blue-yonder.com": {
+    "mails": ["Bruno.Daniel@blue-yonder.com", "bruno.daniel@blue-yonder.com"],
+    "name": "Bruno Daniel"
+  },
+  "bryce.paul.guinta@gmail.com": {
+    "mails": ["bryce.paul.guinta@gmail.com", "bryce.guinta@protonmail.com"],
+    "name": "Bryce Guinta",
+    "team": "Maintainers"
+  },
+  "buck@yelp.com": {
+    "mails": ["buck@yelp.com", "buck.2019@gmail.com"],
+    "name": "Buck (Yelp)"
+  },
+  "calen.pennington@gmail.com": {
+    "mails": ["cale@edx.org", "calen.pennington@gmail.com"],
+    "name": "Calen Pennington"
+  },
+  "carli.freudenberg@energymeteo.de": {
+    "mails": ["carli.freudenberg@energymeteo.de"],
+    "name": "Carli Freudenberg"
+  },
+  "ceridwenv@gmail.com": {
+    "mails": ["ceridwenv@gmail.com"],
+    "name": "Ceridwen",
+    "team": "Maintainers"
+  },
+  "cezar.elnazli2@gmail.com": {
+    "mails": ["celnazli@bitdefender.com", "cezar.elnazli2@gmail.com"],
+    "name": "Cezar Elnazli"
+  },
+  "cmin@ropython.org": {
+    "mails": ["cmin@ropython.org"],
+    "name": "Cosmin Poieană"
+  },
+  "contact@ionelmc.ro": {
+    "mails": ["contact@ionelmc.ro"],
+    "name": "Ionel Maries Cristian"
+  },
+  "dan.r.neal@gmail.com": {
+    "mails": ["dan.r.neal@gmail.com"],
+    "name": "Daniel R. Neal"
+  },
+  "david.douard@sdfa3.org": {
+    "mails": ["david.douard@sdfa3.org", "david.douard@logilab.fr"],
+    "name": "David Douard"
+  },
+  "david.pursehouse@gmail.com": {
+    "mails": ["david.pursehouse@gmail.com", "david.pursehouse@sonymobile.com"],
+    "name": "David Pursehouse"
+  },
+  "ddandd@gmail.com": {
+    "mails": ["ddandd@gmail.com"],
+    "name": "Daniel Dorani"
+  },
+  "dharding@gmail.com": {
+    "mails": ["dharding@gmail.com", "dharding@living180.net"],
+    "name": "Daniel Harding"
+  },
+  "djgoldsmith@googlemail.com": {
+    "mails": ["djgoldsmith@googlemail.com"],
+    "name": "Dan Goldsmith"
+  },
+  "dmand@yandex.ru": {
+    "mails": ["dmand@yandex.ru"],
+    "name": "Dimitri Prybysh",
+    "team": "Maintainers"
+  },
+  "drewrisinger@users.noreply.github.com": {
+    "mails": ["drewrisinger@users.noreply.github.com"],
+    "name": "Drew Risinger"
+  },
+  "ejfine@gmail.com": {
+    "mails": [
+      "ubuntu@ip-172-31-89-59.ec2.internal",
+      "eli88fine@gmail.com",
+      "ejfine@gmail.com"
+    ],
+    "name": "Eli Fine"
+  },
+  "email@holger-peters.de": {
+    "mails": ["email@holger-peters.de", "holger.peters@blue-yonder.com"],
+    "name": "Holger Peters"
+  },
+  "emile.anclin@logilab.fr": {
+    "mails": ["emile.anclin@logilab.fr", ""],
+    "name": "Emile Anclin"
+  },
+  "emile@crater.logilab.fr": {
+    "mails": ["emile@crater.logilab.fr"],
+    "name": "Émile Crater"
+  },
+  "ethanleba5@gmail.com": {
+    "mails": ["ethanleba5@gmail.com"],
+    "name": "Ethan Leba"
+  },
+  "flying-sheep@web.de": {
+    "mails": ["flying-sheep@web.de", "palbrecht@mailbox.org"],
+    "name": "Philipp Albrecht"
+  },
+  "fortemarco.irl@gmail.com": {
+    "mails": ["fortemarco.irl@gmail.com", "marcoyolos"],
+    "name": "Marco Forte"
+  },
+  "frank@doublethefish.com": {
+    "mails": ["frank@doublethefish.com", "doublethefish@gmail.com"],
+    "name": "Frank Harrison"
+  },
+  "frost.nzcr4@jagmort.com": {
+    "mails": ["frost.nzcr4@jagmort.com"],
+    "name": "Alexander Pervakov"
+  },
+  "frostming@tencent.com": {
+    "mails": ["frostming@tencent.com", "mianghong@gmail.com"],
+    "name": "Frost Ming"
+  },
+  "g@briel.dev": {
+    "mails": ["g@briel.dev", "gabriel@sezefredo.com.br"],
+    "name": "Gabriel R. Sezefredo"
+  },
+  "gergely.kalmar@logikal.jp": {
+    "mails": ["gergely.kalmar@logikal.jp"],
+    "name": "Gergely Kalmár"
+  },
+  "github@euresti.com": {
+    "mails": ["david@dropbox.com", "github@euresti.com"],
+    "name": "David Euresti"
+  },
+  "github@hornwitser.no": {
+    "mails": ["github@hornwitser.no"],
+    "name": "Hornwitser"
+  },
+  "glenn@e-dad.net": {
+    "mails": ["glenn@e-dad.net", "glmatthe@cisco.com"],
+    "name": "Glenn Matthews"
+  },
+  "guillaume.peillex@gmail.com": {
+    "mails": ["guillaume.peillex@gmail.com", "guillaume.peillex@gmail.col"],
+    "name": "Hippo91",
+    "team": "Maintainers"
+  },
+  "hg@stevenmyint.com": {
+    "mails": ["hg@stevenmyint.com", "git@stevenmyint.com"],
+    "name": "Steven Myint"
+  },
+  "hugovk@users.noreply.github.com": {
+    "mails": ["hugovk@users.noreply.github.com"],
+    "name": "Hugo van Kemenade"
+  },
+  "hugues.bruant@affirm.com": {
+    "mails": ["hugues.bruant@affirm.com"],
+    "name": "Hugues Bruant"
+  },
+  "iilei@users.noreply.github.com": {
+    "mails": ["iilei@users.noreply.github.com"],
+    "name": "Jochen Preusche"
+  },
+  "jacob@bogdanov.dev": {
+    "mails": ["jacob@bogdanov.dev", "jbogdanov@128technology.com"],
+    "name": "Jacob Bogdanov"
+  },
+  "jacobtylerwalls@gmail.com": {
+    "mails": ["jacobtylerwalls@gmail.com"],
+    "name": "Jacob Walls",
+    "team": "Maintainers"
+  },
+  "joffrey.mander+pro@gmail.com": {
+    "mails": ["joffrey.mander+pro@gmail.com"],
+    "name": "Joffrey Mander"
+  },
+  "joshdcannon@gmail.com": {
+    "mails": ["joshdcannon@gmail.com", "joshua.cannon@ni.com"],
+    "name": "Joshua Cannon"
+  },
+  "josselin@trailofbits.com": {
+    "mails": ["josselin@trailofbits.com"],
+    "name": "Josselin Feist"
+  },
+  "justinnhli@gmail.com": {
+    "mails": ["justinnhli@gmail.com", "justinnhli@users.noreply.github.com"],
+    "name": "Justin Li"
+  },
+  "kapsh@kap.sh": {
+    "mails": ["kapsh@kap.sh"],
+    "name": "Alexander Kapshuna"
+  },
+  "kavinsingh@hotmail.com": {
+    "mails": ["kavin.singh@mail.utoronto.ca", "kavinsingh@hotmail.com"],
+    "name": "Kavins Singh"
+  },
+  "keichi.t@me.com": {
+    "mails": ["hello@keichi.dev", "keichi.t@me.com"],
+    "name": "Keichi Takahashi"
+  },
+  "laike9m@users.noreply.github.com": {
+    "mails": ["laike9m@users.noreply.github.com"],
+    "name": "laike9m"
+  },
+  "laura.medioni@logilab.fr": {
+    "mails": ["laura.medioni@logilab.fr", "lmedioni@logilab.fr"],
+    "name": "Laura Médioni"
+  },
+  "liyt@ios.ac.cn": {
+    "mails": ["liyt@ios.ac.cn"],
+    "name": "Yeting Li"
+  },
+  "lothiraldan@gmail.com": {
+    "mails": ["lothiraldan@gmail.com"],
+    "name": "Boris Feld"
+  },
+  "lucristofolini@gmail.com": {
+    "mails": ["luigi.cristofolini@q-ctrl.com", "lucristofolini@gmail.com"],
+    "name": "Luigi Bertaco Cristofolini"
+  },
+  "m.fesenko@corp.vk.com": {
+    "mails": ["m.fesenko@corp.vk.com", "proggga@gmail.com"],
+    "name": "Mikhail Fesenko"
+  },
+  "mariocj89@gmail.com": {
+    "mails": ["mcorcherojim@bloomberg.net", "mariocj89@gmail.com"],
+    "name": "Mario Corchero"
+  },
+  "mark00bell@googlemail.com": {
+    "mails": ["mark00bell@googlemail.com", "MarkCBell@users.noreply.github.com"],
+    "name": "Mark Bell"
+  },
+  "martin@vielsmaier.net": {
+    "mails": ["martin@vielsmaier.net", "martin.vielsmaier@gmail.com"],
+    "name": "Martin Vielsmaier"
+  },
+  "matusvalo@users.noreply.github.com": {
+    "mails": ["matusvalo@users.noreply.github.com", "matusvalo@gmail.com"],
+    "name": "Matus Valo"
+  },
+  "me@the-compiler.org": {
+    "mails": [
+      "me@the-compiler.org",
+      "git@the-compiler.org",
+      "bitbucket.org@the-compiler.org"
+    ],
+    "name": "Florian Bruhin",
+    "team": "Maintainers"
+  },
+  "mitchelly@gmail.com": {
+    "mails": ["mitchelly@gmail.com"],
+    "name": "Mitchell Young"
+  },
+  "molobrakos@users.noreply.github.com": {
+    "mails": ["molobrakos@users.noreply.github.com", "erik.eriksson@yahoo.com"],
+    "name": "Erik Eriksson"
+  },
+  "moylop260@vauxoo.com": {
+    "mails": ["moylop260@vauxoo.com"],
+    "name": "Moisés López"
+  },
+  "mtmiller@users.noreply.github.com": {
+    "mails": ["725mrm@gmail.com", "mtmiller@users.noreply.github.com"],
+    "name": "Mark Roman Miller"
+  },
+  "nelfin@gmail.com": {
+    "mails": ["nelfin@gmail.com", "hello@nelf.in"],
+    "name": "Andrew Haigh"
+  },
+  "nickpesce22@gmail.com": {
+    "mails": ["nickpesce22@gmail.com", "npesce@terpmail.umd.edu"],
+    "name": "Nick Pesce"
+  },
+  "nozzy123nozzy@gmail.com": {
+    "mails": ["nozzy123nozzy@gmail.com"],
+    "name": "Takahide Nojima"
+  },
+  "or.ba402@gmail.com": {
+    "mails": ["or.ba402@gmail.com", "orbahari@mail.tau.ac.il"],
+    "name": "Or Bahari"
+  },
+  "pcmanticore@gmail.com": {
+    "mails": ["cpopa@cloudbasesolutions.com", "pcmanticore@gmail.com"],
+    "name": "Claudiu Popa",
+    "team": "Ex-maintainers"
+  },
+  "peter.kolbus@gmail.com": {
+    "mails": ["peter.kolbus@gmail.com", "peter.kolbus@garmin.com"],
+    "name": "Peter Kolbus"
+  },
+  "pierre.sassoulas@gmail.com": {
+    "mails": [
+      "pierre.sassoulas@gmail.com",
+      "pierre.sassoulas@cea.fr",
+      "pierre.sassoulas@wisebim.fr"
+    ],
+    "name": "Pierre Sassoulas",
+    "team": "Maintainers"
+  },
+  "pnlbagan@gmail.com": {
+    "mails": ["pnlbagan@gmail.com"],
+    "name": "Sasha Bagan"
+  },
+  "raphael@makeleaps.com": {
+    "mails": ["raphael@rtpg.co", "raphael@makeleaps.com"],
+    "name": "Raphael Gaschignard"
+  },
+  "reverbc@users.noreply.github.com": {
+    "mails": ["reverbc@users.noreply.github.com"],
+    "name": "Reverb Chu"
+  },
+  "rhys.fureigh@gsa.gov": {
+    "mails": ["rhys.fureigh@gsa.gov", "fureigh@users.noreply.github.com"],
+    "name": "Fureigh"
+  },
+  "rogalski.91@gmail.com": {
+    "mails": ["rogalski.91@gmail.com", "lukasz.rogalski@intel.com"],
+    "name": "Łukasz Rogalski",
+    "team": "Maintainers"
+  },
+  "roy.williams.iii@gmail.com": {
+    "mails": ["roy.williams.iii@gmail.com", "rwilliams@lyft.com"],
+    "name": "Roy Williams",
+    "team": "Maintainers"
+  },
+  "ruro.ruro@ya.ru": {
+    "mails": ["ruro.ruro@ya.ru"],
+    "name": "Ruro"
+  },
+  "sergeykosarchuk@gmail.com": {
+    "mails": ["sergeykosarchuk@gmail.com"],
+    "name": "Kosarchuk Sergey"
+  },
+  "shlomme@gmail.com": {
+    "mails": ["shlomme@gmail.com", "tmarek@google.com"],
+    "name": "Torsten Marek",
+    "team": "Ex-maintainers"
+  },
+  "slavfoxman@gmail.com": {
+    "mails": ["slavfoxman@gmail.com"],
+    "name": "Slavfox"
+  },
+  "sneakypete81@gmail.com": {
+    "mails": ["sneakypete81@gmail.com"],
+    "name": "Sneaky Pete"
+  },
+  "stefan@sofa-rockers.org": {
+    "mails": ["stefan.scherfke@energymeteo.de", "stefan@sofa-rockers.org"],
+    "name": "Stefan Scherfke"
+  },
+  "stephane@wirtel.be": {
+    "mails": ["stephane@wirtel.be"],
+    "name": "Stéphane Wirtel"
+  },
+  "svet@hyperscience.com": {
+    "mails": ["svet@hyperscience.com"],
+    "name": "Svetoslav Neykov"
+  },
+  "tanant@users.noreply.github.com": {
+    "mails": ["tanant@users.noreply.github.com"],
+    "name": "Anthony Tan"
+  },
+  "thenault@gmail.com": {
+    "mails": ["thenault@gmail.com", "sylvain.thenault@logilab.fr"],
+    "name": "Sylvain Thénault",
+    "team": "Ex-maintainers"
+  },
+  "tushar.sadhwani000@gmail.com": {
+    "mails": [
+      "tushar.sadhwani000@gmail.com",
+      "tushar@deepsource.io",
+      "86737547+tushar-deepsource@users.noreply.github.com"
+    ],
+    "name": "Tushar Sadhwani"
+  },
+  "vapier@gmail.com": {
+    "mails": ["vapier@gmail.com", "vapier@gentoo.org"],
+    "name": "Mike Frysinger"
+  },
+  "ville.skytta@iki.fi": {
+    "mails": ["ville.skytta@iki.fi", "ville.skytta@upcloud.com"],
+    "name": "Ville Skyttä"
+  },
+  "viorels@gmail.com": {
+    "mails": ["viorels@gmail.com"],
+    "name": "Viorel Știrbu"
+  },
+  "vladtemian@gmail.com": {
+    "mails": ["vladtemian@gmail.com"],
+    "name": "Vlad Temian"
+  }
+}
diff --git a/script/__init__.py b/script/__init__.py
index e69de29bb2..e8a8ff79fd 100644
--- a/script/__init__.py
+++ b/script/__init__.py
@@ -0,0 +1,3 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
diff --git a/script/bump_changelog.py b/script/bump_changelog.py
index 6b8e4abbff..f1edcdbb0f 100644
--- a/script/bump_changelog.py
+++ b/script/bump_changelog.py
@@ -1,9 +1,11 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 # ORIGINAL here: https://github.com/PyCQA/astroid/blob/main/script/bump_changelog.py
 # DO NOT MODIFY DIRECTLY
 
-"""
-This script permits to upgrade the changelog in astroid or pylint when releasing a version.
-"""
+"""This script permits to upgrade the changelog in astroid or pylint when releasing a version."""
 # pylint: disable=logging-fstring-interpolation
 import argparse
 import enum
diff --git a/script/copyright.txt b/script/copyright.txt
new file mode 100644
index 0000000000..e8a8ff79fd
--- /dev/null
+++ b/script/copyright.txt
@@ -0,0 +1,3 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
diff --git a/script/create_contributor_list.py b/script/create_contributor_list.py
new file mode 100644
index 0000000000..9b336a01b1
--- /dev/null
+++ b/script/create_contributor_list.py
@@ -0,0 +1,21 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+from pathlib import Path
+
+from contributors_txt import create_contributors_txt
+
+BASE_DIRECTORY = Path(__file__).parent.parent
+ALIASES_FILE = BASE_DIRECTORY / "script/.contributors_aliases.json"
+DEFAULT_CONTRIBUTOR_PATH = BASE_DIRECTORY / "CONTRIBUTORS.txt"
+
+
+def main():
+    create_contributors_txt(
+        aliases_file=ALIASES_FILE, output=DEFAULT_CONTRIBUTOR_PATH, verbose=True
+    )
+
+
+if __name__ == "__main__":
+    main()
diff --git a/script/fix_documentation.py b/script/fix_documentation.py
index b03f70ead4..24dd0097e2 100644
--- a/script/fix_documentation.py
+++ b/script/fix_documentation.py
@@ -1,3 +1,7 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 """Small script to fix various issues with the documentation. Used by pre-commit."""
 import argparse
 import re
@@ -23,7 +27,7 @@ def fix_inline_code_blocks(file_content: str) -> str:
 
 
 def changelog_insert_empty_lines(file_content: str, subtitle_text: str) -> str:
-    """Insert up to two empty lines before `What's New` entry in ChangeLog"""
+    """Insert up to two empty lines before `What's New` entry in ChangeLog."""
     lines = file_content.split("\n")
     subtitle_count = 0
     for i, line in enumerate(lines):
@@ -83,14 +87,14 @@ def main(argv: Union[List[str], None] = None) -> int:
     return_value: int = 0
     for file_name in args.filenames:
         with open(file_name, encoding="utf-8") as fp:
-            orignal_content = fp.read()
-        content = orignal_content
+            original_content = fp.read()
+        content = original_content
         # Modify files
         content = fix_inline_code_blocks(content)
         if file_name == args.changelog:
             content = changelog_insert_empty_lines(content, args.subtitle_prefix)
         # If modified, write changes and eventually return 1
-        if orignal_content != content:
+        if original_content != content:
             with open(file_name, "w", encoding="utf-8") as fp:
                 fp.write(content)
             return_value |= 1
diff --git a/script/get_unused_message_id_category.py b/script/get_unused_message_id_category.py
index 5ddcd0b3c4..7bf1a1343c 100644
--- a/script/get_unused_message_id_category.py
+++ b/script/get_unused_message_id_category.py
@@ -1,16 +1,18 @@
-"""Small script to get a new unused message id category"""
+"""Small script to get a new unused message id category."""
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 from typing import List
 
 from pylint.checkers import initialize as initialize_checkers
+from pylint.constants import DELETED_MSGID_PREFIXES
 from pylint.extensions import initialize as initialize_extensions
 from pylint.lint.pylinter import PyLinter
 
 
 def register_all_checkers_and_plugins(linter: "PyLinter") -> None:
-    """Registers all checkers and plugins"""
+    """Registers all checkers and plugins."""
     linter.cmdline_parser.set_conflict_handler("resolve")
     initialize_checkers(linter)
     initialize_extensions(linter)
@@ -18,6 +20,8 @@ def register_all_checkers_and_plugins(linter: "PyLinter") -> None:
 
 def get_next_code_category(message_ids: List[str]) -> int:
     categories = sorted({int(i[:2]) for i in message_ids})
+    # We add the prefixes for deleted checkers
+    categories += DELETED_MSGID_PREFIXES
     for i in categories:
         if i + 1 not in categories:
             return i + 1
diff --git a/setup.cfg b/setup.cfg
index 2a0bb250a1..eeceb78d7b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -43,15 +43,22 @@ project_urls =
 [options]
 packages = find:
 install_requires =
+    dill>=0.2
     platformdirs>=2.2.0
-    astroid>=2.9.0,<2.10 # (You should also upgrade requirements_test_min.txt)
+    # Also upgrade requirements_test_min.txt if you are bumping astroid.
+    # Pinned to dev of next minor update to allow editable installs,
+    # see https://github.com/PyCQA/astroid/issues/1341
+    astroid>=2.11.2,<=2.12.0-dev0
     isort>=4.2.5,<6
-    mccabe>=0.6,<0.7
-    toml>=0.9.2
+    mccabe>=0.6,<0.8
+    tomli>=1.1.0;python_version<"3.11"
     colorama;sys_platform=="win32"
     typing-extensions>=3.10.0;python_version<"3.10"
 python_requires = >=3.6.2
 
+[options.extras_require]
+testutil=gitpython>3
+
 [options.packages.find]
 include =
     pylint*
@@ -63,6 +70,9 @@ console_scripts =
     pyreverse = pylint:run_pyreverse
     symilar = pylint:run_symilar
 
+[options.package_data]
+pylint = testutils/testing_pylintrc
+
 [aliases]
 test = pytest
 
@@ -87,6 +97,7 @@ no_implicit_optional = True
 scripts_are_modules = True
 warn_unused_ignores = True
 show_error_codes = True
+enable_error_code = ignore-without-code
 
 [mypy-astroid.*]
 ignore_missing_imports = True
@@ -94,6 +105,9 @@ ignore_missing_imports = True
 [mypy-tests.*]
 ignore_missing_imports = True
 
+[mypy-contributors_txt]
+ignore_missing_imports = True
+
 [mypy-coverage]
 ignore_missing_imports = True
 
@@ -118,8 +132,11 @@ ignore_missing_imports = True
 [mypy-_string]
 ignore_missing_imports = True
 
-[mypy-toml.decoder]
+[mypy-git.*]
 ignore_missing_imports = True
 
-[mypy-git.*]
+[mypy-dill]
+ignore_missing_imports = True
+
+[mypy-colorama]
 ignore_missing_imports = True
diff --git a/tbump.toml b/tbump.toml
index d53b722f6a..e050fcda2e 100644
--- a/tbump.toml
+++ b/tbump.toml
@@ -1,7 +1,7 @@
 github_url = "https://github.com/PyCQA/pylint"
 
 [version]
-current = "2.12.2"
+current = "2.13.5"
 regex = '''
 ^(?P<major>0|[1-9]\d*)
 \.
@@ -29,8 +29,16 @@ name = "Upgrade changelog"
 cmd = "python3 script/bump_changelog.py {new_version}"
 
 [[before_commit]]
-name = "Upgrade copyrights"
-cmd = "pip3 install copyrite;copyrite --contribution-threshold 1 --change-threshold 3 --backend-type git --aliases=.copyrite_aliases . --jobs=8"
+name = "Upgrade and check doc"
+cmd = "tox -e docs||echo 'Hack so this command does not fail'"
+
+[[before_commit]]
+name = "Normalize the contributors-txt configuration"
+cmd = "contributors-txt-normalize-configuration -a script/.contributors_aliases.json -o script/.contributors_aliases.json"
+
+[[before_commit]]
+name = "Upgrade the contributors list"
+cmd = "python3 script/create_contributor_list.py"
 
 [[before_commit]]
 name = "Apply pre-commit"
diff --git a/tests/benchmark/test_baseline_benchmarks.py b/tests/benchmark/test_baseline_benchmarks.py
index 27635f6191..f9e997ef3d 100644
--- a/tests/benchmark/test_baseline_benchmarks.py
+++ b/tests/benchmark/test_baseline_benchmarks.py
@@ -1,14 +1,8 @@
-""" Profiles basic -jX functionality """
-# Copyright (c) 2020-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2020 Frank Harrison <frank@doublethefish.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
+"""Profiles basic -jX functionality."""
 
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 # pylint: disable=missing-function-docstring
 
@@ -37,10 +31,11 @@ def _empty_filepath():
 
 
 class SleepingChecker(BaseChecker):
-    """A checker that sleeps, the wall-clock time should reduce as we add workers
+    """A checker that sleeps, the wall-clock time should reduce as we add workers.
 
     As we apply a roughly constant amount of "work" in this checker any variance is
-    likely to be caused by the pylint system."""
+    likely to be caused by the pylint system.
+    """
 
     __implements__ = (pylint.interfaces.IRawChecker,)
 
@@ -55,17 +50,19 @@ class SleepingChecker(BaseChecker):
     sleep_duration = 0.5  # the time to pretend we're doing work for
 
     def process_module(self, _node: nodes.Module) -> None:
-        """Sleeps for `sleep_duration` on each call
+        """Sleeps for `sleep_duration` on each call.
 
-        This effectively means each file costs ~`sleep_duration`+framework overhead"""
+        This effectively means each file costs ~`sleep_duration`+framework overhead
+        """
         time.sleep(self.sleep_duration)
 
 
 class SleepingCheckerLong(BaseChecker):
-    """A checker that sleeps, the wall-clock time should reduce as we add workers
+    """A checker that sleeps, the wall-clock time should reduce as we add workers.
 
     As we apply a roughly constant amount of "work" in this checker any variance is
-    likely to be caused by the pylint system."""
+    likely to be caused by the pylint system.
+    """
 
     __implements__ = (pylint.interfaces.IRawChecker,)
 
@@ -80,14 +77,15 @@ class SleepingCheckerLong(BaseChecker):
     sleep_duration = 0.5  # the time to pretend we're doing work for
 
     def process_module(self, _node: nodes.Module) -> None:
-        """Sleeps for `sleep_duration` on each call
+        """Sleeps for `sleep_duration` on each call.
 
-        This effectively means each file costs ~`sleep_duration`+framework overhead"""
+        This effectively means each file costs ~`sleep_duration`+framework overhead
+        """
         time.sleep(self.sleep_duration)
 
 
 class NoWorkChecker(BaseChecker):
-    """A checker that sleeps, the wall-clock time should change as we add threads"""
+    """A checker that sleeps, the wall-clock time should change as we add threads."""
 
     __implements__ = (pylint.interfaces.IRawChecker,)
 
@@ -108,10 +106,11 @@ def process_module(self, _node: nodes.Module) -> None:
     group="baseline",
 )
 class TestEstablishBaselineBenchmarks:
-    """Naive benchmarks for the high-level pylint framework
+    """Naive benchmarks for the high-level pylint framework.
 
     Because this benchmarks the fundamental and common parts and changes seen here will
-    impact everything else"""
+    impact everything else
+    """
 
     empty_filepath = _empty_filepath()
     empty_file_info = FileItem(
@@ -122,7 +121,7 @@ class TestEstablishBaselineBenchmarks:
     lot_of_files = 500
 
     def test_baseline_benchmark_j1(self, benchmark):
-        """Establish a baseline of pylint performance with no work
+        """Establish a baseline of pylint performance with no work.
 
         We will add extra Checkers in other benchmarks.
 
@@ -137,46 +136,47 @@ def test_baseline_benchmark_j1(self, benchmark):
             linter.msg_status == 0
         ), f"Expected no errors to be thrown: {pprint.pformat(linter.reporter.messages)}"
 
-    def test_baseline_benchmark_j10(self, benchmark):
-        """Establish a baseline of pylint performance with no work across threads
+    def test_baseline_benchmark_j2(self, benchmark):
+        """Establish a baseline of pylint performance with no work across threads.
 
-        Same as `test_baseline_benchmark_j1` but we use -j10 with 10 fake files to
+        Same as `test_baseline_benchmark_j1` but we use -j2 with 2 fake files to
         ensure end-to-end-system invoked.
 
         Because this is also so simple, if this regresses something very serious has
         happened.
         """
         linter = PyLinter(reporter=Reporter())
-        linter.config.jobs = 10
+        linter.config.jobs = 2
 
         # Create file per worker, using all workers
         fileinfos = [self.empty_filepath for _ in range(linter.config.jobs)]
 
-        assert linter.config.jobs == 10
+        assert linter.config.jobs == 2
         assert len(linter._checkers) == 1, "Should have 'master'"
         benchmark(linter.check, fileinfos)
         assert (
             linter.msg_status == 0
         ), f"Expected no errors to be thrown: {pprint.pformat(linter.reporter.messages)}"
 
-    def test_baseline_benchmark_check_parallel_j10(self, benchmark):
-        """Should demonstrate times very close to `test_baseline_benchmark_j10`"""
+    def test_baseline_benchmark_check_parallel_j2(self, benchmark):
+        """Should demonstrate times very close to `test_baseline_benchmark_j2`."""
         linter = PyLinter(reporter=Reporter())
 
         # Create file per worker, using all workers
         fileinfos = [self.empty_file_info for _ in range(linter.config.jobs)]
 
         assert len(linter._checkers) == 1, "Should have 'master'"
-        benchmark(check_parallel, linter, jobs=10, files=fileinfos)
+        benchmark(check_parallel, linter, jobs=2, files=fileinfos)
         assert (
             linter.msg_status == 0
         ), f"Expected no errors to be thrown: {pprint.pformat(linter.reporter.messages)}"
 
     def test_baseline_lots_of_files_j1(self, benchmark):
-        """Establish a baseline with only 'master' checker being run in -j1
+        """Establish a baseline with only 'master' checker being run in -j1.
 
         We do not register any checkers except the default 'master', so the cost is just
-        that of the system with a lot of files registerd"""
+        that of the system with a lot of files registered
+        """
         if benchmark.disabled:
             benchmark(print, "skipping, only benchmark large file counts")
             return  # _only_ run this test is profiling
@@ -190,19 +190,20 @@ def test_baseline_lots_of_files_j1(self, benchmark):
             linter.msg_status == 0
         ), f"Expected no errors to be thrown: {pprint.pformat(linter.reporter.messages)}"
 
-    def test_baseline_lots_of_files_j10(self, benchmark):
-        """Establish a baseline with only 'master' checker being run in -j10
+    def test_baseline_lots_of_files_j2(self, benchmark):
+        """Establish a baseline with only 'master' checker being run in -j2.
 
         As with the -j1 variant above `test_baseline_lots_of_files_j1`, we do not
         register any checkers except the default 'master', so the cost is just that of
-        the check_parallel system across 10 workers, plus the overhead of PyLinter"""
+        the check_parallel system across 2 workers, plus the overhead of PyLinter
+        """
         if benchmark.disabled:
             benchmark(print, "skipping, only benchmark large file counts")
             return  # _only_ run this test is profiling
         linter = PyLinter(reporter=Reporter())
-        linter.config.jobs = 10
+        linter.config.jobs = 2
         fileinfos = [self.empty_filepath for _ in range(self.lot_of_files)]
-        assert linter.config.jobs == 10
+        assert linter.config.jobs == 2
         assert len(linter._checkers) == 1, "Should have 'master'"
         benchmark(linter.check, fileinfos)
         assert (
@@ -210,10 +211,11 @@ def test_baseline_lots_of_files_j10(self, benchmark):
         ), f"Expected no errors to be thrown: {pprint.pformat(linter.reporter.messages)}"
 
     def test_baseline_lots_of_files_j1_empty_checker(self, benchmark):
-        """Baselines pylint for a single extra checker being run in -j1, for N-files
+        """Baselines pylint for a single extra checker being run in -j1, for N-files.
 
         We use a checker that does no work, so the cost is just that of the system at
-        scale"""
+        scale
+        """
         if benchmark.disabled:
             benchmark(print, "skipping, only benchmark large file counts")
             return  # _only_ run this test is profiling
@@ -228,19 +230,20 @@ def test_baseline_lots_of_files_j1_empty_checker(self, benchmark):
             linter.msg_status == 0
         ), f"Expected no errors to be thrown: {pprint.pformat(linter.reporter.messages)}"
 
-    def test_baseline_lots_of_files_j10_empty_checker(self, benchmark):
-        """Baselines pylint for a single extra checker being run in -j10, for N-files
+    def test_baseline_lots_of_files_j2_empty_checker(self, benchmark):
+        """Baselines pylint for a single extra checker being run in -j2, for N-files.
 
         We use a checker that does no work, so the cost is just that of the system at
-        scale, across workers"""
+        scale, across workers
+        """
         if benchmark.disabled:
             benchmark(print, "skipping, only benchmark large file counts")
             return  # _only_ run this test is profiling
         linter = PyLinter(reporter=Reporter())
-        linter.config.jobs = 10
+        linter.config.jobs = 2
         linter.register_checker(NoWorkChecker(linter))
         fileinfos = [self.empty_filepath for _ in range(self.lot_of_files)]
-        assert linter.config.jobs == 10
+        assert linter.config.jobs == 2
         assert len(linter._checkers) == 2, "Should have 'master' and 'sleeper'"
         benchmark(linter.check, fileinfos)
         assert (
@@ -248,13 +251,14 @@ def test_baseline_lots_of_files_j10_empty_checker(self, benchmark):
         ), f"Expected no errors to be thrown: {pprint.pformat(linter.reporter.messages)}"
 
     def test_baseline_benchmark_j1_single_working_checker(self, benchmark):
-        """Establish a baseline of single-worker performance for PyLinter
+        """Establish a baseline of single-worker performance for PyLinter.
 
         Here we mimic a single Checker that does some work so that we can see the
-        impact of running a simple system with -j1 against the same system with -j10.
+        impact of running a simple system with -j1 against the same system with -j2.
 
         We expect this benchmark to take very close to
-        `numfiles*SleepingChecker.sleep_duration`"""
+        `numfiles*SleepingChecker.sleep_duration`
+        """
         if benchmark.disabled:
             benchmark(print, "skipping, do not want to sleep in main tests")
             return  # _only_ run this test is profiling
@@ -262,8 +266,8 @@ def test_baseline_benchmark_j1_single_working_checker(self, benchmark):
         linter.register_checker(SleepingChecker(linter))
 
         # Check the same number of files as
-        # `test_baseline_benchmark_j10_single_working_checker`
-        fileinfos = [self.empty_filepath for _ in range(10)]
+        # `test_baseline_benchmark_j2_single_working_checker`
+        fileinfos = [self.empty_filepath for _ in range(2)]
 
         assert linter.config.jobs == 1
         assert len(linter._checkers) == 2, "Should have 'master' and 'sleeper'"
@@ -272,26 +276,27 @@ def test_baseline_benchmark_j1_single_working_checker(self, benchmark):
             linter.msg_status == 0
         ), f"Expected no errors to be thrown: {pprint.pformat(linter.reporter.messages)}"
 
-    def test_baseline_benchmark_j10_single_working_checker(self, benchmark):
-        """Establishes baseline of multi-worker performance for PyLinter/check_parallel
+    def test_baseline_benchmark_j2_single_working_checker(self, benchmark):
+        """Establishes baseline of multi-worker performance for PyLinter/check_parallel.
 
         We expect this benchmark to take less time that test_baseline_benchmark_j1,
         `error_margin*(1/J)*(numfiles*SleepingChecker.sleep_duration)`
 
         Because of the cost of the framework and system the performance difference will
-        *not* be 1/10 of -j1 versions."""
+        *not* be 1/2 of -j1 versions.
+        """
         if benchmark.disabled:
             benchmark(print, "skipping, do not want to sleep in main tests")
             return  # _only_ run this test is profiling
         linter = PyLinter(reporter=Reporter())
-        linter.config.jobs = 10
+        linter.config.jobs = 2
         linter.register_checker(SleepingChecker(linter))
 
         # Check the same number of files as
         # `test_baseline_benchmark_j1_single_working_checker`
-        fileinfos = [self.empty_filepath for _ in range(10)]
+        fileinfos = [self.empty_filepath for _ in range(2)]
 
-        assert linter.config.jobs == 10
+        assert linter.config.jobs == 2
         assert len(linter._checkers) == 2, "Should have 'master' and 'sleeper'"
         benchmark(linter.check, fileinfos)
         assert (
@@ -299,7 +304,7 @@ def test_baseline_benchmark_j10_single_working_checker(self, benchmark):
         ), f"Expected no errors to be thrown: {pprint.pformat(linter.reporter.messages)}"
 
     def test_baseline_benchmark_j1_all_checks_single_file(self, benchmark):
-        """Runs a single file, with -j1, against all plug-ins
+        """Runs a single file, with -j1, against all plug-ins.
 
         ... that's the intent at least.
         """
@@ -316,7 +321,7 @@ def test_baseline_benchmark_j1_all_checks_single_file(self, benchmark):
         ), f"Expected no errors to be thrown: {pprint.pformat(runner.linter.reporter.messages)}"
 
     def test_baseline_benchmark_j1_all_checks_lots_of_files(self, benchmark):
-        """Runs lots of files, with -j1, against all plug-ins
+        """Runs lots of files, with -j1, against all plug-ins.
 
         ... that's the intent at least.
         """
diff --git a/tests/checkers/__init__.py b/tests/checkers/__init__.py
index e69de29bb2..e8a8ff79fd 100644
--- a/tests/checkers/__init__.py
+++ b/tests/checkers/__init__.py
@@ -0,0 +1,3 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
diff --git a/tests/checkers/base/unittest_base.py b/tests/checkers/base/unittest_base.py
new file mode 100644
index 0000000000..05a7271cda
--- /dev/null
+++ b/tests/checkers/base/unittest_base.py
@@ -0,0 +1,18 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Unittest for the base checker."""
+
+import unittest
+
+
+class TestNoSix(unittest.TestCase):
+    @unittest.skip("too many dependencies need six :(")
+    def test_no_six(self):
+        try:
+            has_six = True
+        except ImportError:
+            has_six = False
+
+        self.assertFalse(has_six, "pylint must be able to run without six")
diff --git a/tests/checkers/base/unittest_multi_naming_style.py b/tests/checkers/base/unittest_multi_naming_style.py
new file mode 100644
index 0000000000..b9215a1e0f
--- /dev/null
+++ b/tests/checkers/base/unittest_multi_naming_style.py
@@ -0,0 +1,176 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Unittest for the NameChecker."""
+
+import re
+
+import astroid
+
+from pylint.checkers import base
+from pylint.interfaces import HIGH
+from pylint.testutils import CheckerTestCase, MessageTest, set_config
+
+
+class TestMultiNamingStyle(CheckerTestCase):
+    CHECKER_CLASS = base.NameChecker
+
+    MULTI_STYLE_RE = re.compile("(?:(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$")
+
+    @set_config(class_rgx=MULTI_STYLE_RE)
+    def test_multi_name_detection_majority(self) -> None:
+        classes = astroid.extract_node(
+            """
+        class classb(object): #@
+            pass
+        class CLASSA(object): #@
+            pass
+        class CLASSC(object): #@
+            pass
+        """
+        )
+        message = MessageTest(
+            "invalid-name",
+            node=classes[0],
+            args=(
+                "Class",
+                "classb",
+                "the `UP` group in the '(?:(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$' pattern",
+            ),
+            confidence=HIGH,
+            line=2,
+            col_offset=0,
+            end_line=2,
+            end_col_offset=12,
+        )
+        with self.assertAddsMessages(message):
+            cls = None
+            for cls in classes:
+                self.checker.visit_classdef(cls)
+            if cls:
+                self.checker.leave_module(cls.root)
+
+    @set_config(class_rgx=MULTI_STYLE_RE)
+    def test_multi_name_detection_first_invalid(self) -> None:
+        classes = astroid.extract_node(
+            """
+        class class_a(object): #@
+            pass
+        class classb(object): #@
+            pass
+        class CLASSC(object): #@
+            pass
+        """
+        )
+        messages = [
+            MessageTest(
+                "invalid-name",
+                node=classes[0],
+                args=(
+                    "Class",
+                    "class_a",
+                    "'(?:(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$' pattern",
+                ),
+                confidence=HIGH,
+                line=2,
+                col_offset=0,
+                end_line=2,
+                end_col_offset=13,
+            ),
+            MessageTest(
+                "invalid-name",
+                node=classes[2],
+                args=(
+                    "Class",
+                    "CLASSC",
+                    "the `down` group in the '(?:(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$' pattern",
+                ),
+                confidence=HIGH,
+                line=6,
+                col_offset=0,
+                end_line=6,
+                end_col_offset=12,
+            ),
+        ]
+        with self.assertAddsMessages(*messages):
+            cls = None
+            for cls in classes:
+                self.checker.visit_classdef(cls)
+            if cls:
+                self.checker.leave_module(cls.root)
+
+    @set_config(
+        method_rgx=MULTI_STYLE_RE,
+        function_rgx=MULTI_STYLE_RE,
+        name_group=("function:method",),
+    )
+    def test_multi_name_detection_group(self):
+        function_defs = astroid.extract_node(
+            """
+        class First(object):
+            def func(self): #@
+                pass
+
+        def FUNC(): #@
+            pass
+        """,
+            module_name="test",
+        )
+        message = MessageTest(
+            "invalid-name",
+            node=function_defs[1],
+            args=(
+                "Function",
+                "FUNC",
+                "the `down` group in the '(?:(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$' pattern",
+            ),
+            confidence=HIGH,
+            line=6,
+            col_offset=0,
+            end_line=6,
+            end_col_offset=8,
+        )
+        with self.assertAddsMessages(message):
+            func = None
+            for func in function_defs:
+                self.checker.visit_functiondef(func)
+            if func:
+                self.checker.leave_module(func.root)
+
+    @set_config(
+        function_rgx=re.compile("(?:(?P<ignore>FOO)|(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$")
+    )
+    def test_multi_name_detection_exempt(self) -> None:
+        function_defs = astroid.extract_node(
+            """
+        def FOO(): #@
+            pass
+        def lower(): #@
+            pass
+        def FOO(): #@
+            pass
+        def UPPER(): #@
+            pass
+        """
+        )
+        message = MessageTest(
+            "invalid-name",
+            node=function_defs[3],
+            args=(
+                "Function",
+                "UPPER",
+                "the `down` group in the '(?:(?P<ignore>FOO)|(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$' pattern",
+            ),
+            confidence=HIGH,
+            line=8,
+            col_offset=0,
+            end_line=8,
+            end_col_offset=9,
+        )
+        with self.assertAddsMessages(message):
+            func = None
+            for func in function_defs:
+                self.checker.visit_functiondef(func)
+            if func:
+                self.checker.leave_module(func.root)
diff --git a/tests/checkers/base/unittest_name_preset.py b/tests/checkers/base/unittest_name_preset.py
new file mode 100644
index 0000000000..9d4b748c65
--- /dev/null
+++ b/tests/checkers/base/unittest_name_preset.py
@@ -0,0 +1,99 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Unittest for the NameChecker."""
+
+import unittest
+from typing import Type
+
+from pylint.checkers import base
+
+
+class TestNamePresets(unittest.TestCase):
+    SNAKE_CASE_NAMES = {"tést_snake_case", "test_snake_case11", "test_https_200"}
+    CAMEL_CASE_NAMES = {"téstCamelCase", "testCamelCase11", "testHTTP200"}
+    UPPER_CASE_NAMES = {"TÉST_UPPER_CASE", "TEST_UPPER_CASE11", "TEST_HTTP_200"}
+    PASCAL_CASE_NAMES = {"TéstPascalCase", "TestPascalCase11", "TestHTTP200"}
+    ALL_NAMES = (
+        SNAKE_CASE_NAMES | CAMEL_CASE_NAMES | UPPER_CASE_NAMES | PASCAL_CASE_NAMES
+    )
+
+    def _test_name_is_correct_for_all_name_types(
+        self, naming_style: Type[base.NamingStyle], name: str
+    ) -> None:
+        for name_type in base.KNOWN_NAME_TYPES_WITH_STYLE:
+            self._test_is_correct(naming_style, name, name_type)
+
+    def _test_name_is_incorrect_for_all_name_types(
+        self, naming_style: Type[base.NamingStyle], name: str
+    ) -> None:
+        for name_type in base.KNOWN_NAME_TYPES_WITH_STYLE:
+            self._test_is_incorrect(naming_style, name, name_type)
+
+    def _test_should_always_pass(self, naming_style: Type[base.NamingStyle]) -> None:
+        always_pass_data = [
+            ("__add__", "method"),
+            ("__set_name__", "method"),
+            ("__version__", "const"),
+            ("__author__", "const"),
+        ]
+        for name, name_type in always_pass_data:
+            self._test_is_correct(naming_style, name, name_type)
+
+    @staticmethod
+    def _test_is_correct(
+        naming_style: Type[base.NamingStyle], name: str, name_type: str
+    ) -> None:
+        rgx = naming_style.get_regex(name_type)
+        fail = f"{name!r} does not match pattern {rgx!r} (style: {naming_style}, type: {name_type})"
+        assert rgx.match(name), fail
+
+    @staticmethod
+    def _test_is_incorrect(
+        naming_style: Type[base.NamingStyle], name: str, name_type: str
+    ) -> None:
+        rgx = naming_style.get_regex(name_type)
+        fail = f"{name!r} not match pattern {rgx!r} (style: {naming_style}, type: {name_type})"
+        assert not rgx.match(name), fail
+
+    def test_snake_case(self) -> None:
+        naming_style = base.SnakeCaseStyle
+
+        for name in self.SNAKE_CASE_NAMES:
+            self._test_name_is_correct_for_all_name_types(naming_style, name)
+        for name in self.ALL_NAMES - self.SNAKE_CASE_NAMES:
+            self._test_name_is_incorrect_for_all_name_types(naming_style, name)
+
+        self._test_should_always_pass(naming_style)
+
+    def test_camel_case(self) -> None:
+        naming_style = base.CamelCaseStyle
+
+        for name in self.CAMEL_CASE_NAMES:
+            self._test_name_is_correct_for_all_name_types(naming_style, name)
+        for name in self.ALL_NAMES - self.CAMEL_CASE_NAMES:
+            self._test_name_is_incorrect_for_all_name_types(naming_style, name)
+
+        self._test_should_always_pass(naming_style)
+
+    def test_upper_case(self) -> None:
+        naming_style = base.UpperCaseStyle
+
+        for name in self.UPPER_CASE_NAMES:
+            self._test_name_is_correct_for_all_name_types(naming_style, name)
+        for name in self.ALL_NAMES - self.UPPER_CASE_NAMES:
+            self._test_name_is_incorrect_for_all_name_types(naming_style, name)
+        self._test_name_is_incorrect_for_all_name_types(naming_style, "UPPERcase")
+
+        self._test_should_always_pass(naming_style)
+
+    def test_pascal_case(self) -> None:
+        naming_style = base.PascalCaseStyle
+
+        for name in self.PASCAL_CASE_NAMES:
+            self._test_name_is_correct_for_all_name_types(naming_style, name)
+        for name in self.ALL_NAMES - self.PASCAL_CASE_NAMES:
+            self._test_name_is_incorrect_for_all_name_types(naming_style, name)
+
+        self._test_should_always_pass(naming_style)
diff --git a/tests/checkers/conftest.py b/tests/checkers/conftest.py
index e831015420..ac2a187d45 100644
--- a/tests/checkers/conftest.py
+++ b/tests/checkers/conftest.py
@@ -1,3 +1,7 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 from pathlib import Path
 
 HERE = Path(__file__).parent
diff --git a/tests/checkers/unittest_base.py b/tests/checkers/unittest_base.py
deleted file mode 100644
index 24e17a0a5d..0000000000
--- a/tests/checkers/unittest_base.py
+++ /dev/null
@@ -1,393 +0,0 @@
-# Copyright (c) 2013-2015 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2013-2014 Google, Inc.
-# Copyright (c) 2015-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Dmitry Pribysh <dmand@yandex.ru>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2016 Yannack <yannack@users.noreply.github.com>
-# Copyright (c) 2017, 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2017, 2019 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2017 ttenhoeve-aa <ttenhoeve@appannie.com>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2018 Fureigh <fureigh@users.noreply.github.com>
-# Copyright (c) 2018 glmdgrielson <32415403+glmdgrielson@users.noreply.github.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020-2021 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 ethan-leba <ethanleba5@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2020 bernie gray <bfgray3@users.noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Yilei "Dolee" Yang <yileiyang@google.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Or Bahari <orbahari@mail.tau.ac.il>
-# Copyright (c) 2021 David Gilman <davidgilman1@gmail.com>
-
-# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-
-"""Unittest for the base checker."""
-
-import re
-import unittest
-from typing import Type
-
-import astroid
-
-from pylint.checkers import base
-from pylint.interfaces import HIGH
-from pylint.testutils import CheckerTestCase, MessageTest, set_config
-
-
-class TestMultiNamingStyle(CheckerTestCase):
-    CHECKER_CLASS = base.NameChecker
-
-    MULTI_STYLE_RE = re.compile("(?:(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$")
-
-    @set_config(class_rgx=MULTI_STYLE_RE)
-    def test_multi_name_detection_majority(self) -> None:
-        classes = astroid.extract_node(
-            """
-        class classb(object): #@
-            pass
-        class CLASSA(object): #@
-            pass
-        class CLASSC(object): #@
-            pass
-        """
-        )
-        message = MessageTest(
-            "invalid-name",
-            node=classes[0],
-            args=(
-                "Class",
-                "classb",
-                "the `UP` group in the '(?:(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$' pattern",
-            ),
-            confidence=HIGH,
-        )
-        with self.assertAddsMessages(message):
-            cls = None
-            for cls in classes:
-                self.checker.visit_classdef(cls)
-            if cls:
-                self.checker.leave_module(cls.root)
-
-    @set_config(class_rgx=MULTI_STYLE_RE)
-    def test_multi_name_detection_first_invalid(self) -> None:
-        classes = astroid.extract_node(
-            """
-        class class_a(object): #@
-            pass
-        class classb(object): #@
-            pass
-        class CLASSC(object): #@
-            pass
-        """
-        )
-        messages = [
-            MessageTest(
-                "invalid-name",
-                node=classes[0],
-                args=(
-                    "Class",
-                    "class_a",
-                    "'(?:(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$' pattern",
-                ),
-                confidence=HIGH,
-            ),
-            MessageTest(
-                "invalid-name",
-                node=classes[2],
-                args=(
-                    "Class",
-                    "CLASSC",
-                    "the `down` group in the '(?:(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$' pattern",
-                ),
-                confidence=HIGH,
-            ),
-        ]
-        with self.assertAddsMessages(*messages):
-            cls = None
-            for cls in classes:
-                self.checker.visit_classdef(cls)
-            if cls:
-                self.checker.leave_module(cls.root)
-
-    @set_config(
-        method_rgx=MULTI_STYLE_RE,
-        function_rgx=MULTI_STYLE_RE,
-        name_group=("function:method",),
-    )
-    def test_multi_name_detection_group(self):
-        function_defs = astroid.extract_node(
-            """
-        class First(object):
-            def func(self): #@
-                pass
-
-        def FUNC(): #@
-            pass
-        """,
-            module_name="test",
-        )
-        message = MessageTest(
-            "invalid-name",
-            node=function_defs[1],
-            args=(
-                "Function",
-                "FUNC",
-                "the `down` group in the '(?:(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$' pattern",
-            ),
-            confidence=HIGH,
-        )
-        with self.assertAddsMessages(message):
-            func = None
-            for func in function_defs:
-                self.checker.visit_functiondef(func)
-            if func:
-                self.checker.leave_module(func.root)
-
-    @set_config(
-        function_rgx=re.compile("(?:(?P<ignore>FOO)|(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$")
-    )
-    def test_multi_name_detection_exempt(self) -> None:
-        function_defs = astroid.extract_node(
-            """
-        def FOO(): #@
-            pass
-        def lower(): #@
-            pass
-        def FOO(): #@
-            pass
-        def UPPER(): #@
-            pass
-        """
-        )
-        message = MessageTest(
-            "invalid-name",
-            node=function_defs[3],
-            args=(
-                "Function",
-                "UPPER",
-                "the `down` group in the '(?:(?P<ignore>FOO)|(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$' pattern",
-            ),
-            confidence=HIGH,
-        )
-        with self.assertAddsMessages(message):
-            func = None
-            for func in function_defs:
-                self.checker.visit_functiondef(func)
-            if func:
-                self.checker.leave_module(func.root)
-
-
-class TestComparison(CheckerTestCase):
-    CHECKER_CLASS = base.ComparisonChecker
-
-    def test_comparison(self) -> None:
-        node = astroid.extract_node("foo == True")
-        message = MessageTest(
-            "singleton-comparison",
-            node=node,
-            args=(
-                "'foo == True'",
-                "'foo is True' if checking for the singleton value True, or 'bool(foo)' if testing for truthiness",
-            ),
-        )
-        with self.assertAddsMessages(message):
-            self.checker.visit_compare(node)
-
-        node = astroid.extract_node("foo == False")
-        message = MessageTest(
-            "singleton-comparison",
-            node=node,
-            args=(
-                "'foo == False'",
-                "'foo is False' if checking for the singleton value False, or 'not foo' if testing for falsiness",
-            ),
-        )
-        with self.assertAddsMessages(message):
-            self.checker.visit_compare(node)
-
-        node = astroid.extract_node("foo == None")
-        message = MessageTest(
-            "singleton-comparison", node=node, args=("'foo == None'", "'foo is None'")
-        )
-        with self.assertAddsMessages(message):
-            self.checker.visit_compare(node)
-
-        node = astroid.extract_node("foo is float('nan')")
-        message = MessageTest(
-            "nan-comparison",
-            node=node,
-            args=("'foo is float('nan')'", "'math.isnan(foo)'"),
-        )
-        with self.assertAddsMessages(message):
-            self.checker.visit_compare(node)
-
-        node = astroid.extract_node(
-            """
-                                import numpy
-                                foo != numpy.NaN
-                                """
-        )
-        message = MessageTest(
-            "nan-comparison",
-            node=node,
-            args=("'foo != numpy.NaN'", "'not math.isnan(foo)'"),
-        )
-        with self.assertAddsMessages(message):
-            self.checker.visit_compare(node)
-
-        node = astroid.extract_node(
-            """
-                                import numpy as nmp
-                                foo is not nmp.NaN
-                                """
-        )
-        message = MessageTest(
-            "nan-comparison",
-            node=node,
-            args=("'foo is not nmp.NaN'", "'not math.isnan(foo)'"),
-        )
-        with self.assertAddsMessages(message):
-            self.checker.visit_compare(node)
-
-        node = astroid.extract_node("True == foo")
-        messages = (
-            MessageTest(
-                "singleton-comparison",
-                node=node,
-                args=(
-                    "'True == foo'",
-                    "'True is foo' if checking for the singleton value True, or 'bool(foo)' if testing for truthiness",
-                ),
-            ),
-        )
-        with self.assertAddsMessages(*messages):
-            self.checker.visit_compare(node)
-
-        node = astroid.extract_node("False == foo")
-        messages = (
-            MessageTest(
-                "singleton-comparison",
-                node=node,
-                args=(
-                    "'False == foo'",
-                    "'False is foo' if checking for the singleton value False, or 'not foo' if testing for falsiness",
-                ),
-            ),
-        )
-        with self.assertAddsMessages(*messages):
-            self.checker.visit_compare(node)
-
-        node = astroid.extract_node("None == foo")
-        messages = (
-            MessageTest(
-                "singleton-comparison",
-                node=node,
-                args=("'None == foo'", "'None is foo'"),
-            ),
-        )
-        with self.assertAddsMessages(*messages):
-            self.checker.visit_compare(node)
-
-
-class TestNamePresets(unittest.TestCase):
-    SNAKE_CASE_NAMES = {"tést_snake_case", "test_snake_case11", "test_https_200"}
-    CAMEL_CASE_NAMES = {"téstCamelCase", "testCamelCase11", "testHTTP200"}
-    UPPER_CASE_NAMES = {"TÉST_UPPER_CASE", "TEST_UPPER_CASE11", "TEST_HTTP_200"}
-    PASCAL_CASE_NAMES = {"TéstPascalCase", "TestPascalCase11", "TestHTTP200"}
-    ALL_NAMES = (
-        SNAKE_CASE_NAMES | CAMEL_CASE_NAMES | UPPER_CASE_NAMES | PASCAL_CASE_NAMES
-    )
-
-    def _test_name_is_correct_for_all_name_types(
-        self, naming_style: Type[base.NamingStyle], name: str
-    ) -> None:
-        for name_type in base.KNOWN_NAME_TYPES:
-            self._test_is_correct(naming_style, name, name_type)
-
-    def _test_name_is_incorrect_for_all_name_types(
-        self, naming_style: Type[base.NamingStyle], name: str
-    ) -> None:
-        for name_type in base.KNOWN_NAME_TYPES:
-            self._test_is_incorrect(naming_style, name, name_type)
-
-    def _test_should_always_pass(self, naming_style: Type[base.NamingStyle]) -> None:
-        always_pass_data = [
-            ("__add__", "method"),
-            ("__set_name__", "method"),
-            ("__version__", "const"),
-            ("__author__", "const"),
-        ]
-        for name, name_type in always_pass_data:
-            self._test_is_correct(naming_style, name, name_type)
-
-    @staticmethod
-    def _test_is_correct(
-        naming_style: Type[base.NamingStyle], name: str, name_type: str
-    ) -> None:
-        rgx = naming_style.get_regex(name_type)
-        fail = f"{name!r} does not match pattern {rgx!r} (style: {naming_style}, type: {name_type})"
-        assert rgx.match(name), fail
-
-    @staticmethod
-    def _test_is_incorrect(
-        naming_style: Type[base.NamingStyle], name: str, name_type: str
-    ) -> None:
-        rgx = naming_style.get_regex(name_type)
-        fail = f"{name!r} not match pattern {rgx!r} (style: {naming_style}, type: {name_type})"
-        assert not rgx.match(name), fail
-
-    def test_snake_case(self) -> None:
-        naming_style = base.SnakeCaseStyle
-
-        for name in self.SNAKE_CASE_NAMES:
-            self._test_name_is_correct_for_all_name_types(naming_style, name)
-        for name in self.ALL_NAMES - self.SNAKE_CASE_NAMES:
-            self._test_name_is_incorrect_for_all_name_types(naming_style, name)
-
-        self._test_should_always_pass(naming_style)
-
-    def test_camel_case(self) -> None:
-        naming_style = base.CamelCaseStyle
-
-        for name in self.CAMEL_CASE_NAMES:
-            self._test_name_is_correct_for_all_name_types(naming_style, name)
-        for name in self.ALL_NAMES - self.CAMEL_CASE_NAMES:
-            self._test_name_is_incorrect_for_all_name_types(naming_style, name)
-
-        self._test_should_always_pass(naming_style)
-
-    def test_upper_case(self) -> None:
-        naming_style = base.UpperCaseStyle
-
-        for name in self.UPPER_CASE_NAMES:
-            self._test_name_is_correct_for_all_name_types(naming_style, name)
-        for name in self.ALL_NAMES - self.UPPER_CASE_NAMES:
-            self._test_name_is_incorrect_for_all_name_types(naming_style, name)
-        self._test_name_is_incorrect_for_all_name_types(naming_style, "UPPERcase")
-
-        self._test_should_always_pass(naming_style)
-
-    def test_pascal_case(self) -> None:
-        naming_style = base.PascalCaseStyle
-
-        for name in self.PASCAL_CASE_NAMES:
-            self._test_name_is_correct_for_all_name_types(naming_style, name)
-        for name in self.ALL_NAMES - self.PASCAL_CASE_NAMES:
-            self._test_name_is_incorrect_for_all_name_types(naming_style, name)
-
-        self._test_should_always_pass(naming_style)
-
-
-class TestNoSix(unittest.TestCase):
-    @unittest.skip("too many dependencies need six :(")
-    def test_no_six(self):
-        try:
-            has_six = True
-        except ImportError:
-            has_six = False
-
-        self.assertFalse(has_six, "pylint must be able to run without six")
diff --git a/tests/checkers/unittest_base_checker.py b/tests/checkers/unittest_base_checker.py
index ba5e8dfcc2..68d36cd6c5 100644
--- a/tests/checkers/unittest_base_checker.py
+++ b/tests/checkers/unittest_base_checker.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Unittest for the BaseChecker class."""
 
diff --git a/tests/checkers/unittest_deprecated.py b/tests/checkers/unittest_deprecated.py
index fbf6c1ce8c..0b35b297aa 100644
--- a/tests/checkers/unittest_deprecated.py
+++ b/tests/checkers/unittest_deprecated.py
@@ -1,3 +1,7 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 from typing import List, Optional, Set, Tuple, Union
 
 import astroid
@@ -71,6 +75,10 @@ def deprecated_func():
                 args=("deprecated_func",),
                 node=node,
                 confidence=UNDEFINED,
+                line=5,
+                col_offset=0,
+                end_line=5,
+                end_col_offset=17,
             )
         ):
             self.checker.visit_call(node)
@@ -93,6 +101,10 @@ def deprecated_method():
                 args=("deprecated_method",),
                 node=node,
                 confidence=UNDEFINED,
+                line=7,
+                col_offset=0,
+                end_line=7,
+                end_col_offset=21,
             )
         ):
             self.checker.visit_call(node)
@@ -118,6 +130,10 @@ def _deprecated_method(self):
                 args=("deprecated_method",),
                 node=node,
                 confidence=UNDEFINED,
+                line=9,
+                col_offset=0,
+                end_line=9,
+                end_col_offset=21,
             )
         ):
             self.checker.visit_call(node)
@@ -157,6 +173,10 @@ def myfunction1(arg1, deprecated_arg1='spam'):
                 args=("deprecated_arg1", "myfunction1"),
                 node=node,
                 confidence=UNDEFINED,
+                line=5,
+                col_offset=0,
+                end_line=5,
+                end_col_offset=31,
             )
         ):
             self.checker.visit_call(node)
@@ -177,6 +197,10 @@ def myfunction1(arg1, deprecated_arg1='spam'):
                 args=("deprecated_arg1", "myfunction1"),
                 node=node,
                 confidence=UNDEFINED,
+                line=5,
+                col_offset=0,
+                end_line=5,
+                end_col_offset=47,
             )
         ):
             self.checker.visit_call(node)
@@ -210,6 +234,10 @@ def myfunction3(arg1, *, deprecated_arg1='spam'):
                 args=("deprecated_arg1", "myfunction3"),
                 node=node,
                 confidence=UNDEFINED,
+                line=5,
+                col_offset=0,
+                end_line=5,
+                end_col_offset=47,
             )
         ):
             self.checker.visit_call(node)
@@ -231,6 +259,10 @@ def mymethod1(self, arg1, deprecated_arg1):
                 args=("deprecated_arg1", "mymethod1"),
                 node=node,
                 confidence=UNDEFINED,
+                line=6,
+                col_offset=0,
+                end_line=6,
+                end_col_offset=39,
             )
         ):
             self.checker.visit_call(node)
@@ -252,6 +284,10 @@ def mymethod1(self, arg1, deprecated_arg1):
                 args=("deprecated_arg1", "mymethod1"),
                 node=node,
                 confidence=UNDEFINED,
+                line=6,
+                col_offset=0,
+                end_line=6,
+                end_col_offset=55,
             )
         ):
             self.checker.visit_call(node)
@@ -287,6 +323,10 @@ def mymethod3(self, arg1, *, deprecated_arg1):
                 args=("deprecated_arg1", "mymethod3"),
                 node=node,
                 confidence=UNDEFINED,
+                line=6,
+                col_offset=0,
+                end_line=6,
+                end_col_offset=55,
             )
         ):
             self.checker.visit_call(node)
@@ -308,12 +348,20 @@ def myfunction2(arg1, deprecated_arg1, arg2='foo', deprecated_arg2='spam'):
                 args=("deprecated_arg1", "myfunction2"),
                 node=node,
                 confidence=UNDEFINED,
+                line=5,
+                col_offset=0,
+                end_line=5,
+                end_col_offset=61,
             ),
             MessageTest(
                 msg_id="deprecated-argument",
                 args=("deprecated_arg2", "myfunction2"),
                 node=node,
                 confidence=UNDEFINED,
+                line=5,
+                col_offset=0,
+                end_line=5,
+                end_col_offset=61,
             ),
         ):
             self.checker.visit_call(node)
@@ -334,12 +382,20 @@ def myfunction2(arg1, deprecated_arg1, arg2='foo', deprecated_arg2='spam'):
                 args=("deprecated_arg1", "myfunction2"),
                 node=node,
                 confidence=UNDEFINED,
+                line=5,
+                col_offset=0,
+                end_line=5,
+                end_col_offset=77,
             ),
             MessageTest(
                 msg_id="deprecated-argument",
                 args=("deprecated_arg2", "myfunction2"),
                 node=node,
                 confidence=UNDEFINED,
+                line=5,
+                col_offset=0,
+                end_line=5,
+                end_col_offset=77,
             ),
         ):
             self.checker.visit_call(node)
@@ -362,12 +418,20 @@ def mymethod2(self, arg1, deprecated_arg1, arg2='foo', deprecated_arg2='spam'):
                 args=("deprecated_arg1", "mymethod2"),
                 node=node,
                 confidence=UNDEFINED,
+                line=6,
+                col_offset=0,
+                end_line=6,
+                end_col_offset=69,
             ),
             MessageTest(
                 msg_id="deprecated-argument",
                 args=("deprecated_arg2", "mymethod2"),
                 node=node,
                 confidence=UNDEFINED,
+                line=6,
+                col_offset=0,
+                end_line=6,
+                end_col_offset=69,
             ),
         ):
             self.checker.visit_call(node)
@@ -389,12 +453,20 @@ def mymethod2(self, arg1, deprecated_arg1, arg2='foo', deprecated_arg2='spam'):
                 args=("deprecated_arg1", "mymethod2"),
                 node=node,
                 confidence=UNDEFINED,
+                line=6,
+                col_offset=0,
+                end_line=6,
+                end_col_offset=85,
             ),
             MessageTest(
                 msg_id="deprecated-argument",
                 args=("deprecated_arg2", "mymethod2"),
                 node=node,
                 confidence=UNDEFINED,
+                line=6,
+                col_offset=0,
+                end_line=6,
+                end_col_offset=85,
             ),
         ):
             self.checker.visit_call(node)
@@ -416,6 +488,10 @@ def __init__(self, deprecated_arg=None):
                 args=("deprecated_arg", "MyClass"),
                 node=node,
                 confidence=UNDEFINED,
+                line=6,
+                col_offset=0,
+                end_line=6,
+                end_col_offset=10,
             )
         ):
             self.checker.visit_call(node)
@@ -433,6 +509,10 @@ def test_deprecated_module(self) -> None:
                 args="deprecated_module",
                 node=node,
                 confidence=UNDEFINED,
+                line=2,
+                col_offset=0,
+                end_line=2,
+                end_col_offset=24,
             )
         ):
             self.checker.visit_import(node)
@@ -450,6 +530,10 @@ def test_deprecated_module_from(self) -> None:
                 args="deprecated_module",
                 node=node,
                 confidence=UNDEFINED,
+                line=2,
+                col_offset=0,
+                end_line=2,
+                end_col_offset=40,
             )
         ):
             self.checker.visit_importfrom(node)
@@ -467,6 +551,10 @@ def test_deprecated_class_import_from(self) -> None:
                 args=("DeprecatedClass", "deprecated"),
                 node=node,
                 confidence=UNDEFINED,
+                line=2,
+                col_offset=0,
+                end_line=2,
+                end_col_offset=38,
             )
         ):
             self.checker.visit_importfrom(node)
@@ -484,6 +572,10 @@ def test_deprecated_class_import(self) -> None:
                 args=("DeprecatedClass", "deprecated"),
                 node=node,
                 confidence=UNDEFINED,
+                line=2,
+                col_offset=0,
+                end_line=2,
+                end_col_offset=33,
             )
         ):
             self.checker.visit_import(node)
@@ -502,6 +594,10 @@ def test_deprecated_class_call(self) -> None:
                 args=("DeprecatedClass", "deprecated"),
                 node=node,
                 confidence=UNDEFINED,
+                line=3,
+                col_offset=0,
+                end_line=3,
+                end_col_offset=28,
             )
         ):
             self.checker.visit_call(node)
@@ -526,6 +622,10 @@ def function():
                 args=".deprecated_decorator",
                 node=node,
                 confidence=UNDEFINED,
+                line=7,
+                col_offset=0,
+                end_line=7,
+                end_col_offset=21,
             )
         ):
             self.checker.visit_decorators(node)
@@ -552,6 +652,10 @@ def function():
                 args=".deprecated_decorator",
                 node=node,
                 confidence=UNDEFINED,
+                line=9,
+                col_offset=0,
+                end_line=9,
+                end_col_offset=27,
             )
         ):
             self.checker.visit_decorators(node)
diff --git a/tests/checkers/unittest_design.py b/tests/checkers/unittest_design.py
index fd9c78f0e2..46eab45d72 100644
--- a/tests/checkers/unittest_design.py
+++ b/tests/checkers/unittest_design.py
@@ -1,12 +1,6 @@
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Mike Fiedler <miketheman@gmail.com>
-# Copyright (c) 2021 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2021 Rebecca Turner <rbt@sent.as>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import astroid
 
@@ -47,7 +41,7 @@ class Eeee(Dddd):
 
     @set_config(exclude_too_few_public_methods="toml.*")
     def test_exclude_too_few_methods_with_value(self) -> None:
-        """Test exclude-too-few-public-methods option with value"""
+        """Test exclude-too-few-public-methods option with value."""
         options = get_global_option(self.checker, "exclude-too-few-public-methods")
 
         assert any(i.match("toml") for i in options)
@@ -56,7 +50,8 @@ def test_exclude_too_few_methods_with_value(self) -> None:
 
     def test_ignore_paths_with_no_value(self) -> None:
         """Test exclude-too-few-public-methods option with no value.
-        Compare against actual list to see if validator works."""
+        Compare against actual list to see if validator works.
+        """
         options = get_global_option(self.checker, "exclude-too-few-public-methods")
 
         assert options == []
diff --git a/tests/checkers/unittest_format.py b/tests/checkers/unittest_format.py
index 1fdb0f8bce..fa8b549a53 100644
--- a/tests/checkers/unittest_format.py
+++ b/tests/checkers/unittest_format.py
@@ -1,32 +1,8 @@
-# Copyright (c) 2009-2011, 2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2012 FELD Boris <lothiraldan@gmail.com>
-# Copyright (c) 2013-2014 Google, Inc.
-# Copyright (c) 2014-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 buck <buck.2019@gmail.com>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Harut <yes@harutune.name>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Petr Pulc <petrpulc@gmail.com>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2017 Krzysztof Czapla <k.czapla68@gmail.com>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2017 James M. Allen <james.m.allen@gmail.com>
-# Copyright (c) 2017 vinnyrose <vinnyrose@users.noreply.github.com>
-# Copyright (c) 2018, 2020 Bryce Guinta <bryce.guinta@protonmail.com>
-# Copyright (c) 2018 Bryce Guinta <bryce.paul.guinta@gmail.com>
-# Copyright (c) 2018, 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""Check format checker helper functions"""
+"""Check format checker helper functions."""
 
 import os
 import tempfile
@@ -109,7 +85,8 @@ def testCheckKeywordParensHandlesUnnecessaryParens(self) -> None:
 
     def testNoSuperfluousParensWalrusOperatorIf(self) -> None:
         """Parenthesis change the meaning of assignment in the walrus operator
-        and so are not always superfluous:"""
+        and so are not always superfluous:
+        """
         cases = [
             ("if (odd := is_odd(i))\n"),
             ("not (foo := 5)\n"),
@@ -119,7 +96,7 @@ def testNoSuperfluousParensWalrusOperatorIf(self) -> None:
                 self.checker.process_tokens(_tokenize_str(code))
 
     def testPositiveSuperfluousParensWalrusOperatorIf(self) -> None:
-        """Test positive superfluous parens cases with the walrus operator"""
+        """Test positive superfluous parens cases with the walrus operator."""
         cases = [
             (
                 MessageTest("superfluous-parens", line=1, args="if"),
@@ -161,7 +138,7 @@ class TestCheckSpace(CheckerTestCase):
     CHECKER_CLASS = FormatChecker
 
     def test_encoding_token(self) -> None:
-        """Make sure the encoding token doesn't change the checker's behavior
+        """Make sure the encoding token doesn't change the checker's behavior.
 
         _tokenize_str doesn't produce an encoding token, but
         reading a file does
@@ -177,8 +154,7 @@ def test_encoding_token(self) -> None:
 
 
 def test_disable_global_option_end_of_line() -> None:
-    """
-    Test for issue with disabling tokenizer messages
+    """Test for issue with disabling tokenizer messages
     that extend beyond the scope of the ast tokens
     """
     file_ = tempfile.NamedTemporaryFile("w", delete=False)
diff --git a/tests/checkers/unittest_imports.py b/tests/checkers/unittest_imports.py
index 9dbcf2fe1e..ac36f784fb 100644
--- a/tests/checkers/unittest_imports.py
+++ b/tests/checkers/unittest_imports.py
@@ -1,21 +1,6 @@
-# Copyright (c) 2015-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Dmitry Pribysh <dmand@yandex.ru>
-# Copyright (c) 2015 Cezar <celnazli@bitdefender.com>
-# Copyright (c) 2015 James Morgensen <james.morgensen@gmail.com>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2018 Hornwitser <github@hornwitser.no>
-# Copyright (c) 2018 Marianna Polatoglou <mpolatoglou@bloomberg.net>
-# Copyright (c) 2018 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Nick Drozd <nicholasdrozd@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Unit tests for the imports checker."""
 
@@ -39,7 +24,14 @@ def test_relative_beyond_top_level(self) -> None:
         module = astroid.MANAGER.ast_from_module_name("beyond_top", REGR_DATA)
         import_from = module.body[0]
 
-        msg = MessageTest(msg_id="relative-beyond-top-level", node=import_from)
+        msg = MessageTest(
+            msg_id="relative-beyond-top-level",
+            node=import_from,
+            line=1,
+            col_offset=0,
+            end_line=1,
+            end_col_offset=25,
+        )
         with self.assertAddsMessages(msg):
             self.checker.visit_importfrom(import_from)
         with self.assertNoMessages():
@@ -53,8 +45,11 @@ def test_relative_beyond_top_level_two() -> None:
             f"{os.path.join(REGR_DATA, 'beyond_top_two')} -d all -e relative-beyond-top-level",
             return_std=True,
         )
+        top_level_function = os.path.join(
+            REGR_DATA, "beyond_top_two/namespace_package/top_level_function.py"
+        )
         output2, errors2 = lint.py_run(
-            f"{os.path.join(REGR_DATA, 'beyond_top_two/namespace_package/top_level_function.py')} -d all -e relative-beyond-top-level",
+            f"{top_level_function} -d all -e relative-beyond-top-level",
             return_std=True,
         )
 
@@ -95,6 +90,10 @@ def test_wildcard_import_non_init(self) -> None:
             node=import_from,
             args="empty",
             confidence=UNDEFINED,
+            line=1,
+            col_offset=0,
+            end_line=1,
+            end_col_offset=19,
         )
         with self.assertAddsMessages(msg):
             self.checker.visit_importfrom(import_from)
diff --git a/tests/checkers/unittest_misc.py b/tests/checkers/unittest_misc.py
index 23e19a9d0f..e360d3bb68 100644
--- a/tests/checkers/unittest_misc.py
+++ b/tests/checkers/unittest_misc.py
@@ -1,20 +1,6 @@
-# Copyright (c) 2013-2014, 2016-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2013-2014 Google, Inc.
-# Copyright (c) 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2016 glegoux <gilles.legoux@gmail.com>
-# Copyright (c) 2018 Rogalski, Lukasz <lukasz.rogalski@intel.com>
-# Copyright (c) 2018 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Tests for the misc checker."""
 
@@ -68,6 +54,16 @@ def test_without_space_fixme(self) -> None:
         ):
             self.checker.process_tokens(_tokenize_str(code))
 
+    @set_config(notes=["???"])
+    def test_non_alphanumeric_codetag(self) -> None:
+        code = """a = 1
+                #???
+                """
+        with self.assertAddsMessages(
+            MessageTest(msg_id="fixme", line=2, args="???", col_offset=17)
+        ):
+            self.checker.process_tokens(_tokenize_str(code))
+
     @set_config(notes=[])
     def test_absent_codetag(self) -> None:
         code = """a = 1
diff --git a/tests/checkers/unittest_non_ascii_name.py b/tests/checkers/unittest_non_ascii_name.py
new file mode 100644
index 0000000000..f6c9abcdbd
--- /dev/null
+++ b/tests/checkers/unittest_non_ascii_name.py
@@ -0,0 +1,283 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+import sys
+from typing import Iterable, Optional
+
+import astroid
+import pytest
+from astroid import nodes
+
+import pylint.checkers.non_ascii_names
+import pylint.interfaces
+import pylint.testutils
+
+
+class TestNonAsciiChecker(pylint.testutils.CheckerTestCase):
+    CHECKER_CLASS = pylint.checkers.non_ascii_names.NonAsciiNameChecker
+    checker: pylint.checkers.non_ascii_names.NonAsciiNameChecker
+
+    @pytest.mark.skipif(
+        sys.version_info < (3, 8), reason="requires python3.8 or higher"
+    )
+    def test_kwargs_and_position_only(self):
+        """Even the new position only and keyword only should be found."""
+        node = astroid.extract_node(
+            """
+                def name(
+                    ok,
+                    not_økay,
+                    not_okay_defaułt=None,
+                    /,
+                    p_or_kw_okay=None,
+                    p_or_kw_not_økay=None,
+                    *,
+                    kw_arg_okay,
+                    kw_arg_not_økay,
+                ):
+                    ...
+            """
+        )
+        assert isinstance(node, nodes.FunctionDef)
+        arguments = node.args
+
+        posargs = list(arguments.posonlyargs)
+        args = list(arguments.args)
+        kwargs = list(arguments.kwonlyargs)
+
+        with self.assertAddsMessages(
+            pylint.testutils.MessageTest(
+                msg_id="non-ascii-name",
+                node=posargs[1],
+                args=("Argument", "not_økay"),
+                confidence=pylint.interfaces.HIGH,
+            ),
+            pylint.testutils.MessageTest(
+                msg_id="non-ascii-name",
+                node=posargs[2],
+                args=("Argument", "not_okay_defaułt"),
+                confidence=pylint.interfaces.HIGH,
+            ),
+            pylint.testutils.MessageTest(
+                msg_id="non-ascii-name",
+                node=args[1],
+                args=("Argument", "p_or_kw_not_økay"),
+                confidence=pylint.interfaces.HIGH,
+            ),
+            pylint.testutils.MessageTest(
+                msg_id="non-ascii-name",
+                node=kwargs[1],
+                args=("Argument", "kw_arg_not_økay"),
+                confidence=pylint.interfaces.HIGH,
+            ),
+            ignore_position=True,
+        ):
+            self.checker.visit_functiondef(node)
+
+    @pytest.mark.parametrize(
+        "code, assign_type",
+        [
+            pytest.param(
+                """
+                try:
+                    ...
+                except ValueError as łol: #@
+                    ...
+                """,
+                "Variable",
+                id="try-except",
+            ),
+            pytest.param(
+                """
+                class FooBar:
+                    łol = "test" #@
+                """,
+                "Attribute",
+                id="class_attribute",
+            ),
+            pytest.param(
+                """
+                łol = "test" #@
+                """,
+                "Variable",
+                id="global_assign",
+            ),
+            pytest.param(
+                """
+                def foobar():
+                    łol="test"  #@
+                """,
+                "Variable",
+                id="function_variable",
+            ),
+            pytest.param(
+                """
+                for łol in os.listdir("."):  #@
+                    ...
+                """,
+                "Variable",
+                id="for_loop_variable",
+            ),
+            pytest.param(
+                """
+                [łoł
+                    for łol in os.listdir(".")  #@
+                ]
+                """,
+                "Variable",
+                id="inline_for_loop_variable",
+            ),
+        ],
+    )
+    def test_assignname(
+        self,
+        code: str,
+        assign_type: str,
+    ):
+        """Variables defined no matter where, should be checked for non ascii."""
+        assign_node = astroid.extract_node(code)
+
+        if not isinstance(assign_node, nodes.AssignName):
+            # For some elements we can't directly extract the assign
+            # node, so we have to manually look in the children for it
+            for child in assign_node.get_children():
+                if isinstance(child, nodes.AssignName):
+                    assign_node = child
+                    break
+
+        # Just to make sure we found the correct node
+        assert isinstance(assign_node, nodes.AssignName)
+
+        with self.assertAddsMessages(
+            pylint.testutils.MessageTest(
+                msg_id="non-ascii-name",
+                node=assign_node,
+                args=(assign_type, "łol"),
+                confidence=pylint.interfaces.HIGH,
+            ),
+            ignore_position=True,
+        ):
+            self.checker.visit_assignname(assign_node)
+
+    @pytest.mark.parametrize(
+        "import_statement, wrong_name",
+        [
+            pytest.param("import fürimma", "fürimma", id="bad_single_main_module"),
+            pytest.param(
+                "import fürimma as okay",
+                None,
+                id="bad_single_main_module_with_okay_alias",
+            ),
+            pytest.param(
+                "import fürimma, pathlib",
+                "fürimma",
+                id="bad_single_main_module_with_stdlib_import",
+            ),
+            pytest.param(
+                "import pathlib, os, foobar, fürimma",
+                "fürimma",
+                id="stdlib_with_bad_single_main_module",
+            ),
+            pytest.param(
+                "import pathlib, os, foobar, sys as systëm",
+                "systëm",
+                id="stdlib_with_bad_alias",
+            ),
+            pytest.param(
+                "import fürimma as okay, pathlib",
+                None,
+                id="bad_single_main_module_with_okay_alias_with_stdlib_import",
+            ),
+            pytest.param(
+                "import fürimma.submodule", "fürimma.submodule", id="bad_main_module"
+            ),
+            pytest.param(
+                "import fürimma.submodule as submodule",
+                None,
+                id="bad_main_module_with_okay_alias",
+            ),
+            pytest.param(
+                "import main_module.fürimma", "main_module.fürimma", id="bad_submodule"
+            ),
+            pytest.param(
+                "import main_module.fürimma as okay",
+                None,
+                id="bad_submodule_with_okay_alias",
+            ),
+            pytest.param(
+                "import main_module.fürimma as not_økay",
+                "not_økay",
+                id="bad_submodule_with_bad_alias",
+            ),
+            pytest.param(
+                "from foo.bar import function", None, id="from_okay_module_import_okay"
+            ),
+            pytest.param(
+                "from foo.bär import function", None, id="from_bad_module_import_okay"
+            ),
+            pytest.param(
+                "from foo.bar import functiøn",
+                "functiøn",
+                id="from_okay_module_import_bad",
+            ),
+            pytest.param(
+                "from foo.bar import functiøn as function",
+                None,
+                id="from_okay_module_import_bad_as_good",
+            ),
+            pytest.param(
+                "from foo.bär import functiøn as function",
+                None,
+                id="from_bad_module_import_bad_as_good",
+            ),
+            pytest.param(
+                "from foo.bar import functiøn as føl",
+                "føl",
+                id="from_okay_module_import_bad_as_bad",
+            ),
+            pytest.param(
+                "from foo.bar import functiøn as good, bäd",
+                "bäd",
+                id="from_okay_module_import_bad_as_good_and_bad",
+            ),
+            pytest.param(
+                "from foo.bar import functiøn as good, bäd",
+                "bäd",
+                id="from_okay_module_import_bad_as_good_and_bad",
+            ),
+            pytest.param(
+                "from foo.bar import functiøn as good, *",
+                # We still have functiøn within our namespace and could detect this
+                # But to do this properly we would need to check all `*` imports
+                # -> Too much effort!
+                "functiøn",
+                id="from_okay_module_import_bad_as_good_and_star",
+                marks=pytest.mark.xfail(
+                    reason="We don't know what is imported when using star"
+                ),
+            ),
+        ],
+    )
+    def test_check_import(self, import_statement: str, wrong_name: Optional[str]):
+        """We expect that for everything that user can change there is a message."""
+        node = astroid.extract_node(f"{import_statement} #@")
+
+        expected_msgs: Iterable[pylint.testutils.MessageTest] = tuple()
+
+        if wrong_name:
+            expected_msgs = (
+                pylint.testutils.MessageTest(
+                    msg_id="non-ascii-module-import",
+                    node=node,
+                    args=("Module", wrong_name),
+                    confidence=pylint.interfaces.HIGH,
+                ),
+            )
+        with self.assertAddsMessages(*expected_msgs, ignore_position=True):
+            if import_statement.startswith("from"):
+                assert isinstance(node, nodes.ImportFrom)
+                self.checker.visit_importfrom(node)
+            else:
+                assert isinstance(node, nodes.Import)
+                self.checker.visit_import(node)
diff --git a/tests/checkers/unittest_refactoring.py b/tests/checkers/unittest_refactoring.py
index 3c87a8d333..fda53098d7 100644
--- a/tests/checkers/unittest_refactoring.py
+++ b/tests/checkers/unittest_refactoring.py
@@ -1,48 +1,34 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-import astroid
-
-from pylint.checkers.refactoring import ImplicitBooleanessChecker
-
-
-def test_class_tree_detection() -> None:
-    module = astroid.parse(
-        """
-class ClassWithBool(list):
-    def __bool__(self):
-        return True
-
-class ClassWithoutBool(dict):
-    pass
-
-class ChildClassWithBool(ClassWithBool):
-    pass
-
-class ChildClassWithoutBool(ClassWithoutBool):
-    pass
-"""
-    )
-    with_bool, without_bool, child_with_bool, child_without_bool = module.body
-    assert ImplicitBooleanessChecker().base_classes_of_node(with_bool) == [
-        "ClassWithBool",
-        "list",
-        "object",
-    ]
-    assert ImplicitBooleanessChecker().base_classes_of_node(without_bool) == [
-        "ClassWithoutBool",
-        "dict",
-        "object",
-    ]
-    assert ImplicitBooleanessChecker().base_classes_of_node(child_with_bool) == [
-        "ChildClassWithBool",
-        "ClassWithBool",
-        "list",
-        "object",
-    ]
-    assert ImplicitBooleanessChecker().base_classes_of_node(child_without_bool) == [
-        "ChildClassWithoutBool",
-        "ClassWithoutBool",
-        "dict",
-        "object",
-    ]
+import os
+
+import pytest
+
+from pylint.lint import Run
+from pylint.reporters.text import TextReporter
+
+PARENT_DIR = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+REGR_DATA = os.path.join(PARENT_DIR, "regrtest_data")
+
+
+@pytest.mark.timeout(8)
+def test_process_tokens() -> None:
+    with pytest.raises(SystemExit) as cm:
+        Run([os.path.join(REGR_DATA, "very_long_line.py")], reporter=TextReporter())
+    assert cm.value.code == 0
+
+
+@pytest.mark.timeout(25)
+def test_issue_5724() -> None:
+    """Regression test for parsing of pylint disable pragma's."""
+    with pytest.raises(SystemExit) as cm:
+        Run(
+            [
+                os.path.join(REGR_DATA, "issue_5724.py"),
+                "--enable=missing-final-newline",
+            ],
+            reporter=TextReporter(),
+        )
+    assert cm.value.code == 0
diff --git a/tests/checkers/unittest_similar.py b/tests/checkers/unittest_similar.py
index a9a13b72ac..64ed46eb02 100644
--- a/tests/checkers/unittest_similar.py
+++ b/tests/checkers/unittest_similar.py
@@ -1,24 +1,6 @@
-# Copyright (c) 2010, 2012, 2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2012 Ry4an Brase <ry4an-hg@ry4an.org>
-# Copyright (c) 2014 Google, Inc.
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2018 Scott Worley <scottworley@scottworley.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2019 Taewon D. Kim <kimt33@mcmaster.ca>
-# Copyright (c) 2020-2021 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Frank Harrison <frank@doublethefish.com>
-# Copyright (c) 2020 Eli Fine <ejfine@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Maksym Humetskyi <Humetsky@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Aditya Gupta <adityagupta1089@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 from contextlib import redirect_stdout
 from io import StringIO
@@ -394,12 +376,10 @@ def test_no_args() -> None:
 
 
 def test_get_map_data() -> None:
-    """Tests that a SimilarChecker respects the MapReduceMixin interface"""
+    """Tests that a SimilarChecker respects the MapReduceMixin interface."""
     linter = PyLinter(reporter=Reporter())
-
     # Add a parallel checker to ensure it can map and reduce
     linter.register_checker(similar.SimilarChecker(linter))
-
     source_streams = (
         str(INPUT / "similar_lines_a.py"),
         str(INPUT / "similar_lines_b.py"),
diff --git a/tests/checkers/unittest_spelling.py b/tests/checkers/unittest_spelling.py
index 29bc1bca61..3d45539138 100644
--- a/tests/checkers/unittest_spelling.py
+++ b/tests/checkers/unittest_spelling.py
@@ -1,22 +1,6 @@
-# Copyright (c) 2014-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Michal Nowikowski <godfryd@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2017, 2020 Pedro Algarvio <pedro@algarvio.me>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2018, 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2019 agutole <toldo_carp@hotmail.com>
-# Copyright (c) 2020 Ganden Schaffner <gschaffner@pm.me>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Jaehoon Hwang <jaehoonhwang@users.noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Eli Fine <ejfine@gmail.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Unittest for the spelling checker."""
 
@@ -75,7 +59,7 @@ def test_check_bad_coment(self):
     @skip_on_missing_package_or_dict
     @set_config(spelling_dict=spell_dict)
     @set_config(max_spelling_suggestions=2)
-    def test_check_bad_coment_custom_suggestion_count(self):
+    def test_check_bad_comment_custom_suggestion_count(self):
         with self.assertAddsMessages(
             MessageTest(
                 "wrong-spelling-in-comment",
diff --git a/tests/checkers/unittest_stdlib.py b/tests/checkers/unittest_stdlib.py
index f38d3e89e4..cdd61e6bad 100644
--- a/tests/checkers/unittest_stdlib.py
+++ b/tests/checkers/unittest_stdlib.py
@@ -1,15 +1,6 @@
-# Copyright (c) 2015-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Cezar <celnazli@bitdefender.com>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2017 Martin <MartinBasti@users.noreply.github.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import contextlib
 from typing import Any, Callable, Iterator, Optional, Union
@@ -45,13 +36,12 @@ def test_deprecated_no_qname_on_unexpected_nodes(self) -> None:
 
         While this test might seem weird since it uses a transform, it's actually testing a crash
         that happened in production, but there was no way to retrieve the code for which this
-        occurred (how an AssignAttr got to be the result of a function inference beats me..)"""
+        occurred (how an AssignAttr got to be the result of a function inference beats me...)
+        """
 
         def infer_func(
-            node: Name, context: Optional[Any] = None
-        ) -> Iterator[
-            Union[Iterator, Iterator[AssignAttr]]
-        ]:  # pylint: disable=unused-argument
+            node: Name, context: Optional[Any] = None  # pylint: disable=unused-argument
+        ) -> Iterator[Union[Iterator, Iterator[AssignAttr]]]:
             new_node = nodes.AssignAttr(attrname="alpha", parent=node)
             yield new_node
 
diff --git a/tests/checkers/unittest_strings.py b/tests/checkers/unittest_strings.py
index 9f2d378016..7927dcc49d 100644
--- a/tests/checkers/unittest_strings.py
+++ b/tests/checkers/unittest_strings.py
@@ -1,16 +1,6 @@
-# Copyright (c) 2015-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2018 Lucas Cimon <lucas.cimon@gmail.com>
-# Copyright (c) 2018 Yury Gribov <tetra2005@gmail.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 from pylint.checkers import strings
 
diff --git a/tests/checkers/unittest_typecheck.py b/tests/checkers/unittest_typecheck.py
index fbb4d53de6..afcc2dc2e7 100644
--- a/tests/checkers/unittest_typecheck.py
+++ b/tests/checkers/unittest_typecheck.py
@@ -1,29 +1,6 @@
-# Copyright (c) 2014 Google, Inc.
-# Copyright (c) 2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2014 Holger Peters <email@holger-peters.de>
-# Copyright (c) 2015-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Dmitry Pribysh <dmand@yandex.ru>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2016 Filipe Brandenburger <filbranden@google.com>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2018 Bryce Guinta <bryce.paul.guinta@gmail.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2019 Martin Vielsmaier <martin.vielsmaier@gmail.com>
-# Copyright (c) 2019 Federico Bond <federicobond@gmail.com>
-# Copyright (c) 2020 Julien Palard <julien@palard.fr>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Damien Baty <damien.baty@polyconseil.fr>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 David Liu <david@cs.toronto.edu>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 David Gilman <davidgilman1@gmail.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import astroid
 import pytest
@@ -46,7 +23,8 @@
 
 
 class TestTypeChecker(CheckerTestCase):
-    "Tests for pylint.checkers.typecheck"
+    """Tests for pylint.checkers.typecheck."""
+
     CHECKER_CLASS = typecheck.TypeChecker
 
     @set_config(suggestion_mode=False)
@@ -63,6 +41,10 @@ def test_nomember_on_c_extension_error_msg(self) -> None:
             node=node,
             args=("Module", "coverage.tracer", "CTracer", ""),
             confidence=INFERENCE,
+            line=3,
+            col_offset=0,
+            end_line=3,
+            end_col_offset=14,
         )
         with self.assertAddsMessages(message):
             self.checker.visit_attribute(node)
@@ -81,13 +63,18 @@ def test_nomember_on_c_extension_info_msg(self) -> None:
             node=node,
             args=("Module", "coverage.tracer", "CTracer", ""),
             confidence=INFERENCE,
+            line=3,
+            col_offset=0,
+            end_line=3,
+            end_col_offset=14,
         )
         with self.assertAddsMessages(message):
             self.checker.visit_attribute(node)
 
 
 class TestTypeCheckerOnDecorators(CheckerTestCase):
-    "Tests for pylint.checkers.typecheck on decorated functions."
+    """Tests for pylint.checkers.typecheck on decorated functions."""
+
     CHECKER_CLASS = typecheck.TypeChecker
 
     def test_issue3882_class_decorators(self) -> None:
@@ -128,6 +115,10 @@ def getitem_on_modules(self) -> None:
                 node=subscript.value,
                 args="collections",
                 confidence=UNDEFINED,
+                line=3,
+                col_offset=7,
+                end_line=3,
+                end_col_offset=18,
             )
         ):
             self.checker.visit_subscript(subscript)
@@ -179,6 +170,10 @@ def decorated():
                 node=subscript.value,
                 args="decorated",
                 confidence=UNDEFINED,
+                line=18,
+                col_offset=7,
+                end_line=18,
+                end_col_offset=16,
             )
         ):
             self.checker.visit_subscript(subscript)
@@ -219,6 +214,10 @@ def decorated():
                 node=subscript.value,
                 args="decorated",
                 confidence=UNDEFINED,
+                line=17,
+                col_offset=7,
+                end_line=17,
+                end_col_offset=16,
             )
         ):
             self.checker.visit_subscript(subscript)
diff --git a/tests/checkers/unittest_unicode/__init__.py b/tests/checkers/unittest_unicode/__init__.py
new file mode 100644
index 0000000000..df1e5bf3dc
--- /dev/null
+++ b/tests/checkers/unittest_unicode/__init__.py
@@ -0,0 +1,86 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+import io
+from pathlib import Path
+
+import pylint.interfaces
+import pylint.testutils
+
+CODEC_AND_MSG = [
+    ("utf-8", tuple()),
+    (
+        "utf-16",
+        (
+            pylint.testutils.MessageTest(
+                msg_id="invalid-unicode-codec",
+                confidence=pylint.interfaces.HIGH,
+                # node=module,
+                line=1,
+                end_line=1,
+                col_offset=None,
+                end_col_offset=None,
+            ),
+        ),
+    ),
+    (
+        "utf-32",
+        (
+            pylint.testutils.MessageTest(
+                msg_id="invalid-unicode-codec",
+                confidence=pylint.interfaces.HIGH,
+                # node=module,
+                line=1,
+                end_line=1,
+                col_offset=None,
+                end_col_offset=None,
+            ),
+        ),
+    ),
+    (
+        "iso-8859-1",
+        (
+            pylint.testutils.MessageTest(
+                msg_id="bad-file-encoding",
+                confidence=pylint.interfaces.HIGH,
+                # node=module,
+                line=1,
+                end_line=1,
+                col_offset=None,
+                end_col_offset=None,
+            ),
+        ),
+    ),
+    (
+        "ascii",
+        (
+            pylint.testutils.MessageTest(
+                msg_id="bad-file-encoding",
+                confidence=pylint.interfaces.HIGH,
+                # node=module,
+                line=1,
+                end_line=1,
+                col_offset=None,
+                end_col_offset=None,
+            ),
+        ),
+    ),
+]
+
+
+class FakeNode:
+    """Simple Faker representing a Module node.
+
+    Astroid crashes in a number of cases if we want to lint unsupported encodings.
+    So, this is used to test the behaviour of the encoding checker.
+    This shall ensure that our checks keep working once Python supports UTF16/32.
+    """
+
+    file: Path
+
+    def __init__(self, content: bytes):
+        self.content = io.BytesIO(content)
+
+    def stream(self):
+        return self.content
diff --git a/tests/checkers/unittest_unicode/unittest_bad_chars.py b/tests/checkers/unittest_unicode/unittest_bad_chars.py
new file mode 100644
index 0000000000..154faad5a0
--- /dev/null
+++ b/tests/checkers/unittest_unicode/unittest_bad_chars.py
@@ -0,0 +1,273 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+# pylint: disable=redefined-outer-name
+import itertools
+from pathlib import Path
+from typing import Callable, Tuple, cast
+
+import astroid
+import pytest
+from astroid import AstroidBuildingError, nodes
+
+import pylint.checkers.unicode
+import pylint.interfaces
+import pylint.testutils
+
+from . import CODEC_AND_MSG, FakeNode
+
+
+@pytest.fixture()
+def bad_char_file_generator(tmp_path: Path) -> Callable[[str, bool, str], Path]:
+    """Generates a test file for bad chars.
+
+    The generator also ensures that file generated is correct
+    """
+
+    def encode_without_bom(string, encoding):
+        return pylint.checkers.unicode._encode_without_bom(string, encoding)
+
+    # All lines contain a not extra checked invalid character
+    lines = (
+        "# Example File containing bad ASCII",
+        "# invalid char backspace: \b",
+        "# Bad carriage-return \r # not at the end",
+        "# Invalid char sub: \x1A",
+        "# Invalid char esc: \x1B",
+    )
+
+    def _bad_char_file_generator(codec: str, add_invalid_bytes: bool, line_ending: str):
+        byte_suffix = b""
+        if add_invalid_bytes:
+            if codec == "utf-8":
+                byte_suffix = b"BAD:\x80abc"
+            elif codec == "utf-16":
+                byte_suffix = b"BAD:\n"  # Generates Truncated Data
+            else:
+                byte_suffix = b"BAD:\xc3\x28 "
+            byte_suffix = encode_without_bom(" foobar ", codec) + byte_suffix
+
+        line_ending_encoded = encode_without_bom(line_ending, codec)
+
+        # Start content with BOM / codec definition and two empty lines
+        content = f"# coding: {codec} \n # \n ".encode(codec)
+
+        # Generate context with the given codec and line ending
+        for lineno, line in enumerate(lines):
+            byte_line = encode_without_bom(line, codec)
+            byte_line += byte_suffix + line_ending_encoded
+            content += byte_line
+
+            # Directly test the generated content
+            if not add_invalid_bytes:
+                # Test that the content is correct and gives no errors
+                try:
+                    byte_line.decode(codec, "strict")
+                except UnicodeDecodeError as e:
+                    raise ValueError(
+                        f"Line {lineno} did raise unexpected error: {byte_line}\n{e}"
+                    ) from e
+            else:
+                try:
+                    # But if there was a byte_suffix we expect an error
+                    # because that is what we want to test for
+                    byte_line.decode(codec, "strict")
+                except UnicodeDecodeError:
+                    ...
+                else:
+                    raise ValueError(
+                        f"Line {lineno} did not raise decode error: {byte_line}"
+                    )
+
+        file = tmp_path / "bad_chars.py"
+        file.write_bytes(content)
+        return file
+
+    return _bad_char_file_generator
+
+
+class TestBadCharsChecker(pylint.testutils.CheckerTestCase):
+    CHECKER_CLASS = pylint.checkers.unicode.UnicodeChecker
+
+    checker: pylint.checkers.unicode.UnicodeChecker
+
+    @pytest.mark.parametrize(
+        "codec_and_msg, line_ending, add_invalid_bytes",
+        [
+            pytest.param(
+                codec_and_msg,
+                line_ending[0],
+                suffix[0],
+                id=f"{codec_and_msg[0]}_{line_ending[1]}_{suffix[1]}",
+            )
+            for codec_and_msg, line_ending, suffix in itertools.product(
+                CODEC_AND_MSG,
+                (("\n", "linux"), ("\r\n", "windows")),
+                ((False, "valid_line"), (True, "not_decode_able_line")),
+            )
+            # Only utf8 can drop invalid lines
+            if codec_and_msg[0].startswith("utf") or not suffix[0]
+        ],
+    )
+    def test_find_bad_chars(
+        self,
+        bad_char_file_generator: Callable[[str, bool, str], Path],
+        codec_and_msg: Tuple[str, Tuple[pylint.testutils.MessageTest]],
+        line_ending: str,
+        add_invalid_bytes: bool,
+    ):
+        """All combinations of bad characters that are accepted by Python at the moment
+        are tested in all possible combinations of
+          - line ending
+          - encoding
+          - including not encode-able byte (or not)
+        """
+        codec, start_msg = codec_and_msg
+
+        start_lines = 2
+
+        file = bad_char_file_generator(codec, add_invalid_bytes, line_ending)
+
+        try:
+            # We need to use ast from file as only this function reads bytes and not
+            # string
+            module = astroid.MANAGER.ast_from_string(file)
+        except AstroidBuildingError:
+            # pylint: disable-next=redefined-variable-type
+            module = cast(nodes.Module, FakeNode(file.read_bytes()))
+
+        expected = [
+            *start_msg,
+            pylint.testutils.MessageTest(
+                msg_id="invalid-character-backspace",
+                line=2 + start_lines,
+                end_line=2 + start_lines,
+                # node=module,
+                args=None,
+                confidence=pylint.interfaces.HIGH,
+                col_offset=27,
+                end_col_offset=28,
+            ),
+            pylint.testutils.MessageTest(
+                msg_id="invalid-character-carriage-return",
+                line=3 + start_lines,
+                end_line=3 + start_lines,
+                # node=module,
+                args=None,
+                confidence=pylint.interfaces.HIGH,
+                col_offset=23,
+                end_col_offset=24,
+            ),
+            pylint.testutils.MessageTest(
+                msg_id="invalid-character-sub",
+                line=4 + start_lines,
+                end_line=4 + start_lines,
+                # node=module,
+                args=None,
+                confidence=pylint.interfaces.HIGH,
+                col_offset=21,
+                end_col_offset=22,
+            ),
+            pylint.testutils.MessageTest(
+                msg_id="invalid-character-esc",
+                line=5 + start_lines,
+                end_line=5 + start_lines,
+                # node=module,
+                args=None,
+                confidence=pylint.interfaces.HIGH,
+                col_offset=21,
+                end_col_offset=22,
+            ),
+        ]
+        with self.assertAddsMessages(*expected):
+            self.checker.process_module(module)
+
+    @pytest.mark.parametrize(
+        "codec_and_msg, char, msg_id",
+        [
+            pytest.param(
+                codec_and_msg,
+                char_msg[0],
+                char_msg[1],
+                id=f"{char_msg[1]}_{codec_and_msg[0]}",
+            )
+            for codec_and_msg, char_msg in itertools.product(
+                CODEC_AND_MSG,
+                (
+                    ("\0", "invalid-character-nul"),
+                    ("\N{ZERO WIDTH SPACE}", "invalid-character-zero-width-space"),
+                ),
+            )
+            # Only utf contains zero width space
+            if (
+                char_msg[0] != "\N{ZERO WIDTH SPACE}"
+                or codec_and_msg[0].startswith("utf")
+            )
+        ],
+    )
+    def test_bad_chars_that_would_currently_crash_python(
+        self,
+        char: str,
+        msg_id: str,
+        codec_and_msg: Tuple[str, Tuple[pylint.testutils.MessageTest]],
+    ):
+        """Special test for a file containing chars that lead to
+        Python or Astroid crashes (which causes Pylint to exit early)
+        """
+        codec, start_msg = codec_and_msg
+        # Create file that will fail loading in astroid.
+        # We still want to check this, in case this behavior changes
+        content = f"# # coding: {codec}\n# file containing {char} <-\n"
+        module = FakeNode(content.encode(codec))
+
+        expected = [
+            *start_msg,
+            pylint.testutils.MessageTest(
+                msg_id=msg_id,
+                line=2,
+                end_line=2,
+                # node=module,
+                args=None,
+                confidence=pylint.interfaces.HIGH,
+                col_offset=19,
+                end_col_offset=20,
+            ),
+        ]
+
+        with self.assertAddsMessages(*expected):
+            self.checker.process_module(cast(nodes.Module, module))
+
+    @pytest.mark.parametrize(
+        "char, msg, codec",
+        [
+            pytest.param(
+                char.unescaped,
+                char.human_code(),
+                codec_and_msg[0],
+                id=f"{char.name}_{codec_and_msg[0]}",
+            )
+            for char, codec_and_msg in itertools.product(
+                pylint.checkers.unicode.BAD_CHARS, CODEC_AND_MSG
+            )
+            # Only utf contains zero width space
+            if (
+                char.unescaped != "\N{ZERO WIDTH SPACE}"
+                or codec_and_msg[0].startswith("utf")
+            )
+        ],
+    )
+    def test___check_invalid_chars(self, char: str, msg: str, codec: str) -> None:
+        """Check function should deliver correct column no matter which codec we used."""
+        with self.assertAddsMessages(
+            pylint.testutils.MessageTest(
+                msg_id=msg,
+                line=55,
+                args=None,
+                confidence=pylint.interfaces.HIGH,
+                end_line=55,
+                col_offset=5,
+                end_col_offset=6,
+            )
+        ):
+            self.checker._check_invalid_chars(f"#234{char}".encode(codec), 55, codec)
diff --git a/tests/checkers/unittest_unicode/unittest_bidirectional_unicode.py b/tests/checkers/unittest_unicode/unittest_bidirectional_unicode.py
new file mode 100644
index 0000000000..68134fcc98
--- /dev/null
+++ b/tests/checkers/unittest_unicode/unittest_bidirectional_unicode.py
@@ -0,0 +1,97 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+import itertools
+import unicodedata
+from pathlib import Path
+from typing import cast
+
+import astroid
+import pytest
+from astroid import nodes
+
+import pylint.checkers.unicode
+import pylint.interfaces
+import pylint.testutils
+
+from . import FakeNode
+
+UNICODE_TESTS = Path(__file__).parent.parent.parent / "regrtest_data" / "unicode"
+
+
+class TestBidirectionalUnicodeChecker(pylint.testutils.CheckerTestCase):
+    CHECKER_CLASS = pylint.checkers.unicode.UnicodeChecker
+
+    checker: pylint.checkers.unicode.UnicodeChecker
+
+    def test_finds_bidirectional_unicode_that_currently_not_parsed(self):
+        """Test an example from https://github.com/nickboucher/trojan-source/tree/main/Python
+        that is currently not working Python but producing a syntax error
+
+        So we test this to make sure it stays like this
+        """
+
+        test_file = UNICODE_TESTS / "invisible_function.txt"
+
+        with pytest.raises(astroid.AstroidSyntaxError):
+            astroid.MANAGER.ast_from_string(test_file.read_text("utf-8"))
+
+        with pytest.raises(AssertionError):
+            # The following errors are not risen at the moment,
+            # But we keep this in order to allow writing the test fast, if
+            # the condition above isn't met anymore.
+            module = FakeNode(test_file.read_bytes())
+            with self.assertAddsMessages(
+                pylint.testutils.MessageTest(
+                    msg_id="bidirectional-unicode",
+                    confidence=pylint.interfaces.HIGH,
+                    # node=module,
+                    line=6,
+                    end_line=10,
+                    col_offset=0,
+                    end_col_offset=17,
+                ),
+                pylint.testutils.MessageTest(
+                    msg_id="bidirectional-unicode",
+                    confidence=pylint.interfaces.HIGH,
+                    line=10,
+                    # node=module,
+                    end_line=10,
+                    col_offset=0,
+                    end_col_offset=20,
+                ),
+            ):
+                self.checker.process_module(cast(nodes.Module, module))
+
+    @pytest.mark.parametrize(
+        "bad_string, codec",
+        [
+            pytest.param(
+                char,
+                codec,
+                id=f"{unicodedata.name(char)}_{codec}".replace(" ", "_"),
+            )
+            for char, codec in itertools.product(
+                pylint.checkers.unicode.BIDI_UNICODE,
+                ("utf-8", "utf-16le", "utf-16be", "utf-32le", "utf-32be"),
+            )
+        ],
+    )
+    def test_find_bidi_string(self, bad_string: str, codec: str):
+        """Ensure that all Bidirectional strings are detected.
+
+        Tests also UTF-16 and UTF-32.
+        """
+        expected = pylint.testutils.MessageTest(
+            msg_id="bidirectional-unicode",
+            confidence=pylint.interfaces.HIGH,
+            line=1,
+            # node=module,
+            end_line=1,
+            col_offset=0,
+            end_col_offset=3,
+        )
+
+        with self.assertAddsMessages(expected):
+            self.checker._check_bidi_chars(f"# {bad_string}".encode(codec), 1, codec)
diff --git a/tests/checkers/unittest_unicode/unittest_functions.py b/tests/checkers/unittest_unicode/unittest_functions.py
new file mode 100644
index 0000000000..bf42df996c
--- /dev/null
+++ b/tests/checkers/unittest_unicode/unittest_functions.py
@@ -0,0 +1,263 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+import itertools
+from pathlib import Path
+from typing import Dict
+
+import pytest
+
+import pylint.checkers.unicode
+
+SEARCH_DICT_BYTE_UTF8 = {
+    char.unescaped.encode("utf-8"): char for char in pylint.checkers.unicode.BAD_CHARS
+}
+
+
+@pytest.mark.parametrize(
+    "line, expected, search_dict",
+    [
+        # Test special carrier return cases
+        pytest.param(
+            "valid windows\r\n",
+            {},
+            pylint.checkers.unicode.BAD_ASCII_SEARCH_DICT,
+            id="valid-windows",
+        ),
+        pytest.param(
+            b"TOTO = ('Caf\xe9', 'Caf\xe9', 'Caf\xe9')\r\n",
+            {},
+            SEARCH_DICT_BYTE_UTF8,
+            id="valid-windows-bytes",
+        ),
+        pytest.param(
+            "invalid\r windows\r\n",
+            {7: pylint.checkers.unicode.BAD_ASCII_SEARCH_DICT["\r"]},
+            pylint.checkers.unicode.BAD_ASCII_SEARCH_DICT,
+            id="invalid-carrier-return-windows",
+        ),
+        pytest.param(
+            "invalid\r linux\n",
+            {7: pylint.checkers.unicode.BAD_ASCII_SEARCH_DICT["\r"]},
+            pylint.checkers.unicode.BAD_ASCII_SEARCH_DICT,
+            id="invalid-carrier-return-linux",
+        ),
+        pytest.param(
+            b"invalid\r windows\r\n",
+            {7: pylint.checkers.unicode.BAD_ASCII_SEARCH_DICT["\r"]},
+            SEARCH_DICT_BYTE_UTF8,
+            id="invalid-carrier-return-windows-bytes",
+        ),
+        pytest.param(
+            b"invalid\r linux\n",
+            {7: pylint.checkers.unicode.BAD_ASCII_SEARCH_DICT["\r"]},
+            SEARCH_DICT_BYTE_UTF8,
+            id="invalid-carrier-return-linux-bytes",
+        ),
+        # Auto test Linux all remaining Linux cases ...
+        *(
+            pytest.param(
+                f"invalid{char.unescaped} back\n",
+                {7: char},
+                pylint.checkers.unicode.BAD_ASCII_SEARCH_DICT,
+                id=f"invalid-{char.name}-linux",
+            )
+            for char in pylint.checkers.unicode.BAD_CHARS
+            if char.unescaped != "\r"
+        ),
+        # ... also byte encoded
+        *(
+            pytest.param(
+                f"invalid{char.unescaped} back\n".encode("ASCII"),
+                {7: char},
+                SEARCH_DICT_BYTE_UTF8,
+                id=f"invalid-{char.name}-linux-bytes",
+            )
+            for char in pylint.checkers.unicode.BAD_CHARS[:-1]
+            if char.unescaped != "\r"
+        ),
+        # Test all remaining windows cases ...
+        *(
+            pytest.param(
+                f"invalid{char.unescaped} back\r\n",
+                {7: char},
+                pylint.checkers.unicode.BAD_ASCII_SEARCH_DICT,
+                id=f"invalid-{char.name}-windows",
+            )
+            for char in pylint.checkers.unicode.BAD_CHARS
+            if char.unescaped != "\r"
+        ),
+        # ... also byte encoded
+        *(
+            pytest.param(
+                f"invalid{char.unescaped} back\r\n".encode("ASCII"),
+                {7: char},
+                SEARCH_DICT_BYTE_UTF8,
+                id=f"invalid-{char.name}-windows-bytes",
+            )
+            for char in pylint.checkers.unicode.BAD_CHARS[:-1]
+            if char.unescaped != "\r"
+        ),
+    ],
+)
+def test_map_positions_to_result(
+    line: pylint.checkers.unicode._StrLike,
+    expected: Dict[int, pylint.checkers.unicode._BadChar],
+    search_dict,
+):
+    """Test all possible outcomes for map position function in UTF-8 and ASCII."""
+    if isinstance(line, bytes):
+        newline = b"\n"
+    else:
+        newline = "\n"
+    assert (
+        pylint.checkers.unicode._map_positions_to_result(
+            line, search_dict, new_line=newline
+        )
+        == expected
+    )
+
+
+@pytest.mark.parametrize(
+    "line",
+    [
+        pytest.param("1234567890", id="no_line_ending"),
+        pytest.param(b"1234567890", id="no_line_ending_byte"),
+        pytest.param("1234567890\n", id="linux"),
+        pytest.param(b"1234567890\n", id="linux_byte"),
+        pytest.param("1234567890\r\n", id="windows"),
+        pytest.param(b"1234567890\r\n", id="windows_byte"),
+        pytest.param("12345678\n\r", id="wrong_order"),
+        pytest.param(b"12345678\n\r", id="wrong_order_byte"),
+    ],
+)
+def test_line_length(line: pylint.checkers.unicode._StrLike):
+    assert pylint.checkers.unicode._line_length(line, "utf-8") == 10
+
+
+@pytest.mark.parametrize(
+    "line",
+    [
+        pytest.param("1234567890", id="no_line_ending"),
+        pytest.param("1234567890\n", id="linux"),
+        pytest.param("1234567890\r\n", id="windows"),
+        pytest.param("12345678\n\r", id="wrong_order"),
+    ],
+)
+def test_line_length_utf16(line: str):
+    assert pylint.checkers.unicode._line_length(line.encode("utf-16"), "utf-16") == 10
+
+
+@pytest.mark.parametrize(
+    "line",
+    [
+        pytest.param("1234567890", id="no_line_ending"),
+        pytest.param("1234567890\n", id="linux"),
+        pytest.param("1234567890\r\n", id="windows"),
+        pytest.param("12345678\n\r", id="wrong_order"),
+    ],
+)
+def test_line_length_utf32(line: str):
+    assert pylint.checkers.unicode._line_length(line.encode("utf-32"), "utf-32") == 10
+
+
+@pytest.mark.parametrize(
+    "codec, expected",
+    [
+        ("utf-8sig", "utf-8"),
+        ("utf8", "utf-8"),
+        ("utf 8", "utf-8"),
+        ("utf-8", "utf-8"),
+        ("utf-8", "utf-8"),
+        ("utf-16", "utf-16"),
+        ("utf-32", "utf-32"),
+        ("utf 16", "utf-16"),
+        ("utf 32", "utf-32"),
+        ("utf 16 LE", "utf-16le"),
+        ("utf 32-BE", "utf-32be"),
+        ("UTF-32", "utf-32"),
+        ("UTF-32-le", "utf-32le"),
+        ("UTF-16 LE", "utf-16le"),
+        ("UTF-16BE", "utf-16be"),
+        ("UTF8", "utf-8"),
+        ("Latin1", "latin1"),
+        ("ASCII", "ascii"),
+    ],
+)
+def test__normalize_codec_name(codec: str, expected: str):
+    assert pylint.checkers.unicode._normalize_codec_name(codec) == expected
+
+
+@pytest.mark.parametrize(
+    "codec, line_ending, final_new_line",
+    [
+        pytest.param(
+            codec,
+            line_ending[0],
+            final_nl[0],
+            id=f"{codec}_{line_ending[1]}_{final_nl[1]}",
+        )
+        for codec, line_ending, final_nl in itertools.product(
+            (
+                "utf-8",
+                "utf-16",
+                "utf-16le",
+                "utf-16be",
+                "utf-32",
+                "utf-32le",
+                "utf-32be",
+            ),
+            (("\n", "linux"), ("\r\n", "windows")),
+            ((True, "final_nl"), (False, "no_final_nl")),
+        )
+    ],
+)
+def test___fix_utf16_32_line_stream(
+    tmp_path: Path, codec: str, line_ending: str, final_new_line: bool
+):
+    """Content of stream should be the same as should be the length."""
+
+    def decode_line(line: bytes, codec: str) -> str:
+        return line.decode(codec)
+
+    file = tmp_path / "test.txt"
+
+    content = [
+        f"line1{line_ending}",
+        f"# Line 2{line_ending}",
+        f"łöł{line_ending}",
+        f"last line{line_ending if final_new_line else ''}",
+    ]
+
+    text = "".join(content)
+    encoded = text.encode(codec)
+
+    file.write_bytes(encoded)
+
+    gathered = b""
+    collected = []
+    with file.open("rb") as f:
+        for line in pylint.checkers.unicode._fix_utf16_32_line_stream(f, codec):
+            gathered += line
+            collected.append(decode_line(line, codec))
+
+    # Test content equality
+    assert collected == content
+    # Test byte equality
+    assert gathered == encoded
+
+
+@pytest.mark.parametrize(
+    "codec, expected",
+    [
+        ("utf-32", 4),
+        ("utf-32-le", 4),
+        ("utf-16", 2),
+        ("utf-8", 1),
+        ("latin1", 1),
+        ("ascii", 1),
+    ],
+)
+def test__byte_to_str_length(codec: str, expected: int):
+    assert pylint.checkers.unicode._byte_to_str_length(codec) == expected
diff --git a/tests/checkers/unittest_unicode/unittest_invalid_encoding.py b/tests/checkers/unittest_unicode/unittest_invalid_encoding.py
new file mode 100644
index 0000000000..ff46539e46
--- /dev/null
+++ b/tests/checkers/unittest_unicode/unittest_invalid_encoding.py
@@ -0,0 +1,142 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+import codecs
+import io
+import shutil
+from pathlib import Path
+from typing import Tuple, cast
+
+import pytest
+from astroid import nodes
+
+import pylint.checkers.unicode
+import pylint.interfaces
+import pylint.testutils
+
+from . import CODEC_AND_MSG, FakeNode
+
+UNICODE_TESTS = Path(__file__).parent.parent.parent / "regrtest_data" / "unicode"
+
+
+class TestInvalidEncoding(pylint.testutils.CheckerTestCase):
+    CHECKER_CLASS = pylint.checkers.unicode.UnicodeChecker
+    checker: pylint.checkers.unicode.UnicodeChecker
+
+    @pytest.mark.parametrize(
+        "test_file, line_no",
+        [
+            pytest.param(
+                "pep_bidirectional_utf_16_le_no_bom.txt",
+                2,
+                marks=pytest.mark.xfail(
+                    reason="Python currently doesn't support UTF-16 code detection"
+                ),
+            ),
+            pytest.param(
+                "pep_bidirectional_utf_32_le_no_bom.txt",
+                2,
+                marks=pytest.mark.xfail(
+                    reason="Python currently doesn't support UTF-32 code detection"
+                ),
+            ),
+            # A note to the xfails above: If you open these files in an editor, you
+            # only will see garbage if you don't select the correct encoding by hand.
+            # Still maybe in the future the python way of defining the encoding could
+            # work - even so it is unlikely as the first line is not ASCII and would
+            # have to be treated differently anyway...
+            ("pep_bidirectional_utf_16_bom.txt", 1),
+            ("pep_bidirectional_utf_32_bom.txt", 1),
+        ],
+    )
+    def test_invalid_unicode_files(self, tmp_path: Path, test_file: str, line_no: int):
+        test_file_path = UNICODE_TESTS / test_file
+        target = shutil.copy(
+            test_file_path, tmp_path / test_file.replace(".txt", ".py")
+        )
+
+        # Fake node as otherwise we get syntax errors etc...
+        # So currently the UTF-16/UTF-32 tests does not work, as UTF-16 / UTF-32
+        # is not really working at all in in Python, but checking it now already
+        # is future save in case that changes....
+
+        module = FakeNode(Path(target).read_bytes())
+
+        with self.assertAddsMessages(
+            pylint.testutils.MessageTest(
+                msg_id="invalid-unicode-codec",
+                confidence=pylint.interfaces.HIGH,
+                # node=module,
+                line=line_no,
+                end_line=1,
+                col_offset=None,
+                end_col_offset=None,
+            ),
+            pylint.testutils.MessageTest(
+                msg_id="bidirectional-unicode",
+                confidence=pylint.interfaces.HIGH,
+                # node=module,
+                line=line_no + 2,
+                end_line=line_no + 2,
+                col_offset=0,
+                end_col_offset=37,
+            ),
+        ):
+            self.checker.process_module(cast(nodes.Module, module))
+
+    @pytest.mark.parametrize(
+        "content, codec, line",
+        [
+            pytest.param(b"# Nothing", "utf-8", 1, id="default_utf8"),
+            pytest.param(b"# coding: latin-1", "iso-8859-1", 1, id="pep263_latin1"),
+            pytest.param(
+                b"#!/usr/bin/python\n# coding: latin-1",
+                "iso-8859-1",
+                2,
+                id="pep263_latin1_multiline",
+            ),
+            pytest.param(b"# coding: ascii", "ascii", 1, id="pep263_ascii"),
+            pytest.param(b"# coding: UTF-8", "utf-8", 1, id="pep263_utf-8"),
+            # This looks correct but is actually wrong. If you would try to decode
+            # the byte to utf-16be it would fail
+            pytest.param(
+                b"# coding: UTF-16le", "utf-16le", 1, id="pep263_utf-16le_fake"
+            ),
+            # This contains no bom but a correct encoding line in none ascii
+            # So this fails at the moment
+            pytest.param(
+                "# coding: UTF-16le".encode("utf-16le"),
+                "utf-16le",
+                1,
+                id="pep263_utf-16le_real",
+                marks=pytest.mark.xfail(reason="Currently not supported by Python"),
+            ),
+            *(
+                pytest.param(bom, codec, 1, id=f"bom_{codec}")
+                for codec, bom in (
+                    ("utf-8", codecs.BOM_UTF8),
+                    ("utf-16le", codecs.BOM_UTF16_LE),
+                    ("utf-16be", codecs.BOM_UTF16_BE),
+                    ("utf-32le", codecs.BOM_UTF32_LE),
+                    ("utf-32be", codecs.BOM_UTF32_BE),
+                )
+            ),
+        ],
+    )
+    def test__determine_codec(self, content: bytes, codec: str, line: int):
+        """The codec determined should be exact no matter what we throw at it."""
+        assert self.checker._determine_codec(io.BytesIO(content)) == (codec, line)
+
+    def test__determine_codec_raises_syntax_error_on_invalid_input(self):
+        """Invalid input should lead to a SyntaxError."""
+        with pytest.raises(SyntaxError):
+            self.checker._determine_codec(io.BytesIO(b"\x80abc"))
+
+    @pytest.mark.parametrize(
+        "codec, msg",
+        (pytest.param(codec, msg, id=codec) for codec, msg in CODEC_AND_MSG),
+    )
+    def test___check_codec(self, codec: str, msg: Tuple[pylint.testutils.MessageTest]):
+        with self.assertAddsMessages(*msg):
+            self.checker._check_codec(codec, 1)
diff --git a/tests/checkers/unittest_utils.py b/tests/checkers/unittest_utils.py
index 58ff5ed734..121bcef2e9 100644
--- a/tests/checkers/unittest_utils.py
+++ b/tests/checkers/unittest_utils.py
@@ -1,22 +1,6 @@
-# Copyright (c) 2010 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2013-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2013-2014 Google, Inc.
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2018 Alan Chan <achan961117@gmail.com>
-# Copyright (c) 2018 Caio Carrara <ccarrara@redhat.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2019 Nathan Marrow <nmarrow@google.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Jaehoon Hwang <jaehoonhwang@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Tests for the pylint.checkers.utils module."""
 
@@ -489,7 +473,7 @@ def test_is_empty_literal() -> None:
 
 
 def test_deprecation_is_inside_lambda() -> None:
-    """Test that is_inside_lambda is throwing a DeprecationWarning"""
+    """Test that is_inside_lambda is throwing a DeprecationWarning."""
     with pytest.warns(DeprecationWarning) as records:
         utils.is_inside_lambda(nodes.NodeNG())
         assert len(records) == 1
diff --git a/tests/checkers/unittest_variables.py b/tests/checkers/unittest_variables.py
index 43ecedb904..c2d2d8ec34 100644
--- a/tests/checkers/unittest_variables.py
+++ b/tests/checkers/unittest_variables.py
@@ -1,24 +1,6 @@
-# Copyright (c) 2014-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Google, Inc.
-# Copyright (c) 2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2017 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2018 Bryce Guinta <bryce.guinta@protonmail.com>
-# Copyright (c) 2018 Bryce Guinta <bryce.paul.guinta@gmail.com>
-# Copyright (c) 2018 mar-chi-pan <mar.polatoglou@gmail.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Andrew Simmons <anjsimmo@gmail.com>
-# Copyright (c) 2020 Andrew Simmons <a.simmons@deakin.edu.au>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Sergei Lebedev <185856+superbobry@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import os
 import re
@@ -90,7 +72,14 @@ def normal_func(abc):
         )
         with self.assertAddsMessages(
             MessageTest(
-                "unused-argument", node=node["abc"], args="abc", confidence=HIGH
+                "unused-argument",
+                node=node["abc"],
+                args="abc",
+                confidence=HIGH,
+                line=2,
+                col_offset=16,
+                end_line=2,
+                end_col_offset=19,
             )
         ):
             self.checker.visit_functiondef(node)
@@ -104,7 +93,14 @@ def cb_func(abc):
         )
         with self.assertAddsMessages(
             MessageTest(
-                "unused-argument", node=node["abc"], args="abc", confidence=HIGH
+                "unused-argument",
+                node=node["abc"],
+                args="abc",
+                confidence=HIGH,
+                line=2,
+                col_offset=12,
+                end_line=2,
+                end_col_offset=15,
             )
         ):
             self.checker.visit_functiondef(node)
@@ -118,7 +114,15 @@ def test_redefined_builtin_modname_not_ignored(self) -> None:
         """
         )
         with self.assertAddsMessages(
-            MessageTest("redefined-builtin", node=node.body[0], args="open")
+            MessageTest(
+                "redefined-builtin",
+                node=node.body[0],
+                args="open",
+                line=2,
+                col_offset=0,
+                end_line=2,
+                end_col_offset=32,
+            )
         ):
             self.checker.visit_module(node)
 
@@ -176,7 +180,8 @@ def test_nested_lambda(self) -> None:
     @set_config(ignored_argument_names=re.compile("arg"))
     def test_ignored_argument_names_no_message(self) -> None:
         """Make sure is_ignored_argument_names properly ignores
-        function arguments"""
+        function arguments
+        """
         node = astroid.parse(
             """
         def fooby(arg):
diff --git a/tests/config/conftest.py b/tests/config/conftest.py
index 5a6778af2f..491b16267a 100644
--- a/tests/config/conftest.py
+++ b/tests/config/conftest.py
@@ -1,3 +1,7 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 from pathlib import Path
 
 import pytest
diff --git a/tests/config/file_to_lint.py b/tests/config/file_to_lint.py
index e7c395dd97..b6a8c14c86 100644
--- a/tests/config/file_to_lint.py
+++ b/tests/config/file_to_lint.py
@@ -1 +1,5 @@
-"""Perfect module with only documentation for configuration tests"""
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Perfect module with only documentation for configuration tests."""
diff --git a/tests/config/functional/toml/issue_3181/toml_decode_error.1.out b/tests/config/functional/toml/issue_3181/toml_decode_error.1.out
index 545acbd2dd..4511afc5c1 100644
--- a/tests/config/functional/toml/issue_3181/toml_decode_error.1.out
+++ b/tests/config/functional/toml/issue_3181/toml_decode_error.1.out
@@ -1,2 +1,2 @@
 ************* Module {abspath}
-{relpath}:1:0: F0011: error while parsing the configuration: Found invalid character in key name: '*'. Try quoting the key name. (line 3 column 2 char 48) (config-parse-error)
+{relpath}:1:0: F0011: error while parsing the configuration: Invalid statement (at line 3, column 1) (config-parse-error)
diff --git a/tests/config/test_config.py b/tests/config/test_config.py
index f89e624168..701d24a822 100644
--- a/tests/config/test_config.py
+++ b/tests/config/test_config.py
@@ -1,3 +1,7 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 import os
 from pathlib import Path
 from typing import Optional, Set
diff --git a/tests/config/test_functional_config_loading.py b/tests/config/test_functional_config_loading.py
index 6ee86d6796..e4ed15051b 100644
--- a/tests/config/test_functional_config_loading.py
+++ b/tests/config/test_functional_config_loading.py
@@ -1,12 +1,12 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""
-This launches the configuration functional tests. This permits to test configuration
+"""This launches the configuration functional tests. This permits to test configuration
 files by providing a file with the appropriate extension in the ``tests/config/functional``
 directory.
 
-Let's say you have a regression_list_crash.toml file to test. Then if there is an error in the conf,
+Let's say you have a regression_list_crash.toml file to test. Then, if there is an error in the conf,
 add ``regression_list_crash.out`` alongside your file with the expected output of pylint in it. Use
 ``{relpath}`` and ``{abspath}`` for the path of the file. The exit code will have to be 2 (error)
 if this file exists.
@@ -34,8 +34,8 @@
 HERE = Path(__file__).parent
 USER_SPECIFIC_PATH = HERE.parent.parent
 FUNCTIONAL_DIR = HERE / "functional"
-# We use string then recast to path so we can use -k in pytest.
-# Otherwise we get 'configuration_path0' as a test name. The path is relative to the functional
+# We use string then recast to path, so we can use -k in pytest.
+# Otherwise, we get 'configuration_path0' as a test name. The path is relative to the functional
 # directory because otherwise the string would be very lengthy.
 ACCEPTED_CONFIGURATION_EXTENSIONS = ("toml", "ini", "cfg")
 CONFIGURATION_PATHS = [
@@ -83,7 +83,7 @@ def test_functional_config_loading(
     )
     mock_exit.assert_called_once_with(expected_code)
     out, err = capsys.readouterr()
-    # rstrip() applied so we can have a final newline in the expected test file
+    # 'rstrip()' applied, so we can have a final newline in the expected test file
     assert expected_output.rstrip() == out.rstrip(), msg
     assert sorted(expected_loaded_configuration.keys()) == sorted(
         runner.linter.config.__dict__.keys()
diff --git a/tests/config/unittest_config.py b/tests/config/unittest_config.py
index b10c686e4d..14c3b72320 100644
--- a/tests/config/unittest_config.py
+++ b/tests/config/unittest_config.py
@@ -1,21 +1,12 @@
-# Copyright (c) 2015 Aru Sahni <arusahni@gmail.com>
-# Copyright (c) 2016-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2017 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Unit tests for the config module."""
 
 import re
 import sre_constants
+import sys
 from typing import Dict, Tuple, Type
 
 import pytest
@@ -25,7 +16,10 @@
 from pylint.testutils import CheckerTestCase, set_config
 from pylint.utils.utils import get_global_option
 
-RE_PATTERN_TYPE = getattr(re, "Pattern", getattr(re, "_pattern_type", None))
+if sys.version_info >= (3, 7):
+    RE_PATTERN_TYPE = re.Pattern
+else:
+    RE_PATTERN_TYPE = re._pattern_type  # pylint: disable=no-member
 
 
 def test__regexp_validator_valid() -> None:
@@ -73,7 +67,8 @@ def test__regexp_csv_validator_invalid() -> None:
 
 class TestPyLinterOptionSetters(CheckerTestCase):
     """Class to check the set_config decorator and get_global_option util
-    for options declared in PyLinter."""
+    for options declared in PyLinter.
+    """
 
     class Checker(BaseChecker):
         name = "checker"
@@ -84,7 +79,7 @@ class Checker(BaseChecker):
 
     @set_config(ignore_paths=".*/tests/.*,.*\\ignore\\.*")
     def test_ignore_paths_with_value(self) -> None:
-        """Test ignore-paths option with value"""
+        """Test ignore-paths option with value."""
         options = get_global_option(self.checker, "ignore-paths")
 
         assert any(i.match("dir/tests/file.py") for i in options)
@@ -94,7 +89,8 @@ def test_ignore_paths_with_value(self) -> None:
 
     def test_ignore_paths_with_no_value(self) -> None:
         """Test ignore-paths option with no value.
-        Compare against actual list to see if validator works."""
+        Compare against actual list to see if validator works.
+        """
         options = get_global_option(self.checker, "ignore-paths")
 
         assert options == []
diff --git a/tests/conftest.py b/tests/conftest.py
index bdd3e4516c..dd0b1195e3 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,3 +1,7 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 # pylint: disable=redefined-outer-name
 import os
 from pathlib import Path
@@ -74,7 +78,7 @@ def pytest_addoption(parser) -> None:
 
 
 def pytest_collection_modifyitems(config, items) -> None:
-    """Convert command line options to markers"""
+    """Convert command line options to markers."""
     # Add skip_primer_external mark
     if not config.getoption("--primer-external"):
         skip_primer_external = pytest.mark.skip(
diff --git a/tests/data/clientmodule_test.py b/tests/data/clientmodule_test.py
index 82deaaf6f8..35c39684b5 100644
--- a/tests/data/clientmodule_test.py
+++ b/tests/data/clientmodule_test.py
@@ -28,3 +28,14 @@ def __init__(self, value, _id, relation2: DoNothing2):
         self._id = _id
         self.relation = DoNothing()
         self.relation2 = relation2
+
+    @classmethod
+    def from_value(cls, value: int):
+        return cls(value, 0, DoNothing2())
+
+    @staticmethod
+    def transform_value(value: int) -> int:
+        return value * 2
+
+    def increment_value(self) -> None:
+        self.set_value(self.get_value() + 1)
diff --git a/tests/extensions/__init__.py b/tests/extensions/__init__.py
index e69de29bb2..e8a8ff79fd 100644
--- a/tests/extensions/__init__.py
+++ b/tests/extensions/__init__.py
@@ -0,0 +1,3 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
diff --git a/tests/extensions/test_check_docs.py b/tests/extensions/test_check_docs.py
deleted file mode 100644
index 0f7f6c252b..0000000000
--- a/tests/extensions/test_check_docs.py
+++ /dev/null
@@ -1,1870 +0,0 @@
-# Copyright (c) 2014-2015 Bruno Daniel <bruno.daniel@blue-yonder.com>
-# Copyright (c) 2015-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2016-2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2016 Glenn Matthews <glenn@e-dad.net>
-# Copyright (c) 2016 Glenn Matthews <glmatthe@cisco.com>
-# Copyright (c) 2017, 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2017 Mitar <mitar.github@tnode.com>
-# Copyright (c) 2017 John Paraskevopoulos <io.paraskev@gmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Adrian Chirieac <chirieacam@gmail.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2020 Luigi <luigi.cristofolini@q-ctrl.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Konstantina Saketou <56515303+ksaketou@users.noreply.github.com>
-# Copyright (c) 2021 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Logan Miller <14319179+komodo472@users.noreply.github.com>
-
-# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-
-"""Unit tests for the pylint checkers in :mod:`pylint.extensions.check_docs`,
-in particular the parameter documentation checker `DocstringChecker`
-"""
-
-# pylint: disable=too-many-public-methods
-
-import re
-
-import astroid
-import pytest
-from astroid import nodes
-
-from pylint.extensions.docparams import DocstringParameterChecker
-from pylint.testutils import CheckerTestCase, MessageTest, set_config
-from pylint.testutils.decorator import set_config_directly
-
-
-class TestParamDocChecker(CheckerTestCase):
-    """Tests for pylint_plugin.ParamDocChecker"""
-
-    CHECKER_CLASS = DocstringParameterChecker
-    CONFIG = {
-        "accept_no_param_doc": False,
-        "no_docstring_rgx": re.compile("^$"),
-        "docstring_min_length": -1,
-    }
-
-    def test_missing_func_params_in_google_docstring(self) -> None:
-        """Example of a function with missing Google style parameter
-        documentation in the docstring
-        """
-        node = astroid.extract_node(
-            """
-        def function_foo(x, y, z):
-            '''docstring ...
-
-            Args:
-                x: bla
-                z (int): bar
-
-            some other stuff
-            '''
-            pass
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-param-doc", node=node, args=("y",)),
-            MessageTest(msg_id="missing-type-doc", node=node, args=("x, y",)),
-        ):
-            self.checker.visit_functiondef(node)
-
-    def test_missing_type_doc_google_docstring_exempt_kwonly_args(self) -> None:
-        node = astroid.extract_node(
-            """
-        def identifier_kwarg_method(arg1: int, arg2: int, *, value1: str, value2: str):
-            '''Code to show failure in missing-type-doc
-
-            Args:
-                arg1: First argument.
-                arg2: Second argument.
-                value1: First kwarg.
-                value2: Second kwarg.
-            '''
-            print("NOTE: It doesn't like anything after the '*'.")
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_missing_func_params_with_annotations_in_google_docstring(self) -> None:
-        """Example of a function with missing Google style parameter
-        documentation in the docstring.
-        """
-        node = astroid.extract_node(
-            """
-        def function_foo(x: int, y: bool, z):
-            '''docstring ...
-
-            Args:
-                x: bla
-                y: blah blah
-                z (int): bar
-
-            some other stuff
-            '''
-            pass
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_default_arg_with_annotations_in_google_docstring(self) -> None:
-        """Example of a function with missing Google style parameter
-        documentation in the docstring.
-        """
-        node = astroid.extract_node(
-            """
-        def function_foo(x: int, y: bool, z: int = 786):
-            '''docstring ...
-
-            Args:
-                x: bla
-                y: blah blah
-                z: bar
-
-            some other stuff
-            '''
-            pass
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_missing_func_params_with_partial_annotations_in_google_docstring(
-        self,
-    ) -> None:
-        """Example of a function with missing Google style parameter
-        documentation in the docstring.
-        """
-        node = astroid.extract_node(
-            """
-        def function_foo(x, y: bool, z):
-            '''docstring ...
-
-            Args:
-                x: bla
-                y: blah blah
-                z (int): bar
-
-            some other stuff
-            '''
-            pass
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-type-doc", node=node, args=("x",))
-        ):
-            self.checker.visit_functiondef(node)
-
-    def test_non_builtin_annotations_in_google_docstring(self) -> None:
-        """Example of a function with missing Google style parameter
-        documentation in the docstring.
-        """
-        node = astroid.extract_node(
-            """
-        def area(bottomleft: Point, topright: Point) -> float:
-            '''Calculate area of fake rectangle.
-                Args:
-                    bottomleft: bottom left point of rectangle
-                    topright: top right point of rectangle
-            '''
-            pass
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_non_builtin_annotations_for_returntype_in_google_docstring(self) -> None:
-        """Example of a function with missing Google style parameter
-        documentation in the docstring.
-        """
-        node = astroid.extract_node(
-            """
-        def get_midpoint(bottomleft: Point, topright: Point) -> Point:
-            '''Calculate midpoint of fake rectangle.
-                Args:
-                    bottomleft: bottom left point of rectangle
-                    topright: top right point of rectangle
-            '''
-            pass
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_func_params_and_keyword_params_in_google_docstring(self) -> None:
-        """Example of a function with Google style parameter split
-        in Args and Keyword Args in the docstring
-        """
-        node = astroid.extract_node(
-            """
-        def my_func(this, other, that=True):
-            '''Prints this, other and that
-
-                Args:
-                    this (str): Printed first
-                    other (int): Other args
-
-                Keyword Args:
-                    that (bool): Printed second
-            '''
-            print(this, that, other)
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_func_params_and_wrong_keyword_params_in_google_docstring(self) -> None:
-        """Example of a function with Google style parameter split
-        in Args and Keyword Args in the docstring but with wrong keyword args
-        """
-        node = astroid.extract_node(
-            """
-        def my_func(this, other, that=True):
-            '''Prints this, other and that
-
-                Args:
-                    this (str): Printed first
-                    other (int): Other args
-
-                Keyword Args:
-                    these (bool): Printed second
-            '''
-            print(this, that, other)
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-param-doc", node=node, args=("that",)),
-            MessageTest(msg_id="missing-type-doc", node=node, args=("that",)),
-            MessageTest(msg_id="differing-param-doc", node=node, args=("these",)),
-            MessageTest(msg_id="differing-type-doc", node=node, args=("these",)),
-        ):
-            self.checker.visit_functiondef(node)
-
-    def test_missing_func_params_in_numpy_docstring(self) -> None:
-        """Example of a function with missing NumPy style parameter
-        documentation in the docstring
-        """
-        node = astroid.extract_node(
-            """
-        def function_foo(x, y, z):
-            '''docstring ...
-
-            Parameters
-            ----------
-            x:
-                bla
-            z: int
-                bar
-
-            some other stuff
-            '''
-            pass
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-param-doc", node=node, args=("y",)),
-            MessageTest(msg_id="missing-type-doc", node=node, args=("x, y",)),
-        ):
-            self.checker.visit_functiondef(node)
-
-    @set_config(accept_no_param_doc=True)
-    def test_tolerate_no_param_documentation_at_all(self) -> None:
-        """Example of a function with no parameter documentation at all
-
-        No error message is emitted.
-        """
-        node = astroid.extract_node(
-            """
-        def function_foo(x, y):
-            '''docstring ...
-
-            missing parameter documentation'''
-            pass
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_don_t_tolerate_no_param_documentation_at_all(self) -> None:
-        """Example of a function with no parameter documentation at all
-
-        Missing documentation error message is emitted.
-        """
-        node = astroid.extract_node(
-            """
-        def function_foo(x, y):
-            '''docstring ...
-
-            missing parameter documentation'''
-            pass
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-any-param-doc", node=node, args=(node.name)),
-        ):
-            self.checker.visit_functiondef(node)
-
-    def test_see_tolerate_no_param_documentation_at_all(self) -> None:
-        """Example for the usage of "For the parameters, see"
-        to suppress missing-param warnings.
-        """
-        node = astroid.extract_node(
-            """
-        def function_foo(x, y):
-            '''docstring ...
-
-            For the parameters, see :func:`blah`
-            '''
-            pass
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def _visit_methods_of_class(self, node: nodes.ClassDef) -> None:
-        """Visit all methods of a class node
-
-        :param node: class node
-        :type node: :class:`nodes.Class`
-        """
-        for body_item in node.body:
-            if isinstance(body_item, nodes.FunctionDef) and hasattr(body_item, "name"):
-                self.checker.visit_functiondef(body_item)
-
-    def test_missing_method_params_in_google_docstring(self) -> None:
-        """Example of a class method with missing parameter documentation in
-        the Google style docstring
-        """
-        node = astroid.extract_node(
-            """
-        class Foo(object):
-            def method_foo(self, x, y):
-                '''docstring ...
-
-                missing parameter documentation
-
-                Args:
-                    x: bla
-                '''
-                pass
-        """
-        )
-        method_node = node.body[0]
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-param-doc", node=method_node, args=("y",)),
-            MessageTest(msg_id="missing-type-doc", node=method_node, args=("x, y",)),
-        ):
-            self._visit_methods_of_class(node)
-
-    def test_missing_method_params_in_numpy_docstring(self) -> None:
-        """Example of a class method with missing parameter documentation in
-        the Numpy style docstring
-        """
-        node = astroid.extract_node(
-            """
-        class Foo(object):
-            def method_foo(self, x, y):
-                '''docstring ...
-
-                missing parameter documentation
-
-                Parameters
-                ----------
-                x:
-                    bla
-                '''
-                pass
-        """
-        )
-        method_node = node.body[0]
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-param-doc", node=method_node, args=("y",)),
-            MessageTest(msg_id="missing-type-doc", node=method_node, args=("x, y",)),
-        ):
-            self._visit_methods_of_class(node)
-
-    def test_existing_func_params_in_google_docstring(self) -> None:
-        """Example of a function with correctly documented parameters and
-        return values (Google style)
-        """
-        node = astroid.extract_node(
-            """
-        def function_foo(xarg, yarg, zarg, warg):
-            '''function foo ...
-
-            Args:
-                xarg (int): bla xarg
-                yarg (my.qualified.type): bla
-                    bla yarg
-
-                zarg (int): bla zarg
-                warg (my.qualified.type): bla warg
-
-            Returns:
-                float: sum
-            '''
-            return xarg + yarg
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_existing_func_params_in_numpy_docstring(self) -> None:
-        """Example of a function with correctly documented parameters and
-        return values (Numpy style)
-        """
-        node = astroid.extract_node(
-            """
-        def function_foo(xarg, yarg, zarg, warg):
-            '''function foo ...
-
-            Parameters
-            ----------
-            xarg: int
-                bla xarg
-            yarg: my.qualified.type
-                bla yarg
-
-            zarg: int
-                bla zarg
-            warg: my.qualified.type
-                bla warg
-
-            Returns
-            -------
-            float
-                sum
-            '''
-            return xarg + yarg
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_wrong_name_of_func_params_in_google_docstring(self) -> None:
-        """Example of functions with inconsistent parameter names in the
-        signature and in the Google style documentation
-        """
-        node = astroid.extract_node(
-            """
-        def function_foo(xarg, yarg, zarg):
-            '''function foo ...
-
-            Args:
-                xarg1 (int): bla xarg
-                yarg (float): bla yarg
-
-                zarg1 (str): bla zarg
-            '''
-            return xarg + yarg
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-param-doc", node=node, args=("xarg, zarg",)),
-            MessageTest(msg_id="missing-type-doc", node=node, args=("xarg, zarg",)),
-            MessageTest(
-                msg_id="differing-param-doc", node=node, args=("xarg1, zarg1",)
-            ),
-            MessageTest(msg_id="differing-type-doc", node=node, args=("xarg1, zarg1",)),
-        ):
-            self.checker.visit_functiondef(node)
-
-        node = astroid.extract_node(
-            """
-        def function_foo(xarg, yarg):
-            '''function foo ...
-
-            Args:
-                yarg1 (float): bla yarg
-
-            For the other parameters, see bla.
-            '''
-            return xarg + yarg
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="differing-param-doc", node=node, args=("yarg1",)),
-            MessageTest(msg_id="differing-type-doc", node=node, args=("yarg1",)),
-        ):
-            self.checker.visit_functiondef(node)
-
-    def test_wrong_name_of_func_params_in_numpy_docstring(self) -> None:
-        """Example of functions with inconsistent parameter names in the
-        signature and in the Numpy style documentation
-        """
-        node = astroid.extract_node(
-            """
-        def function_foo(xarg, yarg, zarg):
-            '''function foo ...
-
-            Parameters
-            ----------
-            xarg1: int
-                bla xarg
-            yarg: float
-                bla yarg
-
-            zarg1: str
-                bla zarg
-            '''
-            return xarg + yarg
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-param-doc", node=node, args=("xarg, zarg",)),
-            MessageTest(msg_id="missing-type-doc", node=node, args=("xarg, zarg",)),
-            MessageTest(
-                msg_id="differing-param-doc", node=node, args=("xarg1, zarg1",)
-            ),
-            MessageTest(msg_id="differing-type-doc", node=node, args=("xarg1, zarg1",)),
-        ):
-            self.checker.visit_functiondef(node)
-
-        node = astroid.extract_node(
-            """
-        def function_foo(xarg, yarg):
-            '''function foo ...
-
-            Parameters
-            ----------
-            yarg1: float
-                bla yarg
-
-            For the other parameters, see bla.
-            '''
-            return xarg + yarg
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="differing-param-doc", node=node, args=("yarg1",)),
-            MessageTest(msg_id="differing-type-doc", node=node, args=("yarg1",)),
-        ):
-            self.checker.visit_functiondef(node)
-
-    def test_see_sentence_for_func_params_in_google_docstring(self) -> None:
-        """Example for the usage of "For the other parameters, see" to avoid
-        too many repetitions, e.g. in functions or methods adhering to a
-        given interface (Google style)
-        """
-        node = astroid.extract_node(
-            """
-        def function_foo(xarg, yarg):
-            '''function foo ...
-
-            Args:
-                yarg (float): bla yarg
-
-            For the other parameters, see :func:`bla`
-            '''
-            return xarg + yarg
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_see_sentence_for_func_params_in_numpy_docstring(self) -> None:
-        """Example for the usage of "For the other parameters, see" to avoid
-        too many repetitions, e.g. in functions or methods adhering to a
-        given interface (Numpy style)
-        """
-        node = astroid.extract_node(
-            """
-        def function_foo(xarg, yarg):
-            '''function foo ...
-
-            Parameters
-            ----------
-            yarg: float
-                bla yarg
-
-            For the other parameters, see :func:`bla`
-            '''
-            return xarg + yarg
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_constr_params_in_class_google(self) -> None:
-        """Example of a class with missing constructor parameter documentation
-        (Google style)
-
-        Everything is completely analogous to functions.
-        """
-        node = astroid.extract_node(
-            """
-        class ClassFoo(object):
-            '''docstring foo
-
-            Args:
-                y: bla
-
-            missing constructor parameter documentation
-            '''
-
-            def __init__(self, x, y):
-                pass
-
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-param-doc", node=node, args=("x",)),
-            MessageTest(msg_id="missing-type-doc", node=node, args=("x, y",)),
-        ):
-            self._visit_methods_of_class(node)
-
-    def test_constr_params_in_class_numpy(self) -> None:
-        """Example of a class with missing constructor parameter documentation
-        (Numpy style)
-
-        Everything is completely analogous to functions.
-        """
-        node = astroid.extract_node(
-            """
-        class ClassFoo(object):
-            '''docstring foo
-
-            Parameters
-            ----------
-            y:
-                bla
-
-            missing constructor parameter documentation
-            '''
-
-            def __init__(self, x, y):
-                pass
-
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-param-doc", node=node, args=("x",)),
-            MessageTest(msg_id="missing-type-doc", node=node, args=("x, y",)),
-        ):
-            self._visit_methods_of_class(node)
-
-    def test_constr_params_and_attributes_in_class_numpy(self) -> None:
-        """Example of a class with correct constructor parameter documentation
-        and an attributes section (Numpy style)
-        """
-        node = astroid.extract_node(
-            """
-        class ClassFoo(object):
-            '''
-            Parameters
-            ----------
-            foo : str
-                Something.
-
-            Attributes
-            ----------
-            bar : str
-                Something.
-            '''
-            def __init__(self, foo):
-                self.bar = None
-        """
-        )
-        with self.assertNoMessages():
-            self._visit_methods_of_class(node)
-
-    def test_constr_params_in_init_google(self) -> None:
-        """Example of a class with missing constructor parameter documentation
-        (Google style)
-
-        Everything is completely analogous to functions.
-        """
-        node = astroid.extract_node(
-            """
-        class ClassFoo(object):
-            def __init__(self, x, y):
-                '''docstring foo constructor
-
-                Args:
-                    y: bla
-
-                missing constructor parameter documentation
-                '''
-                pass
-
-        """
-        )
-        constructor_node = node.body[0]
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-param-doc", node=constructor_node, args=("x",)),
-            MessageTest(
-                msg_id="missing-type-doc", node=constructor_node, args=("x, y",)
-            ),
-        ):
-            self._visit_methods_of_class(node)
-
-    def test_constr_params_in_init_numpy(self) -> None:
-        """Example of a class with missing constructor parameter documentation
-        (Numpy style)
-
-        Everything is completely analogous to functions.
-        """
-        node = astroid.extract_node(
-            """
-        class ClassFoo(object):
-            def __init__(self, x, y):
-                '''docstring foo constructor
-
-                Parameters
-                ----------
-                y:
-                    bla
-
-                missing constructor parameter documentation
-                '''
-                pass
-
-        """
-        )
-        constructor_node = node.body[0]
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-param-doc", node=constructor_node, args=("x",)),
-            MessageTest(
-                msg_id="missing-type-doc", node=constructor_node, args=("x, y",)
-            ),
-        ):
-            self._visit_methods_of_class(node)
-
-    def test_see_sentence_for_constr_params_in_class(self) -> None:
-        """Example usage of "For the parameters, see" in class docstring"""
-        node = astroid.extract_node(
-            """
-        class ClassFoo(object):
-            '''docstring foo
-
-            For the parameters, see :func:`bla`
-            '''
-
-            def __init__(self, x, y):
-                '''init'''
-                pass
-
-        """
-        )
-        with self.assertNoMessages():
-            self._visit_methods_of_class(node)
-
-    def test_see_sentence_for_constr_params_in_init(self) -> None:
-        """Example usage of "For the parameters, see" in init docstring"""
-        node = astroid.extract_node(
-            """
-        class ClassFoo(object):
-            '''foo'''
-
-            def __init__(self, x, y):
-                '''docstring foo constructor
-
-                For the parameters, see :func:`bla`
-                '''
-                pass
-
-        """
-        )
-        with self.assertNoMessages():
-            self._visit_methods_of_class(node)
-
-    def test_constr_params_in_class_and_init_google(self) -> None:
-        """Example of a class with missing constructor parameter documentation
-        in both the init docstring and the class docstring
-        (Google style)
-
-        Everything is completely analogous to functions.
-        """
-        node = astroid.extract_node(
-            """
-        class ClassFoo(object):
-            '''docstring foo
-
-            Args:
-                y: bla
-
-            missing constructor parameter documentation
-            '''
-
-            def __init__(self, x, y):
-                '''docstring foo
-
-                Args:
-                    y: bla
-
-                missing constructor parameter documentation
-                '''
-                pass
-
-        """
-        )
-        constructor_node = node.body[0]
-        with self.assertAddsMessages(
-            MessageTest(
-                msg_id="multiple-constructor-doc", node=node, args=(node.name,)
-            ),
-            MessageTest(msg_id="missing-param-doc", node=node, args=("x",)),
-            MessageTest(msg_id="missing-type-doc", node=node, args=("x, y",)),
-            MessageTest(msg_id="missing-param-doc", node=constructor_node, args=("x",)),
-            MessageTest(
-                msg_id="missing-type-doc", node=constructor_node, args=("x, y",)
-            ),
-        ):
-            self._visit_methods_of_class(node)
-
-    def test_constr_params_in_class_and_init_numpy(self) -> None:
-        """Example of a class with missing constructor parameter documentation
-        in both the init docstring and the class docstring
-        (Numpy style)
-
-        Everything is completely analogous to functions.
-        """
-        node = astroid.extract_node(
-            """
-        class ClassFoo(object):
-            '''docstring foo
-
-            Parameters
-            ----------
-            y:
-                bla
-
-            missing constructor parameter documentation
-            '''
-
-            def __init__(self, x, y):
-                '''docstring foo
-
-                Parameters
-                ----------
-                y:
-                    bla
-
-                missing constructor parameter documentation
-                '''
-                pass
-
-        """
-        )
-        constructor_node = node.body[0]
-        with self.assertAddsMessages(
-            MessageTest(
-                msg_id="multiple-constructor-doc", node=node, args=(node.name,)
-            ),
-            MessageTest(msg_id="missing-param-doc", node=node, args=("x",)),
-            MessageTest(msg_id="missing-type-doc", node=node, args=("x, y",)),
-            MessageTest(msg_id="missing-param-doc", node=constructor_node, args=("x",)),
-            MessageTest(
-                msg_id="missing-type-doc", node=constructor_node, args=("x, y",)
-            ),
-        ):
-            self._visit_methods_of_class(node)
-
-    def test_kwonlyargs_are_taken_in_account(self) -> None:
-        node = astroid.extract_node(
-            '''
-        def my_func(arg, *, kwonly, missing_kwonly):
-            """The docstring
-
-            :param int arg: The argument.
-            :param bool kwonly: A keyword-arg.
-            """
-        '''
-        )
-        with self.assertAddsMessages(
-            MessageTest(
-                msg_id="missing-param-doc", node=node, args=("missing_kwonly",)
-            ),
-            MessageTest(msg_id="missing-type-doc", node=node, args=("missing_kwonly",)),
-        ):
-            self.checker.visit_functiondef(node)
-
-    def test_warns_missing_args_google(self) -> None:
-        node = astroid.extract_node(
-            '''
-        def my_func(named_arg, *args):
-            """The docstring
-
-            Args:
-                named_arg (object): Returned
-
-            Returns:
-                object or None: Maybe named_arg
-            """
-            if args:
-                return named_arg
-        '''
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-param-doc", node=node, args=("*args",))
-        ):
-            self.checker.visit_functiondef(node)
-
-    def test_warns_missing_kwargs_google(self) -> None:
-        node = astroid.extract_node(
-            '''
-        def my_func(named_arg, **kwargs):
-            """The docstring
-
-            Args:
-                named_arg (object): Returned
-
-            Returns:
-                object or None: Maybe named_arg
-            """
-            if kwargs:
-                return named_arg
-        '''
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-param-doc", node=node, args=("**kwargs",))
-        ):
-            self.checker.visit_functiondef(node)
-
-    def test_warns_missing_args_numpy(self) -> None:
-        node = astroid.extract_node(
-            '''
-        def my_func(named_arg, *args):
-            """The docstring
-
-            Args
-            ----
-            named_arg : object
-                Returned
-
-            Returns
-            -------
-                object or None
-                    Maybe named_arg
-            """
-            if args:
-                return named_arg
-        '''
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-param-doc", node=node, args=("*args",))
-        ):
-            self.checker.visit_functiondef(node)
-
-    def test_warns_missing_kwargs_numpy(self) -> None:
-        node = astroid.extract_node(
-            '''
-        def my_func(named_arg, **kwargs):
-            """The docstring
-
-            Args
-            ----
-            named_arg : object
-                Returned
-
-            Returns
-            -------
-                object or None
-                    Maybe named_arg
-            """
-            if kwargs:
-                return named_arg
-        '''
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-param-doc", node=node, args=("**kwargs",))
-        ):
-            self.checker.visit_functiondef(node)
-
-    def test_finds_args_without_type_google(self) -> None:
-        node = astroid.extract_node(
-            '''
-        def my_func(named_arg, *args):
-            """The docstring
-
-            Args:
-                named_arg (object): Returned
-                *args: Optional arguments
-
-            Returns:
-                object or None: Maybe named_arg
-            """
-            if args:
-                return named_arg
-        '''
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_finds_kwargs_without_type_google(self) -> None:
-        node = astroid.extract_node(
-            '''
-        def my_func(named_arg, **kwargs):
-            """The docstring
-
-            Args:
-                named_arg (object): Returned
-                **kwargs: Keyword arguments
-
-            Returns:
-                object or None: Maybe named_arg
-            """
-            if kwargs:
-                return named_arg
-        '''
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_finds_args_without_type_numpy(self) -> None:
-        node = astroid.extract_node(
-            '''
-        def my_func(named_arg, typed_arg: bool, untyped_arg, *args):
-            """The docstring
-
-            Args
-            ----
-            named_arg : object
-                Returned
-            typed_arg
-                Other argument without numpy type annotation
-            untyped_arg
-                Other argument without any type annotation
-            *args :
-                Optional Arguments
-
-            Returns
-            -------
-                object or None
-                    Maybe named_arg
-            """
-            if args:
-                return named_arg
-        '''
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-type-doc", node=node, args=("untyped_arg",))
-        ):
-            self.checker.visit_functiondef(node)
-
-    def test_finds_args_with_xref_type_google(self) -> None:
-        node = astroid.extract_node(
-            '''
-        def my_func(named_arg, **kwargs):
-            """The docstring
-
-            Args:
-                named_arg (`example.value`): Returned
-                **kwargs: Keyword arguments
-
-            Returns:
-                `example.value`: Maybe named_arg
-            """
-            if kwargs:
-                return named_arg
-        '''
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_finds_args_with_xref_type_numpy(self) -> None:
-        node = astroid.extract_node(
-            '''
-        def my_func(named_arg, *args):
-            """The docstring
-
-            Args
-            ----
-            named_arg : `example.value`
-                Returned
-            *args :
-                Optional Arguments
-
-            Returns
-            -------
-                `example.value`
-                    Maybe named_arg
-            """
-            if args:
-                return named_arg
-        '''
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_finds_kwargs_without_type_numpy(self) -> None:
-        node = astroid.extract_node(
-            '''
-        def my_func(named_arg, **kwargs):
-            """The docstring
-
-            Args
-            ----
-            named_arg : object
-                Returned
-            **kwargs :
-                Keyword arguments
-
-            Returns
-            -------
-                object or None
-                    Maybe named_arg
-            """
-            if kwargs:
-                return named_arg
-        '''
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    CONTAINER_TYPES = [
-        "dict(str,str)",
-        "dict[str,str]",
-        "tuple(int)",
-        "list[tokenize.TokenInfo]",
-    ]
-
-    COMPLEX_TYPES = CONTAINER_TYPES + [
-        "dict(str, str)",
-        "dict[str, str]",
-        "int or str",
-        "tuple(int or str)",
-        "tuple(int) or list(int)",
-        "tuple(int or str) or list(int or str)",
-    ]
-
-    @pytest.mark.parametrize("complex_type", COMPLEX_TYPES)
-    def test_finds_multiple_types_google(self, complex_type):
-        node = astroid.extract_node(
-            f'''
-        def my_func(named_arg):
-            """The docstring
-
-            Args:
-                named_arg ({complex_type}): Returned
-
-            Returns:
-                {complex_type}: named_arg
-            """
-            return named_arg
-        '''
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    @pytest.mark.parametrize("complex_type", COMPLEX_TYPES)
-    def test_finds_multiple_types_numpy(self, complex_type):
-        node = astroid.extract_node(
-            f'''
-        def my_func(named_arg):
-            """The docstring
-
-            Args
-            ----
-            named_arg : {complex_type}
-                Returned
-
-            Returns
-            -------
-                {complex_type}
-                    named_arg
-            """
-            return named_arg
-        '''
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_ignores_optional_specifier_google(self) -> None:
-        node = astroid.extract_node(
-            '''
-        def do_something(param1, param2, param3=(), param4=[], param5=[], param6=True):
-            """Do something.
-
-            Args:
-                param1 (str): Description.
-                param2 (dict(str, int)): Description.
-                param3 (tuple(str), optional): Defaults to empty. Description.
-                param4 (List[str], optional): Defaults to empty. Description.
-                param5 (list[tuple(str)], optional): Defaults to empty. Description.
-                param6 (bool, optional): Defaults to True. Description.
-
-            Returns:
-                int: Description.
-            """
-            return param1, param2, param3, param4, param5, param6
-        '''
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_ignores_optional_specifier_numpy(self) -> None:
-        node = astroid.extract_node(
-            '''
-        def do_something(param, param2='all'):
-            """Do something.
-
-            Parameters
-            ----------
-            param : str
-                Description.
-            param2 : str, optional
-                Description (the default is 'all').
-
-            Returns
-            -------
-            int
-                Description.
-            """
-            return param, param2
-        '''
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_finds_short_name_exception(self) -> None:
-        node = astroid.extract_node(
-            '''
-        from fake_package import BadError
-
-        def do_something(): #@
-            """Do something.
-
-            Raises:
-                ~fake_package.exceptions.BadError: When something bad happened.
-            """
-            raise BadError("A bad thing happened.")
-        '''
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_finds_missing_raises_from_setter_google(self) -> None:
-        """Example of a setter having missing raises documentation in
-        the Google style docstring of the property
-        """
-        property_node, node = astroid.extract_node(
-            """
-        class Foo(object):
-            @property
-            def foo(self): #@
-                '''int: docstring
-
-                Include a "Raises" section so that this is identified
-                as a Google docstring and not a Numpy docstring.
-
-                Raises:
-                    RuntimeError: Always
-                '''
-                raise RuntimeError()
-                return 10
-
-            @foo.setter
-            def foo(self, value):
-                raise AttributeError() #@
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(
-                msg_id="missing-raises-doc",
-                node=property_node,
-                args=("AttributeError",),
-            )
-        ):
-            self.checker.visit_raise(node)
-
-    def test_finds_missing_raises_from_setter_numpy(self) -> None:
-        """Example of a setter having missing raises documentation in
-        the Numpy style docstring of the property
-        """
-        property_node, node = astroid.extract_node(
-            """
-        class Foo(object):
-            @property
-            def foo(self): #@
-                '''int: docstring
-
-                Include a "Raises" section so that this is identified
-                as a Numpy docstring and not a Google docstring.
-
-                Raises
-                ------
-                RuntimeError
-                    Always
-                '''
-                raise RuntimeError()
-                return 10
-
-            @foo.setter
-            def foo(self, value):
-                raise AttributeError() #@
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(
-                msg_id="missing-raises-doc",
-                node=property_node,
-                args=("AttributeError",),
-            )
-        ):
-            self.checker.visit_raise(node)
-
-    def test_finds_missing_raises_from_setter_google_2(self) -> None:
-        """Example of a setter having missing raises documentation in
-        its own Google style docstring of the property
-        """
-        setter_node, node = astroid.extract_node(
-            """
-        class Foo(object):
-            @property
-            def foo(self):
-                '''int: docstring ...
-
-                Raises:
-                    RuntimeError: Always
-                '''
-                raise RuntimeError()
-                return 10
-
-            @foo.setter
-            def foo(self, value): #@
-                '''setter docstring ...
-
-                Raises:
-                    RuntimeError: Never
-                '''
-                if True:
-                    raise AttributeError() #@
-                raise RuntimeError()
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(
-                msg_id="missing-raises-doc", node=setter_node, args=("AttributeError",)
-            )
-        ):
-            self.checker.visit_raise(node)
-
-    def test_finds_missing_raises_from_setter_numpy_2(self) -> None:
-        """Example of a setter having missing raises documentation in
-        its own Numpy style docstring of the property
-        """
-        setter_node, node = astroid.extract_node(
-            """
-        class Foo(object):
-            @property
-            def foo(self):
-                '''int: docstring ...
-
-                Raises
-                ------
-                RuntimeError
-                    Always
-                '''
-                raise RuntimeError()
-                return 10
-
-            @foo.setter
-            def foo(self, value): #@
-                '''setter docstring ...
-
-                Raises
-                ------
-                RuntimeError
-                    Never
-                '''
-                if True:
-                    raise AttributeError() #@
-                raise RuntimeError()
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(
-                msg_id="missing-raises-doc", node=setter_node, args=("AttributeError",)
-            )
-        ):
-            self.checker.visit_raise(node)
-
-    def test_finds_property_return_type_google(self) -> None:
-        """Example of a property having return documentation in
-        a Google style docstring
-        """
-        node = astroid.extract_node(
-            """
-        class Foo(object):
-            @property
-            def foo(self): #@
-                '''int: docstring ...
-
-                Raises:
-                    RuntimeError: Always
-                '''
-                raise RuntimeError()
-                return 10
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_finds_property_return_type_numpy(self) -> None:
-        """Example of a property having return documentation in
-        a numpy style docstring
-        """
-        node = astroid.extract_node(
-            """
-        class Foo(object):
-            @property
-            def foo(self): #@
-                '''int: docstring ...
-
-                Raises
-                ------
-                RuntimeError
-                    Always
-                '''
-                raise RuntimeError()
-                return 10
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_finds_annotation_property_return_type_google(self) -> None:
-        """Example of a property having return documentation in
-        a Google style docstring
-        """
-        _, node = astroid.extract_node(
-            """
-        class Foo(object):
-            @property
-            def foo(self) -> int: #@
-                '''docstring ...
-
-                Raises:
-                    RuntimeError: Always
-                '''
-                raise RuntimeError()
-                return 10 #@
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_return(node)
-
-    @set_config(accept_no_return_doc="no")
-    def test_finds_missing_property_return_type_google(self) -> None:
-        """Example of a property having return documentation in
-        a Google style docstring
-        """
-        property_node, node = astroid.extract_node(
-            """
-        class Foo(object):
-            @property
-            def foo(self): #@
-                '''docstring ...
-
-                Raises:
-                    RuntimeError: Always
-                '''
-                raise RuntimeError()
-                return 10 #@
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-return-type-doc", node=property_node)
-        ):
-            self.checker.visit_return(node)
-
-    @set_config(accept_no_return_doc="no")
-    def test_finds_missing_property_return_type_numpy(self) -> None:
-        """Example of a property having return documentation in
-        a numpy style docstring
-        """
-        property_node, node = astroid.extract_node(
-            """
-        class Foo(object):
-            @property
-            def foo(self): #@
-                '''docstring ...
-
-                Raises
-                ------
-                RuntimeError
-                    Always
-                '''
-                raise RuntimeError()
-                return 10 #@
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-return-type-doc", node=property_node)
-        ):
-            self.checker.visit_return(node)
-
-    @set_config(accept_no_return_doc="no")
-    def test_ignores_non_property_return_type_google(self) -> None:
-        """Example of a class function trying to use `type` as return
-        documentation in a Google style docstring
-        """
-        func_node, node = astroid.extract_node(
-            """
-        class Foo(object):
-            def foo(self): #@
-                '''int: docstring ...
-
-                Raises:
-                    RuntimeError: Always
-                '''
-                raise RuntimeError()
-                return 10 #@
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-return-doc", node=func_node),
-            MessageTest(msg_id="missing-return-type-doc", node=func_node),
-        ):
-            self.checker.visit_return(node)
-
-    @set_config(accept_no_return_doc="no")
-    def test_ignores_non_property_return_type_numpy(self) -> None:
-        """Example of a class function trying to use `type` as return
-        documentation in a numpy style docstring
-        """
-        func_node, node = astroid.extract_node(
-            """
-        class Foo(object):
-            def foo(self): #@
-                '''int: docstring ...
-
-                Raises
-                ------
-                RuntimeError
-                    Always
-                '''
-                raise RuntimeError()
-                return 10 #@
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-return-doc", node=func_node),
-            MessageTest(msg_id="missing-return-type-doc", node=func_node),
-        ):
-            self.checker.visit_return(node)
-
-    @set_config(accept_no_return_doc="no")
-    def test_non_property_annotation_return_type_numpy(self) -> None:
-        """Example of a class function trying to use `type` as return
-        documentation in a numpy style docstring
-        """
-        func_node, node = astroid.extract_node(
-            """
-        class Foo(object):
-            def foo(self) -> int: #@
-                '''int: docstring ...
-
-                Raises
-                ------
-                RuntimeError
-                    Always
-                '''
-                raise RuntimeError()
-                return 10 #@
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="missing-return-doc", node=func_node)
-        ):
-            self.checker.visit_return(node)
-
-    def test_ignores_return_in_abstract_method_google(self) -> None:
-        """Example of an abstract method documenting the return type that an
-        implementation should return.
-        """
-        node = astroid.extract_node(
-            """
-        import abc
-        class Foo(object):
-            @abc.abstractmethod
-            def foo(self): #@
-                '''docstring ...
-
-                Returns:
-                    int: Ten
-                '''
-                return 10
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_ignores_return_in_abstract_method_numpy(self) -> None:
-        """Example of an abstract method documenting the return type that an
-        implementation should return.
-        """
-        node = astroid.extract_node(
-            """
-        import abc
-        class Foo(object):
-            @abc.abstractmethod
-            def foo(self): #@
-                '''docstring ...
-
-                Returns
-                -------
-                int
-                    Ten
-                '''
-                return 10
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_ignores_return_in_abstract_method_google_2(self) -> None:
-        """Example of a method documenting the return type that an
-        implementation should return.
-        """
-        node = astroid.extract_node(
-            """
-        class Foo(object):
-            def foo(self, arg): #@
-                '''docstring ...
-
-                Args:
-                    arg (int): An argument.
-                '''
-                raise NotImplementedError()
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_ignores_return_in_abstract_method_numpy_2(self) -> None:
-        """Example of a method documenting the return type that an
-        implementation should return.
-        """
-        node = astroid.extract_node(
-            """
-        class Foo(object):
-            def foo(self, arg): #@
-                '''docstring ...
-
-                Parameters
-                ----------
-                arg : int
-                    An argument.
-                '''
-                raise NotImplementedError()
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_ignores_ignored_argument_names_google(self) -> None:
-        """Example of a method documenting the return type that an
-        implementation should return.
-        """
-        node = astroid.extract_node(
-            """
-        class Foo(object):
-            def foo(self, arg, _): #@
-                '''docstring ...
-
-                Args:
-                    arg (int): An argument.
-                '''
-                pass
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_ignores_ignored_argument_names_numpy(self) -> None:
-        """Example of a method documenting the return type that an
-        implementation should return.
-        """
-        node = astroid.extract_node(
-            """
-        class Foo(object):
-            def foo(self, arg, _): #@
-                '''docstring ...
-
-                Parameters
-                ----------
-                arg : int
-                    An argument.
-                '''
-                pass
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_useless_docs_ignored_argument_names_google(self) -> None:
-        """Example of a method documenting the return type that an
-        implementation should return.
-        """
-        node = astroid.extract_node(
-            """
-        class Foo(object):
-            def foo(self, arg, _, _ignored): #@
-                '''docstring ...
-
-                Args:
-                    arg (int): An argument.
-                    _ (float): Another argument.
-                    _ignored: Ignored argument.
-                '''
-                pass
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="useless-type-doc", node=node, args=("_",)),
-            MessageTest(msg_id="useless-param-doc", node=node, args=("_, _ignored",)),
-        ):
-            self.checker.visit_functiondef(node)
-
-    def test_useless_docs_ignored_argument_names_numpy(self) -> None:
-        """Example of a method documenting the return type that an
-        implementation should return.
-        """
-        node = astroid.extract_node(
-            """
-        class Foo(object):
-            def foo(self, arg, _, _ignored): #@
-                '''docstring ...
-
-                Parameters
-                ----------
-                arg : int
-                    An argument.
-
-                _ : float
-                    Another argument.
-
-                _ignored :
-                    Ignored Argument
-                '''
-                pass
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(msg_id="useless-type-doc", node=node, args=("_",)),
-            MessageTest(msg_id="useless-param-doc", node=node, args=("_, _ignored",)),
-        ):
-            self.checker.visit_functiondef(node)
-
-    @set_config_directly(no_docstring_rgx=re.compile(r"^_(?!_).*$"))
-    def test_skip_no_docstring_rgx(self) -> None:
-        """Example of a function that matches the default 'no-docstring-rgx' config option
-
-        No error message is emitted.
-        """
-        node = astroid.extract_node(
-            """
-        def _private_function_foo(x, y):
-            '''docstring ...
-
-            missing parameter documentation'''
-            pass
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
-
-    def test_all_docstring_rgx(self) -> None:
-        """Function that matches "check all functions" 'no-docstring-rgx' config option
-        No error message is emitted.
-        """
-        node = astroid.extract_node(
-            """
-        #pylint disable=missing-module-docstring, too-few-public-methods,
-        class MyClass:
-            def __init__(self, my_param: int) -> None:
-                '''
-                My init docstring
-                :param my_param: My first param
-                '''
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node.body[0])
-
-    def test_fail_empty_docstring_rgx(self) -> None:
-        """Function that matches "check all functions" 'no-docstring-rgx' config option
-        An error message is emitted.
-        """
-        node = astroid.extract_node(
-            """
-        #pylint disable=missing-module-docstring, too-few-public-methods,
-        class MyClass:
-            def __init__(self, my_param: int) -> None:
-                '''
-                My init docstring
-                '''
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(
-                msg_id="missing-param-doc", node=node.body[0], args=("my_param",)
-            ),
-        ):
-            self.checker.visit_functiondef(node.body[0])
-
-    @set_config_directly(no_docstring_rgx=re.compile("^(?!__init__$)_"))
-    def test_fail_docparams_check_init(self) -> None:
-        """Check that __init__ is checked correctly, but other private methods aren't"""
-        node = astroid.extract_node(
-            """
-        #pylint disable=missing-module-docstring, too-few-public-methods,
-        class MyClass:
-            def __init__(self, my_param: int) -> None:
-                '''
-                My init docstring
-                '''
-
-            def _private_method(self, my_param: int) -> None:
-                '''
-                My private method
-                '''
-        """
-        )
-        with self.assertAddsMessages(
-            MessageTest(
-                msg_id="missing-param-doc", node=node.body[0], args=("my_param",)
-            )
-        ):
-            self.checker.visit_functiondef(node.body[0])
-
-    @set_config_directly(no_docstring_rgx=re.compile(""))
-    def test_no_docstring_rgx(self) -> None:
-        """Function that matches "check no functions" 'no-docstring-rgx' config option
-        No error message is emitted.
-        """
-        node = astroid.extract_node(
-            """
-        #pylint disable=missing-module-docstring, too-few-public-methods,
-        class MyClass:
-            def __init__(self, my_param: int) -> None:
-                '''
-                My init docstring
-                '''
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node.body[0])
-
-    @set_config_directly(docstring_min_length=3)
-    def test_skip_docstring_min_length(self) -> None:
-        """Example of a function that is less than 'docstring-min-length' config option
-
-        No error message is emitted.
-        """
-        node = astroid.extract_node(
-            """
-        def function_foo(x, y):
-            '''function is too short and is missing parameter documentation'''
-            pass
-        """
-        )
-        with self.assertNoMessages():
-            self.checker.visit_functiondef(node)
diff --git a/tests/extensions/test_check_docs_utils.py b/tests/extensions/test_check_docs_utils.py
index c1552a0c30..b14138a921 100644
--- a/tests/extensions/test_check_docs_utils.py
+++ b/tests/extensions/test_check_docs_utils.py
@@ -1,20 +1,8 @@
-# Copyright (c) 2016-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2016, 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2018 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Damien Baty <damien.baty@polyconseil.fr>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""Unit tests for the pylint checkers in :mod:`pylint.extensions.check_docs`,
-in particular the parameter documentation checker `DocstringChecker`
-"""
+"""Unit tests for utils functions in :mod:`pylint.extensions._check_docs_utils`."""
 import astroid
 import pytest
 
@@ -26,7 +14,7 @@
     [("abc", 0), ("", 0), ("  abc", 2), ("\n  abc", 0), ("   \n  abc", 3)],
 )
 def test_space_indentation(string: str, count: int) -> None:
-    """Test for pylint_plugin.ParamDocChecker"""
+    """Test for pylint_plugin.ParamDocChecker."""
     assert utils.space_indentation(string) == count
 
 
@@ -147,5 +135,7 @@ def my_func():
     ],
 )
 def test_exception(raise_node, expected):
-    found = utils.possible_exc_types(raise_node)
-    assert found == expected
+    found_nodes = utils.possible_exc_types(raise_node)
+    for node in found_nodes:
+        assert isinstance(node, astroid.nodes.ClassDef)
+    assert {node.name for node in found_nodes} == expected
diff --git a/tests/extensions/test_confusing_elif.py b/tests/extensions/test_confusing_elif.py
deleted file mode 100644
index 236b0c6e6a..0000000000
--- a/tests/extensions/test_confusing_elif.py
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-
-# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-
-"""Tests for the pylint checker in :mod:`pylint.extensions.confusing_elif
-"""
-
-import astroid
-
-from pylint.extensions.confusing_elif import ConfusingConsecutiveElifChecker
-from pylint.testutils import CheckerTestCase, MessageTest
-
-MSG_ID_CONFUSING_CONSECUTIVE_ELIF = "confusing-consecutive-elif"
-
-
-class TestConfusingConsecutiveElifChecker(CheckerTestCase):
-    """Tests for pylint.extensions.confusing_elif.ConfusingConsecutiveElifChecker"""
-
-    CHECKER_CLASS = ConfusingConsecutiveElifChecker
-
-    def test_triggered_if_if_block_ends_with_elif(self) -> None:
-        """
-        Given an if-elif construct
-        When the body of the if ends with an elif
-        Then the message confusing-consecutive-elif must be triggered.
-        """
-        example_code = """
-        def foo(a, b, c):
-            if a > b: #@
-                if a > 0:
-                    return a
-                elif a < 0:
-                    return 0
-            elif a > c: #@
-                return c
-        """
-        if_node_to_test, elif_node = astroid.extract_node(example_code)
-        with self.assertAddsMessages(
-            MessageTest(msg_id=MSG_ID_CONFUSING_CONSECUTIVE_ELIF, node=elif_node)
-        ):
-            self.checker.visit_if(if_node_to_test)
-
-    def test_triggered_if_elif_block_ends_with_elif(self) -> None:
-        """
-        Given an if-elif-elif construct
-        When the body of the first elif ends with an elif
-        Then the message confusing-consecutive-elif must be triggered.
-        """
-        example_code = """
-        def foo(a, b, c):
-            if a < b:
-                return b
-            elif a > b: #@
-                if a > 0:
-                    return a
-                elif a < 0:
-                    return 0
-            elif a > c: #@
-                return c
-        """
-        if_node_to_test, elif_node = astroid.extract_node(example_code)
-        with self.assertAddsMessages(
-            MessageTest(msg_id=MSG_ID_CONFUSING_CONSECUTIVE_ELIF, node=elif_node)
-        ):
-            self.checker.visit_if(if_node_to_test)
-
-    def test_triggered_if_block_ends_with_if(self) -> None:
-        """
-        Given an if-elif construct
-        When the body of the if ends with an if
-        Then the message confusing-consecutive-elif must be triggered.
-        """
-        example_code = """
-        def foo(a, b, c):
-            if a > b: #@
-                if a > 0:
-                    return a
-            elif a > c: #@
-                return c
-        """
-        if_node_to_test, elif_node = astroid.extract_node(example_code)
-        with self.assertAddsMessages(
-            MessageTest(msg_id=MSG_ID_CONFUSING_CONSECUTIVE_ELIF, node=elif_node)
-        ):
-            self.checker.visit_if(if_node_to_test)
-
-    def test_not_triggered_if_indented_block_ends_with_else(self) -> None:
-        """
-        Given an if-elif construct
-        When the body of the if ends with an else
-        Then no message shall be triggered.
-        """
-        example_code = """
-        def foo(a, b, c):
-            if a > b: #@
-                if a > 0:
-                    return a
-                else:
-                    return 0
-            elif a > c:
-                return c
-        """
-        if_node_to_test = astroid.extract_node(example_code)
-        with self.assertNoMessages():
-            self.checker.visit_if(if_node_to_test)
-
-    def test_not_triggered_if_indentend_block_ends_with_call(self) -> None:
-        """
-        Given an if-elif construct
-        When the body of the if ends with a function call
-        Then no message shall be triggered.
-
-        Note: There is nothing special about the body ending with a function call. This is just taken as a
-        representative value for the equivalence class of "every node class unrelated to if/elif/else".
-        """
-        example_code = """
-        def foo(a, b, c):
-            result = None
-            if a > b: #@
-                if a > 0:
-                    result = a
-                print("result is", result)
-            elif a > c:
-                result = c
-            return result
-        """
-        if_node_to_test = astroid.extract_node(example_code)
-        with self.assertNoMessages():
-            self.checker.visit_if(if_node_to_test)
-
-    def test_not_triggered_if_indented_block_ends_with_ifexp(self) -> None:
-        """
-        Given an if-elif construct
-        When the body of the if ends with an if expression
-        Then no message shall be triggered.
-        """
-        example_code = """
-        def foo(a, b, c):
-            result = None
-            if a > b: #@
-                if a > 0:
-                    result = a
-                result = b if b > c else c
-            elif a > c:
-                result = c
-            return result
-        """
-        if_node_to_test = astroid.extract_node(example_code)
-        with self.assertNoMessages():
-            self.checker.visit_if(if_node_to_test)
-
-    def test_not_triggered_if_outer_block_does_not_have_elif(self) -> None:
-        """
-        Given an if construct without an elif
-        When the body of the if ends with an if
-        Then no message shall be triggered.
-        """
-        example_code = """
-        def foo(a, b, c):
-            result = None
-            if a > b: #@
-                if a > 0:
-                    result = a
-                elif a < 0:
-                    result = 0
-            else:
-                result = c
-            return result
-        """
-        if_node_to_test = astroid.extract_node(example_code)
-        with self.assertNoMessages():
-            self.checker.visit_if(if_node_to_test)
-
-    def test_not_triggered_if_outer_block_continues_with_if(self) -> None:
-        """
-        Given an if construct which continues with a new if construct
-        When the body of the first if ends with an if expression
-        Then no message shall be triggered.
-        """
-        example_code = """
-        def foo(a, b, c):
-            result = None
-            if a > b: #@
-                if a > 0:
-                    result = a
-                elif a < 0:
-                    result = 0
-            if b > c:
-                result = c
-            return result
-        """
-        if_node_to_test = astroid.extract_node(example_code)
-        with self.assertNoMessages():
-            self.checker.visit_if(if_node_to_test)
diff --git a/tests/extensions/test_private_import.py b/tests/extensions/test_private_import.py
new file mode 100644
index 0000000000..d2d79947fb
--- /dev/null
+++ b/tests/extensions/test_private_import.py
@@ -0,0 +1,73 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Tests the local module directory comparison logic which requires mocking file directories"""
+
+from unittest.mock import patch
+
+import astroid
+
+from pylint.extensions import private_import
+from pylint.interfaces import HIGH
+from pylint.testutils import CheckerTestCase, MessageTest
+
+
+class TestPrivateImport(CheckerTestCase):
+    """The mocked dirname is the directory of the file being linted, the node is code inside that file"""
+
+    CHECKER_CLASS = private_import.PrivateImportChecker
+
+    @patch("pathlib.Path.parent")
+    def test_internal_module(self, parent) -> None:
+        parent.parts = ("", "dir", "module")
+        import_from = astroid.extract_node("""from module import _file""")
+
+        with self.assertNoMessages():
+            self.checker.visit_importfrom(import_from)
+
+    @patch("pathlib.Path.parent")
+    def test_external_module_nested(self, parent) -> None:
+        parent.parts = ("", "dir", "module", "module_files", "util")
+
+        import_from = astroid.extract_node("""from module import _file""")
+
+        with self.assertNoMessages():
+            self.checker.visit_importfrom(import_from)
+
+    @patch("pathlib.Path.parent")
+    def test_external_module_dot_import(self, parent) -> None:
+        parent.parts = ("", "dir", "outer", "inner", "module_files", "util")
+
+        import_from = astroid.extract_node("""from outer.inner import _file""")
+
+        with self.assertNoMessages():
+            self.checker.visit_importfrom(import_from)
+
+    @patch("pathlib.Path.parent")
+    def test_external_module_dot_import_outer_only(self, parent) -> None:
+        parent.parts = ("", "dir", "outer", "extensions")
+
+        import_from = astroid.extract_node("""from outer.inner import _file""")
+
+        with self.assertNoMessages():
+            self.checker.visit_importfrom(import_from)
+
+    @patch("pathlib.Path.parent")
+    def test_external_module(self, parent) -> None:
+        parent.parts = ("", "dir", "other")
+
+        import_from = astroid.extract_node("""from module import _file""")
+
+        msg = MessageTest(
+            msg_id="import-private-name",
+            node=import_from,
+            line=1,
+            col_offset=0,
+            end_line=1,
+            end_col_offset=24,
+            args=("object", "_file"),
+            confidence=HIGH,
+        )
+        with self.assertAddsMessages(msg):
+            self.checker.visit_importfrom(import_from)
diff --git a/tests/extensions/test_while_used.py b/tests/extensions/test_while_used.py
deleted file mode 100644
index 9eab48520f..0000000000
--- a/tests/extensions/test_while_used.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""Tests for the pylint checker in :mod:`pylint.extensions.while
-"""
-
-import astroid
-
-from pylint.extensions.while_used import WhileChecker
-from pylint.testutils import CheckerTestCase, MessageTest
-
-
-class TestWhileUsed(CheckerTestCase):
-
-    CHECKER_CLASS = WhileChecker
-
-    def test_while_used(self) -> None:
-        node = astroid.extract_node(
-            """
-        def f():
-            i = 0
-            while i < 10:
-                i += 1
-        """
-        ).body[1]
-
-        with self.assertAddsMessages(MessageTest("while-used", node=node)):
-            self.checker.visit_while(node)
diff --git a/tests/functional/a/abstract/abstract_method.txt b/tests/functional/a/abstract/abstract_method.txt
index 1eb47639c6..2b4ea9a2eb 100644
--- a/tests/functional/a/abstract/abstract_method.txt
+++ b/tests/functional/a/abstract/abstract_method.txt
@@ -1,16 +1,16 @@
-abstract-method:47:0:51:38:Concrete:Method 'bbbb' is abstract in class 'Abstract' but is not overridden:UNDEFINED
-abstract-method:70:0:72:12:Container:Method '__hash__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:70:0:72:12:Container:Method '__iter__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:70:0:72:12:Container:Method '__len__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:76:0:78:17:Sizable:Method '__contains__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:76:0:78:17:Sizable:Method '__hash__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:76:0:78:17:Sizable:Method '__iter__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:82:0:83:17:Hashable:Method '__contains__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:82:0:83:17:Hashable:Method '__iter__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:82:0:83:17:Hashable:Method '__len__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:87:0:91:19:Iterator:Method '__contains__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:87:0:91:19:Iterator:Method '__hash__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:87:0:91:19:Iterator:Method '__len__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:106:0:107:8:BadComplexMro:Method '__hash__' is abstract in class 'Structure' but is not overridden:UNDEFINED
-abstract-method:106:0:107:8:BadComplexMro:Method '__len__' is abstract in class 'AbstractSizable' but is not overridden:UNDEFINED
-abstract-method:106:0:107:8:BadComplexMro:Method 'length' is abstract in class 'AbstractSizable' but is not overridden:UNDEFINED
+abstract-method:47:0:47:14:Concrete:Method 'bbbb' is abstract in class 'Abstract' but is not overridden:UNDEFINED
+abstract-method:70:0:70:15:Container:Method '__hash__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:70:0:70:15:Container:Method '__iter__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:70:0:70:15:Container:Method '__len__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:76:0:76:13:Sizable:Method '__contains__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:76:0:76:13:Sizable:Method '__hash__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:76:0:76:13:Sizable:Method '__iter__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:82:0:82:14:Hashable:Method '__contains__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:82:0:82:14:Hashable:Method '__iter__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:82:0:82:14:Hashable:Method '__len__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:87:0:87:14:Iterator:Method '__contains__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:87:0:87:14:Iterator:Method '__hash__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:87:0:87:14:Iterator:Method '__len__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:106:0:106:19:BadComplexMro:Method '__hash__' is abstract in class 'Structure' but is not overridden:UNDEFINED
+abstract-method:106:0:106:19:BadComplexMro:Method '__len__' is abstract in class 'AbstractSizable' but is not overridden:UNDEFINED
+abstract-method:106:0:106:19:BadComplexMro:Method 'length' is abstract in class 'AbstractSizable' but is not overridden:UNDEFINED
diff --git a/tests/functional/a/arguments_differ.py b/tests/functional/a/arguments_differ.py
index b5b43505a4..1dbd40086e 100644
--- a/tests/functional/a/arguments_differ.py
+++ b/tests/functional/a/arguments_differ.py
@@ -141,7 +141,7 @@ def close(self, attr):
 
 class StaticmethodChild2(Staticmethod):
 
-    def func(self, data):
+    def func(self, data):  # [arguments-differ]
         super().func(data)
 
 
@@ -151,15 +151,23 @@ class SuperClass(object):
     def impl(arg1, arg2, **kwargs):
         return arg1 + arg2
 
+    def should_have_been_decorated_as_static(arg1, arg2):  # pylint: disable=no-self-argument
+        return arg1 + arg2
+
 
 class MyClass(SuperClass):
 
-    def impl(self, *args, **kwargs):
+    @staticmethod
+    def impl(*args, **kwargs):
         """
         Acceptable use of vararg in subclass because it does not violate LSP.
         """
         super().impl(*args, **kwargs)
 
+    @staticmethod
+    def should_have_been_decorated_as_static(arg1, arg2):
+        return arg1 + arg2
+
 
 class FirstHasArgs(object):
 
@@ -244,6 +252,7 @@ def meth(self, _arg, dummy):
 import typing  # pylint: disable=wrong-import-position
 from typing import Dict  # pylint: disable=wrong-import-position
 
+
 class ParentT1:
     def func(self, user_input: Dict[str, int]) -> None:
         pass
@@ -318,3 +327,34 @@ class Foo2(AbstractFoo):
 
     def kwonly_6(self, first, *args, **kwargs):  # valid override
         "One positional with the rest variadics to pass through parent params"
+
+
+# Adding arguments with default values to a child class is valid
+# See:
+# https://github.com/PyCQA/pylint/issues/1556
+# https://github.com/PyCQA/pylint/issues/5338
+
+
+class BaseClass:
+    def method(self, arg: str):
+        print(self, arg)
+
+
+class DerivedClassWithAnnotation(BaseClass):
+    def method(self, arg: str, param1: int = 42, *, param2: int = 42):
+        print(arg, param1, param2)
+
+
+class DerivedClassWithoutAnnotation(BaseClass):
+    def method(self, arg, param1=42, *, param2=42):
+        print(arg, param1, param2)
+
+
+class AClass:
+    def method(self, *, arg1):
+        print(self)
+
+
+class ClassWithNewNonDefaultKeywordOnly(AClass):
+    def method(self, *, arg2, arg1=None):  # [arguments-differ]
+        ...
diff --git a/tests/functional/a/arguments_differ.txt b/tests/functional/a/arguments_differ.txt
index ea0b74dfaf..bb1abb2eb9 100644
--- a/tests/functional/a/arguments_differ.txt
+++ b/tests/functional/a/arguments_differ.txt
@@ -1,11 +1,13 @@
-arguments-differ:12:4:13:12:Child.test:Number of parameters was 1 in 'Parent.test' and is now 2 in overridden 'Child.test' method:UNDEFINED
-arguments-differ:23:4:24:12:ChildDefaults.test:Number of parameters was 3 in 'ParentDefaults.test' and is now 2 in overridden 'ChildDefaults.test' method:UNDEFINED
-arguments-differ:41:4:42:12:ClassmethodChild.func:Number of parameters was 2 in 'Classmethod.func' and is now 0 in overridden 'ClassmethodChild.func' method:UNDEFINED
-arguments-differ:68:4:69:64:VarargsChild.has_kwargs:Variadics removed in overridden 'VarargsChild.has_kwargs' method:UNDEFINED
-arguments-renamed:71:4:72:89:VarargsChild.no_kwargs:Parameter 'args' has been renamed to 'arg' in overridden 'VarargsChild.no_kwargs' method:UNDEFINED
-arguments-differ:172:4:173:12:SecondChangesArgs.test:Number of parameters was 2 in 'FirstHasArgs.test' and is now 4 in overridden 'SecondChangesArgs.test' method:UNDEFINED
-arguments-differ:298:4:299:60:Foo.kwonly_1:Number of parameters was 4 in 'AbstractFoo.kwonly_1' and is now 3 in overridden 'Foo.kwonly_1' method:UNDEFINED
-arguments-differ:301:4:302:82:Foo.kwonly_2:Number of parameters was 3 in 'AbstractFoo.kwonly_2' and is now 2 in overridden 'Foo.kwonly_2' method:UNDEFINED
-arguments-differ:304:4:305:32:Foo.kwonly_3:Number of parameters was 3 in 'AbstractFoo.kwonly_3' and is now 3 in overridden 'Foo.kwonly_3' method:UNDEFINED
-arguments-differ:307:4:308:32:Foo.kwonly_4:Number of parameters was 3 in 'AbstractFoo.kwonly_4' and is now 3 in overridden 'Foo.kwonly_4' method:UNDEFINED
-arguments-differ:310:4:311:41:Foo.kwonly_5:Variadics removed in overridden 'Foo.kwonly_5' method:UNDEFINED
+arguments-differ:12:4:12:12:Child.test:Number of parameters was 1 in 'Parent.test' and is now 2 in overridden 'Child.test' method:UNDEFINED
+arguments-differ:23:4:23:12:ChildDefaults.test:Number of parameters was 3 in 'ParentDefaults.test' and is now 2 in overridden 'ChildDefaults.test' method:UNDEFINED
+arguments-differ:41:4:41:12:ClassmethodChild.func:Number of parameters was 2 in 'Classmethod.func' and is now 0 in overridden 'ClassmethodChild.func' method:UNDEFINED
+arguments-differ:68:4:68:18:VarargsChild.has_kwargs:Variadics removed in overridden 'VarargsChild.has_kwargs' method:UNDEFINED
+arguments-renamed:71:4:71:17:VarargsChild.no_kwargs:Parameter 'args' has been renamed to 'arg' in overridden 'VarargsChild.no_kwargs' method:UNDEFINED
+arguments-differ:144:4:144:12:StaticmethodChild2.func:Number of parameters was 1 in 'Staticmethod.func' and is now 2 in overridden 'StaticmethodChild2.func' method:UNDEFINED
+arguments-differ:180:4:180:12:SecondChangesArgs.test:Number of parameters was 2 in 'FirstHasArgs.test' and is now 4 in overridden 'SecondChangesArgs.test' method:UNDEFINED
+arguments-differ:307:4:307:16:Foo.kwonly_1:Number of parameters was 4 in 'AbstractFoo.kwonly_1' and is now 3 in overridden 'Foo.kwonly_1' method:UNDEFINED
+arguments-differ:310:4:310:16:Foo.kwonly_2:Number of parameters was 3 in 'AbstractFoo.kwonly_2' and is now 2 in overridden 'Foo.kwonly_2' method:UNDEFINED
+arguments-differ:313:4:313:16:Foo.kwonly_3:Number of parameters was 3 in 'AbstractFoo.kwonly_3' and is now 3 in overridden 'Foo.kwonly_3' method:UNDEFINED
+arguments-differ:316:4:316:16:Foo.kwonly_4:Number of parameters was 3 in 'AbstractFoo.kwonly_4' and is now 3 in overridden 'Foo.kwonly_4' method:UNDEFINED
+arguments-differ:319:4:319:16:Foo.kwonly_5:Variadics removed in overridden 'Foo.kwonly_5' method:UNDEFINED
+arguments-differ:359:4:359:14:ClassWithNewNonDefaultKeywordOnly.method:Number of parameters was 2 in 'AClass.method' and is now 3 in overridden 'ClassWithNewNonDefaultKeywordOnly.method' method:UNDEFINED
diff --git a/tests/functional/a/arguments_differ_issue5371.py b/tests/functional/a/arguments_differ_issue5371.py
new file mode 100644
index 0000000000..a0cd396138
--- /dev/null
+++ b/tests/functional/a/arguments_differ_issue5371.py
@@ -0,0 +1,13 @@
+"""https://github.com/PyCQA/pylint/issues/5371"""
+from enum import Enum
+
+
+class MyEnum(Enum):
+    """
+    Enum._generate_next_value_() in the stdlib currently lacks a
+    @staticmethod decorator.
+    """
+
+    @staticmethod
+    def _generate_next_value_(name: str, start: int, count: int, last_values: list):
+        return 42
diff --git a/tests/functional/a/arguments_renamed.py b/tests/functional/a/arguments_renamed.py
index 22e7519ac6..2b5474c831 100644
--- a/tests/functional/a/arguments_renamed.py
+++ b/tests/functional/a/arguments_renamed.py
@@ -40,7 +40,7 @@ class Child(Parent):
     def test(self, arg1): # [arguments-renamed]
         return arg1 + 1
 
-    def kwargs_test(self, arg, *, value1, var2): #[arguments-renamed]
+    def kwargs_test(self, arg, *, value1, var2): #[arguments-differ]
         print(f"keyword parameters are {value1} and {var2}.")
 
 class Child2(Parent):
@@ -48,7 +48,7 @@ class Child2(Parent):
     def test(self, var): # [arguments-renamed]
         return var + 1
 
-    def kwargs_test(self, *, var1, kw2): #[arguments-renamed, arguments-differ]
+    def kwargs_test(self, *, var1, kw2): #[arguments-differ]
         print(f"keyword parameters are {var1} and {kw2}.")
 
 class ParentDefaults(object):
@@ -72,3 +72,29 @@ def test2(self, _arg, ignored_barg): # no error here
 
     def test3(self, dummy_param, arg2): # no error here
         print(f"arguments: {arg2}")
+
+# Check for crash on method definitions not at top level of class
+# https://github.com/PyCQA/pylint/issues/5648
+class FruitConditional:
+
+    define_eat = True
+
+    def brew(self, fruit_name: str):
+        print(f"Brewing a fruit named {fruit_name}")
+
+    if define_eat:
+        def eat_with_condiment(self, fruit_name:str, condiment: Condiment):
+            print(f"Eating a fruit named {fruit_name} with {condiment}")
+
+class FruitOverrideConditional(FruitConditional):
+
+    fruit = "orange"
+    override_condiment = True
+
+    if fruit == "orange":
+        def brew(self, orange_name: str): # [arguments-renamed]
+            print(f"Brewing an orange named {orange_name}")
+
+        if override_condiment:
+            def eat_with_condiment(self, fruit_name: str, condiment: Condiment, error: str): # [arguments-differ]
+                print(f"Eating a fruit named {fruit_name} with {condiment}")
diff --git a/tests/functional/a/arguments_renamed.txt b/tests/functional/a/arguments_renamed.txt
index 1656c5f9eb..47d4188dd2 100644
--- a/tests/functional/a/arguments_renamed.txt
+++ b/tests/functional/a/arguments_renamed.txt
@@ -1,9 +1,10 @@
-arguments-renamed:17:4:18:55:Orange.brew:Parameter 'fruit_name' has been renamed to 'orange_name' in overridden 'Orange.brew' method:UNDEFINED
-arguments-renamed:20:4:21:69:Orange.eat_with_condiment:Parameter 'fruit_name' has been renamed to 'orange_name' in overridden 'Orange.eat_with_condiment' method:UNDEFINED
-arguments-differ:27:4:28:68:Banana.eat_with_condiment:Number of parameters was 3 in 'Fruit.eat_with_condiment' and is now 4 in overridden 'Banana.eat_with_condiment' method:UNDEFINED
-arguments-renamed:40:4:41:23:Child.test:Parameter 'arg' has been renamed to 'arg1' in overridden 'Child.test' method:UNDEFINED
-arguments-renamed:43:4:44:61:Child.kwargs_test:Parameter 'var1' has been renamed to 'value1' in overridden 'Child.kwargs_test' method:UNDEFINED
-arguments-renamed:48:4:49:22:Child2.test:Parameter 'arg' has been renamed to 'var' in overridden 'Child2.test' method:UNDEFINED
-arguments-differ:51:4:52:58:Child2.kwargs_test:Number of parameters was 4 in 'Parent.kwargs_test' and is now 3 in overridden 'Child2.kwargs_test' method:UNDEFINED
-arguments-renamed:51:4:52:58:Child2.kwargs_test:Parameter 'var2' has been renamed to 'kw2' in overridden 'Child2.kwargs_test' method:UNDEFINED
-arguments-renamed:67:4:68:56:ChildDefaults.test1:Parameter 'barg' has been renamed to 'param2' in overridden 'ChildDefaults.test1' method:UNDEFINED
+arguments-renamed:17:4:17:12:Orange.brew:Parameter 'fruit_name' has been renamed to 'orange_name' in overridden 'Orange.brew' method:UNDEFINED
+arguments-renamed:20:4:20:26:Orange.eat_with_condiment:Parameter 'fruit_name' has been renamed to 'orange_name' in overridden 'Orange.eat_with_condiment' method:UNDEFINED
+arguments-differ:27:4:27:26:Banana.eat_with_condiment:Number of parameters was 3 in 'Fruit.eat_with_condiment' and is now 4 in overridden 'Banana.eat_with_condiment' method:UNDEFINED
+arguments-renamed:40:4:40:12:Child.test:Parameter 'arg' has been renamed to 'arg1' in overridden 'Child.test' method:UNDEFINED
+arguments-differ:43:4:43:19:Child.kwargs_test:Number of parameters was 4 in 'Parent.kwargs_test' and is now 4 in overridden 'Child.kwargs_test' method:UNDEFINED
+arguments-renamed:48:4:48:12:Child2.test:Parameter 'arg' has been renamed to 'var' in overridden 'Child2.test' method:UNDEFINED
+arguments-differ:51:4:51:19:Child2.kwargs_test:Number of parameters was 4 in 'Parent.kwargs_test' and is now 3 in overridden 'Child2.kwargs_test' method:UNDEFINED
+arguments-renamed:67:4:67:13:ChildDefaults.test1:Parameter 'barg' has been renamed to 'param2' in overridden 'ChildDefaults.test1' method:UNDEFINED
+arguments-renamed:95:8:95:16:FruitOverrideConditional.brew:Parameter 'fruit_name' has been renamed to 'orange_name' in overridden 'FruitOverrideConditional.brew' method:UNDEFINED
+arguments-differ:99:12:99:34:FruitOverrideConditional.eat_with_condiment:Number of parameters was 3 in 'FruitConditional.eat_with_condiment' and is now 4 in overridden 'FruitOverrideConditional.eat_with_condiment' method:UNDEFINED
diff --git a/tests/functional/a/assign/assign_to_new_keyword.py b/tests/functional/a/assign_to_new_keyword.py
similarity index 100%
rename from tests/functional/a/assign/assign_to_new_keyword.py
rename to tests/functional/a/assign_to_new_keyword.py
diff --git a/tests/functional/a/assign/assign_to_new_keyword.rc b/tests/functional/a/assign_to_new_keyword.rc
similarity index 100%
rename from tests/functional/a/assign/assign_to_new_keyword.rc
rename to tests/functional/a/assign_to_new_keyword.rc
diff --git a/tests/functional/a/assign/assign_to_new_keyword.txt b/tests/functional/a/assign_to_new_keyword.txt
similarity index 100%
rename from tests/functional/a/assign/assign_to_new_keyword.txt
rename to tests/functional/a/assign_to_new_keyword.txt
diff --git a/tests/functional/a/assign/assigning_non_slot.py b/tests/functional/a/assigning/assigning_non_slot.py
similarity index 85%
rename from tests/functional/a/assign/assigning_non_slot.py
rename to tests/functional/a/assigning/assigning_non_slot.py
index cf673692ff..2cd1483e0b 100644
--- a/tests/functional/a/assign/assigning_non_slot.py
+++ b/tests/functional/a/assigning/assigning_non_slot.py
@@ -173,3 +173,30 @@ class Cls(Generic[TYPE]):
 
     def __init__(self, value):
         self.value = value
+
+
+class ClassDefiningSetattr(object):
+    __slots__ = ["foobar"]
+
+    def __init__(self):
+        self.foobar = {}
+
+    def __setattr__(self, name, value):
+        if name == "foobar":
+            super().__setattr__(name, value)
+        else:
+            self.foobar[name] = value
+
+
+class ClassWithParentDefiningSetattr(ClassDefiningSetattr):
+    __slots__ = []
+
+
+def dont_emit_for_defined_setattr():
+    inst = ClassDefiningSetattr()
+    # This should not emit because we can't reason about what happens with
+    # classes defining __setattr__
+    inst.non_existent = "non-existent"
+
+    child = ClassWithParentDefiningSetattr()
+    child.non_existent = "non-existent"
diff --git a/tests/functional/a/assign/assigning_non_slot.txt b/tests/functional/a/assigning/assigning_non_slot.txt
similarity index 100%
rename from tests/functional/a/assign/assigning_non_slot.txt
rename to tests/functional/a/assigning/assigning_non_slot.txt
diff --git a/tests/functional/a/assign/assigning_non_slot_4509.py b/tests/functional/a/assigning/assigning_non_slot_4509.py
similarity index 100%
rename from tests/functional/a/assign/assigning_non_slot_4509.py
rename to tests/functional/a/assigning/assigning_non_slot_4509.py
diff --git a/tests/functional/a/assign/assigning_non_slot_4509.rc b/tests/functional/a/assigning/assigning_non_slot_4509.rc
similarity index 100%
rename from tests/functional/a/assign/assigning_non_slot_4509.rc
rename to tests/functional/a/assigning/assigning_non_slot_4509.rc
diff --git a/tests/functional/a/assign/assigning_non_slot_4509.txt b/tests/functional/a/assigning/assigning_non_slot_4509.txt
similarity index 100%
rename from tests/functional/a/assign/assigning_non_slot_4509.txt
rename to tests/functional/a/assigning/assigning_non_slot_4509.txt
diff --git a/tests/functional/a/assign/assignment_expression.py b/tests/functional/a/assignment/assignment_expression.py
similarity index 100%
rename from tests/functional/a/assign/assignment_expression.py
rename to tests/functional/a/assignment/assignment_expression.py
diff --git a/tests/functional/a/assign/assignment_expression.rc b/tests/functional/a/assignment/assignment_expression.rc
similarity index 100%
rename from tests/functional/a/assign/assignment_expression.rc
rename to tests/functional/a/assignment/assignment_expression.rc
diff --git a/tests/functional/a/assign/assignment_expression.txt b/tests/functional/a/assignment/assignment_expression.txt
similarity index 74%
rename from tests/functional/a/assign/assignment_expression.txt
rename to tests/functional/a/assignment/assignment_expression.txt
index 35dd1e4fb5..23fb5c394e 100644
--- a/tests/functional/a/assign/assignment_expression.txt
+++ b/tests/functional/a/assignment/assignment_expression.txt
@@ -1,3 +1,3 @@
-used-before-assignment:21:7:21:12::Using variable 'err_a' before assignment:UNDEFINED
-used-before-assignment:22:6:22:11::Using variable 'err_b' before assignment:UNDEFINED
-used-before-assignment:24:13:24:18::Using variable 'err_d' before assignment:UNDEFINED
+used-before-assignment:21:7:21:12::Using variable 'err_a' before assignment:HIGH
+used-before-assignment:22:6:22:11::Using variable 'err_b' before assignment:HIGH
+used-before-assignment:24:13:24:18::Using variable 'err_d' before assignment:HIGH
diff --git a/tests/functional/a/assign/assignment_from_no_return.py b/tests/functional/a/assignment/assignment_from_no_return.py
similarity index 100%
rename from tests/functional/a/assign/assignment_from_no_return.py
rename to tests/functional/a/assignment/assignment_from_no_return.py
diff --git a/tests/functional/a/assign/assignment_from_no_return.txt b/tests/functional/a/assignment/assignment_from_no_return.txt
similarity index 100%
rename from tests/functional/a/assign/assignment_from_no_return.txt
rename to tests/functional/a/assignment/assignment_from_no_return.txt
diff --git a/tests/functional/a/assign/assignment_from_no_return_2.py b/tests/functional/a/assignment/assignment_from_no_return_2.py
similarity index 89%
rename from tests/functional/a/assign/assignment_from_no_return_2.py
rename to tests/functional/a/assignment/assignment_from_no_return_2.py
index 4cd5ef1066..fd1489dbc5 100644
--- a/tests/functional/a/assign/assignment_from_no_return_2.py
+++ b/tests/functional/a/assignment/assignment_from_no_return_2.py
@@ -3,10 +3,10 @@
 
     'E1111': ('Assigning to function call which doesn\'t return',
               'Used when an assignment is done on a function call but the \
-              infered function doesn\'t return anything.'),
+              inferred function doesn\'t return anything.'),
     'W1111': ('Assigning to function call which only returns None',
               'Used when an assignment is done on a function call but the \
-              infered function returns nothing but None.'),
+              inferred function returns nothing but None.'),
 
 """
 from __future__ import generators, print_function
@@ -32,6 +32,8 @@ def func_implicit_return_none():
 
 A = func_implicit_return_none()  # [assignment-from-none]
 
+lst = [3, 2]
+A = lst.sort()  # [assignment-from-none]
 
 def func_return_none_and_smth():
     """function returning none and something else"""
diff --git a/tests/functional/a/assign/assignment_from_no_return_2.txt b/tests/functional/a/assignment/assignment_from_no_return_2.txt
similarity index 75%
rename from tests/functional/a/assign/assignment_from_no_return_2.txt
rename to tests/functional/a/assignment/assignment_from_no_return_2.txt
index 31a878b6db..b6aec14dad 100644
--- a/tests/functional/a/assign/assignment_from_no_return_2.txt
+++ b/tests/functional/a/assignment/assignment_from_no_return_2.txt
@@ -1,3 +1,4 @@
 assignment-from-no-return:18:0:18:20::Assigning result of a function call, where the function has no return:UNDEFINED
 assignment-from-none:26:0:26:22::Assigning result of a function call, where the function returns None:UNDEFINED
 assignment-from-none:33:0:33:31::Assigning result of a function call, where the function returns None:UNDEFINED
+assignment-from-none:36:0:36:14::Assigning result of a function call, where the function returns None:INFERENCE
diff --git a/tests/functional/a/assign/assignment_from_no_return_py3.py b/tests/functional/a/assignment/assignment_from_no_return_py3.py
similarity index 100%
rename from tests/functional/a/assign/assignment_from_no_return_py3.py
rename to tests/functional/a/assignment/assignment_from_no_return_py3.py
diff --git a/tests/functional/a/async_functions.txt b/tests/functional/a/async_functions.txt
index 535e387097..7ab56e2d3c 100644
--- a/tests/functional/a/async_functions.txt
+++ b/tests/functional/a/async_functions.txt
@@ -1,11 +1,11 @@
-redefined-builtin:5:0:6:8:next:Redefining built-in 'next':UNDEFINED
+redefined-builtin:5:0:5:14:next:Redefining built-in 'next':UNDEFINED
 unused-argument:8:30:8:34:some_function:Unused argument 'arg2':HIGH
 bad-super-call:22:8:22:31:Class.some_method:Bad first argument 'OtherClass' given to super():UNDEFINED
-too-many-arguments:26:0:53:12:complex_function:Too many arguments (10/5):UNDEFINED
-too-many-branches:26:0:53:12:complex_function:Too many branches (13/12):UNDEFINED
-too-many-return-statements:26:0:53:12:complex_function:Too many return statements (10/6):UNDEFINED
-dangerous-default-value:57:0:58:15:func:Dangerous default value [] as argument:UNDEFINED
+too-many-arguments:26:0:26:26:complex_function:Too many arguments (10/5):UNDEFINED
+too-many-branches:26:0:26:26:complex_function:Too many branches (13/12):UNDEFINED
+too-many-return-statements:26:0:26:26:complex_function:Too many return statements (10/6):UNDEFINED
+dangerous-default-value:57:0:57:14:func:Dangerous default value [] as argument:UNDEFINED
 duplicate-argument-name:57:15:57:16:func:Duplicate argument name a in function definition:UNDEFINED
 duplicate-argument-name:57:18:57:19:func:Duplicate argument name a in function definition:UNDEFINED
-disallowed-name:62:0:63:6:foo:"Disallowed name ""foo""":UNDEFINED
-empty-docstring:62:0:63:6:foo:Empty function docstring:HIGH
+disallowed-name:62:0:62:13:foo:"Disallowed name ""foo""":UNDEFINED
+empty-docstring:62:0:62:13:foo:Empty function docstring:HIGH
diff --git a/tests/functional/b/bad_char/bad_char_backspace.py b/tests/functional/b/bad_char/bad_char_backspace.py
new file mode 100644
index 0000000000..5a2325b1a3
--- /dev/null
+++ b/tests/functional/b/bad_char/bad_char_backspace.py
@@ -0,0 +1,6 @@
+# pylint: disable=trailing-whitespace, missing-module-docstring, trailing-newlines, missing-final-newline
+
+# +2: [invalid-character-backspace]
+BACKSPACE = '''
+--><---
+'''  # bad char  backspace should be only used as \b
diff --git a/tests/functional/b/bad_char/bad_char_backspace.txt b/tests/functional/b/bad_char/bad_char_backspace.txt
new file mode 100644
index 0000000000..4850fad0ef
--- /dev/null
+++ b/tests/functional/b/bad_char/bad_char_backspace.txt
@@ -0,0 +1 @@
+invalid-character-backspace:5:4:5:5::"Invalid unescaped character backspace, use ""\b"" instead.":HIGH
diff --git a/tests/functional/b/bad_char/bad_char_carriage_return.py b/tests/functional/b/bad_char/bad_char_carriage_return.py
new file mode 100644
index 0000000000..bb17880ca7
--- /dev/null
+++ b/tests/functional/b/bad_char/bad_char_carriage_return.py
@@ -0,0 +1,6 @@
+# pylint: disable=trailing-whitespace, missing-module-docstring, trailing-newlines, missing-final-newline
+
+# +2: [invalid-character-carriage-return]
+CARRIAGE_RETURN = '''
+-->
<---
+'''  # bad char  carriage-return should be only used as \r
diff --git a/tests/functional/b/bad_char/bad_char_carriage_return.rc b/tests/functional/b/bad_char/bad_char_carriage_return.rc
new file mode 100644
index 0000000000..7ca0c92636
--- /dev/null
+++ b/tests/functional/b/bad_char/bad_char_carriage_return.rc
@@ -0,0 +1,3 @@
+[testoptions]
+# This test cannot run on Windows as \r will be the newline
+exclude_platforms=win32
diff --git a/tests/functional/b/bad_char/bad_char_carriage_return.txt b/tests/functional/b/bad_char/bad_char_carriage_return.txt
new file mode 100644
index 0000000000..3fdb3533fc
--- /dev/null
+++ b/tests/functional/b/bad_char/bad_char_carriage_return.txt
@@ -0,0 +1 @@
+invalid-character-carriage-return:5:4:5:5::"Invalid unescaped character carriage-return, use ""\r"" instead.":HIGH
diff --git a/tests/functional/b/bad_char/bad_char_esc.py b/tests/functional/b/bad_char/bad_char_esc.py
new file mode 100644
index 0000000000..53bb0b4ed8
--- /dev/null
+++ b/tests/functional/b/bad_char/bad_char_esc.py
@@ -0,0 +1,6 @@
+# pylint: disable=trailing-whitespace, missing-module-docstring, trailing-newlines, missing-final-newline
+
+# +2: [invalid-character-esc]
+ESC = '''
+--><---
+'''  # bad char  esc should be only used as \x1B
diff --git a/tests/functional/b/bad_char/bad_char_esc.txt b/tests/functional/b/bad_char/bad_char_esc.txt
new file mode 100644
index 0000000000..5009deb382
--- /dev/null
+++ b/tests/functional/b/bad_char/bad_char_esc.txt
@@ -0,0 +1 @@
+invalid-character-esc:5:4:5:5::"Invalid unescaped character esc, use ""\x1B"" instead.":HIGH
diff --git a/tests/functional/b/bad_char/bad_char_sub.py b/tests/functional/b/bad_char/bad_char_sub.py
new file mode 100644
index 0000000000..57b8b5081c
--- /dev/null
+++ b/tests/functional/b/bad_char/bad_char_sub.py
@@ -0,0 +1,6 @@
+# pylint: disable=trailing-whitespace, missing-module-docstring, trailing-newlines, missing-final-newline
+
+# +2: [invalid-character-sub]
+SUB = '''
+--><---
+'''  # bad char  sub should be only used as \x1A
diff --git a/tests/functional/b/bad_char/bad_char_sub.txt b/tests/functional/b/bad_char/bad_char_sub.txt
new file mode 100644
index 0000000000..51ee45e16c
--- /dev/null
+++ b/tests/functional/b/bad_char/bad_char_sub.txt
@@ -0,0 +1 @@
+invalid-character-sub:5:4:5:5::"Invalid unescaped character sub, use ""\x1A"" instead.":HIGH
diff --git a/tests/functional/b/bad_char/bad_char_zero_width_space.py b/tests/functional/b/bad_char/bad_char_zero_width_space.py
new file mode 100644
index 0000000000..b9f0df0311
--- /dev/null
+++ b/tests/functional/b/bad_char/bad_char_zero_width_space.py
@@ -0,0 +1,6 @@
+# pylint: disable=trailing-whitespace, missing-module-docstring, trailing-newlines, missing-final-newline
+
+# +2: [invalid-character-zero-width-space]
+ZERO_WIDTH_SPACE = '''
+-->​<---
+'''  # bad char  zero-width-space should be only used as \u200B
diff --git a/tests/functional/b/bad_char/bad_char_zero_width_space.txt b/tests/functional/b/bad_char/bad_char_zero_width_space.txt
new file mode 100644
index 0000000000..cab9980e75
--- /dev/null
+++ b/tests/functional/b/bad_char/bad_char_zero_width_space.txt
@@ -0,0 +1 @@
+invalid-character-zero-width-space:5:4:5:5::"Invalid unescaped character zero-width-space, use ""\u200B"" instead.":HIGH
diff --git a/tests/functional/b/bad_staticmethod_argument.txt b/tests/functional/b/bad_staticmethod_argument.txt
index 115555c31b..1456726875 100644
--- a/tests/functional/b/bad_staticmethod_argument.txt
+++ b/tests/functional/b/bad_staticmethod_argument.txt
@@ -1,2 +1,2 @@
-bad-staticmethod-argument:5:4:6:12:Abcd.method1:Static method with 'self' as first argument:UNDEFINED
-bad-staticmethod-argument:10:4:11:12:Abcd.method2:Static method with 'cls' as first argument:UNDEFINED
+bad-staticmethod-argument:5:4:5:15:Abcd.method1:Static method with 'self' as first argument:UNDEFINED
+bad-staticmethod-argument:10:4:10:15:Abcd.method2:Static method with 'cls' as first argument:UNDEFINED
diff --git a/tests/functional/b/blacklisted_name.txt b/tests/functional/b/blacklisted_name.txt
index 63fe309713..b6b96c5901 100644
--- a/tests/functional/b/blacklisted_name.txt
+++ b/tests/functional/b/blacklisted_name.txt
@@ -1 +1 @@
-disallowed-name:3:0:4:8:baz:"Disallowed name ""baz""":UNDEFINED
+disallowed-name:3:0:3:7:baz:"Disallowed name ""baz""":UNDEFINED
diff --git a/tests/functional/c/cache_max_size_none.py b/tests/functional/c/cache_max_size_none.py
new file mode 100644
index 0000000000..e4c157ddb0
--- /dev/null
+++ b/tests/functional/c/cache_max_size_none.py
@@ -0,0 +1,75 @@
+"""Tests for cache-max-size-none"""
+# pylint: disable=no-self-use, missing-function-docstring, reimported, too-few-public-methods
+# pylint: disable=missing-class-docstring, function-redefined
+
+import functools
+import functools as aliased_functools
+from functools import lru_cache
+from functools import lru_cache as aliased_cache
+
+
+@lru_cache
+def my_func(param):
+    return param + 1
+
+
+class MyClassWithMethods:
+    @lru_cache()
+    def my_func(self, param):
+        return param + 1
+
+    @lru_cache(1)
+    def my_func(self, param):
+        return param + 1
+
+    @lru_cache(None)  # [cache-max-size-none]
+    def my_func(self, param):
+        return param + 1
+
+    @functools.lru_cache(None)  # [cache-max-size-none]
+    def my_func(self, param):
+        return param + 1
+
+    @aliased_functools.lru_cache(None)  # [cache-max-size-none]
+    def my_func(self, param):
+        return param + 1
+
+    @aliased_cache(None)  # [cache-max-size-none]
+    def my_func(self, param):
+        return param + 1
+
+    # Check double decorating to check robustness of checker itself
+    @aliased_cache(None)  # [cache-max-size-none]
+    @aliased_cache(None)  # [cache-max-size-none]
+    def my_func(self, param):
+        return param + 1
+
+
+class MyClassWithMethodsAndMaxSize:
+    @lru_cache(maxsize=1)
+    def my_func(self, param):
+        return param + 1
+
+    @lru_cache(maxsize=1)
+    def my_func(self, param):
+        return param + 1
+
+    @lru_cache(typed=True)
+    def my_func(self, param):
+        return param + 1
+
+    @lru_cache(typed=True)
+    def my_func(self, param):
+        return param + 1
+
+    @lru_cache(typed=True, maxsize=1)
+    def my_func(self, param):
+        return param + 1
+
+    @lru_cache(typed=True, maxsize=1)
+    def my_func(self, param):
+        return param + 1
+
+    @lru_cache(typed=True, maxsize=None)  # [cache-max-size-none]
+    def my_func(self, param):
+        return param + 1
diff --git a/tests/functional/c/cache_max_size_none.txt b/tests/functional/c/cache_max_size_none.txt
new file mode 100644
index 0000000000..6fb063df5b
--- /dev/null
+++ b/tests/functional/c/cache_max_size_none.txt
@@ -0,0 +1,7 @@
+cache-max-size-none:25:5:25:20:MyClassWithMethods.my_func:'lru_cache(maxsize=None)' will keep all method args alive indefinitely, including 'self':INFERENCE
+cache-max-size-none:29:5:29:30:MyClassWithMethods.my_func:'lru_cache(maxsize=None)' will keep all method args alive indefinitely, including 'self':INFERENCE
+cache-max-size-none:33:5:33:38:MyClassWithMethods.my_func:'lru_cache(maxsize=None)' will keep all method args alive indefinitely, including 'self':INFERENCE
+cache-max-size-none:37:5:37:24:MyClassWithMethods.my_func:'lru_cache(maxsize=None)' will keep all method args alive indefinitely, including 'self':INFERENCE
+cache-max-size-none:42:5:42:24:MyClassWithMethods.my_func:'lru_cache(maxsize=None)' will keep all method args alive indefinitely, including 'self':INFERENCE
+cache-max-size-none:43:5:43:24:MyClassWithMethods.my_func:'lru_cache(maxsize=None)' will keep all method args alive indefinitely, including 'self':INFERENCE
+cache-max-size-none:73:5:73:40:MyClassWithMethodsAndMaxSize.my_func:'lru_cache(maxsize=None)' will keep all method args alive indefinitely, including 'self':INFERENCE
diff --git a/tests/functional/c/cached_property.txt b/tests/functional/c/cached_property.txt
index a4b52237c8..3756dd9198 100644
--- a/tests/functional/c/cached_property.txt
+++ b/tests/functional/c/cached_property.txt
@@ -1 +1 @@
-invalid-overridden-method:22:4:23:17:Child.func:Method 'func' was expected to be 'method', found it instead as 'property':UNDEFINED
+invalid-overridden-method:22:4:22:12:Child.func:Method 'func' was expected to be 'method', found it instead as 'property':UNDEFINED
diff --git a/tests/functional/c/class_members.py b/tests/functional/c/class_members.py
index e43ab57baa..e741c760b3 100644
--- a/tests/functional/c/class_members.py
+++ b/tests/functional/c/class_members.py
@@ -3,7 +3,6 @@
 
 class Class:
     attr: int
-    ...
 
 
 # `bar` definitely does not exist here, but in a complex scenario,
diff --git a/tests/functional/c/class_scope.txt b/tests/functional/c/class_scope.txt
index d32dcfe6c2..d065c1b975 100644
--- a/tests/functional/c/class_scope.txt
+++ b/tests/functional/c/class_scope.txt
@@ -1,5 +1,5 @@
 undefined-variable:11:39:11:46:Well.<lambda>:Undefined variable 'revattr':UNDEFINED
-used-before-assignment:11:30:11:37:Well.<lambda>:Using variable 'revattr' before assignment:UNDEFINED
+used-before-assignment:11:30:11:37:Well.<lambda>:Using variable 'revattr' before assignment:HIGH
 undefined-variable:13:25:13:37:Well.<lambda>:Undefined variable 'get_attr_bad':UNDEFINED
 undefined-variable:14:19:14:23:Well:Undefined variable 'attr':UNDEFINED
 undefined-variable:20:15:20:19:Well.Sub:Undefined variable 'Data':UNDEFINED
diff --git a/tests/functional/c/comparison_with_callable.py b/tests/functional/c/comparison_with_callable.py
index fb02729d84..2afe430356 100644
--- a/tests/functional/c/comparison_with_callable.py
+++ b/tests/functional/c/comparison_with_callable.py
@@ -58,3 +58,14 @@ def fake_property(self, prop):
 b = 786
 if a == b:
     pass
+
+
+def eventually_raise():
+    print()
+    raise Exception
+
+
+if a == eventually_raise:
+    # Does not emit comparison-with-callable because the
+    # function (eventually) raises
+    pass
diff --git a/tests/functional/c/comparison_with_callable_typing_constants.py b/tests/functional/c/comparison_with_callable_typing_constants.py
new file mode 100644
index 0000000000..70aa9763f5
--- /dev/null
+++ b/tests/functional/c/comparison_with_callable_typing_constants.py
@@ -0,0 +1,18 @@
+"""Typing constants are actually implemented as functions, but they
+raise when called, so Pylint uses that to avoid false positives for
+comparison-with-callable.
+"""
+from typing import Any, Optional
+
+
+def check_any(type_) -> bool:
+    """See https://github.com/PyCQA/pylint/issues/5557"""
+    return type_ == Any
+
+
+def check_optional(type_) -> bool:
+    """
+    Unlike Any, Optional does not raise in its body.
+    It raises via its decorator: typing._SpecialForm.__call__()
+    """
+    return type_ == Optional
diff --git a/tests/functional/c/consider/consider_using_dict_comprehension.py b/tests/functional/c/consider/consider_using_dict_comprehension.py
index c9d740e18c..ef9ee3f012 100644
--- a/tests/functional/c/consider/consider_using_dict_comprehension.py
+++ b/tests/functional/c/consider/consider_using_dict_comprehension.py
@@ -1,4 +1,4 @@
-# pylint: disable=missing-docstring, invalid-name, use-dict-literal
+# pylint: disable=missing-docstring, invalid-name, use-dict-literal, line-too-long
 
 numbers = [1, 2, 3, 4, 5, 6]
 
@@ -8,5 +8,10 @@
 
 dict([(number, number*2) for number in numbers])  # [consider-using-dict-comprehension]
 
+stuff = {1: 10, 2: -20}
+dict([(k, v) if v > 0 else (k, 0) for k, v in stuff.items()])  # [consider-using-dict-comprehension]
+dict([(k, v) if v > 0 else (k*2, v) for k, v in stuff.items()])  # [consider-using-dict-comprehension]
+dict([(k, v) if v > 0 else (k * 2, 0) for k, v in stuff.items()])
+
 # Cannot emit as this cannot be written as a comprehension
 dict([value.split("=") for value in ["a=b", "c=d"]])
diff --git a/tests/functional/c/consider/consider_using_dict_comprehension.txt b/tests/functional/c/consider/consider_using_dict_comprehension.txt
index a241d19078..2bde7ffa23 100644
--- a/tests/functional/c/consider/consider_using_dict_comprehension.txt
+++ b/tests/functional/c/consider/consider_using_dict_comprehension.txt
@@ -1 +1,3 @@
 consider-using-dict-comprehension:9:0:9:48::Consider using a dictionary comprehension:UNDEFINED
+consider-using-dict-comprehension:12:0:12:61::Consider using a dictionary comprehension:UNDEFINED
+consider-using-dict-comprehension:13:0:13:63::Consider using a dictionary comprehension:UNDEFINED
diff --git a/tests/functional/c/consider/consider_using_dict_items.py b/tests/functional/c/consider/consider_using_dict_items.py
index 32e92e8034..7ffea608f3 100644
--- a/tests/functional/c/consider/consider_using_dict_items.py
+++ b/tests/functional/c/consider/consider_using_dict_items.py
@@ -1,5 +1,5 @@
 """Emit a message for iteration through dict keys and subscripting dict with key."""
-# pylint: disable=line-too-long,missing-docstring,unsubscriptable-object,too-few-public-methods,redefined-outer-name,use-dict-literal
+# pylint: disable=line-too-long,missing-docstring,unsubscriptable-object,too-few-public-methods,redefined-outer-name,use-dict-literal,modified-iterating-dict
 
 def bad():
     a_dict = {1: 1, 2: 2, 3: 3}
diff --git a/tests/functional/c/consider/consider_using_with.py b/tests/functional/c/consider/consider_using_with.py
index d05866aaab..3466e15c0a 100644
--- a/tests/functional/c/consider/consider_using_with.py
+++ b/tests/functional/c/consider/consider_using_with.py
@@ -21,7 +21,7 @@ def test_urlopen():
 
 
 def test_temporary_file():
-    _ = tempfile.TemporaryFile("r")  # [consider-using-with]
+    _ = tempfile.TemporaryFile("r")  # ambiguous with NamedTemporaryFile
 
 
 def test_named_temporary_file():
diff --git a/tests/functional/c/consider/consider_using_with.txt b/tests/functional/c/consider/consider_using_with.txt
index dad0eb45f2..973d974035 100644
--- a/tests/functional/c/consider/consider_using_with.txt
+++ b/tests/functional/c/consider/consider_using_with.txt
@@ -1,6 +1,5 @@
 consider-using-with:15:9:15:40:test_codecs_open:Consider using 'with' for resource-allocating operations:UNDEFINED
 consider-using-with:20:8:20:55:test_urlopen:Consider using 'with' for resource-allocating operations:UNDEFINED
-consider-using-with:24:8:24:35:test_temporary_file:Consider using 'with' for resource-allocating operations:UNDEFINED
 consider-using-with:28:8:28:40:test_named_temporary_file:Consider using 'with' for resource-allocating operations:UNDEFINED
 consider-using-with:32:8:32:42:test_spooled_temporary_file:Consider using 'with' for resource-allocating operations:UNDEFINED
 consider-using-with:36:8:36:37:test_temporary_directory:Consider using 'with' for resource-allocating operations:UNDEFINED
diff --git a/tests/functional/c/consider/consider_using_with_open.py b/tests/functional/c/consider/consider_using_with_open.py
index 7c584d8f53..d35b58eb1c 100644
--- a/tests/functional/c/consider/consider_using_with_open.py
+++ b/tests/functional/c/consider/consider_using_with_open.py
@@ -137,7 +137,8 @@ def test_defined_in_try_and_finally(self):
         except FileNotFoundError:
             Path("foo").touch()
         finally:
-            file_handle.open("foo", encoding="utf")  # must not trigger
+            # +1: [used-before-assignment]
+            file_handle.open("foo", encoding="utf")  # must not trigger consider-using-with
         with file_handle:
             return file_handle.read()
 
diff --git a/tests/functional/c/consider/consider_using_with_open.txt b/tests/functional/c/consider/consider_using_with_open.txt
index b52b661af1..ad112994ff 100644
--- a/tests/functional/c/consider/consider_using_with_open.txt
+++ b/tests/functional/c/consider/consider_using_with_open.txt
@@ -4,3 +4,4 @@ consider-using-with:46:4:46:33:test_open_outside_assignment:Consider using 'with
 consider-using-with:47:14:47:43:test_open_outside_assignment:Consider using 'with' for resource-allocating operations:UNDEFINED
 consider-using-with:52:8:52:37:test_open_inside_with_block:Consider using 'with' for resource-allocating operations:UNDEFINED
 consider-using-with:120:26:122:13:TestControlFlow.test_triggers_if_reassigned_after_if_else:Consider using 'with' for resource-allocating operations:UNDEFINED
+used-before-assignment:141:12:141:23:TestControlFlow.test_defined_in_try_and_finally:Using variable 'file_handle' before assignment:CONTROL_FLOW
diff --git a/tests/functional/d/dangerous_default_value.txt b/tests/functional/d/dangerous_default_value.txt
index 5d809f2359..98d55c2b62 100644
--- a/tests/functional/d/dangerous_default_value.txt
+++ b/tests/functional/d/dangerous_default_value.txt
@@ -1,22 +1,22 @@
-dangerous-default-value:6:0:8:16:function1:Dangerous default value [] as argument:UNDEFINED
-dangerous-default-value:10:0:12:16:function2:Dangerous default value HEHE (builtins.dict) as argument:UNDEFINED
-dangerous-default-value:18:0:20:16:function4:Dangerous default value set() (builtins.set) as argument:UNDEFINED
-dangerous-default-value:28:0:30:16:function6:Dangerous default value GLOBAL_SET (builtins.set) as argument:UNDEFINED
-dangerous-default-value:32:0:34:16:function7:Dangerous default value dict() (builtins.dict) as argument:UNDEFINED
-dangerous-default-value:36:0:38:16:function8:Dangerous default value list() (builtins.list) as argument:UNDEFINED
-dangerous-default-value:40:0:42:16:function9:Dangerous default value [] as argument:UNDEFINED
-dangerous-default-value:44:0:46:16:function10:Dangerous default value {} as argument:UNDEFINED
-dangerous-default-value:48:0:50:16:function11:Dangerous default value list() (builtins.list) as argument:UNDEFINED
-dangerous-default-value:52:0:54:16:function12:Dangerous default value dict() (builtins.dict) as argument:UNDEFINED
-dangerous-default-value:61:0:63:16:function13:Dangerous default value OINK (builtins.dict) as argument:UNDEFINED
-dangerous-default-value:65:0:69:16:function14:Dangerous default value dict() (builtins.dict) as argument:UNDEFINED
-dangerous-default-value:73:0:75:16:function15:Dangerous default value INVALID_DICT (builtins.dict) as argument:UNDEFINED
-dangerous-default-value:77:0:79:16:function16:Dangerous default value set() as argument:UNDEFINED
-dangerous-default-value:81:0:83:16:function17:Dangerous default value deque() (collections.deque) as argument:UNDEFINED
-dangerous-default-value:85:0:87:16:function18:Dangerous default value ChainMap() (collections.ChainMap) as argument:UNDEFINED
-dangerous-default-value:89:0:91:16:function19:Dangerous default value Counter() (collections.Counter) as argument:UNDEFINED
-dangerous-default-value:93:0:95:16:function20:Dangerous default value OrderedDict() (collections.OrderedDict) as argument:UNDEFINED
-dangerous-default-value:97:0:99:16:function21:Dangerous default value defaultdict() (collections.defaultdict) as argument:UNDEFINED
-dangerous-default-value:101:0:103:16:function22:Dangerous default value UserDict() (collections.UserDict) as argument:UNDEFINED
-dangerous-default-value:105:0:107:16:function23:Dangerous default value UserList() (collections.UserList) as argument:UNDEFINED
-dangerous-default-value:109:0:111:16:function24:Dangerous default value [] as argument:UNDEFINED
+dangerous-default-value:6:0:6:13:function1:Dangerous default value [] as argument:UNDEFINED
+dangerous-default-value:10:0:10:13:function2:Dangerous default value HEHE (builtins.dict) as argument:UNDEFINED
+dangerous-default-value:18:0:18:13:function4:Dangerous default value set() (builtins.set) as argument:UNDEFINED
+dangerous-default-value:28:0:28:13:function6:Dangerous default value GLOBAL_SET (builtins.set) as argument:UNDEFINED
+dangerous-default-value:32:0:32:13:function7:Dangerous default value dict() (builtins.dict) as argument:UNDEFINED
+dangerous-default-value:36:0:36:13:function8:Dangerous default value list() (builtins.list) as argument:UNDEFINED
+dangerous-default-value:40:0:40:13:function9:Dangerous default value [] as argument:UNDEFINED
+dangerous-default-value:44:0:44:14:function10:Dangerous default value {} as argument:UNDEFINED
+dangerous-default-value:48:0:48:14:function11:Dangerous default value list() (builtins.list) as argument:UNDEFINED
+dangerous-default-value:52:0:52:14:function12:Dangerous default value dict() (builtins.dict) as argument:UNDEFINED
+dangerous-default-value:61:0:61:14:function13:Dangerous default value OINK (builtins.dict) as argument:UNDEFINED
+dangerous-default-value:65:0:65:14:function14:Dangerous default value dict() (builtins.dict) as argument:UNDEFINED
+dangerous-default-value:73:0:73:14:function15:Dangerous default value INVALID_DICT (builtins.dict) as argument:UNDEFINED
+dangerous-default-value:77:0:77:14:function16:Dangerous default value set() as argument:UNDEFINED
+dangerous-default-value:81:0:81:14:function17:Dangerous default value deque() (collections.deque) as argument:UNDEFINED
+dangerous-default-value:85:0:85:14:function18:Dangerous default value ChainMap() (collections.ChainMap) as argument:UNDEFINED
+dangerous-default-value:89:0:89:14:function19:Dangerous default value Counter() (collections.Counter) as argument:UNDEFINED
+dangerous-default-value:93:0:93:14:function20:Dangerous default value OrderedDict() (collections.OrderedDict) as argument:UNDEFINED
+dangerous-default-value:97:0:97:14:function21:Dangerous default value defaultdict() (collections.defaultdict) as argument:UNDEFINED
+dangerous-default-value:101:0:101:14:function22:Dangerous default value UserDict() (collections.UserDict) as argument:UNDEFINED
+dangerous-default-value:105:0:105:14:function23:Dangerous default value UserList() (collections.UserList) as argument:UNDEFINED
+dangerous-default-value:109:0:109:14:function24:Dangerous default value [] as argument:UNDEFINED
diff --git a/tests/functional/d/deprecated/dataclass_typecheck.py b/tests/functional/d/dataclass_typecheck.py
similarity index 100%
rename from tests/functional/d/deprecated/dataclass_typecheck.py
rename to tests/functional/d/dataclass_typecheck.py
diff --git a/tests/functional/d/deprecated/dataclass_typecheck.rc b/tests/functional/d/dataclass_typecheck.rc
similarity index 100%
rename from tests/functional/d/deprecated/dataclass_typecheck.rc
rename to tests/functional/d/dataclass_typecheck.rc
diff --git a/tests/functional/d/deprecated/dataclass_typecheck.txt b/tests/functional/d/dataclass_typecheck.txt
similarity index 94%
rename from tests/functional/d/deprecated/dataclass_typecheck.txt
rename to tests/functional/d/dataclass_typecheck.txt
index e898c85fad..97f5860bb6 100644
--- a/tests/functional/d/deprecated/dataclass_typecheck.txt
+++ b/tests/functional/d/dataclass_typecheck.txt
@@ -7,6 +7,6 @@ unsubscriptable-object:56:6:56:15::Value 'obj.attr1' is unsubscriptable:UNDEFINE
 unsupported-assignment-operation:61:0:61:9::'obj.attr1' does not support item assignment:UNDEFINED
 unsupported-delete-operation:66:4:66:13::'obj.attr1' does not support item deletion:UNDEFINED
 not-context-manager:91:0:92:8::Context manager 'str' doesn't implement __enter__ and __exit__.:UNDEFINED
-invalid-metaclass:99:0:100:8:Test2:Invalid metaclass 'Instance of builtins.int' used:UNDEFINED
+invalid-metaclass:99:0:99:11:Test2:Invalid metaclass 'Instance of builtins.int' used:UNDEFINED
 unhashable-dict-key:105:0:105:2::Dict key is unhashable:UNDEFINED
 isinstance-second-argument-not-valid-type:115:6:115:30::Second argument of isinstance is not a type:UNDEFINED
diff --git a/tests/functional/d/deprecated/deprecated_method_suppression.py b/tests/functional/d/deprecated/deprecated_method_suppression.py
new file mode 100644
index 0000000000..4f3bb63fe0
--- /dev/null
+++ b/tests/functional/d/deprecated/deprecated_method_suppression.py
@@ -0,0 +1,8 @@
+"""Test that versions below Py3.10 will not emit useless-suppression for
+disabling deprecated-method (on a method deprecated in Py3.10.
+
+This test can be run on all Python versions, but it will lack value when
+Pylint drops support for 3.9."""
+# pylint: disable=import-error, unused-import
+
+import threading.current_thread  # pylint: disable=deprecated-method
diff --git a/tests/functional/d/deprecated/deprecated_methods_py39.py b/tests/functional/d/deprecated/deprecated_methods_py39.py
new file mode 100644
index 0000000000..9959b1c2a2
--- /dev/null
+++ b/tests/functional/d/deprecated/deprecated_methods_py39.py
@@ -0,0 +1,4 @@
+"""Test deprecated methods from Python 3.9."""
+
+import binascii
+binascii.b2a_hqx() # [deprecated-method]
diff --git a/tests/functional/d/deprecated/deprecated_methods_py39.rc b/tests/functional/d/deprecated/deprecated_methods_py39.rc
new file mode 100644
index 0000000000..16b75eea75
--- /dev/null
+++ b/tests/functional/d/deprecated/deprecated_methods_py39.rc
@@ -0,0 +1,2 @@
+[testoptions]
+min_pyver=3.9
diff --git a/tests/functional/d/deprecated/deprecated_methods_py39.txt b/tests/functional/d/deprecated/deprecated_methods_py39.txt
new file mode 100644
index 0000000000..292ca5ef16
--- /dev/null
+++ b/tests/functional/d/deprecated/deprecated_methods_py39.txt
@@ -0,0 +1 @@
+deprecated-method:4:0:4:18::Using deprecated method b2a_hqx():UNDEFINED
diff --git a/tests/functional/d/deprecated/deprecated_module_py3.txt b/tests/functional/d/deprecated/deprecated_module_py3.txt
index 79c0a418c2..bf41f781e9 100644
--- a/tests/functional/d/deprecated/deprecated_module_py3.txt
+++ b/tests/functional/d/deprecated/deprecated_module_py3.txt
@@ -1 +1 @@
-deprecated-module:4:::Uses of a deprecated module 'optparse'
+deprecated-module:4:0:4:15::Uses of a deprecated module 'optparse':UNDEFINED
diff --git a/tests/functional/d/deprecated/deprecated_module_py310.py b/tests/functional/d/deprecated/deprecated_module_py310.py
new file mode 100644
index 0000000000..8321474762
--- /dev/null
+++ b/tests/functional/d/deprecated/deprecated_module_py310.py
@@ -0,0 +1,4 @@
+"""Test deprecated modules from Python 3.10."""
+# pylint: disable=unused-import
+
+import distutils  # [deprecated-module]
diff --git a/tests/functional/d/deprecated/deprecated_module_py310.rc b/tests/functional/d/deprecated/deprecated_module_py310.rc
new file mode 100644
index 0000000000..b29fd450ac
--- /dev/null
+++ b/tests/functional/d/deprecated/deprecated_module_py310.rc
@@ -0,0 +1,2 @@
+[testoptions]
+min_pyver = 3.10
diff --git a/tests/functional/d/deprecated/deprecated_module_py310.txt b/tests/functional/d/deprecated/deprecated_module_py310.txt
new file mode 100644
index 0000000000..a46667aa52
--- /dev/null
+++ b/tests/functional/d/deprecated/deprecated_module_py310.txt
@@ -0,0 +1 @@
+deprecated-module:4:0:4:16::Uses of a deprecated module 'distutils':UNDEFINED
diff --git a/tests/functional/d/deprecated/deprecated_module_py33.py b/tests/functional/d/deprecated/deprecated_module_py33.py
new file mode 100644
index 0000000000..a9fc2bda9c
--- /dev/null
+++ b/tests/functional/d/deprecated/deprecated_module_py33.py
@@ -0,0 +1,4 @@
+"""Test deprecated modules from Python 3.3."""
+# pylint: disable=unused-import
+
+import xml.etree.cElementTree  # [deprecated-module]
diff --git a/tests/functional/d/deprecated/deprecated_module_py33.txt b/tests/functional/d/deprecated/deprecated_module_py33.txt
new file mode 100644
index 0000000000..120a9abfdc
--- /dev/null
+++ b/tests/functional/d/deprecated/deprecated_module_py33.txt
@@ -0,0 +1 @@
+deprecated-module:4:0:4:29::Uses of a deprecated module 'xml.etree.cElementTree':UNDEFINED
diff --git a/tests/functional/d/deprecated/deprecated_module_py39.py b/tests/functional/d/deprecated/deprecated_module_py39.py
new file mode 100644
index 0000000000..a897dd4e33
--- /dev/null
+++ b/tests/functional/d/deprecated/deprecated_module_py39.py
@@ -0,0 +1,4 @@
+"""Test deprecated modules from Python 3.9."""
+# pylint: disable=unused-import
+
+import binhex  # [deprecated-module]
diff --git a/tests/functional/d/deprecated/deprecated_module_py39.rc b/tests/functional/d/deprecated/deprecated_module_py39.rc
new file mode 100644
index 0000000000..16b75eea75
--- /dev/null
+++ b/tests/functional/d/deprecated/deprecated_module_py39.rc
@@ -0,0 +1,2 @@
+[testoptions]
+min_pyver=3.9
diff --git a/tests/functional/d/deprecated/deprecated_module_py39.txt b/tests/functional/d/deprecated/deprecated_module_py39.txt
new file mode 100644
index 0000000000..c85cbcbffd
--- /dev/null
+++ b/tests/functional/d/deprecated/deprecated_module_py39.txt
@@ -0,0 +1 @@
+deprecated-module:4:0:4:13::Uses of a deprecated module 'binhex':UNDEFINED
diff --git a/tests/functional/d/deprecated/deprecated_module_py39_earlier_pyversion.py b/tests/functional/d/deprecated/deprecated_module_py39_earlier_pyversion.py
new file mode 100644
index 0000000000..c1c2f17883
--- /dev/null
+++ b/tests/functional/d/deprecated/deprecated_module_py39_earlier_pyversion.py
@@ -0,0 +1,6 @@
+"""Test deprecated modules from Python 3.9,
+but use an earlier --py-version and ensure a warning is still emitted.
+"""
+# pylint: disable=unused-import
+
+import binhex  # [deprecated-module]
diff --git a/tests/functional/d/deprecated/deprecated_module_py39_earlier_pyversion.rc b/tests/functional/d/deprecated/deprecated_module_py39_earlier_pyversion.rc
new file mode 100644
index 0000000000..8118783a19
--- /dev/null
+++ b/tests/functional/d/deprecated/deprecated_module_py39_earlier_pyversion.rc
@@ -0,0 +1,5 @@
+[master]
+py-version=3.8
+
+[testoptions]
+min_pyver=3.9
diff --git a/tests/functional/d/deprecated/deprecated_module_py39_earlier_pyversion.txt b/tests/functional/d/deprecated/deprecated_module_py39_earlier_pyversion.txt
new file mode 100644
index 0000000000..558ed224a4
--- /dev/null
+++ b/tests/functional/d/deprecated/deprecated_module_py39_earlier_pyversion.txt
@@ -0,0 +1 @@
+deprecated-module:6:0:6:13::Uses of a deprecated module 'binhex':UNDEFINED
diff --git a/tests/functional/d/disable_msg_next_line.txt b/tests/functional/d/disable_msg_next_line.txt
index 6601f74377..36ba9527d2 100644
--- a/tests/functional/d/disable_msg_next_line.txt
+++ b/tests/functional/d/disable_msg_next_line.txt
@@ -1,5 +1,5 @@
 invalid-name:15:4:15:5:function_C:"Variable name ""x"" doesn't conform to snake_case naming style":HIGH
 unused-variable:15:4:15:5:function_C:Unused variable 'x':UNDEFINED
 f-string-without-interpolation:16:11:16:44:function_C:Using an f-string that does not have any interpolated variables:UNDEFINED
-invalid-name:19:0:20:15:function_D:"Function name ""function_D"" doesn't conform to snake_case naming style":HIGH
+invalid-name:19:0:19:14:function_D:"Function name ""function_D"" doesn't conform to snake_case naming style":HIGH
 unused-argument:19:21:19:25:function_D:Unused argument 'arg2':HIGH
diff --git a/tests/functional/d/docstrings.txt b/tests/functional/d/docstrings.txt
index 31e25bf368..d1e21f7af5 100644
--- a/tests/functional/d/docstrings.txt
+++ b/tests/functional/d/docstrings.txt
@@ -1,8 +1,8 @@
 missing-module-docstring:1:0:None:None::Missing module docstring:HIGH
-empty-docstring:6:0:7:10:function0:Empty function docstring:HIGH
-missing-function-docstring:10:0:12:16:function1:Missing function or method docstring:HIGH
-missing-class-docstring:23:0:53:12:AAAA:Missing class docstring:HIGH
-missing-function-docstring:40:4:41:12:AAAA.method1:Missing function or method docstring:INFERENCE
-empty-docstring:48:4:50:12:AAAA.method3:Empty method docstring:INFERENCE
-empty-docstring:62:4:64:12:DDDD.method2:Empty method docstring:INFERENCE
-missing-function-docstring:70:4:71:12:DDDD.method4:Missing function or method docstring:INFERENCE
+empty-docstring:6:0:6:13:function0:Empty function docstring:HIGH
+missing-function-docstring:10:0:10:13:function1:Missing function or method docstring:HIGH
+missing-class-docstring:23:0:23:10:AAAA:Missing class docstring:HIGH
+missing-function-docstring:40:4:40:15:AAAA.method1:Missing function or method docstring:INFERENCE
+empty-docstring:48:4:48:15:AAAA.method3:Empty method docstring:INFERENCE
+empty-docstring:62:4:62:15:DDDD.method2:Empty method docstring:INFERENCE
+missing-function-docstring:70:4:70:15:DDDD.method4:Missing function or method docstring:INFERENCE
diff --git a/tests/functional/d/dotted_ancestor.txt b/tests/functional/d/dotted_ancestor.txt
index 9d45ae6bee..f7c6e1f251 100644
--- a/tests/functional/d/dotted_ancestor.txt
+++ b/tests/functional/d/dotted_ancestor.txt
@@ -1 +1 @@
-too-few-public-methods:7:0:10:50:Aaaa:Too few public methods (0/2):UNDEFINED
+too-few-public-methods:7:0:7:10:Aaaa:Too few public methods (0/2):UNDEFINED
diff --git a/tests/functional/d/duplicate_bases.txt b/tests/functional/d/duplicate_bases.txt
index d656763207..f52bbfe44f 100644
--- a/tests/functional/d/duplicate_bases.txt
+++ b/tests/functional/d/duplicate_bases.txt
@@ -1 +1 @@
-duplicate-bases:5:0:6:8:Duplicates:Duplicate bases for class 'Duplicates':UNDEFINED
+duplicate-bases:5:0:5:16:Duplicates:Duplicate bases for class 'Duplicates':UNDEFINED
diff --git a/tests/functional/e/.#emacs_file_lock.py b/tests/functional/e/.#emacs_file_lock.py
new file mode 100644
index 0000000000..b2674f4147
--- /dev/null
+++ b/tests/functional/e/.#emacs_file_lock.py
@@ -0,0 +1,4 @@
+# The name is invalid, but we should not analyse this file
+# Because its filename reseambles an emacs file lock ignored by default
+# https://www.gnu.org/software/emacs/manual/html_node/elisp/File-Locks.html
+# See https://github.com/PyCQA/pylint/issues/367
diff --git a/tests/functional/e/.#emacs_file_lock_by_conf.py b/tests/functional/e/.#emacs_file_lock_by_conf.py
new file mode 100644
index 0000000000..151168cc86
--- /dev/null
+++ b/tests/functional/e/.#emacs_file_lock_by_conf.py
@@ -0,0 +1,3 @@
+# The name is invalid, but we should not analyse this file
+# Because it resembles an emacs file lock and is ignored by the configuration
+# See https://github.com/PyCQA/pylint/issues/367
diff --git a/tests/functional/e/.#emacs_file_lock_by_conf.rc b/tests/functional/e/.#emacs_file_lock_by_conf.rc
new file mode 100644
index 0000000000..4140338cd1
--- /dev/null
+++ b/tests/functional/e/.#emacs_file_lock_by_conf.rc
@@ -0,0 +1,2 @@
+[MASTER]
+ignore-patterns=^\.#
diff --git a/tests/functional/e/.#emacs_file_lock_redefined_conf.py b/tests/functional/e/.#emacs_file_lock_redefined_conf.py
new file mode 100644
index 0000000000..4b26dee73a
--- /dev/null
+++ b/tests/functional/e/.#emacs_file_lock_redefined_conf.py
@@ -0,0 +1,3 @@
+# [invalid-name]
+# The name is invalid and we should analyse this file
+# as ignore-patterns is redefined in the configuration
diff --git a/tests/functional/e/.#emacs_file_lock_redefined_conf.rc b/tests/functional/e/.#emacs_file_lock_redefined_conf.rc
new file mode 100644
index 0000000000..f6cf1bf873
--- /dev/null
+++ b/tests/functional/e/.#emacs_file_lock_redefined_conf.rc
@@ -0,0 +1,3 @@
+[MASTER]
+ignore-patterns=""
+disable=non-ascii-name
diff --git a/tests/functional/e/.#emacs_file_lock_redefined_conf.txt b/tests/functional/e/.#emacs_file_lock_redefined_conf.txt
new file mode 100644
index 0000000000..41b31279f7
--- /dev/null
+++ b/tests/functional/e/.#emacs_file_lock_redefined_conf.txt
@@ -0,0 +1 @@
+invalid-name:1:0:None:None::"Module name ""#emacs_file_lock_redefined_conf"" doesn't conform to snake_case naming style":HIGH
diff --git a/tests/functional/ext/broad_try_clause/broad_try_clause_extension.txt b/tests/functional/ext/broad_try_clause/broad_try_clause_extension.txt
index 221d3a4c4d..d8d2c3e77c 100644
--- a/tests/functional/ext/broad_try_clause/broad_try_clause_extension.txt
+++ b/tests/functional/ext/broad_try_clause/broad_try_clause_extension.txt
@@ -1,4 +1,4 @@
 too-many-try-statements:5:0:10:8::try clause contains 3 statements, expected at most 1:UNDEFINED
 too-many-try-statements:12:0:17:8::try clause contains 3 statements, expected at most 1:UNDEFINED
-too-many-try-statements:19:0:27:8::try clause contains 4 statements, expected at most 1:UNDEFINED
+too-many-try-statements:19:0:25:8::try clause contains 4 statements, expected at most 1:UNDEFINED
 too-many-try-statements:29:0:44:8::try clause contains 7 statements, expected at most 1:UNDEFINED
diff --git a/tests/functional/ext/check_elif/check_elif.txt b/tests/functional/ext/check_elif/check_elif.txt
index 7da5aa8845..2874795e58 100644
--- a/tests/functional/ext/check_elif/check_elif.txt
+++ b/tests/functional/ext/check_elif/check_elif.txt
@@ -1,4 +1,4 @@
-else-if-used:13:8:30:25:my_function:"Consider using ""elif"" instead of ""else if""":HIGH
-else-if-used:25:20:26:28:my_function:"Consider using ""elif"" instead of ""else if""":HIGH
-else-if-used:44:8:48:26:_if_in_fstring_comprehension_with_elif:"Consider using ""elif"" instead of ""else if""":HIGH
-else-if-used:47:12:48:26:_if_in_fstring_comprehension_with_elif:"Consider using ""elif"" instead of ""else if""":HIGH
+else-if-used:13:8:30:25:my_function:"Consider using ""elif"" instead of ""else"" then ""if"" to remove one indentation level":HIGH
+else-if-used:25:20:26:28:my_function:"Consider using ""elif"" instead of ""else"" then ""if"" to remove one indentation level":HIGH
+else-if-used:44:8:48:26:_if_in_fstring_comprehension_with_elif:"Consider using ""elif"" instead of ""else"" then ""if"" to remove one indentation level":HIGH
+else-if-used:47:12:48:26:_if_in_fstring_comprehension_with_elif:"Consider using ""elif"" instead of ""else"" then ""if"" to remove one indentation level":HIGH
diff --git a/tests/functional/ext/code_style/consider_using_assignment_expr.py b/tests/functional/ext/code_style/cs_consider_using_assignment_expr.py
similarity index 100%
rename from tests/functional/ext/code_style/consider_using_assignment_expr.py
rename to tests/functional/ext/code_style/cs_consider_using_assignment_expr.py
diff --git a/tests/functional/ext/code_style/consider_using_assignment_expr.rc b/tests/functional/ext/code_style/cs_consider_using_assignment_expr.rc
similarity index 100%
rename from tests/functional/ext/code_style/consider_using_assignment_expr.rc
rename to tests/functional/ext/code_style/cs_consider_using_assignment_expr.rc
diff --git a/tests/functional/ext/code_style/consider_using_assignment_expr.txt b/tests/functional/ext/code_style/cs_consider_using_assignment_expr.txt
similarity index 100%
rename from tests/functional/ext/code_style/consider_using_assignment_expr.txt
rename to tests/functional/ext/code_style/cs_consider_using_assignment_expr.txt
diff --git a/tests/functional/ext/code_style/consider_using_namedtuple_or_dataclass.py b/tests/functional/ext/code_style/cs_consider_using_namedtuple_or_dataclass.py
similarity index 100%
rename from tests/functional/ext/code_style/consider_using_namedtuple_or_dataclass.py
rename to tests/functional/ext/code_style/cs_consider_using_namedtuple_or_dataclass.py
diff --git a/tests/functional/ext/code_style/consider_using_namedtuple_or_dataclass.rc b/tests/functional/ext/code_style/cs_consider_using_namedtuple_or_dataclass.rc
similarity index 100%
rename from tests/functional/ext/code_style/consider_using_namedtuple_or_dataclass.rc
rename to tests/functional/ext/code_style/cs_consider_using_namedtuple_or_dataclass.rc
diff --git a/tests/functional/ext/code_style/consider_using_namedtuple_or_dataclass.txt b/tests/functional/ext/code_style/cs_consider_using_namedtuple_or_dataclass.txt
similarity index 100%
rename from tests/functional/ext/code_style/consider_using_namedtuple_or_dataclass.txt
rename to tests/functional/ext/code_style/cs_consider_using_namedtuple_or_dataclass.txt
diff --git a/tests/functional/ext/code_style/consider_using_tuple.py b/tests/functional/ext/code_style/cs_consider_using_tuple.py
similarity index 100%
rename from tests/functional/ext/code_style/consider_using_tuple.py
rename to tests/functional/ext/code_style/cs_consider_using_tuple.py
diff --git a/tests/functional/ext/code_style/consider_using_tuple.rc b/tests/functional/ext/code_style/cs_consider_using_tuple.rc
similarity index 100%
rename from tests/functional/ext/code_style/consider_using_tuple.rc
rename to tests/functional/ext/code_style/cs_consider_using_tuple.rc
diff --git a/tests/functional/ext/code_style/consider_using_tuple.txt b/tests/functional/ext/code_style/cs_consider_using_tuple.txt
similarity index 100%
rename from tests/functional/ext/code_style/consider_using_tuple.txt
rename to tests/functional/ext/code_style/cs_consider_using_tuple.txt
diff --git a/tests/functional/ext/code_style/cs_py_version_35.py b/tests/functional/ext/code_style/cs_py_version_35.py
new file mode 100644
index 0000000000..80f75b6544
--- /dev/null
+++ b/tests/functional/ext/code_style/cs_py_version_35.py
@@ -0,0 +1,7 @@
+"""No warnings should be emitted for features that require Python > 3.5"""
+# pylint: disable=invalid-name
+
+# consider-using-assignment-expr -> requires Python 3.8
+a1 = 2
+if a1:
+    ...
diff --git a/tests/functional/ext/code_style/py_version_35.rc b/tests/functional/ext/code_style/cs_py_version_35.rc
similarity index 100%
rename from tests/functional/ext/code_style/py_version_35.rc
rename to tests/functional/ext/code_style/cs_py_version_35.rc
diff --git a/tests/functional/ext/code_style/py_version_35.py b/tests/functional/ext/code_style/py_version_35.py
deleted file mode 100644
index ee880c54a1..0000000000
--- a/tests/functional/ext/code_style/py_version_35.py
+++ /dev/null
@@ -1,14 +0,0 @@
-"""Test warnings aren't emitted for features that require Python > 3.5"""
-# pylint: disable=invalid-name
-
-# consider-using-f-string -> requires Python 3.6
-"Hello {}".format("World")
-
-
-# ------
-# CodeStyle extension
-
-# consider-using-assignment-expr -> requires Python 3.8
-a1 = 2
-if a1:
-    ...
diff --git a/tests/functional/ext/confusing_elif/confusing_elif.py b/tests/functional/ext/confusing_elif/confusing_elif.py
index 9f1d1ffe9e..002931de3d 100644
--- a/tests/functional/ext/confusing_elif/confusing_elif.py
+++ b/tests/functional/ext/confusing_elif/confusing_elif.py
@@ -1,7 +1,13 @@
 # pylint: disable=missing-module-docstring, missing-function-docstring
 
-def check_config(machine, old_conf, new_conf):
-    """Example code that will trigger the message"""
+
+def triggered_if_if_block_ends_with_elif(machine, old_conf, new_conf):
+    """Example code that will trigger the message
+
+    Given an if-elif construct
+    When the body of the if ends with an elif
+    Then the message confusing-consecutive-elif must be triggered.
+    """
     if old_conf:
         if not new_conf:
             machine.disable()
@@ -12,8 +18,13 @@ def check_config(machine, old_conf, new_conf):
         machine.enable(new_conf.value)
 
 
-def check_config_2(machine, old_conf, new_conf):
-    """Example code must not trigger the message, because the inner block ends with else."""
+def not_triggered_if_indented_block_ends_with_else(machine, old_conf, new_conf):
+    """Example code must not trigger the message, because the inner block ends with else.
+
+    Given an if-elif construct
+    When the body of the if ends with an else
+    Then no message shall be triggered.
+    """
     if old_conf:
         if not new_conf:
             machine.disable()
@@ -25,10 +36,18 @@ def check_config_2(machine, old_conf, new_conf):
     elif new_conf:
         machine.enable(new_conf.value)
 
-def check_config_3(machine, old_conf, new_conf):
+
+def not_triggered_if_indentend_block_ends_with_call(machine, old_conf, new_conf):
     """
     Example code must not trigger the message,
-    because the inner if is not the final node of the body.
+
+    Given an if-elif construct
+    When the body of the if ends with a function call
+    Then no message shall be triggered.
+
+    Note: There is nothing special about the body ending with a function call.
+    This is just taken as a representative value for the equivalence class of
+    "every node class unrelated to if/elif/else".
     """
     if old_conf:
         if not new_conf:
@@ -39,3 +58,86 @@ def check_config_3(machine, old_conf, new_conf):
         print("Processed old configuration...")
     elif new_conf:
         machine.enable(new_conf.value)
+
+
+def triggered_if_elif_block_ends_with_elif(machine, old_conf, new_conf, new_new_conf):
+    """Example code that will trigger the message
+
+    Given an if-elif-elif construct
+    When the body of the first elif ends with an elif
+    Then the message confusing-consecutive-elif must be triggered.
+    """
+    if old_conf:
+        machine.disable()
+    elif not new_conf:
+        if new_new_conf:
+            machine.disable()
+        elif old_conf.value != new_conf.value:
+            machine.disable()
+            machine.enable(new_conf.value)
+    elif new_conf:  # [confusing-consecutive-elif]
+        machine.enable(new_conf.value)
+
+
+def triggered_if_block_ends_with_if(machine, old_conf, new_conf, new_new_conf):
+    """Example code that will trigger the message
+
+    Given an if-elif construct
+    When the body of the if ends with an if
+    Then the message confusing-consecutive-elif must be triggered.
+    """
+    if old_conf:
+        if new_new_conf:
+            machine.disable()
+    elif new_conf:  # [confusing-consecutive-elif]
+        machine.enable(new_conf.value)
+
+
+def not_triggered_if_indented_block_ends_with_ifexp(machine, old_conf, new_conf):
+    """
+    Example code must not trigger the message,
+
+    Given an if-elif construct
+    When the body of the if ends with an if expression
+    Then no message shall be triggered.
+    """
+    if old_conf:
+        if not new_conf:
+            machine.disable()
+        print("Processed old configuration...")
+    elif new_conf:
+        machine.enable(new_conf.value)
+
+
+def not_triggered_if_outer_block_does_not_have_elif(machine, old_conf, new_conf):
+    """Example code must not trigger the message
+
+    Given an if construct without an elif
+    When the body of the if ends with an if
+    Then no message shall be triggered.
+    """
+    if old_conf:
+        if not new_conf:
+            machine.disable()
+        elif old_conf.value != new_conf.value:
+            machine.disable()
+            machine.enable(new_conf.value)
+    else:
+        pass
+
+
+def not_triggered_if_outer_block_continues_with_if(machine, old_conf, new_conf, new_new_conf):
+    """Example code that will trigger the message
+
+    Given an if construct which continues with a new if construct
+    When the body of the first if ends with an if expression
+    Then no message shall be triggered.
+    """
+    if old_conf:
+        if new_new_conf:
+            machine.disable()
+        elif old_conf.value != new_conf.value:
+            machine.disable()
+            machine.enable(new_conf.value)
+    if new_conf:
+        machine.enable(new_conf.value)
diff --git a/tests/functional/ext/confusing_elif/confusing_elif.txt b/tests/functional/ext/confusing_elif/confusing_elif.txt
index 17fd18eb5e..35487e9df3 100644
--- a/tests/functional/ext/confusing_elif/confusing_elif.txt
+++ b/tests/functional/ext/confusing_elif/confusing_elif.txt
@@ -1 +1,3 @@
-confusing-consecutive-elif:11:4:12:38:check_config:Consecutive elif with differing indentation level, consider creating a function to separate the inner elif:UNDEFINED
+confusing-consecutive-elif:17:4:18:38:triggered_if_if_block_ends_with_elif:Consecutive elif with differing indentation level, consider creating a function to separate the inner elif:UNDEFINED
+confusing-consecutive-elif:78:4:79:38:triggered_if_elif_block_ends_with_elif:Consecutive elif with differing indentation level, consider creating a function to separate the inner elif:UNDEFINED
+confusing-consecutive-elif:92:4:93:38:triggered_if_block_ends_with_if:Consecutive elif with differing indentation level, consider creating a function to separate the inner elif:UNDEFINED
diff --git a/tests/functional/ext/docparams/docparams.txt b/tests/functional/ext/docparams/docparams.txt
index 1fbad61851..c75a954414 100644
--- a/tests/functional/ext/docparams/docparams.txt
+++ b/tests/functional/ext/docparams/docparams.txt
@@ -1,12 +1,12 @@
-missing-return-doc:4:0:6:17:_private_func1:Missing return documentation:UNDEFINED
-missing-return-type-doc:4:0:6:17:_private_func1:Missing return type documentation:UNDEFINED
-missing-yield-doc:9:0:11:16:_private_func2:Missing yield documentation:UNDEFINED
-missing-yield-type-doc:9:0:11:16:_private_func2:Missing yield type documentation:UNDEFINED
-missing-raises-doc:14:0:16:30:_private_func3:"""Exception"" not documented as being raised":UNDEFINED
-missing-any-param-doc:19:0:21:17:public_func1:"Missing any documentation in ""public_func1""":UNDEFINED
-missing-return-doc:24:0:26:17:_async_private_func1:Missing return documentation:UNDEFINED
-missing-return-type-doc:24:0:26:17:_async_private_func1:Missing return type documentation:UNDEFINED
-missing-yield-doc:29:0:31:16:_async_private_func2:Missing yield documentation:UNDEFINED
-missing-yield-type-doc:29:0:31:16:_async_private_func2:Missing yield type documentation:UNDEFINED
-missing-raises-doc:34:0:36:30:_async_private_func3:"""Exception"" not documented as being raised":UNDEFINED
-missing-any-param-doc:39:0:41:17:async_public_func1:"Missing any documentation in ""async_public_func1""":UNDEFINED
+missing-return-doc:4:0:4:18:_private_func1:Missing return documentation:UNDEFINED
+missing-return-type-doc:4:0:4:18:_private_func1:Missing return type documentation:UNDEFINED
+missing-yield-doc:9:0:9:18:_private_func2:Missing yield documentation:UNDEFINED
+missing-yield-type-doc:9:0:9:18:_private_func2:Missing yield type documentation:UNDEFINED
+missing-raises-doc:14:0:14:18:_private_func3:"""Exception"" not documented as being raised":UNDEFINED
+missing-any-param-doc:19:0:19:16:public_func1:"Missing any documentation in ""public_func1""":UNDEFINED
+missing-return-doc:24:0:24:30:_async_private_func1:Missing return documentation:UNDEFINED
+missing-return-type-doc:24:0:24:30:_async_private_func1:Missing return type documentation:UNDEFINED
+missing-yield-doc:29:0:29:30:_async_private_func2:Missing yield documentation:UNDEFINED
+missing-yield-type-doc:29:0:29:30:_async_private_func2:Missing yield type documentation:UNDEFINED
+missing-raises-doc:34:0:34:30:_async_private_func3:"""Exception"" not documented as being raised":UNDEFINED
+missing-any-param-doc:39:0:39:28:async_public_func1:"Missing any documentation in ""async_public_func1""":UNDEFINED
diff --git a/tests/functional/ext/docparams/missing_param_doc.txt b/tests/functional/ext/docparams/missing_param_doc.txt
index c528212073..c43bdbd7ec 100644
--- a/tests/functional/ext/docparams/missing_param_doc.txt
+++ b/tests/functional/ext/docparams/missing_param_doc.txt
@@ -1,18 +1,18 @@
-missing-any-param-doc:3:0:6:21:foobar1:"Missing any documentation in ""foobar1""":UNDEFINED
-missing-any-param-doc:8:0:13:21:foobar2:"Missing any documentation in ""foobar2""":UNDEFINED
-missing-param-doc:15:0:22:27:foobar3:"""arg1, arg2, arg3"" missing in parameter documentation":UNDEFINED
-missing-type-doc:15:0:22:27:foobar3:"""arg2"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:24:0:31:21:foobar4:"""arg2"" missing in parameter documentation":UNDEFINED
-missing-type-doc:24:0:31:21:foobar4:"""arg2"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:33:0:41:21:foobar5:"""arg2"" missing in parameter documentation":UNDEFINED
-missing-type-doc:33:0:41:21:foobar5:"""arg1"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:43:0:51:27:foobar6:"""arg2, arg3"" missing in parameter documentation":UNDEFINED
-missing-type-doc:43:0:51:27:foobar6:"""arg3"" missing in parameter type documentation":UNDEFINED
-missing-any-param-doc:53:0:59:21:foobar7:"Missing any documentation in ""foobar7""":UNDEFINED
-missing-any-param-doc:61:0:64:15:foobar8:"Missing any documentation in ""foobar8""":UNDEFINED
-missing-param-doc:66:0:74:27:foobar9:"""arg1, arg2, arg3"" missing in parameter documentation":UNDEFINED
-missing-param-doc:76:0:86:27:foobar10:"""arg2"" missing in parameter documentation":UNDEFINED
-missing-type-doc:76:0:86:27:foobar10:"""arg1, arg3"" missing in parameter type documentation":UNDEFINED
-missing-any-param-doc:88:0:95:21:foobar11:"Missing any documentation in ""foobar11""":UNDEFINED
-missing-param-doc:97:0:106:27:foobar12:"""arg1, arg3"" missing in parameter documentation":UNDEFINED
-missing-type-doc:97:0:106:27:foobar12:"""arg2, arg3"" missing in parameter type documentation":UNDEFINED
+missing-any-param-doc:3:0:3:11:foobar1:"Missing any documentation in ""foobar1""":UNDEFINED
+missing-any-param-doc:8:0:8:11:foobar2:"Missing any documentation in ""foobar2""":UNDEFINED
+missing-param-doc:15:0:15:11:foobar3:"""arg1, arg2, arg3"" missing in parameter documentation":UNDEFINED
+missing-type-doc:15:0:15:11:foobar3:"""arg2"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:24:0:24:11:foobar4:"""arg2"" missing in parameter documentation":UNDEFINED
+missing-type-doc:24:0:24:11:foobar4:"""arg2"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:33:0:33:11:foobar5:"""arg2"" missing in parameter documentation":UNDEFINED
+missing-type-doc:33:0:33:11:foobar5:"""arg1"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:43:0:43:11:foobar6:"""arg2, arg3"" missing in parameter documentation":UNDEFINED
+missing-type-doc:43:0:43:11:foobar6:"""arg3"" missing in parameter type documentation":UNDEFINED
+missing-any-param-doc:53:0:53:11:foobar7:"Missing any documentation in ""foobar7""":UNDEFINED
+missing-any-param-doc:61:0:61:11:foobar8:"Missing any documentation in ""foobar8""":UNDEFINED
+missing-param-doc:66:0:66:11:foobar9:"""arg1, arg2, arg3"" missing in parameter documentation":UNDEFINED
+missing-param-doc:76:0:76:12:foobar10:"""arg2"" missing in parameter documentation":UNDEFINED
+missing-type-doc:76:0:76:12:foobar10:"""arg1, arg3"" missing in parameter type documentation":UNDEFINED
+missing-any-param-doc:88:0:88:12:foobar11:"Missing any documentation in ""foobar11""":UNDEFINED
+missing-param-doc:97:0:97:12:foobar12:"""arg1, arg3"" missing in parameter documentation":UNDEFINED
+missing-type-doc:97:0:97:12:foobar12:"""arg2, arg3"" missing in parameter type documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc.py b/tests/functional/ext/docparams/parameter/missing_param_doc.py
new file mode 100644
index 0000000000..6039c4b200
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc.py
@@ -0,0 +1,12 @@
+"""Tests for missing-param-doc and missing-type-doc for non-specified style docstrings
+with accept-no-param-doc = yes
+"""
+# pylint: disable=invalid-name, unused-argument
+
+
+def test_tolerate_no_param_documentation_at_all(x, y):
+    """Example of a function with no parameter documentation at all
+
+    No error message is emitted.
+
+    missing parameter documentation"""
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc.rc b/tests/functional/ext/docparams/parameter/missing_param_doc.rc
new file mode 100644
index 0000000000..4a81d2781a
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc.rc
@@ -0,0 +1,7 @@
+[MASTER]
+load-plugins = pylint.extensions.docparams
+
+[BASIC]
+accept-no-param-doc=yes
+docstring-min-length: -1
+no-docstring-rgx=^$
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required.py b/tests/functional/ext/docparams/parameter/missing_param_doc_required.py
new file mode 100644
index 0000000000..0726455051
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required.py
@@ -0,0 +1,51 @@
+"""Tests for missing-param-doc and missing-type-doc for non-specified style docstrings
+with accept-no-param-doc = no
+"""
+# pylint: disable=invalid-name, unused-argument, too-few-public-methods
+
+
+def test_don_t_tolerate_no_param_documentation_at_all(x, y):  # [missing-any-param-doc]
+    """Example of a function with no parameter documentation at all
+
+    Missing documentation error message is emitted.
+
+    missing parameter documentation"""
+
+
+def test_see_tolerate_no_param_documentation_at_all(x, y):
+    """Example for the usage of "For the parameters, see"
+    to suppress missing-param warnings.
+
+    For the parameters, see :func:`blah`
+    """
+
+
+class ClassFoo:
+    """Example usage of "For the parameters, see" in init docstring"""
+
+    def __init__(self, x, y):
+        """docstring foo constructor
+
+        For the parameters, see :func:`bla`
+        """
+
+
+class ClassFooTwo:
+    """test_see_sentence_for_constr_params_in_class
+    Example usage of "For the parameters, see" in class docstring
+
+    For the parameters, see :func:`bla`
+    """
+
+    def __init__(self, x, y):
+        """init"""
+
+
+def test_kwonlyargs_are_taken_in_account(  # [missing-param-doc, missing-type-doc]
+    arg, *, kwonly, missing_kwonly
+):
+    """The docstring
+
+    :param int arg: The argument.
+    :param bool kwonly: A keyword-arg.
+    """
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required.rc b/tests/functional/ext/docparams/parameter/missing_param_doc_required.rc
new file mode 100644
index 0000000000..24cdf9adaf
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required.rc
@@ -0,0 +1,7 @@
+[MASTER]
+load-plugins = pylint.extensions.docparams
+
+[BASIC]
+accept-no-param-doc=no
+docstring-min-length: -1
+no-docstring-rgx=^$
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required.txt
new file mode 100644
index 0000000000..1db477b902
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required.txt
@@ -0,0 +1,3 @@
+missing-any-param-doc:7:0:7:53:test_don_t_tolerate_no_param_documentation_at_all:"Missing any documentation in ""test_don_t_tolerate_no_param_documentation_at_all""":UNDEFINED
+missing-param-doc:44:0:44:40:test_kwonlyargs_are_taken_in_account:"""missing_kwonly"" missing in parameter documentation":UNDEFINED
+missing-type-doc:44:0:44:40:test_kwonlyargs_are_taken_in_account:"""missing_kwonly"" missing in parameter type documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Google.py b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Google.py
index 0e5bc8e4f3..6e291ce835 100644
--- a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Google.py
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Google.py
@@ -4,7 +4,10 @@
 Styleguide:
 https://google.github.io/styleguide/pyguide.html#doc-function-args
 """
-# pylint: disable=invalid-name
+# pylint: disable=invalid-name, unused-argument, undefined-variable
+# pylint: disable=line-too-long, too-few-public-methods, missing-class-docstring
+# pylint: disable=missing-function-docstring, function-redefined, inconsistent-return-statements
+# pylint: disable=dangerous-default-value, too-many-arguments
 
 
 def test_multi_line_parameters(param: int) -> None:
@@ -16,3 +19,391 @@ def test_multi_line_parameters(param: int) -> None:
             a description
     """
     print(param)
+
+
+def test_missing_func_params_in_google_docstring(  # [missing-param-doc, missing-type-doc]
+    x, y, z
+):
+    """Example of a function with missing Google style parameter
+    documentation in the docstring
+
+    Args:
+        x: bla
+        z (int): bar
+
+    some other stuff
+    """
+
+
+def test_missing_func_params_with_annotations_in_google_docstring(x: int, y: bool, z):
+    """Example of a function with missing Google style parameter
+    documentation in the docstring.
+
+        Args:
+            x: bla
+            y: blah blah
+            z (int): bar
+
+        some other stuff
+    """
+
+
+def test_missing_type_doc_google_docstring_exempt_kwonly_args(
+    arg1: int, arg2: int, *, value1: str, value2: str
+):
+    """Code to show failure in missing-type-doc
+
+    Args:
+        arg1: First argument.
+        arg2: Second argument.
+        value1: First kwarg.
+        value2: Second kwarg.
+    """
+    print("NOTE: It doesn't like anything after the '*'.")
+
+
+def test_default_arg_with_annotations_in_google_docstring(
+    x: int, y: bool, z: int = 786
+):
+    """Example of a function with missing Google style parameter
+        documentation in the docstring.
+
+    Args:
+        x: bla
+        y: blah blah
+        z: bar
+
+    some other stuff
+    """
+
+
+def test_missing_func_params_with_partial_annotations_in_google_docstring(  # [missing-type-doc]
+    x, y: bool, z
+):
+    """Example of a function with missing Google style parameter
+    documentation in the docstring.
+
+    Args:
+        x: bla
+        y: blah blah
+        z (int): bar
+
+    some other stuff
+    """
+
+
+def test_non_builtin_annotations_in_google_docstring(
+    bottomleft: Point, topright: Point
+) -> float:
+    """Example of a function with missing Google style parameter
+    documentation in the docstring.
+        Args:
+            bottomleft: bottom left point of rectangle
+            topright: top right point of rectangle
+    """
+
+
+def test_non_builtin_annotations_for_returntype_in_google_docstring(bottomleft: Point, topright: Point) -> Point:
+    """Example of a function with missing Google style parameter
+    documentation in the docstring.
+    Args:
+        bottomleft: bottom left point of rectangle
+        topright: top right point of rectangle
+    """
+
+
+def test_func_params_and_keyword_params_in_google_docstring(this, other, that=True):
+    """Example of a function with Google style parameter split
+    in Args and Keyword Args in the docstring
+
+        Args:
+            this (str): Printed first
+            other (int): Other args
+
+        Keyword Args:
+            that (bool): Printed second
+    """
+    print(this, that, other)
+
+
+def test_func_params_and_wrong_keyword_params_in_google_docstring(  # [missing-param-doc, missing-type-doc, differing-param-doc, differing-type-doc]
+    this, other, that=True
+):
+    """Example of a function with Google style parameter split
+    in Args and Keyword Args in the docstring but with wrong keyword args
+
+        Args:
+            this (str): Printed first
+            other (int): Other args
+
+        Keyword Args:
+            these (bool): Printed second
+    """
+    print(this, that, other)
+
+
+class Foo:
+    def test_missing_method_params_in_google_docstring(  # [missing-param-doc, missing-type-doc]
+        self, x, y
+    ):
+        """Example of a class method with missing parameter documentation in
+        the Google style docstring
+
+        missing parameter documentation
+
+        Args:
+            x: bla
+        """
+
+
+def test_existing_func_params_in_google_docstring(xarg, yarg, zarg, warg):
+    """Example of a function with correctly documented parameters and
+    return values (Google style)
+
+    Args:
+        xarg (int): bla xarg
+        yarg (my.qualified.type): bla
+            bla yarg
+
+        zarg (int): bla zarg
+        warg (my.qualified.type): bla warg
+
+    Returns:
+        float: sum
+    """
+    return xarg + yarg
+
+
+def test_wrong_name_of_func_params_in_google_docstring_one(  # [missing-param-doc, missing-type-doc, differing-param-doc, differing-type-doc]
+    xarg, yarg, zarg
+):
+    """Example of functions with inconsistent parameter names in the
+    signature and in the Google style documentation
+
+    Args:
+        xarg1 (int): bla xarg
+        yarg (float): bla yarg
+
+        zarg1 (str): bla zarg
+    """
+    return xarg + yarg
+
+
+def test_wrong_name_of_func_params_in_google_docstring_two(  # [differing-param-doc, differing-type-doc]
+    xarg, yarg
+):
+    """Example of functions with inconsistent parameter names in the
+    signature and in the Google style documentation
+
+    Args:
+        yarg1 (float): bla yarg
+
+    For the other parameters, see bla.
+    """
+    return xarg + yarg
+
+
+def test_see_sentence_for_func_params_in_google_docstring(xarg, yarg):
+    """Example for the usage of "For the other parameters, see" to avoid
+        too many repetitions, e.g. in functions or methods adhering to a
+        given interface (Google style)
+
+    Args:
+        yarg (float): bla yarg
+
+    For the other parameters, see :func:`bla`
+    """
+    return xarg + yarg
+
+
+class ClassFoo:  # [missing-param-doc, missing-type-doc]
+    """test_constr_params_in_class_google
+    Example of a class with missing constructor parameter documentation
+    (Google style)
+
+    Everything is completely analogous to functions.
+
+    Args:
+        y: bla
+
+    missing constructor parameter documentation
+    """
+
+    def __init__(self, x, y):
+        pass
+
+
+class ClassFoo:
+    def __init__(self, x, y):  # [missing-param-doc, missing-type-doc]
+        """test_constr_params_in_init_google
+        Example of a class with missing constructor parameter documentation
+        (Google style)
+
+        Args:
+            y: bla
+
+        missing constructor parameter documentation
+        """
+
+
+class ClassFoo:  # [multiple-constructor-doc,missing-param-doc, missing-type-doc]
+    """test_constr_params_in_class_and_init_google
+    Example of a class with missing constructor parameter documentation
+    in both the init docstring and the class docstring
+    (Google style)
+
+    Everything is completely analogous to functions.
+
+    Args:
+        y: bla
+
+    missing constructor parameter documentation
+    """
+
+    def __init__(self, x, y):  # [missing-param-doc, missing-type-doc]
+        """docstring foo
+
+        Args:
+            y: bla
+
+        missing constructor parameter documentation
+        """
+
+
+def test_warns_missing_args_google(named_arg, *args):  # [missing-param-doc]
+    """The docstring
+
+    Args:
+        named_arg (object): Returned
+
+    Returns:
+        object or None: Maybe named_arg
+    """
+    if args:
+        return named_arg
+
+
+def test_warns_missing_kwargs_google(named_arg, **kwargs):  # [missing-param-doc]
+    """The docstring
+
+    Args:
+        named_arg (object): Returned
+
+    Returns:
+        object or None: Maybe named_arg
+    """
+    if kwargs:
+        return named_arg
+
+
+def test_finds_args_without_type_google(named_arg, *args):
+    """The docstring
+
+    Args:
+        named_arg (object): Returned
+        *args: Optional arguments
+
+    Returns:
+        object or None: Maybe named_arg
+    """
+    if args:
+        return named_arg
+
+
+def test_finds_kwargs_without_type_google(named_arg, **kwargs):
+    """The docstring
+
+    Args:
+        named_arg (object): Returned
+        **kwargs: Keyword arguments
+
+    Returns:
+        object or None: Maybe named_arg
+    """
+    if kwargs:
+        return named_arg
+
+
+def test_finds_args_with_xref_type_google(named_arg, **kwargs):
+    """The docstring
+
+    Args:
+        named_arg (`example.value`): Returned
+        **kwargs: Keyword arguments
+
+    Returns:
+        `example.value`: Maybe named_arg
+    """
+    if kwargs:
+        return named_arg
+
+
+def test_ignores_optional_specifier_google(
+    param1, param2, param3=(), param4=[], param5=[], param6=True
+):
+    """Do something.
+
+    Args:
+        param1 (str): Description.
+        param2 (dict(str, int)): Description.
+        param3 (tuple(str), optional): Defaults to empty. Description.
+        param4 (List[str], optional): Defaults to empty. Description.
+        param5 (list[tuple(str)], optional): Defaults to empty. Description.
+        param6 (bool, optional): Defaults to True. Description.
+
+    Returns:
+        int: Description.
+    """
+    return param1, param2, param3, param4, param5, param6
+
+
+def test_finds_multiple_complex_types_google(
+    named_arg_one,
+    named_arg_two,
+    named_arg_three,
+    named_arg_four,
+    named_arg_five,
+    named_arg_six,
+    named_arg_seven,
+    named_arg_eight,
+    named_arg_nine,
+    named_arg_ten,
+):
+    """The google docstring
+
+    Args:
+        named_arg_one (dict(str, str)): Returned
+        named_arg_two (dict[str, str]): Returned
+        named_arg_three (int or str): Returned
+        named_arg_four (tuple(int or str)): Returned
+        named_arg_five (tuple(int) or list(int)): Returned
+        named_arg_six (tuple(int or str) or list(int or str)): Returned
+        named_arg_seven (dict(str,str)): Returned
+        named_arg_eight (dict[str,str]): Returned
+        named_arg_nine (tuple(int)): Returned
+        named_arg_ten (list[tokenize.TokenInfo]): Returned
+
+    Returns:
+        dict(str, str): named_arg_one
+        dict[str, str]: named_arg_two
+        int or str: named_arg_three
+        tuple(int or str): named_arg_four
+        tuple(int) or list(int): named_arg_five
+        tuple(int or str) or list(int or str): named_arg_six
+        dict(str,str): named_arg_seven
+        dict[str,str]: named_arg_eight
+        tuple(int): named_arg_nine
+        list[tokenize.TokenInfo]: named_arg_ten
+    """
+    return (
+        named_arg_one,
+        named_arg_two,
+        named_arg_three,
+        named_arg_four,
+        named_arg_five,
+        named_arg_six,
+        named_arg_seven,
+        named_arg_eight,
+        named_arg_nine,
+        named_arg_ten,
+    )
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Google.rc b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Google.rc
index dd77ffed41..24cdf9adaf 100644
--- a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Google.rc
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Google.rc
@@ -4,3 +4,4 @@ load-plugins = pylint.extensions.docparams
 [BASIC]
 accept-no-param-doc=no
 docstring-min-length: -1
+no-docstring-rgx=^$
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Google.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Google.txt
new file mode 100644
index 0000000000..c0daa6ee21
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Google.txt
@@ -0,0 +1,26 @@
+missing-param-doc:24:0:24:48:test_missing_func_params_in_google_docstring:"""y"" missing in parameter documentation":UNDEFINED
+missing-type-doc:24:0:24:48:test_missing_func_params_in_google_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-type-doc:80:0:80:73:test_missing_func_params_with_partial_annotations_in_google_docstring:"""x"" missing in parameter type documentation":UNDEFINED
+differing-param-doc:129:0:129:65:test_func_params_and_wrong_keyword_params_in_google_docstring:"""these"" differing in parameter documentation":UNDEFINED
+differing-type-doc:129:0:129:65:test_func_params_and_wrong_keyword_params_in_google_docstring:"""these"" differing in parameter type documentation":UNDEFINED
+missing-param-doc:129:0:129:65:test_func_params_and_wrong_keyword_params_in_google_docstring:"""that"" missing in parameter documentation":UNDEFINED
+missing-type-doc:129:0:129:65:test_func_params_and_wrong_keyword_params_in_google_docstring:"""that"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:146:4:146:54:Foo.test_missing_method_params_in_google_docstring:"""y"" missing in parameter documentation":UNDEFINED
+missing-type-doc:146:4:146:54:Foo.test_missing_method_params_in_google_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
+differing-param-doc:177:0:177:58:test_wrong_name_of_func_params_in_google_docstring_one:"""xarg1, zarg1"" differing in parameter documentation":UNDEFINED
+differing-type-doc:177:0:177:58:test_wrong_name_of_func_params_in_google_docstring_one:"""xarg1, zarg1"" differing in parameter type documentation":UNDEFINED
+missing-param-doc:177:0:177:58:test_wrong_name_of_func_params_in_google_docstring_one:"""xarg, zarg"" missing in parameter documentation":UNDEFINED
+missing-type-doc:177:0:177:58:test_wrong_name_of_func_params_in_google_docstring_one:"""xarg, zarg"" missing in parameter type documentation":UNDEFINED
+differing-param-doc:192:0:192:58:test_wrong_name_of_func_params_in_google_docstring_two:"""yarg1"" differing in parameter documentation":UNDEFINED
+differing-type-doc:192:0:192:58:test_wrong_name_of_func_params_in_google_docstring_two:"""yarg1"" differing in parameter type documentation":UNDEFINED
+missing-param-doc:219:0:219:14:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:219:0:219:14:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:237:4:237:16:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:237:4:237:16:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:249:0:249:14:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:249:0:249:14:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
+multiple-constructor-doc:249:0:249:14:ClassFoo:"""ClassFoo"" has constructor parameters documented in class and __init__":UNDEFINED
+missing-param-doc:263:4:263:16:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:263:4:263:16:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:273:0:273:34:test_warns_missing_args_google:"""*args"" missing in parameter documentation":UNDEFINED
+missing-param-doc:286:0:286:36:test_warns_missing_kwargs_google:"""**kwargs"" missing in parameter documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Numpy.py b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Numpy.py
new file mode 100644
index 0000000000..e780ac0f5c
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Numpy.py
@@ -0,0 +1,374 @@
+"""Tests for missing-param-doc and missing-type-doc for Numpy style docstrings
+with accept-no-param-doc = no
+"""
+# pylint: disable=invalid-name, unused-argument, undefined-variable, too-many-arguments
+# pylint: disable=line-too-long, too-few-public-methods, missing-class-docstring
+# pylint: disable=missing-function-docstring, function-redefined, inconsistent-return-statements
+
+
+def test_missing_func_params_in_numpy_docstring(  # [missing-param-doc, missing-type-doc]
+    x, y, z
+):
+    """Example of a function with missing NumPy style parameter
+        documentation in the docstring
+
+    Parameters
+    ----------
+    x:
+        bla
+    z: int
+        bar
+
+    some other stuff
+    """
+
+
+class Foo:
+    def test_missing_method_params_in_numpy_docstring(  # [missing-param-doc, missing-type-doc]
+        self, x, y
+    ):
+        """Example of a class method with missing parameter documentation in
+        the Numpy style docstring
+
+        missing parameter documentation
+
+        Parameters
+        ----------
+        x:
+            bla
+        """
+
+
+def test_existing_func_params_in_numpy_docstring(xarg, yarg, zarg, warg):
+    """Example of a function with correctly documented parameters and
+    return values (Numpy style)
+
+    Parameters
+    ----------
+    xarg: int
+        bla xarg
+    yarg: my.qualified.type
+        bla yarg
+
+    zarg: int
+        bla zarg
+    warg: my.qualified.type
+        bla warg
+
+    Returns
+    -------
+    float
+        sum
+    """
+    return xarg + yarg
+
+
+def test_wrong_name_of_func_params_in_numpy_docstring(  # [missing-param-doc, missing-type-doc, differing-param-doc, differing-type-doc]
+    xarg, yarg, zarg
+):
+    """Example of functions with inconsistent parameter names in the
+    signature and in the Numpy style documentation
+
+    Parameters
+    ----------
+    xarg1: int
+        bla xarg
+    yarg: float
+        bla yarg
+
+    zarg1: str
+        bla zarg
+    """
+    return xarg + yarg
+
+
+def test_wrong_name_of_func_params_in_numpy_docstring_two(  # [differing-param-doc, differing-type-doc]
+    xarg, yarg
+):
+    """Example of functions with inconsistent parameter names in the
+    signature and in the Numpy style documentation
+
+    Parameters
+    ----------
+    yarg1: float
+        bla yarg
+
+    For the other parameters, see bla.
+    """
+    return xarg + yarg
+
+
+def test_see_sentence_for_func_params_in_numpy_docstring(xarg, yarg):
+    """Example for the usage of "For the other parameters, see" to avoid
+    too many repetitions, e.g. in functions or methods adhering to a
+    given interface (Numpy style)
+
+    Parameters
+    ----------
+    yarg: float
+        bla yarg
+
+    For the other parameters, see :func:`bla`
+    """
+    return xarg + yarg
+
+
+class ClassFoo:  # [missing-param-doc, missing-type-doc]
+    """test_constr_params_in_class_numpy
+    Example of a class with missing constructor parameter documentation
+    (Numpy style)
+
+    Everything is completely analogous to functions.
+
+    Parameters
+    ----------
+    y:
+        bla
+
+    missing constructor parameter documentation
+    """
+
+    def __init__(self, x, y):
+        pass
+
+
+class ClassFoo:
+    """test_constr_params_and_attributes_in_class_numpy
+    Example of a class with correct constructor parameter documentation
+    and an attributes section (Numpy style)
+
+    Parameters
+    ----------
+    foobar : str
+        Something.
+
+    Attributes
+    ----------
+    barfoor : str
+        Something.
+    """
+
+    def __init__(self, foobar):
+        self.barfoo = None
+
+
+class ClassFoo:
+    def __init__(self, x, y):  # [missing-param-doc, missing-type-doc]
+        """test_constr_params_in_init_numpy
+        Example of a class with missing constructor parameter documentation
+        (Numpy style)
+
+        Everything is completely analogous to functions.
+
+        Parameters
+        ----------
+        y:
+            bla
+
+        missing constructor parameter documentation
+        """
+
+
+class ClassFoo:  # [multiple-constructor-doc, missing-param-doc, missing-type-doc]
+    """test_constr_params_in_class_and_init_numpy
+    Example of a class with missing constructor parameter documentation
+    in both the init docstring and the class docstring
+    (Numpy style)
+
+    Everything is completely analogous to functions.
+
+    Parameters
+    ----------
+    y:
+        bla
+
+    missing constructor parameter documentation
+    """
+
+    def __init__(self, x, y):  # [missing-param-doc, missing-type-doc]
+        """docstring foo
+
+        Parameters
+        ----------
+        y:
+            bla
+
+        missing constructor parameter documentation
+        """
+
+
+def test_warns_missing_args_numpy(named_arg, *args):  # [missing-param-doc]
+    """The docstring
+
+    Args
+    ----
+    named_arg : object
+        Returned
+
+    Returns
+    -------
+        object or None
+            Maybe named_arg
+    """
+    if args:
+        return named_arg
+
+
+def test_warns_missing_kwargs_numpy(named_arg, **kwargs):  # [missing-param-doc]
+    """The docstring
+
+    Args
+    ----
+    named_arg : object
+        Returned
+
+    Returns
+    -------
+        object or None
+            Maybe named_arg
+    """
+    if kwargs:
+        return named_arg
+
+
+def test_finds_args_without_type_numpy(  # [missing-type-doc]
+    named_arg, typed_arg: bool, untyped_arg, *args
+):
+    """The docstring
+
+    Args
+    ----
+    named_arg : object
+        Returned
+    typed_arg
+        Other argument without numpy type annotation
+    untyped_arg
+        Other argument without any type annotation
+    *args :
+        Optional Arguments
+
+    Returns
+    -------
+        object or None
+            Maybe named_arg
+    """
+    if args:
+        return named_arg
+
+
+def test_finds_args_with_xref_type_numpy(named_arg, *args):
+    """The docstring
+
+    Args
+    ----
+    named_arg : `example.value`
+        Returned
+    *args :
+        Optional Arguments
+
+    Returns
+    -------
+        `example.value`
+            Maybe named_arg
+    """
+    if args:
+        return named_arg
+
+
+def test_finds_kwargs_without_type_numpy(named_arg, **kwargs):
+    """The docstring
+
+    Args
+    ----
+    named_arg : object
+        Returned
+    **kwargs :
+        Keyword arguments
+
+    Returns
+    -------
+        object or None
+            Maybe named_arg
+    """
+    if kwargs:
+        return named_arg
+
+
+def my_func(
+    named_arg_one,
+    named_arg_two,
+    named_arg_three,
+    named_arg_four,
+    named_arg_five,
+    named_arg_six,
+    named_arg_seven,
+    named_arg_eight,
+):
+    """The docstring
+
+    Args
+    ----
+    named_arg_one : dict(str,str)
+        Returned
+    named_arg_two : dict[str,str]
+        Returned
+    named_arg_three : tuple(int)
+        Returned
+    named_arg_four : list[tokenize.TokenInfo]
+        Returned
+    named_arg_five : int or str
+        Returned
+    named_arg_six : tuple(int or str)
+        Returned
+    named_arg_seven : tuple(int) or list(int)
+        Returned
+    named_arg_eight : tuple(int or str) or list(int or str)
+        Returned
+
+    Returns
+    -------
+        dict(str,str)
+            named_arg_one
+        dict[str,str]
+            named_arg_two
+        tuple(int)
+            named_arg_three
+        list[tokenize.TokenInfo]
+            named_arg_four
+        int or str
+            named_arg_five
+        tuple(int or str)
+            named_arg_six
+        tuple(int) or list(int)
+            named_arg_seven
+        tuple(int or str) or list(int or str)
+            named_arg_eight
+    """
+    return (
+        named_arg_one,
+        named_arg_two,
+        named_arg_three,
+        named_arg_four,
+        named_arg_five,
+        named_arg_six,
+        named_arg_seven,
+        named_arg_eight,
+    )
+
+
+def test_ignores_optional_specifier_numpy(param, param2="all"):
+    """Do something.
+
+    Parameters
+    ----------
+    param : str
+        Description.
+    param2 : str, optional
+        Description (the default is 'all').
+
+    Returns
+    -------
+    int
+        Description.
+    """
+    return param, param2
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Numpy.rc b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Numpy.rc
new file mode 100644
index 0000000000..24cdf9adaf
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Numpy.rc
@@ -0,0 +1,7 @@
+[MASTER]
+load-plugins = pylint.extensions.docparams
+
+[BASIC]
+accept-no-param-doc=no
+docstring-min-length: -1
+no-docstring-rgx=^$
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Numpy.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Numpy.txt
new file mode 100644
index 0000000000..bd73de9cce
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Numpy.txt
@@ -0,0 +1,22 @@
+missing-param-doc:9:0:9:47:test_missing_func_params_in_numpy_docstring:"""y"" missing in parameter documentation":UNDEFINED
+missing-type-doc:9:0:9:47:test_missing_func_params_in_numpy_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:27:4:27:53:Foo.test_missing_method_params_in_numpy_docstring:"""y"" missing in parameter documentation":UNDEFINED
+missing-type-doc:27:4:27:53:Foo.test_missing_method_params_in_numpy_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
+differing-param-doc:66:0:66:53:test_wrong_name_of_func_params_in_numpy_docstring:"""xarg1, zarg1"" differing in parameter documentation":UNDEFINED
+differing-type-doc:66:0:66:53:test_wrong_name_of_func_params_in_numpy_docstring:"""xarg1, zarg1"" differing in parameter type documentation":UNDEFINED
+missing-param-doc:66:0:66:53:test_wrong_name_of_func_params_in_numpy_docstring:"""xarg, zarg"" missing in parameter documentation":UNDEFINED
+missing-type-doc:66:0:66:53:test_wrong_name_of_func_params_in_numpy_docstring:"""xarg, zarg"" missing in parameter type documentation":UNDEFINED
+differing-param-doc:85:0:85:57:test_wrong_name_of_func_params_in_numpy_docstring_two:"""yarg1"" differing in parameter documentation":UNDEFINED
+differing-type-doc:85:0:85:57:test_wrong_name_of_func_params_in_numpy_docstring_two:"""yarg1"" differing in parameter type documentation":UNDEFINED
+missing-param-doc:116:0:116:14:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:116:0:116:14:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:156:4:156:16:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:156:4:156:16:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:172:0:172:14:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:172:0:172:14:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
+multiple-constructor-doc:172:0:172:14:ClassFoo:"""ClassFoo"" has constructor parameters documented in class and __init__":UNDEFINED
+missing-param-doc:188:4:188:16:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:188:4:188:16:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:200:0:200:33:test_warns_missing_args_numpy:"""*args"" missing in parameter documentation":UNDEFINED
+missing-param-doc:217:0:217:35:test_warns_missing_kwargs_numpy:"""**kwargs"" missing in parameter documentation":UNDEFINED
+missing-type-doc:234:0:234:38:test_finds_args_without_type_numpy:"""untyped_arg"" missing in parameter type documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Sphinx.py b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Sphinx.py
index 0ec15b234a..942de6e6e3 100644
--- a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Sphinx.py
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Sphinx.py
@@ -219,7 +219,7 @@ def test_finds_args_without_type_sphinx(  # [inconsistent-return-statements]
     named_arg, *args
 ):
     r"""The Sphinx docstring
-    In Sphinx docstrings asteriks should be escaped.
+    In Sphinx docstrings asterisks should be escaped.
     See https://github.com/PyCQA/pylint/issues/5406
 
     :param named_arg: Returned
@@ -238,7 +238,7 @@ def test_finds_kwargs_without_type_sphinx(  # [inconsistent-return-statements]
     named_arg, **kwargs
 ):
     r"""The Sphinx docstring
-    In Sphinx docstrings asteriks should be escaped.
+    In Sphinx docstrings asterisks should be escaped.
     See https://github.com/PyCQA/pylint/issues/5406
 
     :param named_arg: Returned
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Sphinx.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Sphinx.txt
index 7745f76199..dcc77f48ed 100644
--- a/tests/functional/ext/docparams/parameter/missing_param_doc_required_Sphinx.txt
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_Sphinx.txt
@@ -1,37 +1,37 @@
-missing-param-doc:8:0:18:8:test_missing_func_params_in_sphinx_docstring:"""y"" missing in parameter documentation":UNDEFINED
-missing-type-doc:8:0:18:8:test_missing_func_params_in_sphinx_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:22:4:32:12:Foo.test_missing_method_params_in_sphinx_docstring:"""y"" missing in parameter documentation":UNDEFINED
-missing-type-doc:22:4:32:12:Foo.test_missing_method_params_in_sphinx_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
-differing-param-doc:55:0:69:22:test_wrong_name_of_func_params_in_sphinx_docstring:"""xarg1, zarg1"" differing in parameter documentation":UNDEFINED
-differing-type-doc:55:0:69:22:test_wrong_name_of_func_params_in_sphinx_docstring:"""yarg1, zarg1"" differing in parameter type documentation":UNDEFINED
-missing-param-doc:55:0:69:22:test_wrong_name_of_func_params_in_sphinx_docstring:"""xarg, zarg"" missing in parameter documentation":UNDEFINED
-missing-type-doc:55:0:69:22:test_wrong_name_of_func_params_in_sphinx_docstring:"""yarg, zarg"" missing in parameter type documentation":UNDEFINED
-differing-param-doc:72:0:83:22:test_wrong_name_of_func_params_in_sphinx_docstring_two:"""yarg1"" differing in parameter documentation":UNDEFINED
-differing-type-doc:72:0:83:22:test_wrong_name_of_func_params_in_sphinx_docstring_two:"""yarg1"" differing in parameter type documentation":UNDEFINED
-missing-param-doc:99:0:112:12:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
-missing-type-doc:99:0:112:12:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:116:4:128:12:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
-missing-type-doc:116:4:128:12:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
-missing-param-doc:131:0:151:12:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
-missing-type-doc:131:0:151:12:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
-multiple-constructor-doc:131:0:151:12:ClassFoo:"""ClassFoo"" has constructor parameters documented in class and __init__":UNDEFINED
-missing-param-doc:144:4:151:12:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
-missing-type-doc:144:4:151:12:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
-inconsistent-return-statements:154:0:166:24:test_warns_missing_args_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-missing-param-doc:154:0:166:24:test_warns_missing_args_sphinx:"""*args"" missing in parameter documentation":UNDEFINED
-inconsistent-return-statements:169:0:181:24:test_warns_missing_kwargs_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-missing-param-doc:169:0:181:24:test_warns_missing_kwargs_sphinx:"""**kwargs"" missing in parameter documentation":UNDEFINED
-inconsistent-return-statements:184:0:198:24:test_finds_args_without_type_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-missing-param-doc:184:0:198:24:test_finds_args_without_type_sphinx:"""*args"" missing in parameter documentation":UNDEFINED
-inconsistent-return-statements:201:0:215:24:test_finds_kwargs_without_type_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-missing-param-doc:201:0:215:24:test_finds_kwargs_without_type_sphinx:"""**kwargs"" missing in parameter documentation":UNDEFINED
-inconsistent-return-statements:218:0:234:24:test_finds_args_without_type_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:237:0:253:24:test_finds_kwargs_without_type_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-missing-raises-doc:263:4:268:17:Foo.foo:"""AttributeError"" not documented as being raised":UNDEFINED
+missing-param-doc:8:0:8:48:test_missing_func_params_in_sphinx_docstring:"""y"" missing in parameter documentation":UNDEFINED
+missing-type-doc:8:0:8:48:test_missing_func_params_in_sphinx_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:22:4:22:54:Foo.test_missing_method_params_in_sphinx_docstring:"""y"" missing in parameter documentation":UNDEFINED
+missing-type-doc:22:4:22:54:Foo.test_missing_method_params_in_sphinx_docstring:"""x, y"" missing in parameter type documentation":UNDEFINED
+differing-param-doc:55:0:55:54:test_wrong_name_of_func_params_in_sphinx_docstring:"""xarg1, zarg1"" differing in parameter documentation":UNDEFINED
+differing-type-doc:55:0:55:54:test_wrong_name_of_func_params_in_sphinx_docstring:"""yarg1, zarg1"" differing in parameter type documentation":UNDEFINED
+missing-param-doc:55:0:55:54:test_wrong_name_of_func_params_in_sphinx_docstring:"""xarg, zarg"" missing in parameter documentation":UNDEFINED
+missing-type-doc:55:0:55:54:test_wrong_name_of_func_params_in_sphinx_docstring:"""yarg, zarg"" missing in parameter type documentation":UNDEFINED
+differing-param-doc:72:0:72:58:test_wrong_name_of_func_params_in_sphinx_docstring_two:"""yarg1"" differing in parameter documentation":UNDEFINED
+differing-type-doc:72:0:72:58:test_wrong_name_of_func_params_in_sphinx_docstring_two:"""yarg1"" differing in parameter type documentation":UNDEFINED
+missing-param-doc:99:0:99:14:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:99:0:99:14:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:116:4:116:16:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:116:4:116:16:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:131:0:131:14:ClassFoo:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:131:0:131:14:ClassFoo:"""x, y"" missing in parameter type documentation":UNDEFINED
+multiple-constructor-doc:131:0:131:14:ClassFoo:"""ClassFoo"" has constructor parameters documented in class and __init__":UNDEFINED
+missing-param-doc:144:4:144:16:ClassFoo.__init__:"""x"" missing in parameter documentation":UNDEFINED
+missing-type-doc:144:4:144:16:ClassFoo.__init__:"""x, y"" missing in parameter type documentation":UNDEFINED
+inconsistent-return-statements:154:0:154:34:test_warns_missing_args_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+missing-param-doc:154:0:154:34:test_warns_missing_args_sphinx:"""*args"" missing in parameter documentation":UNDEFINED
+inconsistent-return-statements:169:0:169:36:test_warns_missing_kwargs_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+missing-param-doc:169:0:169:36:test_warns_missing_kwargs_sphinx:"""**kwargs"" missing in parameter documentation":UNDEFINED
+inconsistent-return-statements:184:0:184:39:test_finds_args_without_type_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+missing-param-doc:184:0:184:39:test_finds_args_without_type_sphinx:"""*args"" missing in parameter documentation":UNDEFINED
+inconsistent-return-statements:201:0:201:41:test_finds_kwargs_without_type_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+missing-param-doc:201:0:201:41:test_finds_kwargs_without_type_sphinx:"""**kwargs"" missing in parameter documentation":UNDEFINED
+inconsistent-return-statements:218:0:218:39:test_finds_args_without_type_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:237:0:237:41:test_finds_kwargs_without_type_sphinx:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+missing-raises-doc:263:4:263:11:Foo.foo:"""AttributeError"" not documented as being raised":UNDEFINED
 unreachable:289:8:289:17:Foo.foo:Unreachable code:UNDEFINED
-missing-param-doc:292:4:297:30:Foo.foo:"""value"" missing in parameter documentation":UNDEFINED
-missing-raises-doc:292:4:297:30:Foo.foo:"""AttributeError"" not documented as being raised":UNDEFINED
-missing-type-doc:292:4:297:30:Foo.foo:"""value"" missing in parameter type documentation":UNDEFINED
+missing-param-doc:292:4:292:11:Foo.foo:"""value"" missing in parameter documentation":UNDEFINED
+missing-raises-doc:292:4:292:11:Foo.foo:"""AttributeError"" not documented as being raised":UNDEFINED
+missing-type-doc:292:4:292:11:Foo.foo:"""value"" missing in parameter type documentation":UNDEFINED
 unreachable:328:8:328:17:Foo.foo:Unreachable code:UNDEFINED
-useless-param-doc:332:4:346:12:Foo.test_useless_docs_ignored_argument_names_sphinx:"""_, _ignored"" useless ignored parameter documentation":UNDEFINED
-useless-type-doc:332:4:346:12:Foo.test_useless_docs_ignored_argument_names_sphinx:"""_"" useless ignored parameter type documentation":UNDEFINED
+useless-param-doc:332:4:332:55:Foo.test_useless_docs_ignored_argument_names_sphinx:"""_, _ignored"" useless ignored parameter documentation":UNDEFINED
+useless-type-doc:332:4:332:55:Foo.test_useless_docs_ignored_argument_names_sphinx:"""_"" useless ignored parameter type documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_min_length.py b/tests/functional/ext/docparams/parameter/missing_param_doc_required_min_length.py
new file mode 100644
index 0000000000..765bb2d6c8
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_min_length.py
@@ -0,0 +1,9 @@
+"""Tests for missing-param-doc and missing-type-doc for non-specified style docstrings
+with accept-no-param-doc = no and docstring-min-length = 3
+"""
+# pylint: disable=invalid-name, unused-argument
+
+# Example of a function that is less than 'docstring-min-length' config option
+# No error message is emitted.
+def test_skip_docstring_min_length(x, y):
+    """function is too short and is missing parameter documentation"""
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_min_length.rc b/tests/functional/ext/docparams/parameter/missing_param_doc_required_min_length.rc
new file mode 100644
index 0000000000..a0538bf1b9
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_min_length.rc
@@ -0,0 +1,7 @@
+[MASTER]
+load-plugins = pylint.extensions.docparams
+
+[BASIC]
+accept-no-param-doc=no
+docstring-min-length=3
+no-docstring-rgx=^$
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_init.py b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_init.py
new file mode 100644
index 0000000000..1d6d2c70bc
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_init.py
@@ -0,0 +1,18 @@
+"""Tests for missing-param-doc and missing-type-doc for non-specified style docstrings
+with accept-no-param-doc = no and no-docstring-rgx = ^(?!__init__$)_
+"""
+# pylint: disable=invalid-name, unused-argument, too-few-public-methods, missing-class-docstring
+
+
+# test_fail_docparams_check_init
+# Check that __init__ is checked correctly, but other private methods aren't
+class MyClass:
+    def __init__(self, my_param: int) -> None:  # [missing-param-doc]
+        """
+        My init docstring
+        """
+
+    def _private_method(self, my_param: int) -> None:
+        """
+        My private method
+        """
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_init.rc b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_init.rc
new file mode 100644
index 0000000000..3cba99ef40
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_init.rc
@@ -0,0 +1,7 @@
+[MASTER]
+load-plugins = pylint.extensions.docparams
+
+[BASIC]
+accept-no-param-doc=no
+docstring-min-length=-1
+no-docstring-rgx=^(?!__init__$)_
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_init.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_init.txt
new file mode 100644
index 0000000000..7b30afcb55
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_init.txt
@@ -0,0 +1 @@
+missing-param-doc:10:4:10:16:MyClass.__init__:"""my_param"" missing in parameter documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_none.py b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_none.py
new file mode 100644
index 0000000000..ca6eb2f7ea
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_none.py
@@ -0,0 +1,16 @@
+"""Tests for missing-param-doc and missing-type-doc for non-specified style docstrings
+with accept-no-param-doc = no and no-docstring-rgx = ""
+"""
+# pylint: disable=invalid-name, unused-argument, too-few-public-methods
+
+
+class MyClass:
+    """test_no_docstring_rgx
+    Function that matches "check no functions" 'no-docstring-rgx' config option
+    No error message is emitted.
+    """
+
+    def __init__(self, my_param: int) -> None:
+        """
+        My init docstring
+        """
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_none.rc b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_none.rc
new file mode 100644
index 0000000000..1196467cd4
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_check_none.rc
@@ -0,0 +1,7 @@
+[MASTER]
+load-plugins = pylint.extensions.docparams
+
+[BASIC]
+accept-no-param-doc=no
+docstring-min-length=-1
+no-docstring-rgx=
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_default.py b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_default.py
new file mode 100644
index 0000000000..1d2daa1a1b
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_default.py
@@ -0,0 +1,11 @@
+"""Tests for missing-param-doc and missing-type-doc for non-specified style docstrings
+with accept-no-param-doc = no and the default value of no-docstring-rgx
+"""
+# pylint: disable=invalid-name, unused-argument
+
+
+def _test_skip_no_docstring_rgx(x, y):
+    """Example of a function that matches the default 'no-docstring-rgx' config option
+
+    No error message is emitted.
+    """
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_default.rc b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_default.rc
new file mode 100644
index 0000000000..c81f8bd6b2
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_default.rc
@@ -0,0 +1,6 @@
+[MASTER]
+load-plugins = pylint.extensions.docparams
+
+[BASIC]
+accept-no-param-doc=no
+docstring-min-length=-1
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_test_all.py b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_test_all.py
new file mode 100644
index 0000000000..829119a09a
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_test_all.py
@@ -0,0 +1,28 @@
+"""Tests for missing-param-doc and missing-type-doc for non-specified style docstrings
+with accept-no-param-doc = no and no-docstring-rgx = ^$
+"""
+# pylint: disable=invalid-name, unused-argument, too-few-public-methods, function-redefined
+# pylint: disable=missing-class-docstring
+
+
+class MyClass:
+    """test_all_docstring_rgx
+    Function that matches "check all functions" 'no-docstring-rgx' config option
+    No error message is emitted.
+    """
+
+    def __init__(self, my_param: int) -> None:
+        """
+        My init docstring
+        :param my_param: My first param
+        """
+
+
+# test_fail_empty_docstring_rgx
+# Function that matches "check all functions" 'no-docstring-rgx' config option
+# An error message is emitted.
+class MyClass:
+    def __init__(self, my_param: int) -> None:  # [missing-param-doc]
+        """
+        My init docstring
+        """
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_test_all.rc b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_test_all.rc
new file mode 100644
index 0000000000..a616b1a66b
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_test_all.rc
@@ -0,0 +1,7 @@
+[MASTER]
+load-plugins = pylint.extensions.docparams
+
+[BASIC]
+accept-no-param-doc=no
+docstring-min-length=-1
+no-docstring-rgx=^$
diff --git a/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_test_all.txt b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_test_all.txt
new file mode 100644
index 0000000000..d42bc96251
--- /dev/null
+++ b/tests/functional/ext/docparams/parameter/missing_param_doc_required_no_doc_rgx_test_all.txt
@@ -0,0 +1 @@
+missing-param-doc:25:4:25:16:MyClass.__init__:"""my_param"" missing in parameter documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc.py b/tests/functional/ext/docparams/raise/missing_raises_doc.py
index 280d9f8e7b..6ba112bd5f 100644
--- a/tests/functional/ext/docparams/raise/missing_raises_doc.py
+++ b/tests/functional/ext/docparams/raise/missing_raises_doc.py
@@ -3,6 +3,7 @@
 # pylint: disable=unused-argument, import-error, unused-variable, no-member, try-except-raise
 import collections
 
+from fake_package import BadError
 from unknown import Unknown
 
 
@@ -96,3 +97,12 @@ def test_no_error_notimplemented_documented():
         NotImplementedError: When called.
     """
     raise NotImplementedError
+
+
+def test_finds_short_name_exception():
+    """Do something.
+
+    Raises:
+        ~fake_package.exceptions.BadError: When something bad happened.
+    """
+    raise BadError("A bad thing happened.")
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc.txt b/tests/functional/ext/docparams/raise/missing_raises_doc.txt
index 6b11b43d0e..7a93e4b1cd 100644
--- a/tests/functional/ext/docparams/raise/missing_raises_doc.txt
+++ b/tests/functional/ext/docparams/raise/missing_raises_doc.txt
@@ -1,4 +1,4 @@
-unreachable:24:4:24:25:test_ignores_raise_uninferable:Unreachable code:UNDEFINED
-missing-raises-doc:27:0:41:25:test_ignores_returns_from_inner_functions:"""RuntimeError"" not documented as being raised":UNDEFINED
-unreachable:41:4:41:25:test_ignores_returns_from_inner_functions:Unreachable code:UNDEFINED
-raising-bad-type:53:4:53:22:test_ignores_returns_use_only_names:Raising int while only classes or instances are allowed:UNDEFINED
+unreachable:25:4:25:25:test_ignores_raise_uninferable:Unreachable code:UNDEFINED
+missing-raises-doc:28:0:28:45:test_ignores_returns_from_inner_functions:"""RuntimeError"" not documented as being raised":UNDEFINED
+unreachable:42:4:42:25:test_ignores_returns_from_inner_functions:Unreachable code:UNDEFINED
+raising-bad-type:54:4:54:22:test_ignores_returns_use_only_names:Raising int while only classes or instances are allowed:UNDEFINED
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_Google.py b/tests/functional/ext/docparams/raise/missing_raises_doc_Google.py
index ca261ff42d..22dbcadaa3 100644
--- a/tests/functional/ext/docparams/raise/missing_raises_doc_Google.py
+++ b/tests/functional/ext/docparams/raise/missing_raises_doc_Google.py
@@ -1,6 +1,6 @@
 """Tests for missing-raises-doc and missing-raises-type-doc for Google style docstrings"""
 # pylint: disable=function-redefined, invalid-name, undefined-variable, missing-function-docstring
-# pylint: disable=unused-argument, import-outside-toplevel, import-error, try-except-raise
+# pylint: disable=unused-argument, import-outside-toplevel, import-error, try-except-raise, too-few-public-methods
 
 
 def test_find_missing_google_raises(self):  # [missing-raises-doc]
@@ -136,3 +136,57 @@ def test_ignores_caught_google_raises(self):
         pass
 
     raise NameError("hi")
+
+
+class Foo:
+    """test_finds_missing_raises_from_setter_google
+    Example of a setter having missing raises documentation in
+    the Google style docstring of the property
+    """
+
+    @property
+    def foo_method(self):  # [missing-raises-doc]
+        """int: docstring
+
+        Include a "Raises" section so that this is identified
+        as a Google docstring and not a Numpy docstring.
+
+        Raises:
+            RuntimeError: Always
+        """
+        raise RuntimeError()
+        return 10  # [unreachable]
+
+    @foo_method.setter
+    def foo_method(self, value):
+        print(self)
+        raise AttributeError()
+
+
+class Foo:
+    """test_finds_missing_raises_from_setter_google_2
+    Example of a setter having missing raises documentation in
+    its own Google style docstring of the property.
+    """
+
+    @property
+    def foo_method(self):
+        """int: docstring ...
+
+        Raises:
+            RuntimeError: Always
+        """
+        raise RuntimeError()
+        return 10  # [unreachable]
+
+    @foo_method.setter
+    def foo_method(self, value):  # [missing-raises-doc]
+        """setter docstring ...
+
+        Raises:
+            RuntimeError: Never
+        """
+        print(self)
+        if True:  # [using-constant-test]
+            raise AttributeError()
+        raise RuntimeError()
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_Google.txt b/tests/functional/ext/docparams/raise/missing_raises_doc_Google.txt
index 17fbc279d9..6e98f05d9c 100644
--- a/tests/functional/ext/docparams/raise/missing_raises_doc_Google.txt
+++ b/tests/functional/ext/docparams/raise/missing_raises_doc_Google.txt
@@ -1,9 +1,14 @@
-missing-raises-doc:6:0:13:25:test_find_missing_google_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:6:0:6:35:test_find_missing_google_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
 unreachable:13:4:13:25:test_find_missing_google_raises:Unreachable code:UNDEFINED
-missing-raises-doc:38:0:46:21:test_find_valid_missing_google_attr_raises:"""error"" not documented as being raised":UNDEFINED
+missing-raises-doc:38:0:38:46:test_find_valid_missing_google_attr_raises:"""error"" not documented as being raised":UNDEFINED
 unreachable:83:4:83:25:test_find_all_google_raises:Unreachable code:UNDEFINED
 unreachable:94:4:94:25:test_find_multiple_google_raises:Unreachable code:UNDEFINED
 unreachable:95:4:95:30:test_find_multiple_google_raises:Unreachable code:UNDEFINED
 unreachable:96:4:96:27:test_find_multiple_google_raises:Unreachable code:UNDEFINED
-missing-raises-doc:99:0:110:25:test_find_rethrown_google_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
-missing-raises-doc:113:0:124:25:test_find_rethrown_google_multiple_raises:"""RuntimeError, ValueError"" not documented as being raised":UNDEFINED
+missing-raises-doc:99:0:99:36:test_find_rethrown_google_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:113:0:113:45:test_find_rethrown_google_multiple_raises:"""RuntimeError, ValueError"" not documented as being raised":UNDEFINED
+missing-raises-doc:148:4:148:18:Foo.foo_method:"""AttributeError"" not documented as being raised":UNDEFINED
+unreachable:158:8:158:17:Foo.foo_method:Unreachable code:UNDEFINED
+unreachable:180:8:180:17:Foo.foo_method:Unreachable code:UNDEFINED
+missing-raises-doc:183:4:183:18:Foo.foo_method:"""AttributeError"" not documented as being raised":UNDEFINED
+using-constant-test:190:8:191:34:Foo.foo_method:Using a conditional statement with a constant value:UNDEFINED
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_Numpy.py b/tests/functional/ext/docparams/raise/missing_raises_doc_Numpy.py
index e4a9308bd6..8cf8e041f1 100644
--- a/tests/functional/ext/docparams/raise/missing_raises_doc_Numpy.py
+++ b/tests/functional/ext/docparams/raise/missing_raises_doc_Numpy.py
@@ -1,6 +1,11 @@
-"""Tests for missing-raises-doc and missing-raises-type-doc for Numpy style docstrings"""
+"""Tests for missing-raises-doc and missing-raises-type-doc for Numpy style docstrings
+
+Styleguide:
+https://numpydoc.readthedocs.io/en/latest/format.html#docstring-standard
+"""
 # pylint: disable=function-redefined, invalid-name, undefined-variable, missing-function-docstring
 # pylint: disable=unused-argument, try-except-raise, import-outside-toplevel
+# pylint: disable=too-few-public-methods, disallowed-name, using-constant-test
 
 
 def test_find_missing_numpy_raises(self):  # [missing-raises-doc]
@@ -129,3 +134,82 @@ def test_find_invalid_missing_numpy_attr_raises(self):
     from re import error
 
     raise error("hi")
+
+
+class Foo:
+    """test_finds_missing_raises_from_setter_numpy
+    Example of a setter having missing raises documentation in
+    the Numpy style docstring of the property
+    """
+
+    @property
+    def foo(self):  # [missing-raises-doc]
+        """int: docstring
+
+        Include a "Raises" section so that this is identified
+        as a Numpy docstring and not a Google docstring.
+
+        Raises
+        ------
+        RuntimeError
+            Always
+        """
+        raise RuntimeError()
+        return 10  # [unreachable]
+
+    @foo.setter
+    def foo(self, value):
+        print(self)
+        raise AttributeError()
+
+
+class Foo:
+    """test_finds_missing_raises_from_setter_numpy_2
+    Example of a setter having missing raises documentation in
+    its own Numpy style docstring of the property
+    """
+
+    @property
+    def foo(self):
+        """int: docstring ...
+
+        Raises
+        ------
+        RuntimeError
+            Always
+        """
+        raise RuntimeError()
+        return 10  # [unreachable]
+
+    @foo.setter
+    def foo(self, value):  # [missing-raises-doc]
+        """setter docstring ...
+
+        Raises
+        ------
+        RuntimeError
+            Never
+        """
+        print(self)
+        if True:
+            raise AttributeError()
+        raise RuntimeError()
+
+
+class Foo:
+    """test_finds_property_return_type_numpy
+    Example of a property having return documentation in
+    a numpy style docstring
+    """
+
+    @property
+    def foo(self):
+        """int: docstring ...
+
+        Raises
+        ------
+        RuntimeError
+            Always
+        """
+        raise RuntimeError()
+        return 10  # [unreachable]
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_Numpy.txt b/tests/functional/ext/docparams/raise/missing_raises_doc_Numpy.txt
index b6573e38aa..91002c02df 100644
--- a/tests/functional/ext/docparams/raise/missing_raises_doc_Numpy.txt
+++ b/tests/functional/ext/docparams/raise/missing_raises_doc_Numpy.txt
@@ -1,6 +1,11 @@
-missing-raises-doc:6:0:15:25:test_find_missing_numpy_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
-unreachable:15:4:15:25:test_find_missing_numpy_raises:Unreachable code:UNDEFINED
-unreachable:29:4:29:25:test_find_all_numpy_raises:Unreachable code:UNDEFINED
-missing-raises-doc:32:0:45:25:test_find_rethrown_numpy_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
-missing-raises-doc:48:0:61:25:test_find_rethrown_numpy_multiple_raises:"""RuntimeError, ValueError"" not documented as being raised":UNDEFINED
-missing-raises-doc:106:0:116:21:test_find_valid_missing_numpy_attr_raises:"""error"" not documented as being raised":UNDEFINED
+missing-raises-doc:11:0:11:34:test_find_missing_numpy_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
+unreachable:20:4:20:25:test_find_missing_numpy_raises:Unreachable code:UNDEFINED
+unreachable:34:4:34:25:test_find_all_numpy_raises:Unreachable code:UNDEFINED
+missing-raises-doc:37:0:37:35:test_find_rethrown_numpy_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:53:0:53:44:test_find_rethrown_numpy_multiple_raises:"""RuntimeError, ValueError"" not documented as being raised":UNDEFINED
+missing-raises-doc:111:0:111:45:test_find_valid_missing_numpy_attr_raises:"""error"" not documented as being raised":UNDEFINED
+missing-raises-doc:146:4:146:11:Foo.foo:"""AttributeError"" not documented as being raised":UNDEFINED
+unreachable:158:8:158:17:Foo.foo:Unreachable code:UNDEFINED
+unreachable:182:8:182:17:Foo.foo:Unreachable code:UNDEFINED
+missing-raises-doc:185:4:185:11:Foo.foo:"""AttributeError"" not documented as being raised":UNDEFINED
+unreachable:215:8:215:17:Foo.foo:Unreachable code:UNDEFINED
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_Sphinx.txt b/tests/functional/ext/docparams/raise/missing_raises_doc_Sphinx.txt
index 77dbea7080..20c2b4d380 100644
--- a/tests/functional/ext/docparams/raise/missing_raises_doc_Sphinx.txt
+++ b/tests/functional/ext/docparams/raise/missing_raises_doc_Sphinx.txt
@@ -1,13 +1,13 @@
-missing-raises-doc:7:0:13:25:test_find_missing_sphinx_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:7:0:7:35:test_find_missing_sphinx_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
 unreachable:13:4:13:25:test_find_missing_sphinx_raises:Unreachable code:UNDEFINED
 unreachable:36:4:36:25:test_find_all_sphinx_raises:Unreachable code:UNDEFINED
 unreachable:37:4:37:30:test_find_all_sphinx_raises:Unreachable code:UNDEFINED
 unreachable:38:4:38:27:test_find_all_sphinx_raises:Unreachable code:UNDEFINED
 unreachable:48:4:48:25:test_find_multiple_sphinx_raises:Unreachable code:UNDEFINED
-missing-raises-doc:51:0:61:25:test_finds_rethrown_sphinx_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
-missing-raises-doc:64:0:74:25:test_finds_rethrown_sphinx_multiple_raises:"""RuntimeError, ValueError"" not documented as being raised":UNDEFINED
-missing-raises-doc:90:0:97:25:test_find_missing_sphinx_raises_infer_from_instance:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:51:0:51:37:test_finds_rethrown_sphinx_raises:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:64:0:64:46:test_finds_rethrown_sphinx_multiple_raises:"""RuntimeError, ValueError"" not documented as being raised":UNDEFINED
+missing-raises-doc:90:0:90:55:test_find_missing_sphinx_raises_infer_from_instance:"""RuntimeError"" not documented as being raised":UNDEFINED
 unreachable:97:4:97:25:test_find_missing_sphinx_raises_infer_from_instance:Unreachable code:UNDEFINED
-missing-raises-doc:100:0:110:25:test_find_missing_sphinx_raises_infer_from_function:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:100:0:100:55:test_find_missing_sphinx_raises_infer_from_function:"""RuntimeError"" not documented as being raised":UNDEFINED
 unreachable:110:4:110:25:test_find_missing_sphinx_raises_infer_from_function:Unreachable code:UNDEFINED
-missing-raises-doc:133:0:140:21:test_find_valid_missing_sphinx_attr_raises:"""error"" not documented as being raised":UNDEFINED
+missing-raises-doc:133:0:133:46:test_find_valid_missing_sphinx_attr_raises:"""error"" not documented as being raised":UNDEFINED
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_required.txt b/tests/functional/ext/docparams/raise/missing_raises_doc_required.txt
index 3c9f68e163..f04a2b9fdf 100644
--- a/tests/functional/ext/docparams/raise/missing_raises_doc_required.txt
+++ b/tests/functional/ext/docparams/raise/missing_raises_doc_required.txt
@@ -1 +1 @@
-missing-raises-doc:6:0:8:28:test_warns_unknown_style:"""RuntimeError"" not documented as being raised":UNDEFINED
+missing-raises-doc:6:0:6:28:test_warns_unknown_style:"""RuntimeError"" not documented as being raised":UNDEFINED
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_required_exc_inheritance.py b/tests/functional/ext/docparams/raise/missing_raises_doc_required_exc_inheritance.py
new file mode 100644
index 0000000000..16334818d5
--- /dev/null
+++ b/tests/functional/ext/docparams/raise/missing_raises_doc_required_exc_inheritance.py
@@ -0,0 +1,45 @@
+"""Tests for missing-raises-doc for exception class inheritance."""
+# pylint: disable=missing-class-docstring
+
+class CustomError(NameError):
+    pass
+
+
+class CustomChildError(CustomError):
+    pass
+
+
+def test_find_missing_raise_for_parent():  # [missing-raises-doc]
+    """This is a docstring.
+
+    Raises:
+        CustomError: Never
+    """
+    raise NameError("hi")
+
+
+def test_no_missing_raise_for_child_builtin():
+    """This is a docstring.
+
+    Raises:
+        Exception: Never
+    """
+    raise ValueError("hi")
+
+
+def test_no_missing_raise_for_child_custom():
+    """This is a docstring.
+
+    Raises:
+        NameError: Never
+    """
+    raise CustomError("hi")
+
+
+def test_no_missing_raise_for_child_custom_nested():
+    """This is a docstring.
+
+    Raises:
+        NameError: Never
+    """
+    raise CustomChildError("hi")
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_required_exc_inheritance.rc b/tests/functional/ext/docparams/raise/missing_raises_doc_required_exc_inheritance.rc
new file mode 100644
index 0000000000..0989210701
--- /dev/null
+++ b/tests/functional/ext/docparams/raise/missing_raises_doc_required_exc_inheritance.rc
@@ -0,0 +1,5 @@
+[MASTER]
+load-plugins = pylint.extensions.docparams
+
+[BASIC]
+accept-no-raise-doc=no
diff --git a/tests/functional/ext/docparams/raise/missing_raises_doc_required_exc_inheritance.txt b/tests/functional/ext/docparams/raise/missing_raises_doc_required_exc_inheritance.txt
new file mode 100644
index 0000000000..e955a4aec5
--- /dev/null
+++ b/tests/functional/ext/docparams/raise/missing_raises_doc_required_exc_inheritance.txt
@@ -0,0 +1 @@
+missing-raises-doc:12:0:12:38:test_find_missing_raise_for_parent:"""NameError"" not documented as being raised":UNDEFINED
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_Google.py b/tests/functional/ext/docparams/return/missing_return_doc_Google.py
index ba530484b4..498dbf1190 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_Google.py
+++ b/tests/functional/ext/docparams/return/missing_return_doc_Google.py
@@ -1,6 +1,7 @@
 """Tests for missing-return-doc and missing-return-type-doc for Google style docstrings"""
 # pylint: disable=function-redefined, invalid-name, undefined-variable, missing-function-docstring
-# pylint: disable=unused-argument
+# pylint: disable=unused-argument, too-few-public-methods, unnecessary-pass
+import abc
 
 
 def my_func(self):
@@ -75,3 +76,100 @@ def my_func(self):
     if a_func():
         return None
     return 1
+
+
+class Foo:
+    """test_finds_property_return_type_google
+    Example of a property having return documentation in
+    a Google style docstring
+    """
+
+    @property
+    def foo_method(self):
+        """int: docstring ...
+
+        Raises:
+            RuntimeError: Always
+        """
+        raise RuntimeError()
+        return 10  # [unreachable]
+
+
+class Foo:
+    """test_finds_annotation_property_return_type_google
+    Example of a property having return documentation in
+    a Google style docstring
+    """
+
+    @property
+    def foo_method(self) -> int:
+        """docstring ...
+
+        Raises:
+            RuntimeError: Always
+        """
+        raise RuntimeError()
+        return 10  # [unreachable]
+
+
+class Foo:
+    """test_ignores_return_in_abstract_method_google
+    Example of an abstract method documenting the return type that an
+    implementation should return.
+    """
+
+    @abc.abstractmethod
+    def foo_method(self):
+        """docstring ...
+
+        Returns:
+            int: Ten
+        """
+        return 10
+
+
+class Foo:
+    """test_ignores_return_in_abstract_method_google_2
+    Example of a method documenting the return type that an
+    implementation should return.
+    """
+
+    def foo_method(self, arg):
+        """docstring ...
+
+        Args:
+            arg (int): An argument.
+        """
+        raise NotImplementedError()
+
+
+class Foo:
+    """test_ignores_ignored_argument_names_google
+    Example of a method documenting the return type that an
+    implementation should return.
+    """
+
+    def foo_method(self, arg, _):
+        """docstring ...
+
+        Args:
+            arg (int): An argument.
+        """
+        pass
+
+
+class Foo:
+    """test_useless_docs_ignored_argument_names_google
+    Example of a method documenting the return type that an
+    implementation should return.
+    """
+
+    def foo_method(self, arg, _, _ignored):  # [useless-type-doc, useless-param-doc]
+        """docstring ...
+
+        Args:
+            arg (int): An argument.
+            _ (float): Another argument.
+            _ignored: Ignored argument.
+        """
+        pass
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_Google.txt b/tests/functional/ext/docparams/return/missing_return_doc_Google.txt
index 1c226ddcbb..836114036a 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_Google.txt
+++ b/tests/functional/ext/docparams/return/missing_return_doc_Google.txt
@@ -1,3 +1,7 @@
-redundant-returns-doc:42:0:48:15:my_func:Redundant returns documentation:UNDEFINED
-redundant-returns-doc:51:0:57:15:my_func:Redundant returns documentation:UNDEFINED
-redundant-returns-doc:60:0:66:11:my_func:Redundant returns documentation:UNDEFINED
+redundant-returns-doc:43:0:43:11:my_func:Redundant returns documentation:UNDEFINED
+redundant-returns-doc:52:0:52:11:my_func:Redundant returns documentation:UNDEFINED
+redundant-returns-doc:61:0:61:11:my_func:Redundant returns documentation:UNDEFINED
+unreachable:95:8:95:17:Foo.foo_method:Unreachable code:UNDEFINED
+unreachable:112:8:112:17:Foo.foo_method:Unreachable code:UNDEFINED
+useless-param-doc:167:4:167:18:Foo.foo_method:"""_, _ignored"" useless ignored parameter documentation":UNDEFINED
+useless-type-doc:167:4:167:18:Foo.foo_method:"""_"" useless ignored parameter type documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_Numpy.py b/tests/functional/ext/docparams/return/missing_return_doc_Numpy.py
index 269adb4241..47f6f4ae07 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_Numpy.py
+++ b/tests/functional/ext/docparams/return/missing_return_doc_Numpy.py
@@ -1,6 +1,7 @@
 """Tests for missing-return-doc and missing-return-type-doc for Numpy style docstrings"""
 # pylint: disable=function-redefined, invalid-name, undefined-variable, missing-function-docstring
-# pylint: disable=unused-argument
+# pylint: disable=unused-argument, too-few-public-methods, disallowed-name
+import abc
 
 
 def my_func(self):
@@ -103,3 +104,74 @@ def my_func(self):  # [redundant-returns-doc]
             One
     """
     yield 1
+
+
+class Foo:
+    """test_ignores_return_in_abstract_method_numpy
+    Example of an abstract method documenting the return type that an
+    implementation should return."""
+
+    @abc.abstractmethod
+    def foo(self):
+        """docstring ...
+
+        Returns
+        -------
+        int
+            Ten
+        """
+        return 10
+
+
+class Foo:
+    """test_ignores_return_in_abstract_method_numpy_2
+    Example of a method documenting the return type that an
+    implementation should return."""
+
+    def foo(self, arg):
+        """docstring ...
+
+        Parameters
+        ----------
+        arg : int
+            An argument.
+        """
+        raise NotImplementedError()
+
+
+class Foo:
+    """test_ignores_ignored_argument_names_numpy
+    Example of a method documenting the return type that an
+    implementation should return.
+    """
+
+    def foo(self, arg, _):
+        """docstring ...
+
+        Parameters
+        ----------
+        arg : int
+            An argument.
+        """
+
+
+class Foo:
+    """test_useless_docs_ignored_argument_names_numpy
+    Example of a method documenting the return type that an
+    implementation should return.
+    """
+
+    def foo(self, arg, _, _ignored):  # [useless-type-doc, useless-param-doc]
+        """docstring ...
+
+        Parameters
+        ----------
+        arg : int
+            An argument.
+
+        _ : float
+            Another argument.
+
+        _ignored :
+            Ignored Argument
+        """
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_Numpy.txt b/tests/functional/ext/docparams/return/missing_return_doc_Numpy.txt
index 1c17a80af5..fbcfd1287c 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_Numpy.txt
+++ b/tests/functional/ext/docparams/return/missing_return_doc_Numpy.txt
@@ -1,3 +1,5 @@
-redundant-returns-doc:61:0:69:15:my_func:Redundant returns documentation:UNDEFINED
-redundant-returns-doc:72:0:79:15:my_func:Redundant returns documentation:UNDEFINED
-redundant-returns-doc:97:0:105:11:my_func:Redundant returns documentation:UNDEFINED
+redundant-returns-doc:62:0:62:11:my_func:Redundant returns documentation:UNDEFINED
+redundant-returns-doc:73:0:73:11:my_func:Redundant returns documentation:UNDEFINED
+redundant-returns-doc:98:0:98:11:my_func:Redundant returns documentation:UNDEFINED
+useless-param-doc:164:4:164:11:Foo.foo:"""_, _ignored"" useless ignored parameter documentation":UNDEFINED
+useless-type-doc:164:4:164:11:Foo.foo:"""_"" useless ignored parameter type documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_Sphinx.txt b/tests/functional/ext/docparams/return/missing_return_doc_Sphinx.txt
index 604b5d0955..51d324ba7b 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_Sphinx.txt
+++ b/tests/functional/ext/docparams/return/missing_return_doc_Sphinx.txt
@@ -1,2 +1,2 @@
-redundant-returns-doc:44:0:49:15:my_func:Redundant returns documentation:UNDEFINED
-redundant-returns-doc:52:0:57:15:my_func:Redundant returns documentation:UNDEFINED
+redundant-returns-doc:44:0:44:11:my_func:Redundant returns documentation:UNDEFINED
+redundant-returns-doc:52:0:52:11:my_func:Redundant returns documentation:UNDEFINED
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_required.txt b/tests/functional/ext/docparams/return/missing_return_doc_required.txt
index 29042dbaa3..8e15b91a20 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_required.txt
+++ b/tests/functional/ext/docparams/return/missing_return_doc_required.txt
@@ -1,2 +1,2 @@
-missing-return-doc:6:0:7:16:warns_no_docstring:Missing return documentation:UNDEFINED
-missing-return-type-doc:6:0:7:16:warns_no_docstring:Missing return type documentation:UNDEFINED
+missing-return-doc:6:0:6:22:warns_no_docstring:Missing return documentation:UNDEFINED
+missing-return-type-doc:6:0:6:22:warns_no_docstring:Missing return type documentation:UNDEFINED
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_required_Google.py b/tests/functional/ext/docparams/return/missing_return_doc_required_Google.py
index 55cb2e6f3b..37546b34f9 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_required_Google.py
+++ b/tests/functional/ext/docparams/return/missing_return_doc_required_Google.py
@@ -1,7 +1,7 @@
 """Tests for missing-return-doc and missing-return-type-doc for Google style docstrings
 with accept-no-returns-doc = no"""
 # pylint: disable=function-redefined, invalid-name, undefined-variable, missing-function-docstring
-# pylint: disable=unused-argument
+# pylint: disable=unused-argument, too-few-public-methods
 
 
 def my_func(self):  # [missing-return-type-doc]
@@ -38,3 +38,37 @@ def my_func(self):  # [missing-return-doc]
         list(:class:`mymodule.Class`):
     """
     return [mymodule.Class()]
+
+
+class Foo:
+    """test_finds_missing_property_return_type_google
+    Example of a property having return documentation in
+    a Google style docstring
+    """
+
+    @property
+    def foo_method(self):  # [missing-return-type-doc]
+        """docstring ...
+
+        Raises:
+            RuntimeError: Always
+        """
+        raise RuntimeError()
+        return 10  # [unreachable]
+
+
+class Foo:
+    """test_ignores_non_property_return_type_google
+    Example of a class function trying to use `type` as return
+    documentation in a Google style docstring
+    """
+
+    def foo_method(self):  # [missing-return-doc, missing-return-type-doc]
+        """int: docstring ...
+
+        Raises:
+            RuntimeError: Always
+        """
+        print(self)
+        raise RuntimeError()
+        return 10  # [unreachable]
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_required_Google.txt b/tests/functional/ext/docparams/return/missing_return_doc_required_Google.txt
index 16587df8bc..dac5ad2808 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_required_Google.txt
+++ b/tests/functional/ext/docparams/return/missing_return_doc_required_Google.txt
@@ -1,5 +1,10 @@
-missing-return-type-doc:7:0:13:16:my_func:Missing return type documentation:UNDEFINED
-missing-return-doc:16:0:22:16:my_func:Missing return documentation:UNDEFINED
-missing-return-doc:25:0:31:16:my_func:Missing return documentation:UNDEFINED
-missing-return-type-doc:25:0:31:16:my_func:Missing return type documentation:UNDEFINED
-missing-return-doc:34:0:40:29:my_func:Missing return documentation:UNDEFINED
+missing-return-type-doc:7:0:7:11:my_func:Missing return type documentation:UNDEFINED
+missing-return-doc:16:0:16:11:my_func:Missing return documentation:UNDEFINED
+missing-return-doc:25:0:25:11:my_func:Missing return documentation:UNDEFINED
+missing-return-type-doc:25:0:25:11:my_func:Missing return type documentation:UNDEFINED
+missing-return-doc:34:0:34:11:my_func:Missing return documentation:UNDEFINED
+missing-return-type-doc:50:4:50:18:Foo.foo_method:Missing return type documentation:UNDEFINED
+unreachable:57:8:57:17:Foo.foo_method:Unreachable code:UNDEFINED
+missing-return-doc:66:4:66:18:Foo.foo_method:Missing return documentation:UNDEFINED
+missing-return-type-doc:66:4:66:18:Foo.foo_method:Missing return type documentation:UNDEFINED
+unreachable:74:8:74:17:Foo.foo_method:Unreachable code:UNDEFINED
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_required_Numpy.py b/tests/functional/ext/docparams/return/missing_return_doc_required_Numpy.py
index 9b160c1774..8cc59f0ac1 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_required_Numpy.py
+++ b/tests/functional/ext/docparams/return/missing_return_doc_required_Numpy.py
@@ -1,7 +1,7 @@
 """Tests for missing-return-doc and missing-return-type-doc for Numpy style docstrings
 with accept-no-returns-doc = no"""
 # pylint: disable=function-redefined, invalid-name, undefined-variable, missing-function-docstring
-# pylint: disable=unused-argument
+# pylint: disable=unused-argument, too-few-public-methods
 
 
 def my_func(self, doc_type):  # [missing-return-doc]
@@ -38,3 +38,60 @@ def my_func(self):  # [missing-return-doc]
         list(:class:`mymodule.Class`)
     """
     return [mymodule.Class()]
+
+
+class Foo:
+    """test_finds_missing_property_return_type_numpy
+    Example of a property having return documentation in
+    a numpy style docstring
+    """
+
+    @property
+    def foo_prop(self):  # [missing-return-type-doc]
+        """docstring ...
+
+        Raises
+        ------
+        RuntimeError
+            Always
+        """
+        raise RuntimeError()
+        return 10  # [unreachable]
+
+
+class Foo:
+    """test_ignores_non_property_return_type_numpy
+    Example of a class function trying to use `type` as return
+    documentation in a numpy style docstring
+    """
+
+    def foo_method(self):  # [missing-return-doc, missing-return-type-doc]
+        """int: docstring ...
+
+        Raises
+        ------
+        RuntimeError
+            Always
+        """
+        print(self)
+        raise RuntimeError()
+        return 10  # [unreachable]
+
+
+class Foo:
+    """test_non_property_annotation_return_type_numpy
+    Example of a class function trying to use `type` as return
+    documentation in a numpy style docstring
+    """
+
+    def foo_method(self) -> int:  # [missing-return-doc]
+        """int: docstring ...
+
+        Raises
+        ------
+        RuntimeError
+            Always
+        """
+        print(self)
+        raise RuntimeError()
+        return 10  # [unreachable]
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_required_Numpy.txt b/tests/functional/ext/docparams/return/missing_return_doc_required_Numpy.txt
index e3872d206c..61aac4ebb6 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_required_Numpy.txt
+++ b/tests/functional/ext/docparams/return/missing_return_doc_required_Numpy.txt
@@ -1,4 +1,11 @@
-missing-return-doc:7:0:19:16:my_func:Missing return documentation:UNDEFINED
-missing-return-doc:22:0:30:16:my_func:Missing return documentation:UNDEFINED
-missing-return-type-doc:22:0:30:16:my_func:Missing return type documentation:UNDEFINED
-missing-return-doc:33:0:40:29:my_func:Missing return documentation:UNDEFINED
+missing-return-doc:7:0:7:11:my_func:Missing return documentation:UNDEFINED
+missing-return-doc:22:0:22:11:my_func:Missing return documentation:UNDEFINED
+missing-return-type-doc:22:0:22:11:my_func:Missing return type documentation:UNDEFINED
+missing-return-doc:33:0:33:11:my_func:Missing return documentation:UNDEFINED
+missing-return-type-doc:50:4:50:16:Foo.foo_prop:Missing return type documentation:UNDEFINED
+unreachable:59:8:59:17:Foo.foo_prop:Unreachable code:UNDEFINED
+missing-return-doc:68:4:68:18:Foo.foo_method:Missing return documentation:UNDEFINED
+missing-return-type-doc:68:4:68:18:Foo.foo_method:Missing return type documentation:UNDEFINED
+unreachable:78:8:78:17:Foo.foo_method:Unreachable code:UNDEFINED
+missing-return-doc:87:4:87:18:Foo.foo_method:Missing return documentation:UNDEFINED
+unreachable:97:8:97:17:Foo.foo_method:Unreachable code:UNDEFINED
diff --git a/tests/functional/ext/docparams/return/missing_return_doc_required_Sphinx.txt b/tests/functional/ext/docparams/return/missing_return_doc_required_Sphinx.txt
index 0d35b88edd..f9c156e0aa 100644
--- a/tests/functional/ext/docparams/return/missing_return_doc_required_Sphinx.txt
+++ b/tests/functional/ext/docparams/return/missing_return_doc_required_Sphinx.txt
@@ -1,9 +1,9 @@
-missing-return-type-doc:8:0:13:16:my_func:Missing return type documentation:UNDEFINED
-missing-return-doc:24:0:29:16:my_func:Missing return documentation:UNDEFINED
-missing-return-doc:32:0:40:16:warn_missing_sphinx_returns:Missing return documentation:UNDEFINED
-missing-return-type-doc:32:0:40:16:warn_missing_sphinx_returns:Missing return type documentation:UNDEFINED
-missing-return-doc:43:0:48:29:my_func:Missing return documentation:UNDEFINED
-missing-return-type-doc:58:4:64:17:Foo.foo:Missing return type documentation:UNDEFINED
+missing-return-type-doc:8:0:8:11:my_func:Missing return type documentation:UNDEFINED
+missing-return-doc:24:0:24:11:my_func:Missing return documentation:UNDEFINED
+missing-return-doc:32:0:32:31:warn_missing_sphinx_returns:Missing return documentation:UNDEFINED
+missing-return-type-doc:32:0:32:31:warn_missing_sphinx_returns:Missing return type documentation:UNDEFINED
+missing-return-doc:43:0:43:11:my_func:Missing return documentation:UNDEFINED
+missing-return-type-doc:58:4:58:11:Foo.foo:Missing return type documentation:UNDEFINED
 unreachable:64:8:64:17:Foo.foo:Unreachable code:UNDEFINED
-missing-return-doc:72:4:79:17:Foo.test_ignores_non_property_return_type_sphinx:Missing return documentation:UNDEFINED
-missing-return-type-doc:72:4:79:17:Foo.test_ignores_non_property_return_type_sphinx:Missing return type documentation:UNDEFINED
+missing-return-doc:72:4:72:52:Foo.test_ignores_non_property_return_type_sphinx:Missing return documentation:UNDEFINED
+missing-return-type-doc:72:4:72:52:Foo.test_ignores_non_property_return_type_sphinx:Missing return type documentation:UNDEFINED
diff --git a/tests/functional/ext/docparams/useless_type_doc.txt b/tests/functional/ext/docparams/useless_type_doc.txt
index ae879d7f18..3408f18036 100644
--- a/tests/functional/ext/docparams/useless_type_doc.txt
+++ b/tests/functional/ext/docparams/useless_type_doc.txt
@@ -1,4 +1,4 @@
-useless-param-doc:34:0:47:11:function_useless_doc:"""_some_private_param"" useless ignored parameter documentation":UNDEFINED
-useless-type-doc:34:0:47:11:function_useless_doc:"""_some_private_param"" useless ignored parameter type documentation":UNDEFINED
-useless-param-doc:67:0:73:13:test_two:"""_new"" useless ignored parameter documentation":UNDEFINED
-useless-type-doc:67:0:73:13:test_two:"""_new"" useless ignored parameter type documentation":UNDEFINED
+useless-param-doc:34:0:34:24:function_useless_doc:"""_some_private_param"" useless ignored parameter documentation":UNDEFINED
+useless-type-doc:34:0:34:24:function_useless_doc:"""_some_private_param"" useless ignored parameter type documentation":UNDEFINED
+useless-param-doc:67:0:67:12:test_two:"""_new"" useless ignored parameter documentation":UNDEFINED
+useless-type-doc:67:0:67:12:test_two:"""_new"" useless ignored parameter type documentation":UNDEFINED
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc_Google.py b/tests/functional/ext/docparams/yield/missing_yield_doc_Google.py
index 986ca8d08d..9ebfbb30b0 100644
--- a/tests/functional/ext/docparams/yield/missing_yield_doc_Google.py
+++ b/tests/functional/ext/docparams/yield/missing_yield_doc_Google.py
@@ -4,7 +4,7 @@
 import typing
 
 
-# Test redudant yields docstring variants
+# Test redundant yields docstring variants
 def my_func(self):
     """This is a docstring.
 
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc_Google.txt b/tests/functional/ext/docparams/yield/missing_yield_doc_Google.txt
index febb5f9ba2..8315f89bbc 100644
--- a/tests/functional/ext/docparams/yield/missing_yield_doc_Google.txt
+++ b/tests/functional/ext/docparams/yield/missing_yield_doc_Google.txt
@@ -1 +1 @@
-redundant-yields-doc:19:0:25:12:my_func:Redundant yields documentation:UNDEFINED
+redundant-yields-doc:19:0:19:11:my_func:Redundant yields documentation:UNDEFINED
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc_Numpy.py b/tests/functional/ext/docparams/yield/missing_yield_doc_Numpy.py
index bd6a4a0fed..ed827550b3 100644
--- a/tests/functional/ext/docparams/yield/missing_yield_doc_Numpy.py
+++ b/tests/functional/ext/docparams/yield/missing_yield_doc_Numpy.py
@@ -3,7 +3,7 @@
 # pylint: disable=invalid-name, undefined-variable
 
 
-# Test redudant yields docstring variants
+# Test redundant yields docstring variants
 def my_func(self):
     """This is a docstring.
 
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc_Numpy.txt b/tests/functional/ext/docparams/yield/missing_yield_doc_Numpy.txt
index b855ed84df..1324cb5dc7 100644
--- a/tests/functional/ext/docparams/yield/missing_yield_doc_Numpy.txt
+++ b/tests/functional/ext/docparams/yield/missing_yield_doc_Numpy.txt
@@ -1 +1 @@
-redundant-yields-doc:22:0:30:12:my_func:Redundant yields documentation:UNDEFINED
+redundant-yields-doc:22:0:22:11:my_func:Redundant yields documentation:UNDEFINED
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc_required.txt b/tests/functional/ext/docparams/yield/missing_yield_doc_required.txt
index 16a4f535c1..d9162494e4 100644
--- a/tests/functional/ext/docparams/yield/missing_yield_doc_required.txt
+++ b/tests/functional/ext/docparams/yield/missing_yield_doc_required.txt
@@ -1,2 +1,2 @@
-missing-yield-doc:6:0:7:15:my_func:Missing yield documentation:UNDEFINED
-missing-yield-type-doc:6:0:7:15:my_func:Missing yield type documentation:UNDEFINED
+missing-yield-doc:6:0:6:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-type-doc:6:0:6:11:my_func:Missing yield type documentation:UNDEFINED
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc_required_Google.txt b/tests/functional/ext/docparams/yield/missing_yield_doc_required_Google.txt
index e1d8087187..0a655a744d 100644
--- a/tests/functional/ext/docparams/yield/missing_yield_doc_required_Google.txt
+++ b/tests/functional/ext/docparams/yield/missing_yield_doc_required_Google.txt
@@ -1,5 +1,5 @@
-missing-yield-doc:34:0:40:28:my_func:Missing yield documentation:UNDEFINED
-missing-yield-type-doc:43:0:49:15:my_func:Missing yield type documentation:UNDEFINED
-missing-yield-doc:52:0:58:15:my_func:Missing yield documentation:UNDEFINED
-missing-yield-doc:61:0:67:15:my_func:Missing yield documentation:UNDEFINED
-missing-yield-type-doc:61:0:67:15:my_func:Missing yield type documentation:UNDEFINED
+missing-yield-doc:34:0:34:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-type-doc:43:0:43:11:my_func:Missing yield type documentation:UNDEFINED
+missing-yield-doc:52:0:52:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-doc:61:0:61:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-type-doc:61:0:61:11:my_func:Missing yield type documentation:UNDEFINED
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc_required_Numpy.txt b/tests/functional/ext/docparams/yield/missing_yield_doc_required_Numpy.txt
index 26e5989f46..7ca1f80b0a 100644
--- a/tests/functional/ext/docparams/yield/missing_yield_doc_required_Numpy.txt
+++ b/tests/functional/ext/docparams/yield/missing_yield_doc_required_Numpy.txt
@@ -1,3 +1,3 @@
-missing-yield-doc:40:0:47:28:my_func:Missing yield documentation:UNDEFINED
-missing-yield-doc:50:0:58:15:my_func:Missing yield documentation:UNDEFINED
-missing-yield-type-doc:50:0:58:15:my_func:Missing yield type documentation:UNDEFINED
+missing-yield-doc:40:0:40:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-doc:50:0:50:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-type-doc:50:0:50:11:my_func:Missing yield type documentation:UNDEFINED
diff --git a/tests/functional/ext/docparams/yield/missing_yield_doc_required_Sphinx.txt b/tests/functional/ext/docparams/yield/missing_yield_doc_required_Sphinx.txt
index ca4744af2a..3b1931e017 100644
--- a/tests/functional/ext/docparams/yield/missing_yield_doc_required_Sphinx.txt
+++ b/tests/functional/ext/docparams/yield/missing_yield_doc_required_Sphinx.txt
@@ -1,5 +1,5 @@
-missing-yield-doc:35:0:40:28:my_func:Missing yield documentation:UNDEFINED
-missing-yield-type-doc:43:0:48:15:my_func:Missing yield type documentation:UNDEFINED
-missing-yield-doc:51:0:56:15:my_func:Missing yield documentation:UNDEFINED
-missing-yield-doc:59:0:65:15:my_func:Missing yield documentation:UNDEFINED
-missing-yield-type-doc:59:0:65:15:my_func:Missing yield type documentation:UNDEFINED
+missing-yield-doc:35:0:35:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-type-doc:43:0:43:11:my_func:Missing yield type documentation:UNDEFINED
+missing-yield-doc:51:0:51:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-doc:59:0:59:11:my_func:Missing yield documentation:UNDEFINED
+missing-yield-type-doc:59:0:59:11:my_func:Missing yield type documentation:UNDEFINED
diff --git a/tests/functional/ext/docstyle/docstyle.txt b/tests/functional/ext/docstyle/docstyle.txt
deleted file mode 100644
index 0b45cbf8ee..0000000000
--- a/tests/functional/ext/docstyle/docstyle.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-docstring-first-line-empty:4:0:7:19:check_messages:First line empty in function docstring:HIGH
-docstring-first-line-empty:14:0:41:44:FFFF:First line empty in class docstring:HIGH
-bad-docstring-quotes:19:4:22:11:FFFF.method1:"Bad docstring quotes in method, expected """""", given '''":HIGH
-docstring-first-line-empty:19:4:22:11:FFFF.method1:First line empty in method docstring:HIGH
-bad-docstring-quotes:24:4:25:25:FFFF.method2:"Bad docstring quotes in method, expected """""", given """:HIGH
-bad-docstring-quotes:27:4:28:25:FFFF.method3:"Bad docstring quotes in method, expected """""", given '":HIGH
-bad-docstring-quotes:30:4:31:30:FFFF.method4:"Bad docstring quotes in method, expected """""", given '":HIGH
diff --git a/tests/functional/ext/docstyle/docstyle_first_line_empty.py b/tests/functional/ext/docstyle/docstyle_first_line_empty.py
new file mode 100644
index 0000000000..92d7a5b7fe
--- /dev/null
+++ b/tests/functional/ext/docstyle/docstyle_first_line_empty.py
@@ -0,0 +1,22 @@
+"""Checks of Dosctrings 'docstring-first-line-empty'"""
+# pylint: disable=too-few-public-methods,bad-docstring-quotes
+
+def check_messages(*messages):  # [docstring-first-line-empty]
+    """
+    docstring"""
+    return messages
+
+
+def function2():
+    """Test Ok"""
+
+
+class FFFF:  # [docstring-first-line-empty]
+    """
+    Test Docstring First Line Empty
+    """
+
+    def method1(self):  # [docstring-first-line-empty]
+        '''
+        Test Triple Single Quotes docstring
+        '''
diff --git a/tests/functional/ext/docstyle/docstyle.rc b/tests/functional/ext/docstyle/docstyle_first_line_empty.rc
similarity index 100%
rename from tests/functional/ext/docstyle/docstyle.rc
rename to tests/functional/ext/docstyle/docstyle_first_line_empty.rc
diff --git a/tests/functional/ext/docstyle/docstyle_first_line_empty.txt b/tests/functional/ext/docstyle/docstyle_first_line_empty.txt
new file mode 100644
index 0000000000..6113fffaa7
--- /dev/null
+++ b/tests/functional/ext/docstyle/docstyle_first_line_empty.txt
@@ -0,0 +1,3 @@
+docstring-first-line-empty:4:0:4:18:check_messages:First line empty in function docstring:HIGH
+docstring-first-line-empty:14:0:14:10:FFFF:First line empty in class docstring:HIGH
+docstring-first-line-empty:19:4:19:15:FFFF.method1:First line empty in method docstring:HIGH
diff --git a/tests/functional/ext/docstyle/docstyle_quotes_py37.py b/tests/functional/ext/docstyle/docstyle_quotes_py37.py
new file mode 100644
index 0000000000..fd3fc4c508
--- /dev/null
+++ b/tests/functional/ext/docstyle/docstyle_quotes_py37.py
@@ -0,0 +1,35 @@
+"""Checks of Dosctrings 'bad-docstring-quotes'
+
+Check that the checker is not enabled on python <= 3.7
+"""
+# pylint: disable=docstring-first-line-empty,missing-class-docstring, undefined-variable
+
+
+class FFFF:
+    def method1(self):
+        '''
+        Test Triple Single Quotes docstring
+        '''
+
+    def method2(self):
+        "bad docstring 1"
+
+    def method3(self):
+        'bad docstring 2'
+
+    def method4(self):
+        ' """bad docstring 3 '
+
+    @check_messages("bad-open-mode", "redundant-unittest-assert", "deprecated-module")
+    def method5(self):
+        """Test OK 1 with decorators"""
+
+    def method6(self):
+        r"""Test OK 2 with raw string"""
+
+    def method7(self):
+        u"""Test OK 3 with unicode string"""
+
+
+def function2():
+    """Test Ok"""
diff --git a/tests/functional/ext/docstyle/docstyle_quotes_py37.rc b/tests/functional/ext/docstyle/docstyle_quotes_py37.rc
new file mode 100644
index 0000000000..03be9f7f10
--- /dev/null
+++ b/tests/functional/ext/docstyle/docstyle_quotes_py37.rc
@@ -0,0 +1,5 @@
+[MASTER]
+load-plugins=pylint.extensions.docstyle,
+
+[testoptions]
+max_pyver=3.7
diff --git a/tests/functional/ext/docstyle/docstyle.py b/tests/functional/ext/docstyle/docstyle_quotes_py38.py
similarity index 63%
rename from tests/functional/ext/docstyle/docstyle.py
rename to tests/functional/ext/docstyle/docstyle_quotes_py38.py
index a5b6161b05..cb0f96f96c 100644
--- a/tests/functional/ext/docstyle/docstyle.py
+++ b/tests/functional/ext/docstyle/docstyle_quotes_py38.py
@@ -1,22 +1,9 @@
-"""Checks of Dosctrings 'docstring-first-line-empty' 'bad-docstring-quotes'"""
+"""Checks of Dosctrings 'bad-docstring-quotes'"""
+# pylint: disable=docstring-first-line-empty,missing-class-docstring, undefined-variable
 
 
-def check_messages(*messages):  # [docstring-first-line-empty]
-    """
-    docstring"""
-    return messages
-
-
-def function2():
-    """Test Ok"""
-
-
-class FFFF:  # [docstring-first-line-empty]
-    """
-    Test Docstring First Line Empty
-    """
-
-    def method1(self):  # [docstring-first-line-empty, bad-docstring-quotes]
+class FFFF:
+    def method1(self):  # [bad-docstring-quotes]
         '''
         Test Triple Single Quotes docstring
         '''
@@ -39,3 +26,7 @@ def method6(self):
 
     def method7(self):
         u"""Test OK 3 with unicode string"""
+
+
+def function2():
+    """Test Ok"""
diff --git a/tests/functional/ext/docstyle/docstyle_quotes_py38.rc b/tests/functional/ext/docstyle/docstyle_quotes_py38.rc
new file mode 100644
index 0000000000..ef16b89192
--- /dev/null
+++ b/tests/functional/ext/docstyle/docstyle_quotes_py38.rc
@@ -0,0 +1,5 @@
+[MASTER]
+load-plugins=pylint.extensions.docstyle,
+
+[testoptions]
+min_pyver=3.8
diff --git a/tests/functional/ext/docstyle/docstyle_quotes_py38.txt b/tests/functional/ext/docstyle/docstyle_quotes_py38.txt
new file mode 100644
index 0000000000..a83c3ab282
--- /dev/null
+++ b/tests/functional/ext/docstyle/docstyle_quotes_py38.txt
@@ -0,0 +1,4 @@
+bad-docstring-quotes:6:4:6:15:FFFF.method1:"Bad docstring quotes in method, expected """""", given '''":HIGH
+bad-docstring-quotes:11:4:11:15:FFFF.method2:"Bad docstring quotes in method, expected """""", given """:HIGH
+bad-docstring-quotes:14:4:14:15:FFFF.method3:"Bad docstring quotes in method, expected """""", given '":HIGH
+bad-docstring-quotes:17:4:17:15:FFFF.method4:"Bad docstring quotes in method, expected """""", given '":HIGH
diff --git a/tests/functional/ext/eq_without_hash/eq_without_hash.py b/tests/functional/ext/eq_without_hash/eq_without_hash.py
new file mode 100644
index 0000000000..a28afc97bb
--- /dev/null
+++ b/tests/functional/ext/eq_without_hash/eq_without_hash.py
@@ -0,0 +1,11 @@
+"""Regression test for #5025"""
+
+# pylint: disable=invalid-name, missing-docstring, too-few-public-methods
+
+
+class AClass:  # [eq-without-hash]
+    def __init__(self) -> None:
+        self.x = 5
+
+    def __eq__(self, other: object) -> bool:
+        return isinstance(other, AClass) and other.x == self.x
diff --git a/tests/functional/ext/eq_without_hash/eq_without_hash.rc b/tests/functional/ext/eq_without_hash/eq_without_hash.rc
new file mode 100644
index 0000000000..5a4c9fcce3
--- /dev/null
+++ b/tests/functional/ext/eq_without_hash/eq_without_hash.rc
@@ -0,0 +1,2 @@
+[MASTER]
+load-plugins=pylint.extensions.eq_without_hash,
diff --git a/tests/functional/ext/eq_without_hash/eq_without_hash.txt b/tests/functional/ext/eq_without_hash/eq_without_hash.txt
new file mode 100644
index 0000000000..e867a5ab38
--- /dev/null
+++ b/tests/functional/ext/eq_without_hash/eq_without_hash.txt
@@ -0,0 +1 @@
+eq-without-hash:6:0:6:12:AClass:Implementing __eq__ without also implementing __hash__:HIGH
diff --git a/tests/functional/ext/mccabe/mccabe.txt b/tests/functional/ext/mccabe/mccabe.txt
index 9f7663e696..d031943bbd 100644
--- a/tests/functional/ext/mccabe/mccabe.txt
+++ b/tests/functional/ext/mccabe/mccabe.txt
@@ -1,15 +1,15 @@
-too-complex:9:0:11:8:f1:'f1' is too complex. The McCabe rating is 1:HIGH
-too-complex:14:0:18:12:f2:'f2' is too complex. The McCabe rating is 1:HIGH
-too-complex:21:0:28:47:f3:'f3' is too complex. The McCabe rating is 3:HIGH
-too-complex:31:0:34:16:f4:'f4' is too complex. The McCabe rating is 2:HIGH
-too-complex:37:0:42:19:f5:'f5' is too complex. The McCabe rating is 2:HIGH
-too-complex:45:0:50:16:f6:'f6' is too complex. The McCabe rating is 2:HIGH
-too-complex:53:0:65:7:f7:'f7' is too complex. The McCabe rating is 3:HIGH
-too-complex:68:0:77:16:f8:'f8' is too complex. The McCabe rating is 4:HIGH
-too-complex:80:0:103:25:f9:'f9' is too complex. The McCabe rating is 9:HIGH
-too-complex:106:0:130:16:f10:'f10' is too complex. The McCabe rating is 11:HIGH
-too-complex:138:4:140:12:MyClass1.method1:'method1' is too complex. The McCabe rating is 1:HIGH
-too-complex:142:4:195:21:MyClass1.method2:'method2' is too complex. The McCabe rating is 18:HIGH
-too-many-branches:142:4:195:21:MyClass1.method2:Too many branches (20/12):UNDEFINED
+too-complex:9:0:9:6:f1:'f1' is too complex. The McCabe rating is 1:HIGH
+too-complex:14:0:14:6:f2:'f2' is too complex. The McCabe rating is 1:HIGH
+too-complex:21:0:21:6:f3:'f3' is too complex. The McCabe rating is 3:HIGH
+too-complex:31:0:31:6:f4:'f4' is too complex. The McCabe rating is 2:HIGH
+too-complex:37:0:37:6:f5:'f5' is too complex. The McCabe rating is 2:HIGH
+too-complex:45:0:45:6:f6:'f6' is too complex. The McCabe rating is 2:HIGH
+too-complex:53:0:53:6:f7:'f7' is too complex. The McCabe rating is 3:HIGH
+too-complex:68:0:68:6:f8:'f8' is too complex. The McCabe rating is 4:HIGH
+too-complex:80:0:80:6:f9:'f9' is too complex. The McCabe rating is 9:HIGH
+too-complex:106:0:106:7:f10:'f10' is too complex. The McCabe rating is 11:HIGH
+too-complex:138:4:138:15:MyClass1.method1:'method1' is too complex. The McCabe rating is 1:HIGH
+too-complex:142:4:142:15:MyClass1.method2:'method2' is too complex. The McCabe rating is 18:HIGH
+too-many-branches:142:4:142:15:MyClass1.method2:Too many branches (20/12):UNDEFINED
 too-complex:198:0:204:15::This 'for' is too complex. The McCabe rating is 4:HIGH
-too-complex:207:0:216:15:method3:'method3' is too complex. The McCabe rating is 2:HIGH
+too-complex:207:0:207:11:method3:'method3' is too complex. The McCabe rating is 2:HIGH
diff --git a/tests/functional/ext/private_import/private_import.py b/tests/functional/ext/private_import/private_import.py
new file mode 100644
index 0000000000..52ef405c90
--- /dev/null
+++ b/tests/functional/ext/private_import/private_import.py
@@ -0,0 +1,121 @@
+"""Tests for import-private-name."""
+# pylint: disable=unused-import, missing-docstring, reimported, import-error, wrong-import-order
+# pylint: disable=no-name-in-module, multiple-imports, ungrouped-imports, misplaced-future
+# pylint: disable=wrong-import-position
+
+# Basic cases
+from _world import hello  # [import-private-name]
+from _world import _hello  # [import-private-name]
+from city import _house  # [import-private-name]
+from city import a, _b, c, _d  # [import-private-name]
+from _city import a, _b, c, _d  # [import-private-name]
+from city import a, b, c, _d  # [import-private-name]
+import house
+import _house  # [import-private-name]
+import _house, _chair, _stair  # [import-private-name]
+import house, _chair, _stair  # [import-private-name]
+
+# Ignore dunders
+import __asd__
+import __future__
+from __future__ import print_function
+from __future__ import __print_function__
+
+# Ignore local modules
+# The check for local modules compares directory names in the path of the file being linted to
+# the name of the module we are importing from. The use of `__init__.py` to indicate Python modules
+# is deprecated so this is a heuristic solution.
+# If we were importing from `pylint`, it would be counted as a valid internal private import
+# and not emit a message as long as this file has a parent directory called `pylint`, even though
+# we are not importing from that directory. (We would be importing from `pylint/pylint`.)
+from private_import import _private  # pylint: disable=import-self
+from private_import.other_file import _private
+from . import _private
+from astroid import _private  # [import-private-name]
+from sys import _private  # [import-private-name]
+
+# Ignore typecheck
+from typing import TYPE_CHECKING, List, Optional
+
+if TYPE_CHECKING:
+    import _TreeType
+    from types import _TreeType
+    from _types import TreeType
+    from _types import _TreeType
+
+# No error since imports are used as type annotations
+from classes import _PrivateClassA, safe_get_A
+from classes import _PrivateClassB
+from classes import _PrivateClassC
+
+a_var: _PrivateClassA = safe_get_A()
+
+def b_func(class_b: _PrivateClassB):
+    print(class_b)
+
+def c_func() -> _PrivateClassC:
+    return None
+
+# Used as typing in slices
+from classes import _SubScriptA
+from classes import _SubScriptB
+
+a: Optional[_SubScriptA]
+b: Optional[_SubScriptB[List]]
+
+import _TypeContainerA
+import _TypeContainerB
+import _TypeContainerC
+
+import SafeContainerA
+a2: _TypeContainerA.A = SafeContainerA.safe_get_a()
+
+def b_func2(class_b2: _TypeContainerB.B):
+    print(class_b2)
+
+def c2_func() -> _TypeContainerC.C:
+    return None
+
+# This is allowed since all the imports are used for typing
+from _TypeContainerExtra import TypeExtraA, TypeExtraB
+from MakerContainerExtra import GetA, GetB
+extraA: TypeExtraA = GetA()
+extraB: TypeExtraB = GetB()
+
+# This is not allowed because there is an import not used for typing
+from _TypeContainerExtra2 import TypeExtra2, NotTypeExtra # [import-private-name]
+extra2: TypeExtra2
+
+# Try many cases to ensure that type annotation usages of a private import
+# do not mask other illegal usages of the import
+import _private_module # [import-private-name]
+my_var: _private_module.Thing = _private_module.Thing()
+
+import _private_module2 # [import-private-name]
+my_var2: _private_module2.Thing2
+my_var2 = _private_module2.Thing2()
+
+import _private_module3 # [import-private-name]
+my_var3: _private_module3.Thing3
+my_var3 = _private_module3.Thing3
+my_var3_2: _private_module3.Thing3
+
+import _private_module4 # [import-private-name]
+my_var4: _private_module4.Thing4
+my_var4 = _private_module4.get_callers().get_thing4()
+
+from _private_module5 import PrivateClass # [import-private-name]
+my_var5: PrivateClass
+my_var5 = PrivateClass()
+
+from _private_module6 import PrivateClass2 # [import-private-name]
+my_var6: PrivateClass2 = PrivateClass2()
+
+from public_module import _PrivateClass3 # [import-private-name]
+my_var7: _PrivateClass3 = _PrivateClass3()
+
+# Even though we do not see the private call, the type check does not keep us from emitting
+# because we do not use that variable
+import _private_module_unreachable # [import-private-name]
+my_var8: _private_module_unreachable.Thing8
+_private_module_unreachable.Thing8()
diff --git a/tests/functional/ext/private_import/private_import.rc b/tests/functional/ext/private_import/private_import.rc
new file mode 100644
index 0000000000..c9bbc23f1f
--- /dev/null
+++ b/tests/functional/ext/private_import/private_import.rc
@@ -0,0 +1,2 @@
+[MASTER]
+load-plugins=pylint.extensions.private_import,
diff --git a/tests/functional/ext/private_import/private_import.txt b/tests/functional/ext/private_import/private_import.txt
new file mode 100644
index 0000000000..f618d58587
--- /dev/null
+++ b/tests/functional/ext/private_import/private_import.txt
@@ -0,0 +1,20 @@
+import-private-name:7:0:7:24::Imported private module (_world):HIGH
+import-private-name:8:0:8:25::Imported private module (_world):HIGH
+import-private-name:9:0:9:23::Imported private object (_house):HIGH
+import-private-name:10:0:10:29::Imported private objects (_b, _d):HIGH
+import-private-name:11:0:11:30::Imported private module (_city):HIGH
+import-private-name:12:0:12:28::Imported private object (_d):HIGH
+import-private-name:14:0:14:13::Imported private module (_house):HIGH
+import-private-name:15:0:15:29::Imported private modules (_house, _chair, _stair):HIGH
+import-private-name:16:0:16:28::Imported private modules (_chair, _stair):HIGH
+import-private-name:34:0:34:28::Imported private object (_private):HIGH
+import-private-name:35:0:35:24::Imported private object (_private):HIGH
+import-private-name:86:0:86:57::Imported private module (_TypeContainerExtra2):HIGH
+import-private-name:91:0:91:22::Imported private module (_private_module):HIGH
+import-private-name:94:0:94:23::Imported private module (_private_module2):HIGH
+import-private-name:98:0:98:23::Imported private module (_private_module3):HIGH
+import-private-name:103:0:103:23::Imported private module (_private_module4):HIGH
+import-private-name:107:0:107:41::Imported private module (_private_module5):HIGH
+import-private-name:111:0:111:42::Imported private module (_private_module6):HIGH
+import-private-name:114:0:114:40::Imported private object (_PrivateClass3):HIGH
+import-private-name:119:0:119:34::Imported private module (_private_module_unreachable):HIGH
diff --git a/tests/functional/ext/redefined_variable_type/regression_newtype_fstring.py b/tests/functional/ext/redefined_variable_type/regression_newtype_fstring.py
new file mode 100644
index 0000000000..1e3cb28080
--- /dev/null
+++ b/tests/functional/ext/redefined_variable_type/regression_newtype_fstring.py
@@ -0,0 +1,9 @@
+"""Regression test for issue 5770: NewType created with f-string
+See: https://github.com/PyCQA/pylint/issues/5770
+"""
+from typing import NewType
+
+def make_new_type(suffix):
+    """Dynamically create a NewType with `suffix`"""
+    new_type = NewType(f'IntRange_{suffix}', suffix)
+    print(new_type)
diff --git a/tests/functional/ext/redefined_variable_type/regression_newtype_fstring.rc b/tests/functional/ext/redefined_variable_type/regression_newtype_fstring.rc
new file mode 100644
index 0000000000..8ee18a8f10
--- /dev/null
+++ b/tests/functional/ext/redefined_variable_type/regression_newtype_fstring.rc
@@ -0,0 +1,2 @@
+[MASTER]
+load-plugins=pylint.extensions.redefined_variable_type,
diff --git a/tests/functional/ext/typing/typing_broken_callable.py b/tests/functional/ext/typing/typing_broken_callable.py
new file mode 100644
index 0000000000..0713e17c87
--- /dev/null
+++ b/tests/functional/ext/typing/typing_broken_callable.py
@@ -0,0 +1,32 @@
+"""
+'collections.abc.Callable' is broken inside Optional and Union types for Python 3.9.0
+https://bugs.python.org/issue42965
+
+Use 'typing.Callable' instead.
+"""
+# pylint: disable=missing-docstring,unsubscriptable-object
+import collections.abc
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Optional, Union
+
+Alias1 = Optional[Callable[[int], None]]  # [broken-collections-callable]
+Alias2 = Union[Callable[[int], None], None]  # [broken-collections-callable]
+
+Alias3 = Optional[Callable[..., None]]
+Alias4 = Union[Callable[..., None], None]
+Alias5 = list[Callable[..., None]]
+Alias6 = Callable[[int], None]
+
+if TYPE_CHECKING:
+    # ok inside TYPE_CHECKING block
+    Alias7 = Optional[Callable[[int], None]]
+
+
+def func1() -> Optional[Callable[[int], None]]:  # [broken-collections-callable]
+    ...
+
+def func2() -> Optional["Callable[[int], None]"]:
+    ...
+
+def func3() -> Union[collections.abc.Callable[[int], None], None]:  # [broken-collections-callable]
+    ...
diff --git a/tests/functional/ext/typing/typing_broken_callable.rc b/tests/functional/ext/typing/typing_broken_callable.rc
new file mode 100644
index 0000000000..301a67b7c8
--- /dev/null
+++ b/tests/functional/ext/typing/typing_broken_callable.rc
@@ -0,0 +1,6 @@
+[master]
+py-version=3.9
+load-plugins=pylint.extensions.typing
+
+[testoptions]
+min_pyver=3.7
diff --git a/tests/functional/ext/typing/typing_broken_callable.txt b/tests/functional/ext/typing/typing_broken_callable.txt
new file mode 100644
index 0000000000..6edcf211b2
--- /dev/null
+++ b/tests/functional/ext/typing/typing_broken_callable.txt
@@ -0,0 +1,4 @@
+broken-collections-callable:12:18:12:26::'collections.abc.Callable' inside Optional and Union is broken in 3.9.0 / 3.9.1 (use 'typing.Callable' instead):INFERENCE
+broken-collections-callable:13:15:13:23::'collections.abc.Callable' inside Optional and Union is broken in 3.9.0 / 3.9.1 (use 'typing.Callable' instead):INFERENCE
+broken-collections-callable:25:24:25:32:func1:'collections.abc.Callable' inside Optional and Union is broken in 3.9.0 / 3.9.1 (use 'typing.Callable' instead):INFERENCE
+broken-collections-callable:31:21:31:45:func3:'collections.abc.Callable' inside Optional and Union is broken in 3.9.0 / 3.9.1 (use 'typing.Callable' instead):INFERENCE
diff --git a/tests/functional/ext/typing/typing_broken_callable_deprecated_alias.py b/tests/functional/ext/typing/typing_broken_callable_deprecated_alias.py
new file mode 100644
index 0000000000..f01592a59a
--- /dev/null
+++ b/tests/functional/ext/typing/typing_broken_callable_deprecated_alias.py
@@ -0,0 +1,26 @@
+"""
+'collections.abc.Callable' is broken inside Optional and Union types for Python 3.9.0
+https://bugs.python.org/issue42965
+
+Use 'typing.Callable' instead.
+
+Don't emit 'deprecated-typing-alias' for 'Callable' if at least one replacement
+would create broken instances.
+"""
+# pylint: disable=missing-docstring,unsubscriptable-object
+from typing import Callable, Optional, Union
+
+Alias1 = Optional[Callable[[int], None]]
+Alias2 = Union[Callable[[int], None], None]
+
+Alias3 = Optional[Callable[..., None]]
+Alias4 = Union[Callable[..., None], None]
+Alias5 = list[Callable[[int], None]]
+Alias6 = Callable[[int], None]
+
+
+def func1() -> Optional[Callable[[int], None]]:
+    ...
+
+def func2() -> Optional["Callable[[int], None]"]:
+    ...
diff --git a/tests/functional/ext/typing/typing_broken_callable_deprecated_alias.rc b/tests/functional/ext/typing/typing_broken_callable_deprecated_alias.rc
new file mode 100644
index 0000000000..301a67b7c8
--- /dev/null
+++ b/tests/functional/ext/typing/typing_broken_callable_deprecated_alias.rc
@@ -0,0 +1,6 @@
+[master]
+py-version=3.9
+load-plugins=pylint.extensions.typing
+
+[testoptions]
+min_pyver=3.7
diff --git a/tests/functional/ext/typing/typing_broken_callable_future_import.py b/tests/functional/ext/typing/typing_broken_callable_future_import.py
new file mode 100644
index 0000000000..947e060b98
--- /dev/null
+++ b/tests/functional/ext/typing/typing_broken_callable_future_import.py
@@ -0,0 +1,30 @@
+"""
+'collections.abc.Callable' is broken inside Optional and Union types for Python 3.9.0
+https://bugs.python.org/issue42965
+
+Use 'typing.Callable' instead.
+"""
+# pylint: disable=missing-docstring,unsubscriptable-object
+from __future__ import annotations
+
+import collections.abc
+from collections.abc import Callable
+from typing import Optional, Union
+
+Alias1 = Optional[Callable[[int], None]]  # [broken-collections-callable]
+Alias2 = Union[Callable[[int], None], None]  # [broken-collections-callable]
+
+Alias3 = Optional[Callable[..., None]]
+Alias4 = Union[Callable[..., None], None]
+Alias5 = list[Callable[[int], None]]
+Alias6 = Callable[[int], None]
+
+
+def func1() -> Optional[Callable[[int], None]]:
+    ...
+
+def func2() -> Optional["Callable[[int], None]"]:
+    ...
+
+def func3() -> Union[collections.abc.Callable[[int], None], None]:
+    ...
diff --git a/tests/functional/ext/typing/typing_broken_callable_future_import.rc b/tests/functional/ext/typing/typing_broken_callable_future_import.rc
new file mode 100644
index 0000000000..301a67b7c8
--- /dev/null
+++ b/tests/functional/ext/typing/typing_broken_callable_future_import.rc
@@ -0,0 +1,6 @@
+[master]
+py-version=3.9
+load-plugins=pylint.extensions.typing
+
+[testoptions]
+min_pyver=3.7
diff --git a/tests/functional/ext/typing/typing_broken_callable_future_import.txt b/tests/functional/ext/typing/typing_broken_callable_future_import.txt
new file mode 100644
index 0000000000..a3f3553f6a
--- /dev/null
+++ b/tests/functional/ext/typing/typing_broken_callable_future_import.txt
@@ -0,0 +1,2 @@
+broken-collections-callable:14:18:14:26::'collections.abc.Callable' inside Optional and Union is broken in 3.9.0 / 3.9.1 (use 'typing.Callable' instead):INFERENCE
+broken-collections-callable:15:15:15:23::'collections.abc.Callable' inside Optional and Union is broken in 3.9.0 / 3.9.1 (use 'typing.Callable' instead):INFERENCE
diff --git a/tests/functional/ext/typing/typing_broken_noreturn.py b/tests/functional/ext/typing/typing_broken_noreturn.py
new file mode 100644
index 0000000000..4d10ed13ab
--- /dev/null
+++ b/tests/functional/ext/typing/typing_broken_noreturn.py
@@ -0,0 +1,36 @@
+"""
+'typing.NoReturn' is broken inside compond types for Python 3.7.0
+https://bugs.python.org/issue34921
+
+If no runtime introspection is required, use string annotations instead.
+"""
+# pylint: disable=missing-docstring
+import typing
+from typing import TYPE_CHECKING, Callable, NoReturn, Union
+
+import typing_extensions
+
+
+def func1() -> NoReturn:
+    raise Exception
+
+def func2() -> Union[None, NoReturn]:  # [broken-noreturn]
+    pass
+
+def func3() -> Union[None, "NoReturn"]:
+    pass
+
+def func4() -> Union[None, typing.NoReturn]:  # [broken-noreturn]
+    pass
+
+def func5() -> Union[None, typing_extensions.NoReturn]:  # [broken-noreturn]
+    pass
+
+
+Alias1 = NoReturn
+Alias2 = Callable[..., NoReturn]  # [broken-noreturn]
+Alias3 = Callable[..., "NoReturn"]
+
+if TYPE_CHECKING:
+    # ok inside TYPE_CHECKING block
+    Alias4 = Callable[..., NoReturn]
diff --git a/tests/functional/ext/typing/typing_broken_noreturn.rc b/tests/functional/ext/typing/typing_broken_noreturn.rc
new file mode 100644
index 0000000000..56e0bed570
--- /dev/null
+++ b/tests/functional/ext/typing/typing_broken_noreturn.rc
@@ -0,0 +1,3 @@
+[master]
+py-version=3.7
+load-plugins=pylint.extensions.typing
diff --git a/tests/functional/ext/typing/typing_broken_noreturn.txt b/tests/functional/ext/typing/typing_broken_noreturn.txt
new file mode 100644
index 0000000000..ce4503341f
--- /dev/null
+++ b/tests/functional/ext/typing/typing_broken_noreturn.txt
@@ -0,0 +1,4 @@
+broken-noreturn:17:27:17:35:func2:'NoReturn' inside compound types is broken in 3.7.0 / 3.7.1:INFERENCE
+broken-noreturn:23:27:23:42:func4:'NoReturn' inside compound types is broken in 3.7.0 / 3.7.1:INFERENCE
+broken-noreturn:26:27:26:53:func5:'NoReturn' inside compound types is broken in 3.7.0 / 3.7.1:INFERENCE
+broken-noreturn:31:23:31:31::'NoReturn' inside compound types is broken in 3.7.0 / 3.7.1:INFERENCE
diff --git a/tests/functional/ext/typing/typing_broken_noreturn_future_import.py b/tests/functional/ext/typing/typing_broken_noreturn_future_import.py
new file mode 100644
index 0000000000..4743750bc5
--- /dev/null
+++ b/tests/functional/ext/typing/typing_broken_noreturn_future_import.py
@@ -0,0 +1,41 @@
+"""
+'typing.NoReturn' is broken inside compond types for Python 3.7.0
+https://bugs.python.org/issue34921
+
+If no runtime introspection is required, use string annotations instead.
+
+With 'from __future__ import annotations', only emit errors for nodes
+not in a type annotation context.
+"""
+# pylint: disable=missing-docstring
+from __future__ import annotations
+
+import typing
+from typing import TYPE_CHECKING, Callable, NoReturn, Union
+
+import typing_extensions
+
+
+def func1() -> NoReturn:
+    raise Exception
+
+def func2() -> Union[None, NoReturn]:
+    pass
+
+def func3() -> Union[None, "NoReturn"]:
+    pass
+
+def func4() -> Union[None, typing.NoReturn]:
+    pass
+
+def func5() -> Union[None, typing_extensions.NoReturn]:
+    pass
+
+
+Alias1 = NoReturn
+Alias2 = Callable[..., NoReturn]  # [broken-noreturn]
+Alias3 = Callable[..., "NoReturn"]
+
+if TYPE_CHECKING:
+    # ok inside TYPE_CHECKING block
+    Alias4 = Callable[..., NoReturn]
diff --git a/tests/functional/ext/typing/typing_broken_noreturn_future_import.rc b/tests/functional/ext/typing/typing_broken_noreturn_future_import.rc
new file mode 100644
index 0000000000..92ef9524a3
--- /dev/null
+++ b/tests/functional/ext/typing/typing_broken_noreturn_future_import.rc
@@ -0,0 +1,6 @@
+[master]
+py-version=3.7
+load-plugins=pylint.extensions.typing
+
+[testoptions]
+min_pyver=3.7
diff --git a/tests/functional/ext/typing/typing_broken_noreturn_future_import.txt b/tests/functional/ext/typing/typing_broken_noreturn_future_import.txt
new file mode 100644
index 0000000000..891a3a4d8b
--- /dev/null
+++ b/tests/functional/ext/typing/typing_broken_noreturn_future_import.txt
@@ -0,0 +1 @@
+broken-noreturn:36:23:36:31::'NoReturn' inside compound types is broken in 3.7.0 / 3.7.1:INFERENCE
diff --git a/tests/functional/ext/typing/typing_broken_noreturn_py372.py b/tests/functional/ext/typing/typing_broken_noreturn_py372.py
new file mode 100644
index 0000000000..4ff1a71b75
--- /dev/null
+++ b/tests/functional/ext/typing/typing_broken_noreturn_py372.py
@@ -0,0 +1,38 @@
+"""
+'typing.NoReturn' is broken inside compond types for Python 3.7.0
+https://bugs.python.org/issue34921
+
+If no runtime introspection is required, use string annotations instead.
+
+Don't emit errors if py-version set to >= 3.7.2.
+"""
+# pylint: disable=missing-docstring
+import typing
+from typing import TYPE_CHECKING, Callable, NoReturn, Union
+
+import typing_extensions
+
+
+def func1() -> NoReturn:
+    raise Exception
+
+def func2() -> Union[None, NoReturn]:
+    pass
+
+def func3() -> Union[None, "NoReturn"]:
+    pass
+
+def func4() -> Union[None, typing.NoReturn]:
+    pass
+
+def func5() -> Union[None, typing_extensions.NoReturn]:
+    pass
+
+
+Alias1 = NoReturn
+Alias2 = Callable[..., NoReturn]
+Alias3 = Callable[..., "NoReturn"]
+
+if TYPE_CHECKING:
+    # ok inside TYPE_CHECKING block
+    Alias4 = Callable[..., NoReturn]
diff --git a/tests/functional/ext/typing/typing_broken_noreturn_py372.rc b/tests/functional/ext/typing/typing_broken_noreturn_py372.rc
new file mode 100644
index 0000000000..24550b2c9d
--- /dev/null
+++ b/tests/functional/ext/typing/typing_broken_noreturn_py372.rc
@@ -0,0 +1,3 @@
+[master]
+py-version=3.7.2
+load-plugins=pylint.extensions.typing
diff --git a/tests/functional/ext/typing/consider_using_alias.py b/tests/functional/ext/typing/typing_consider_using_alias.py
similarity index 100%
rename from tests/functional/ext/typing/consider_using_alias.py
rename to tests/functional/ext/typing/typing_consider_using_alias.py
diff --git a/tests/functional/ext/typing/consider_using_alias.rc b/tests/functional/ext/typing/typing_consider_using_alias.rc
similarity index 100%
rename from tests/functional/ext/typing/consider_using_alias.rc
rename to tests/functional/ext/typing/typing_consider_using_alias.rc
diff --git a/tests/functional/ext/typing/consider_using_alias.txt b/tests/functional/ext/typing/typing_consider_using_alias.txt
similarity index 64%
rename from tests/functional/ext/typing/consider_using_alias.txt
rename to tests/functional/ext/typing/typing_consider_using_alias.txt
index f4ddbd213f..0845e2c9cd 100644
--- a/tests/functional/ext/typing/consider_using_alias.txt
+++ b/tests/functional/ext/typing/typing_consider_using_alias.txt
@@ -1,20 +1,20 @@
-consider-using-alias:16:6:16:17::'typing.Dict' will be deprecated with PY39, consider using 'dict' instead:UNDEFINED
-consider-using-alias:17:6:17:10::'typing.List' will be deprecated with PY39, consider using 'list' instead:UNDEFINED
-consider-using-alias:19:6:19:24::'typing.OrderedDict' will be deprecated with PY39, consider using 'collections.OrderedDict' instead:UNDEFINED
-consider-using-alias:20:6:20:22::'typing.Awaitable' will be deprecated with PY39, consider using 'collections.abc.Awaitable' instead:UNDEFINED
-consider-using-alias:21:6:21:21::'typing.Iterable' will be deprecated with PY39, consider using 'collections.abc.Iterable' instead:UNDEFINED
-consider-using-alias:22:6:22:21::'typing.Hashable' will be deprecated with PY39, consider using 'collections.abc.Hashable' instead:UNDEFINED
-consider-using-alias:23:6:23:27::'typing.ContextManager' will be deprecated with PY39, consider using 'contextlib.AbstractContextManager' instead:UNDEFINED
-consider-using-alias:24:6:24:20::'typing.Pattern' will be deprecated with PY39, consider using 're.Pattern' instead:UNDEFINED
-consider-using-alias:25:7:25:22::'typing.Match' will be deprecated with PY39, consider using 're.Match' instead:UNDEFINED
-consider-using-alias:34:9:34:13::'typing.List' will be deprecated with PY39, consider using 'list' instead:UNDEFINED
-consider-using-alias:36:7:36:11::'typing.Type' will be deprecated with PY39, consider using 'type' instead:UNDEFINED
-consider-using-alias:37:7:37:12::'typing.Tuple' will be deprecated with PY39, consider using 'tuple' instead:UNDEFINED
-consider-using-alias:38:7:38:15::'typing.Callable' will be deprecated with PY39, consider using 'collections.abc.Callable' instead:UNDEFINED
-consider-using-alias:44:74:44:78:func1:'typing.Dict' will be deprecated with PY39, consider using 'dict' instead:UNDEFINED
-consider-using-alias:44:16:44:20:func1:'typing.List' will be deprecated with PY39, consider using 'list' instead:UNDEFINED
-consider-using-alias:44:37:44:41:func1:'typing.List' will be deprecated with PY39, consider using 'list' instead:UNDEFINED
-consider-using-alias:44:93:44:105:func1:'typing.Tuple' will be deprecated with PY39, consider using 'tuple' instead:UNDEFINED
-consider-using-alias:60:12:60:16:CustomNamedTuple:'typing.List' will be deprecated with PY39, consider using 'list' instead:UNDEFINED
-consider-using-alias:65:12:65:16:CustomTypedDict2:'typing.List' will be deprecated with PY39, consider using 'list' instead:UNDEFINED
-consider-using-alias:69:12:69:16:CustomDataClass:'typing.List' will be deprecated with PY39, consider using 'list' instead:UNDEFINED
+consider-using-alias:16:6:16:17::'typing.Dict' will be deprecated with PY39, consider using 'dict' instead:INFERENCE
+consider-using-alias:17:6:17:10::'typing.List' will be deprecated with PY39, consider using 'list' instead:INFERENCE
+consider-using-alias:19:6:19:24::'typing.OrderedDict' will be deprecated with PY39, consider using 'collections.OrderedDict' instead:INFERENCE
+consider-using-alias:20:6:20:22::'typing.Awaitable' will be deprecated with PY39, consider using 'collections.abc.Awaitable' instead:INFERENCE
+consider-using-alias:21:6:21:21::'typing.Iterable' will be deprecated with PY39, consider using 'collections.abc.Iterable' instead:INFERENCE
+consider-using-alias:22:6:22:21::'typing.Hashable' will be deprecated with PY39, consider using 'collections.abc.Hashable' instead:INFERENCE
+consider-using-alias:23:6:23:27::'typing.ContextManager' will be deprecated with PY39, consider using 'contextlib.AbstractContextManager' instead:INFERENCE
+consider-using-alias:24:6:24:20::'typing.Pattern' will be deprecated with PY39, consider using 're.Pattern' instead:INFERENCE
+consider-using-alias:25:7:25:22::'typing.Match' will be deprecated with PY39, consider using 're.Match' instead:INFERENCE
+consider-using-alias:34:9:34:13::'typing.List' will be deprecated with PY39, consider using 'list' instead:INFERENCE
+consider-using-alias:36:7:36:11::'typing.Type' will be deprecated with PY39, consider using 'type' instead:INFERENCE
+consider-using-alias:37:7:37:12::'typing.Tuple' will be deprecated with PY39, consider using 'tuple' instead:INFERENCE
+consider-using-alias:38:7:38:15::'typing.Callable' will be deprecated with PY39, consider using 'collections.abc.Callable' instead:INFERENCE
+consider-using-alias:44:74:44:78:func1:'typing.Dict' will be deprecated with PY39, consider using 'dict' instead:INFERENCE
+consider-using-alias:44:16:44:20:func1:'typing.List' will be deprecated with PY39, consider using 'list' instead:INFERENCE
+consider-using-alias:44:37:44:41:func1:'typing.List' will be deprecated with PY39, consider using 'list' instead:INFERENCE
+consider-using-alias:44:93:44:105:func1:'typing.Tuple' will be deprecated with PY39, consider using 'tuple' instead:INFERENCE
+consider-using-alias:60:12:60:16:CustomNamedTuple:'typing.List' will be deprecated with PY39, consider using 'list' instead:INFERENCE
+consider-using-alias:65:12:65:16:CustomTypedDict2:'typing.List' will be deprecated with PY39, consider using 'list' instead:INFERENCE
+consider-using-alias:69:12:69:16:CustomDataClass:'typing.List' will be deprecated with PY39, consider using 'list' instead:INFERENCE
diff --git a/tests/functional/ext/typing/consider_using_alias_without_future.py b/tests/functional/ext/typing/typing_consider_using_alias_without_future.py
similarity index 100%
rename from tests/functional/ext/typing/consider_using_alias_without_future.py
rename to tests/functional/ext/typing/typing_consider_using_alias_without_future.py
diff --git a/tests/functional/ext/typing/consider_using_alias_without_future.rc b/tests/functional/ext/typing/typing_consider_using_alias_without_future.rc
similarity index 100%
rename from tests/functional/ext/typing/consider_using_alias_without_future.rc
rename to tests/functional/ext/typing/typing_consider_using_alias_without_future.rc
diff --git a/tests/functional/ext/typing/consider_using_alias_without_future.txt b/tests/functional/ext/typing/typing_consider_using_alias_without_future.txt
similarity index 73%
rename from tests/functional/ext/typing/consider_using_alias_without_future.txt
rename to tests/functional/ext/typing/typing_consider_using_alias_without_future.txt
index e4552cae35..d7ed5fc845 100644
--- a/tests/functional/ext/typing/consider_using_alias_without_future.txt
+++ b/tests/functional/ext/typing/typing_consider_using_alias_without_future.txt
@@ -1,20 +1,20 @@
-consider-using-alias:13:6:13:17::'typing.Dict' will be deprecated with PY39, consider using 'dict' instead. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-using-alias:14:6:14:10::'typing.List' will be deprecated with PY39, consider using 'list' instead. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-using-alias:16:6:16:24::'typing.OrderedDict' will be deprecated with PY39, consider using 'collections.OrderedDict' instead. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-using-alias:17:6:17:22::'typing.Awaitable' will be deprecated with PY39, consider using 'collections.abc.Awaitable' instead. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-using-alias:18:6:18:21::'typing.Iterable' will be deprecated with PY39, consider using 'collections.abc.Iterable' instead. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-using-alias:19:6:19:21::'typing.Hashable' will be deprecated with PY39, consider using 'collections.abc.Hashable' instead:UNDEFINED
-consider-using-alias:20:6:20:27::'typing.ContextManager' will be deprecated with PY39, consider using 'contextlib.AbstractContextManager' instead. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-using-alias:21:6:21:20::'typing.Pattern' will be deprecated with PY39, consider using 're.Pattern' instead. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-using-alias:22:7:22:22::'typing.Match' will be deprecated with PY39, consider using 're.Match' instead. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-using-alias:31:9:31:13::'typing.List' will be deprecated with PY39, consider using 'list' instead:UNDEFINED
-consider-using-alias:33:7:33:11::'typing.Type' will be deprecated with PY39, consider using 'type' instead. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-using-alias:34:7:34:12::'typing.Tuple' will be deprecated with PY39, consider using 'tuple' instead. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-using-alias:35:7:35:15::'typing.Callable' will be deprecated with PY39, consider using 'collections.abc.Callable' instead. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-using-alias:41:74:41:78:func1:'typing.Dict' will be deprecated with PY39, consider using 'dict' instead. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-using-alias:41:16:41:20:func1:'typing.List' will be deprecated with PY39, consider using 'list' instead. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-using-alias:41:37:41:41:func1:'typing.List' will be deprecated with PY39, consider using 'list' instead. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-using-alias:41:93:41:105:func1:'typing.Tuple' will be deprecated with PY39, consider using 'tuple' instead. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-using-alias:57:12:57:16:CustomNamedTuple:'typing.List' will be deprecated with PY39, consider using 'list' instead. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-using-alias:62:12:62:16:CustomTypedDict2:'typing.List' will be deprecated with PY39, consider using 'list' instead. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-using-alias:66:12:66:16:CustomDataClass:'typing.List' will be deprecated with PY39, consider using 'list' instead. Add 'from __future__ import annotations' as well:UNDEFINED
+consider-using-alias:13:6:13:17::'typing.Dict' will be deprecated with PY39, consider using 'dict' instead. Add 'from __future__ import annotations' as well:INFERENCE
+consider-using-alias:14:6:14:10::'typing.List' will be deprecated with PY39, consider using 'list' instead. Add 'from __future__ import annotations' as well:INFERENCE
+consider-using-alias:16:6:16:24::'typing.OrderedDict' will be deprecated with PY39, consider using 'collections.OrderedDict' instead. Add 'from __future__ import annotations' as well:INFERENCE
+consider-using-alias:17:6:17:22::'typing.Awaitable' will be deprecated with PY39, consider using 'collections.abc.Awaitable' instead. Add 'from __future__ import annotations' as well:INFERENCE
+consider-using-alias:18:6:18:21::'typing.Iterable' will be deprecated with PY39, consider using 'collections.abc.Iterable' instead. Add 'from __future__ import annotations' as well:INFERENCE
+consider-using-alias:19:6:19:21::'typing.Hashable' will be deprecated with PY39, consider using 'collections.abc.Hashable' instead:INFERENCE
+consider-using-alias:20:6:20:27::'typing.ContextManager' will be deprecated with PY39, consider using 'contextlib.AbstractContextManager' instead. Add 'from __future__ import annotations' as well:INFERENCE
+consider-using-alias:21:6:21:20::'typing.Pattern' will be deprecated with PY39, consider using 're.Pattern' instead. Add 'from __future__ import annotations' as well:INFERENCE
+consider-using-alias:22:7:22:22::'typing.Match' will be deprecated with PY39, consider using 're.Match' instead. Add 'from __future__ import annotations' as well:INFERENCE
+consider-using-alias:31:9:31:13::'typing.List' will be deprecated with PY39, consider using 'list' instead:INFERENCE
+consider-using-alias:33:7:33:11::'typing.Type' will be deprecated with PY39, consider using 'type' instead. Add 'from __future__ import annotations' as well:INFERENCE
+consider-using-alias:34:7:34:12::'typing.Tuple' will be deprecated with PY39, consider using 'tuple' instead. Add 'from __future__ import annotations' as well:INFERENCE
+consider-using-alias:35:7:35:15::'typing.Callable' will be deprecated with PY39, consider using 'collections.abc.Callable' instead. Add 'from __future__ import annotations' as well:INFERENCE
+consider-using-alias:41:74:41:78:func1:'typing.Dict' will be deprecated with PY39, consider using 'dict' instead. Add 'from __future__ import annotations' as well:INFERENCE
+consider-using-alias:41:16:41:20:func1:'typing.List' will be deprecated with PY39, consider using 'list' instead. Add 'from __future__ import annotations' as well:INFERENCE
+consider-using-alias:41:37:41:41:func1:'typing.List' will be deprecated with PY39, consider using 'list' instead. Add 'from __future__ import annotations' as well:INFERENCE
+consider-using-alias:41:93:41:105:func1:'typing.Tuple' will be deprecated with PY39, consider using 'tuple' instead. Add 'from __future__ import annotations' as well:INFERENCE
+consider-using-alias:57:12:57:16:CustomNamedTuple:'typing.List' will be deprecated with PY39, consider using 'list' instead. Add 'from __future__ import annotations' as well:INFERENCE
+consider-using-alias:62:12:62:16:CustomTypedDict2:'typing.List' will be deprecated with PY39, consider using 'list' instead. Add 'from __future__ import annotations' as well:INFERENCE
+consider-using-alias:66:12:66:16:CustomDataClass:'typing.List' will be deprecated with PY39, consider using 'list' instead. Add 'from __future__ import annotations' as well:INFERENCE
diff --git a/tests/functional/ext/typing/consider_using_union.py b/tests/functional/ext/typing/typing_consider_using_union.py
similarity index 100%
rename from tests/functional/ext/typing/consider_using_union.py
rename to tests/functional/ext/typing/typing_consider_using_union.py
diff --git a/tests/functional/ext/typing/consider_using_union.rc b/tests/functional/ext/typing/typing_consider_using_union.rc
similarity index 100%
rename from tests/functional/ext/typing/consider_using_union.rc
rename to tests/functional/ext/typing/typing_consider_using_union.rc
diff --git a/tests/functional/ext/typing/consider_using_union.txt b/tests/functional/ext/typing/typing_consider_using_union.txt
similarity index 52%
rename from tests/functional/ext/typing/consider_using_union.txt
rename to tests/functional/ext/typing/typing_consider_using_union.txt
index 58b8e74ce5..4a1e7521d2 100644
--- a/tests/functional/ext/typing/consider_using_union.txt
+++ b/tests/functional/ext/typing/typing_consider_using_union.txt
@@ -1,10 +1,10 @@
-consider-alternative-union-syntax:13:6:13:11::Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:14:11:14:16::Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:15:16:15:28::Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:16:6:16:14::Consider using alternative Union syntax instead of 'Optional':UNDEFINED
-consider-alternative-union-syntax:24:10:24:18:func1:Consider using alternative Union syntax instead of 'Optional':UNDEFINED
-consider-alternative-union-syntax:25:24:25:29:func1:Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:26:5:26:10:func1:Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:38:12:38:17:CustomNamedTuple:Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:43:27:43:32:CustomTypedDict2:Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:47:12:47:20:CustomDataClass:Consider using alternative Union syntax instead of 'Optional':UNDEFINED
+consider-alternative-union-syntax:13:6:13:11::Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:14:11:14:16::Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:15:16:15:28::Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:16:6:16:14::Consider using alternative Union syntax instead of 'Optional':INFERENCE
+consider-alternative-union-syntax:24:10:24:18:func1:Consider using alternative Union syntax instead of 'Optional':INFERENCE
+consider-alternative-union-syntax:25:24:25:29:func1:Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:26:5:26:10:func1:Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:38:12:38:17:CustomNamedTuple:Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:43:27:43:32:CustomTypedDict2:Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:47:12:47:20:CustomDataClass:Consider using alternative Union syntax instead of 'Optional':INFERENCE
diff --git a/tests/functional/ext/typing/consider_using_union_py310.py b/tests/functional/ext/typing/typing_consider_using_union_py310.py
similarity index 100%
rename from tests/functional/ext/typing/consider_using_union_py310.py
rename to tests/functional/ext/typing/typing_consider_using_union_py310.py
diff --git a/tests/functional/ext/typing/consider_using_union_py310.rc b/tests/functional/ext/typing/typing_consider_using_union_py310.rc
similarity index 100%
rename from tests/functional/ext/typing/consider_using_union_py310.rc
rename to tests/functional/ext/typing/typing_consider_using_union_py310.rc
diff --git a/tests/functional/ext/typing/consider_using_union_py310.txt b/tests/functional/ext/typing/typing_consider_using_union_py310.txt
similarity index 53%
rename from tests/functional/ext/typing/consider_using_union_py310.txt
rename to tests/functional/ext/typing/typing_consider_using_union_py310.txt
index dec5556e7d..fde1d7e2b2 100644
--- a/tests/functional/ext/typing/consider_using_union_py310.txt
+++ b/tests/functional/ext/typing/typing_consider_using_union_py310.txt
@@ -1,18 +1,18 @@
-consider-alternative-union-syntax:11:6:11:11::Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:12:11:12:16::Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:13:16:13:28::Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:14:6:14:14::Consider using alternative Union syntax instead of 'Optional':UNDEFINED
-consider-alternative-union-syntax:16:9:16:14::Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:17:14:17:19::Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:18:19:18:31::Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:19:9:19:17::Consider using alternative Union syntax instead of 'Optional':UNDEFINED
-consider-alternative-union-syntax:22:10:22:18:func1:Consider using alternative Union syntax instead of 'Optional':UNDEFINED
-consider-alternative-union-syntax:23:24:23:29:func1:Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:24:5:24:10:func1:Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:27:19:27:24:Custom1:Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:31:28:31:33::Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:33:14:33:22::Consider using alternative Union syntax instead of 'Optional':UNDEFINED
-consider-alternative-union-syntax:36:12:36:17:CustomNamedTuple:Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:38:56:38:64::Consider using alternative Union syntax instead of 'Optional':UNDEFINED
-consider-alternative-union-syntax:41:27:41:32:CustomTypedDict2:Consider using alternative Union syntax instead of 'Union':UNDEFINED
-consider-alternative-union-syntax:45:12:45:20:CustomDataClass:Consider using alternative Union syntax instead of 'Optional':UNDEFINED
+consider-alternative-union-syntax:11:6:11:11::Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:12:11:12:16::Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:13:16:13:28::Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:14:6:14:14::Consider using alternative Union syntax instead of 'Optional':INFERENCE
+consider-alternative-union-syntax:16:9:16:14::Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:17:14:17:19::Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:18:19:18:31::Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:19:9:19:17::Consider using alternative Union syntax instead of 'Optional':INFERENCE
+consider-alternative-union-syntax:22:10:22:18:func1:Consider using alternative Union syntax instead of 'Optional':INFERENCE
+consider-alternative-union-syntax:23:24:23:29:func1:Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:24:5:24:10:func1:Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:27:19:27:24:Custom1:Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:31:28:31:33::Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:33:14:33:22::Consider using alternative Union syntax instead of 'Optional':INFERENCE
+consider-alternative-union-syntax:36:12:36:17:CustomNamedTuple:Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:38:56:38:64::Consider using alternative Union syntax instead of 'Optional':INFERENCE
+consider-alternative-union-syntax:41:27:41:32:CustomTypedDict2:Consider using alternative Union syntax instead of 'Union':INFERENCE
+consider-alternative-union-syntax:45:12:45:20:CustomDataClass:Consider using alternative Union syntax instead of 'Optional':INFERENCE
diff --git a/tests/functional/ext/typing/consider_using_union_without_future.py b/tests/functional/ext/typing/typing_consider_using_union_without_future.py
similarity index 100%
rename from tests/functional/ext/typing/consider_using_union_without_future.py
rename to tests/functional/ext/typing/typing_consider_using_union_without_future.py
diff --git a/tests/functional/ext/typing/consider_using_union_without_future.rc b/tests/functional/ext/typing/typing_consider_using_union_without_future.rc
similarity index 100%
rename from tests/functional/ext/typing/consider_using_union_without_future.rc
rename to tests/functional/ext/typing/typing_consider_using_union_without_future.rc
diff --git a/tests/functional/ext/typing/consider_using_union_without_future.txt b/tests/functional/ext/typing/typing_consider_using_union_without_future.txt
similarity index 74%
rename from tests/functional/ext/typing/consider_using_union_without_future.txt
rename to tests/functional/ext/typing/typing_consider_using_union_without_future.txt
index 4eccda9518..bc8ca4c075 100644
--- a/tests/functional/ext/typing/consider_using_union_without_future.txt
+++ b/tests/functional/ext/typing/typing_consider_using_union_without_future.txt
@@ -1,10 +1,10 @@
-consider-alternative-union-syntax:11:6:11:11::Consider using alternative Union syntax instead of 'Union'. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-alternative-union-syntax:12:11:12:16::Consider using alternative Union syntax instead of 'Union'. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-alternative-union-syntax:13:16:13:28::Consider using alternative Union syntax instead of 'Union'. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-alternative-union-syntax:14:6:14:14::Consider using alternative Union syntax instead of 'Optional'. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-alternative-union-syntax:22:10:22:18:func1:Consider using alternative Union syntax instead of 'Optional'. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-alternative-union-syntax:23:24:23:29:func1:Consider using alternative Union syntax instead of 'Union'. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-alternative-union-syntax:24:5:24:10:func1:Consider using alternative Union syntax instead of 'Union'. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-alternative-union-syntax:36:12:36:17:CustomNamedTuple:Consider using alternative Union syntax instead of 'Union'. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-alternative-union-syntax:41:27:41:32:CustomTypedDict2:Consider using alternative Union syntax instead of 'Union'. Add 'from __future__ import annotations' as well:UNDEFINED
-consider-alternative-union-syntax:45:12:45:20:CustomDataClass:Consider using alternative Union syntax instead of 'Optional'. Add 'from __future__ import annotations' as well:UNDEFINED
+consider-alternative-union-syntax:11:6:11:11::Consider using alternative Union syntax instead of 'Union'. Add 'from __future__ import annotations' as well:INFERENCE
+consider-alternative-union-syntax:12:11:12:16::Consider using alternative Union syntax instead of 'Union'. Add 'from __future__ import annotations' as well:INFERENCE
+consider-alternative-union-syntax:13:16:13:28::Consider using alternative Union syntax instead of 'Union'. Add 'from __future__ import annotations' as well:INFERENCE
+consider-alternative-union-syntax:14:6:14:14::Consider using alternative Union syntax instead of 'Optional'. Add 'from __future__ import annotations' as well:INFERENCE
+consider-alternative-union-syntax:22:10:22:18:func1:Consider using alternative Union syntax instead of 'Optional'. Add 'from __future__ import annotations' as well:INFERENCE
+consider-alternative-union-syntax:23:24:23:29:func1:Consider using alternative Union syntax instead of 'Union'. Add 'from __future__ import annotations' as well:INFERENCE
+consider-alternative-union-syntax:24:5:24:10:func1:Consider using alternative Union syntax instead of 'Union'. Add 'from __future__ import annotations' as well:INFERENCE
+consider-alternative-union-syntax:36:12:36:17:CustomNamedTuple:Consider using alternative Union syntax instead of 'Union'. Add 'from __future__ import annotations' as well:INFERENCE
+consider-alternative-union-syntax:41:27:41:32:CustomTypedDict2:Consider using alternative Union syntax instead of 'Union'. Add 'from __future__ import annotations' as well:INFERENCE
+consider-alternative-union-syntax:45:12:45:20:CustomDataClass:Consider using alternative Union syntax instead of 'Optional'. Add 'from __future__ import annotations' as well:INFERENCE
diff --git a/tests/functional/ext/typing/deprecated_alias.py b/tests/functional/ext/typing/typing_deprecated_alias.py
similarity index 100%
rename from tests/functional/ext/typing/deprecated_alias.py
rename to tests/functional/ext/typing/typing_deprecated_alias.py
diff --git a/tests/functional/ext/typing/deprecated_alias.rc b/tests/functional/ext/typing/typing_deprecated_alias.rc
similarity index 100%
rename from tests/functional/ext/typing/deprecated_alias.rc
rename to tests/functional/ext/typing/typing_deprecated_alias.rc
diff --git a/tests/functional/ext/typing/deprecated_alias.txt b/tests/functional/ext/typing/typing_deprecated_alias.txt
similarity index 61%
rename from tests/functional/ext/typing/deprecated_alias.txt
rename to tests/functional/ext/typing/typing_deprecated_alias.txt
index 585f71c235..62cf9902ad 100644
--- a/tests/functional/ext/typing/deprecated_alias.txt
+++ b/tests/functional/ext/typing/typing_deprecated_alias.txt
@@ -1,28 +1,28 @@
-deprecated-typing-alias:13:6:13:17::'typing.Dict' is deprecated, use 'dict' instead:UNDEFINED
-deprecated-typing-alias:14:6:14:10::'typing.List' is deprecated, use 'list' instead:UNDEFINED
-deprecated-typing-alias:16:6:16:24::'typing.OrderedDict' is deprecated, use 'collections.OrderedDict' instead:UNDEFINED
-deprecated-typing-alias:17:6:17:22::'typing.Awaitable' is deprecated, use 'collections.abc.Awaitable' instead:UNDEFINED
-deprecated-typing-alias:18:6:18:21::'typing.Iterable' is deprecated, use 'collections.abc.Iterable' instead:UNDEFINED
-deprecated-typing-alias:19:6:19:21::'typing.Hashable' is deprecated, use 'collections.abc.Hashable' instead:UNDEFINED
-deprecated-typing-alias:20:6:20:27::'typing.ContextManager' is deprecated, use 'contextlib.AbstractContextManager' instead:UNDEFINED
-deprecated-typing-alias:21:6:21:20::'typing.Pattern' is deprecated, use 're.Pattern' instead:UNDEFINED
-deprecated-typing-alias:22:7:22:22::'typing.Match' is deprecated, use 're.Match' instead:UNDEFINED
-deprecated-typing-alias:28:9:28:12::'typing.Set' is deprecated, use 'set' instead:UNDEFINED
-deprecated-typing-alias:29:9:29:13::'typing.Dict' is deprecated, use 'dict' instead:UNDEFINED
-deprecated-typing-alias:29:19:29:23::'typing.List' is deprecated, use 'list' instead:UNDEFINED
-deprecated-typing-alias:30:20:30:31::'typing.List' is deprecated, use 'list' instead:UNDEFINED
-deprecated-typing-alias:31:9:31:13::'typing.List' is deprecated, use 'list' instead:UNDEFINED
-deprecated-typing-alias:33:7:33:11::'typing.Type' is deprecated, use 'type' instead:UNDEFINED
-deprecated-typing-alias:34:7:34:12::'typing.Tuple' is deprecated, use 'tuple' instead:UNDEFINED
-deprecated-typing-alias:35:7:35:15::'typing.Callable' is deprecated, use 'collections.abc.Callable' instead:UNDEFINED
-deprecated-typing-alias:41:74:41:78:func1:'typing.Dict' is deprecated, use 'dict' instead:UNDEFINED
-deprecated-typing-alias:41:16:41:20:func1:'typing.List' is deprecated, use 'list' instead:UNDEFINED
-deprecated-typing-alias:41:37:41:41:func1:'typing.List' is deprecated, use 'list' instead:UNDEFINED
-deprecated-typing-alias:41:93:41:105:func1:'typing.Tuple' is deprecated, use 'tuple' instead:UNDEFINED
-deprecated-typing-alias:48:20:48:31:CustomIntList:'typing.List' is deprecated, use 'list' instead:UNDEFINED
-deprecated-typing-alias:52:28:52:32::'typing.List' is deprecated, use 'list' instead:UNDEFINED
-deprecated-typing-alias:54:14:54:18::'typing.List' is deprecated, use 'list' instead:UNDEFINED
-deprecated-typing-alias:57:12:57:16:CustomNamedTuple:'typing.List' is deprecated, use 'list' instead:UNDEFINED
-deprecated-typing-alias:59:56:59:60::'typing.List' is deprecated, use 'list' instead:UNDEFINED
-deprecated-typing-alias:62:12:62:16:CustomTypedDict2:'typing.List' is deprecated, use 'list' instead:UNDEFINED
-deprecated-typing-alias:66:12:66:16:CustomDataClass:'typing.List' is deprecated, use 'list' instead:UNDEFINED
+deprecated-typing-alias:13:6:13:17::'typing.Dict' is deprecated, use 'dict' instead:INFERENCE
+deprecated-typing-alias:14:6:14:10::'typing.List' is deprecated, use 'list' instead:INFERENCE
+deprecated-typing-alias:16:6:16:24::'typing.OrderedDict' is deprecated, use 'collections.OrderedDict' instead:INFERENCE
+deprecated-typing-alias:17:6:17:22::'typing.Awaitable' is deprecated, use 'collections.abc.Awaitable' instead:INFERENCE
+deprecated-typing-alias:18:6:18:21::'typing.Iterable' is deprecated, use 'collections.abc.Iterable' instead:INFERENCE
+deprecated-typing-alias:19:6:19:21::'typing.Hashable' is deprecated, use 'collections.abc.Hashable' instead:INFERENCE
+deprecated-typing-alias:20:6:20:27::'typing.ContextManager' is deprecated, use 'contextlib.AbstractContextManager' instead:INFERENCE
+deprecated-typing-alias:21:6:21:20::'typing.Pattern' is deprecated, use 're.Pattern' instead:INFERENCE
+deprecated-typing-alias:22:7:22:22::'typing.Match' is deprecated, use 're.Match' instead:INFERENCE
+deprecated-typing-alias:28:9:28:12::'typing.Set' is deprecated, use 'set' instead:INFERENCE
+deprecated-typing-alias:29:9:29:13::'typing.Dict' is deprecated, use 'dict' instead:INFERENCE
+deprecated-typing-alias:29:19:29:23::'typing.List' is deprecated, use 'list' instead:INFERENCE
+deprecated-typing-alias:30:20:30:31::'typing.List' is deprecated, use 'list' instead:INFERENCE
+deprecated-typing-alias:31:9:31:13::'typing.List' is deprecated, use 'list' instead:INFERENCE
+deprecated-typing-alias:33:7:33:11::'typing.Type' is deprecated, use 'type' instead:INFERENCE
+deprecated-typing-alias:34:7:34:12::'typing.Tuple' is deprecated, use 'tuple' instead:INFERENCE
+deprecated-typing-alias:35:7:35:15::'typing.Callable' is deprecated, use 'collections.abc.Callable' instead:INFERENCE
+deprecated-typing-alias:41:74:41:78:func1:'typing.Dict' is deprecated, use 'dict' instead:INFERENCE
+deprecated-typing-alias:41:16:41:20:func1:'typing.List' is deprecated, use 'list' instead:INFERENCE
+deprecated-typing-alias:41:37:41:41:func1:'typing.List' is deprecated, use 'list' instead:INFERENCE
+deprecated-typing-alias:41:93:41:105:func1:'typing.Tuple' is deprecated, use 'tuple' instead:INFERENCE
+deprecated-typing-alias:48:20:48:31:CustomIntList:'typing.List' is deprecated, use 'list' instead:INFERENCE
+deprecated-typing-alias:52:28:52:32::'typing.List' is deprecated, use 'list' instead:INFERENCE
+deprecated-typing-alias:54:14:54:18::'typing.List' is deprecated, use 'list' instead:INFERENCE
+deprecated-typing-alias:57:12:57:16:CustomNamedTuple:'typing.List' is deprecated, use 'list' instead:INFERENCE
+deprecated-typing-alias:59:56:59:60::'typing.List' is deprecated, use 'list' instead:INFERENCE
+deprecated-typing-alias:62:12:62:16:CustomTypedDict2:'typing.List' is deprecated, use 'list' instead:INFERENCE
+deprecated-typing-alias:66:12:66:16:CustomDataClass:'typing.List' is deprecated, use 'list' instead:INFERENCE
diff --git a/tests/functional/f/first_arg.txt b/tests/functional/f/first_arg.txt
index 8517a8ad8a..e75743b33e 100644
--- a/tests/functional/f/first_arg.txt
+++ b/tests/functional/f/first_arg.txt
@@ -1,9 +1,9 @@
-bad-classmethod-argument:10:4:11:12:Obj.__new__:Class method __new__ should have 'cls' as first argument:UNDEFINED
+bad-classmethod-argument:10:4:10:15:Obj.__new__:Class method __new__ should have 'cls' as first argument:UNDEFINED
 no-classmethod-decorator:16:4:16:10:Obj:Consider using a decorator instead of calling classmethod:UNDEFINED
-bad-classmethod-argument:18:4:19:12:Obj.class2:Class method class2 should have 'cls' as first argument:UNDEFINED
+bad-classmethod-argument:18:4:18:14:Obj.class2:Class method class2 should have 'cls' as first argument:UNDEFINED
 no-classmethod-decorator:20:4:20:10:Obj:Consider using a decorator instead of calling classmethod:UNDEFINED
-bad-mcs-classmethod-argument:25:4:26:12:Meta.__new__:Metaclass class method __new__ should have 'cls' as first argument:UNDEFINED
-bad-mcs-method-argument:32:4:33:12:Meta.method2:Metaclass method method2 should have 'cls' as first argument:UNDEFINED
+bad-mcs-classmethod-argument:25:4:25:15:Meta.__new__:Metaclass class method __new__ should have 'cls' as first argument:UNDEFINED
+bad-mcs-method-argument:32:4:32:15:Meta.method2:Metaclass method method2 should have 'cls' as first argument:UNDEFINED
 no-classmethod-decorator:38:4:38:10:Meta:Consider using a decorator instead of calling classmethod:UNDEFINED
-bad-mcs-classmethod-argument:40:4:41:12:Meta.class2:Metaclass class method class2 should have 'cls' as first argument:UNDEFINED
+bad-mcs-classmethod-argument:40:4:40:14:Meta.class2:Metaclass class method class2 should have 'cls' as first argument:UNDEFINED
 no-classmethod-decorator:42:4:42:10:Meta:Consider using a decorator instead of calling classmethod:UNDEFINED
diff --git a/tests/functional/f/fixme.rc b/tests/functional/f/fixme.rc
index 6b903c1bda..be1b23458e 100644
--- a/tests/functional/f/fixme.rc
+++ b/tests/functional/f/fixme.rc
@@ -1,3 +1,5 @@
-[testoptions]
+[MISCELLANEOUS]
+# List of note tags to take in consideration, separated by a comma.
 notes=XXX,TODO,./TODO
+# Regular expression of note tags to take in consideration.
 notes-rgx=FIXME(?!.*ISSUE-\d+)|TO.*DO
diff --git a/tests/functional/f/function_redefined.txt b/tests/functional/f/function_redefined.txt
index 2a538f66aa..724fe13ca1 100644
--- a/tests/functional/f/function_redefined.txt
+++ b/tests/functional/f/function_redefined.txt
@@ -1,7 +1,7 @@
-function-redefined:18:4:19:23:AAAA.method2:method already defined line 15:UNDEFINED
-function-redefined:21:0:28:17:AAAA:class already defined line 8:UNDEFINED
-function-redefined:35:0:38:23:func2:function already defined line 32:UNDEFINED
+function-redefined:18:4:18:15:AAAA.method2:method already defined line 15:UNDEFINED
+function-redefined:21:0:21:10:AAAA:class already defined line 8:UNDEFINED
+function-redefined:35:0:35:9:func2:function already defined line 32:UNDEFINED
 redefined-outer-name:37:4:37:16:func2:Redefining name '__revision__' from outer scope (line 7):UNDEFINED
-function-redefined:54:4:55:51:exclusive_func2:function already defined line 48:UNDEFINED
-function-redefined:89:0:90:8:ceil:function already defined line 88:UNDEFINED
-function-redefined:93:0:94:8:math:function already defined line 92:UNDEFINED
+function-redefined:54:4:54:23:exclusive_func2:function already defined line 48:UNDEFINED
+function-redefined:89:0:89:8:ceil:function already defined line 88:UNDEFINED
+function-redefined:93:0:93:8:math:function already defined line 92:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_collections.txt b/tests/functional/g/generic_alias/generic_alias_collections.txt
index 6d3914a78b..663b81abb2 100644
--- a/tests/functional/g/generic_alias/generic_alias_collections.txt
+++ b/tests/functional/g/generic_alias/generic_alias_collections.txt
@@ -1,16 +1,16 @@
 unsubscriptable-object:66:0:66:24::Value 'collections.abc.Hashable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:67:0:67:21::Value 'collections.abc.Sized' is unsubscriptable:UNDEFINED
-abstract-method:74:0:75:8:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:77:0:78:8:DerivedIterable:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:80:0:81:8:DerivedCollection:Method '__contains__' is abstract in class 'Container' but is not overridden:UNDEFINED
-abstract-method:80:0:81:8:DerivedCollection:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:80:0:81:8:DerivedCollection:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:99:0:100:8:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:99:0:100:8:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:104:0:105:8:CustomAbstractCls2:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:104:0:105:8:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:106:0:107:8:CustomImplementation:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:106:0:107:8:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:74:0:74:21:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:77:0:77:21:DerivedIterable:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:80:0:80:23:DerivedCollection:Method '__contains__' is abstract in class 'Container' but is not overridden:UNDEFINED
+abstract-method:80:0:80:23:DerivedCollection:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:80:0:80:23:DerivedCollection:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:99:0:99:21:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:99:0:99:21:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:104:0:104:24:CustomAbstractCls2:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:104:0:104:24:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:106:0:106:26:CustomImplementation:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:106:0:106:26:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
 unsubscriptable-object:125:9:125:12::Value 'int' is unsubscriptable:UNDEFINED
 unsubscriptable-object:126:15:126:39::Value 'collections.abc.Hashable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:127:12:127:33::Value 'collections.abc.Sized' is unsubscriptable:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_collections_py37.txt b/tests/functional/g/generic_alias/generic_alias_collections_py37.txt
index cd4b30b6f6..84a217d2fc 100644
--- a/tests/functional/g/generic_alias/generic_alias_collections_py37.txt
+++ b/tests/functional/g/generic_alias/generic_alias_collections_py37.txt
@@ -39,7 +39,7 @@ unsubscriptable-object:63:0:63:8::Value 're.Match' is unsubscriptable:UNDEFINED
 unsubscriptable-object:69:0:69:24::Value 'collections.abc.Hashable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:70:0:70:21::Value 'collections.abc.Sized' is unsubscriptable:UNDEFINED
 unsubscriptable-object:73:0:73:26::Value 'collections.abc.ByteString' is unsubscriptable:UNDEFINED
-abstract-method:77:0:78:8:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:77:0:77:21:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
 unsubscriptable-object:80:22:80:46:DerivedIterable:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:83:24:83:50:DerivedCollection:Value 'collections.abc.Collection' is unsubscriptable:UNDEFINED
 unsubscriptable-object:88:18:88:22:DerivedList:Value 'list' is unsubscriptable:UNDEFINED
@@ -47,11 +47,11 @@ unsubscriptable-object:91:17:91:20:DerivedSet:Value 'set' is unsubscriptable:UND
 unsubscriptable-object:94:25:94:48:DerivedOrderedDict:Value 'collections.OrderedDict' is unsubscriptable:UNDEFINED
 unsubscriptable-object:97:31:97:55:DerivedListIterable:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:97:26:97:30:DerivedListIterable:Value 'list' is unsubscriptable:UNDEFINED
-abstract-method:102:0:103:8:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:102:0:103:8:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:107:0:108:8:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:102:0:102:21:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:102:0:102:21:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:107:0:107:24:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
 unsubscriptable-object:107:48:107:72:CustomAbstractCls2:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
-abstract-method:109:0:110:8:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:109:0:109:26:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
 unsubscriptable-object:114:11:114:16::Value 'tuple' is unsubscriptable:UNDEFINED
 unsubscriptable-object:115:10:115:14::Value 'dict' is unsubscriptable:UNDEFINED
 unsubscriptable-object:116:17:116:40::Value 'collections.OrderedDict' is unsubscriptable:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_collections_py37_with_typing.txt b/tests/functional/g/generic_alias/generic_alias_collections_py37_with_typing.txt
index 2d52319ada..ee1407bdb6 100644
--- a/tests/functional/g/generic_alias/generic_alias_collections_py37_with_typing.txt
+++ b/tests/functional/g/generic_alias/generic_alias_collections_py37_with_typing.txt
@@ -39,7 +39,7 @@ unsubscriptable-object:65:0:65:8::Value 're.Match' is unsubscriptable:UNDEFINED
 unsubscriptable-object:71:0:71:24::Value 'collections.abc.Hashable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:72:0:72:21::Value 'collections.abc.Sized' is unsubscriptable:UNDEFINED
 unsubscriptable-object:75:0:75:26::Value 'collections.abc.ByteString' is unsubscriptable:UNDEFINED
-abstract-method:79:0:80:8:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:79:0:79:21:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
 unsubscriptable-object:82:22:82:46:DerivedIterable:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:85:24:85:50:DerivedCollection:Value 'collections.abc.Collection' is unsubscriptable:UNDEFINED
 unsubscriptable-object:90:18:90:22:DerivedList:Value 'list' is unsubscriptable:UNDEFINED
@@ -47,11 +47,11 @@ unsubscriptable-object:93:17:93:20:DerivedSet:Value 'set' is unsubscriptable:UND
 unsubscriptable-object:96:25:96:48:DerivedOrderedDict:Value 'collections.OrderedDict' is unsubscriptable:UNDEFINED
 unsubscriptable-object:99:31:99:55:DerivedListIterable:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:99:26:99:30:DerivedListIterable:Value 'list' is unsubscriptable:UNDEFINED
-abstract-method:104:0:105:8:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:104:0:105:8:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:109:0:110:8:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:104:0:104:21:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:104:0:104:21:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:109:0:109:24:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
 unsubscriptable-object:109:48:109:72:CustomAbstractCls2:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
-abstract-method:111:0:112:8:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:111:0:111:26:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
 unsubscriptable-object:116:11:116:16::Value 'tuple' is unsubscriptable:UNDEFINED
 unsubscriptable-object:117:10:117:14::Value 'dict' is unsubscriptable:UNDEFINED
 unsubscriptable-object:118:17:118:40::Value 'collections.OrderedDict' is unsubscriptable:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_mixed_py37.txt b/tests/functional/g/generic_alias/generic_alias_mixed_py37.txt
index c42ad40062..2bafe20ed8 100644
--- a/tests/functional/g/generic_alias/generic_alias_mixed_py37.txt
+++ b/tests/functional/g/generic_alias/generic_alias_mixed_py37.txt
@@ -1,5 +1,5 @@
-abstract-method:34:0:35:8:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:37:0:38:8:DerivedIterable:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:40:0:41:8:DerivedCollection:Method '__contains__' is abstract in class 'Container' but is not overridden:UNDEFINED
-abstract-method:40:0:41:8:DerivedCollection:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:40:0:41:8:DerivedCollection:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:34:0:34:21:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:37:0:37:21:DerivedIterable:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:40:0:40:23:DerivedCollection:Method '__contains__' is abstract in class 'Container' but is not overridden:UNDEFINED
+abstract-method:40:0:40:23:DerivedCollection:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:40:0:40:23:DerivedCollection:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_mixed_py39.txt b/tests/functional/g/generic_alias/generic_alias_mixed_py39.txt
index fd5746a70c..06dbdc1976 100644
--- a/tests/functional/g/generic_alias/generic_alias_mixed_py39.txt
+++ b/tests/functional/g/generic_alias/generic_alias_mixed_py39.txt
@@ -1,5 +1,5 @@
-abstract-method:29:0:30:8:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:32:0:33:8:DerivedIterable:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:35:0:36:8:DerivedCollection:Method '__contains__' is abstract in class 'Container' but is not overridden:UNDEFINED
-abstract-method:35:0:36:8:DerivedCollection:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:35:0:36:8:DerivedCollection:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:29:0:29:21:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:32:0:32:21:DerivedIterable:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:35:0:35:23:DerivedCollection:Method '__contains__' is abstract in class 'Container' but is not overridden:UNDEFINED
+abstract-method:35:0:35:23:DerivedCollection:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:35:0:35:23:DerivedCollection:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_postponed_evaluation_py37.txt b/tests/functional/g/generic_alias/generic_alias_postponed_evaluation_py37.txt
index 266644535c..56eca5192b 100644
--- a/tests/functional/g/generic_alias/generic_alias_postponed_evaluation_py37.txt
+++ b/tests/functional/g/generic_alias/generic_alias_postponed_evaluation_py37.txt
@@ -39,7 +39,7 @@ unsubscriptable-object:68:0:68:8::Value 're.Match' is unsubscriptable:UNDEFINED
 unsubscriptable-object:74:0:74:24::Value 'collections.abc.Hashable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:75:0:75:21::Value 'collections.abc.Sized' is unsubscriptable:UNDEFINED
 unsubscriptable-object:78:0:78:26::Value 'collections.abc.ByteString' is unsubscriptable:UNDEFINED
-abstract-method:82:0:83:8:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:82:0:82:21:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
 unsubscriptable-object:85:22:85:46:DerivedIterable:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:88:24:88:50:DerivedCollection:Value 'collections.abc.Collection' is unsubscriptable:UNDEFINED
 unsubscriptable-object:93:18:93:22:DerivedList:Value 'list' is unsubscriptable:UNDEFINED
@@ -47,10 +47,10 @@ unsubscriptable-object:96:17:96:20:DerivedSet:Value 'set' is unsubscriptable:UND
 unsubscriptable-object:99:25:99:48:DerivedOrderedDict:Value 'collections.OrderedDict' is unsubscriptable:UNDEFINED
 unsubscriptable-object:102:31:102:55:DerivedListIterable:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:102:26:102:30:DerivedListIterable:Value 'list' is unsubscriptable:UNDEFINED
-abstract-method:107:0:108:8:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:107:0:108:8:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:112:0:113:8:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:107:0:107:21:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:107:0:107:21:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:112:0:112:24:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
 unsubscriptable-object:112:48:112:72:CustomAbstractCls2:Value 'collections.abc.Iterable' is unsubscriptable:UNDEFINED
-abstract-method:114:0:115:8:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:114:0:114:26:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
 unsubscriptable-object:175:19:175:43::Value 'collections.abc.Hashable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:176:16:176:37::Value 'collections.abc.Sized' is unsubscriptable:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_related.txt b/tests/functional/g/generic_alias/generic_alias_related.txt
index 2d65b62137..d13f75fa76 100644
--- a/tests/functional/g/generic_alias/generic_alias_related.txt
+++ b/tests/functional/g/generic_alias/generic_alias_related.txt
@@ -2,4 +2,4 @@ unsubscriptable-object:34:0:34:20::Value 'ClsUnsubscriptable()' is unsubscriptab
 unsubscriptable-object:35:0:35:18::Value 'ClsUnsubscriptable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:38:0:38:10::Value 'ClsGetItem' is unsubscriptable:UNDEFINED
 unsubscriptable-object:40:0:40:17::Value 'ClsClassGetItem()' is unsubscriptable:UNDEFINED
-abstract-method:53:0:54:8:Derived:Method 'abstract_method' is abstract in class 'ClsAbstract' but is not overridden:UNDEFINED
+abstract-method:53:0:53:13:Derived:Method 'abstract_method' is abstract in class 'ClsAbstract' but is not overridden:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_related_py39.txt b/tests/functional/g/generic_alias/generic_alias_related_py39.txt
index 295288f04d..114376f5ef 100644
--- a/tests/functional/g/generic_alias/generic_alias_related_py39.txt
+++ b/tests/functional/g/generic_alias/generic_alias_related_py39.txt
@@ -2,4 +2,4 @@ unsubscriptable-object:36:0:36:20::Value 'ClsUnsubscriptable()' is unsubscriptab
 unsubscriptable-object:37:0:37:18::Value 'ClsUnsubscriptable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:40:0:40:10::Value 'ClsGetItem' is unsubscriptable:UNDEFINED
 unsubscriptable-object:42:0:42:17::Value 'ClsClassGetItem()' is unsubscriptable:UNDEFINED
-abstract-method:55:0:56:8:Derived:Method 'abstract_method' is abstract in class 'ClsAbstract' but is not overridden:UNDEFINED
+abstract-method:55:0:55:13:Derived:Method 'abstract_method' is abstract in class 'ClsAbstract' but is not overridden:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_side_effects.py b/tests/functional/g/generic_alias/generic_alias_side_effects.py
index ea7d7a9ce9..344db95531 100644
--- a/tests/functional/g/generic_alias/generic_alias_side_effects.py
+++ b/tests/functional/g/generic_alias/generic_alias_side_effects.py
@@ -1,4 +1,4 @@
-# pylint: disable=missing-docstring,invalid-name,line-too-long,too-few-public-methods,use-list-literal,use-dict-literal
+# pylint: disable=missing-docstring,invalid-name,line-too-long,too-few-public-methods,use-list-literal,use-dict-literal, typevar-name-incorrect-variance
 import typing
 import collections
 from typing import Generic, TypeVar
diff --git a/tests/functional/g/generic_alias/generic_alias_side_effects.txt b/tests/functional/g/generic_alias/generic_alias_side_effects.txt
index 3e7548da61..b22f185ea8 100644
--- a/tests/functional/g/generic_alias/generic_alias_side_effects.txt
+++ b/tests/functional/g/generic_alias/generic_alias_side_effects.txt
@@ -1,8 +1,8 @@
-dangerous-default-value:19:0:21:16:function4:Dangerous default value set() (builtins.set) as argument:UNDEFINED
-dangerous-default-value:27:0:29:16:function7:Dangerous default value dict() (builtins.dict) as argument:UNDEFINED
-dangerous-default-value:31:0:33:16:function8:Dangerous default value list() (builtins.list) as argument:UNDEFINED
-dangerous-default-value:35:0:37:16:function17:Dangerous default value deque() (collections.deque) as argument:UNDEFINED
-dangerous-default-value:39:0:41:16:function18:Dangerous default value ChainMap() (collections.ChainMap) as argument:UNDEFINED
-dangerous-default-value:43:0:45:16:function19:Dangerous default value Counter() (collections.Counter) as argument:UNDEFINED
-dangerous-default-value:47:0:49:16:function20:Dangerous default value OrderedDict() (collections.OrderedDict) as argument:UNDEFINED
-dangerous-default-value:51:0:53:16:function21:Dangerous default value defaultdict() (collections.defaultdict) as argument:UNDEFINED
+dangerous-default-value:19:0:19:13:function4:Dangerous default value set() (builtins.set) as argument:UNDEFINED
+dangerous-default-value:27:0:27:13:function7:Dangerous default value dict() (builtins.dict) as argument:UNDEFINED
+dangerous-default-value:31:0:31:13:function8:Dangerous default value list() (builtins.list) as argument:UNDEFINED
+dangerous-default-value:35:0:35:14:function17:Dangerous default value deque() (collections.deque) as argument:UNDEFINED
+dangerous-default-value:39:0:39:14:function18:Dangerous default value ChainMap() (collections.ChainMap) as argument:UNDEFINED
+dangerous-default-value:43:0:43:14:function19:Dangerous default value Counter() (collections.Counter) as argument:UNDEFINED
+dangerous-default-value:47:0:47:14:function20:Dangerous default value OrderedDict() (collections.OrderedDict) as argument:UNDEFINED
+dangerous-default-value:51:0:51:14:function21:Dangerous default value defaultdict() (collections.defaultdict) as argument:UNDEFINED
diff --git a/tests/functional/g/generic_alias/generic_alias_typing.txt b/tests/functional/g/generic_alias/generic_alias_typing.txt
index b5cb449b88..8ed10fe10b 100644
--- a/tests/functional/g/generic_alias/generic_alias_typing.txt
+++ b/tests/functional/g/generic_alias/generic_alias_typing.txt
@@ -1,18 +1,18 @@
 unsubscriptable-object:66:0:66:17::Value 'typing.ByteString' is unsubscriptable:UNDEFINED
 unsubscriptable-object:67:0:67:15::Value 'typing.Hashable' is unsubscriptable:UNDEFINED
 unsubscriptable-object:68:0:68:12::Value 'typing.Sized' is unsubscriptable:UNDEFINED
-abstract-method:72:0:73:8:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:75:0:76:8:DerivedIterable:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:78:0:79:8:DerivedCollection:Method '__contains__' is abstract in class 'Container' but is not overridden:UNDEFINED
-abstract-method:78:0:79:8:DerivedCollection:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:78:0:79:8:DerivedCollection:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:100:0:101:8:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
-abstract-method:100:0:101:8:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:105:0:106:8:CustomAbstractCls2:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:105:0:106:8:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:107:0:108:8:CustomImplementation:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
-abstract-method:107:0:108:8:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
-abstract-method:118:0:119:8:DerivedIterable2:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:72:0:72:21:DerivedHashable:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:75:0:75:21:DerivedIterable:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:78:0:78:23:DerivedCollection:Method '__contains__' is abstract in class 'Container' but is not overridden:UNDEFINED
+abstract-method:78:0:78:23:DerivedCollection:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:78:0:78:23:DerivedCollection:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:100:0:100:21:DerivedMultiple:Method '__hash__' is abstract in class 'Hashable' but is not overridden:UNDEFINED
+abstract-method:100:0:100:21:DerivedMultiple:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:105:0:105:24:CustomAbstractCls2:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:105:0:105:24:CustomAbstractCls2:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:107:0:107:26:CustomImplementation:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
+abstract-method:107:0:107:26:CustomImplementation:Method '__len__' is abstract in class 'Sized' but is not overridden:UNDEFINED
+abstract-method:118:0:118:22:DerivedIterable2:Method '__iter__' is abstract in class 'Iterable' but is not overridden:UNDEFINED
 unsubscriptable-object:138:9:138:12::Value 'int' is unsubscriptable:UNDEFINED
 unsubscriptable-object:139:17:139:34::Value 'typing.ByteString' is unsubscriptable:UNDEFINED
 unsubscriptable-object:140:15:140:30::Value 'typing.Hashable' is unsubscriptable:UNDEFINED
diff --git a/tests/functional/g/globals.py b/tests/functional/g/globals.py
index a5e4b4bffc..f12c06800c 100644
--- a/tests/functional/g/globals.py
+++ b/tests/functional/g/globals.py
@@ -1,5 +1,5 @@
 """Warnings about global statements and usage of global variables."""
-# pylint: disable=invalid-name, redefined-outer-name, missing-function-docstring, import-outside-toplevel
+# pylint: disable=invalid-name, redefined-outer-name, missing-function-docstring, missing-class-docstring, import-outside-toplevel, too-few-public-methods
 from __future__ import print_function
 
 global CSTE  # [global-at-module-level]
@@ -9,6 +9,9 @@
 def FUNC():
     pass
 
+class CLASS:
+    pass
+
 def fix_contant(value):
     """all this is ok, but try not using global ;)"""
     global CONSTANT  # [global-statement]
@@ -40,6 +43,13 @@ def global_no_assign():
     print(CONSTANT)
 
 
+def global_del():
+    """Deleting the global name prevents `global-variable-not-assigned`"""
+    global CONSTANT  # [global-statement]
+    print(CONSTANT)
+    del CONSTANT
+
+
 def global_operator_assign():
     """Operator assigns should only throw a global statement error"""
     global CONSTANT  # [global-statement]
@@ -71,3 +81,12 @@ def func():
     global sys  # [global-statement]
 
     import sys
+
+def override_class():
+    """Overriding a class should only throw a global statement error"""
+    global CLASS  # [global-statement]
+
+    class CLASS():
+        pass
+
+    CLASS()
diff --git a/tests/functional/g/globals.txt b/tests/functional/g/globals.txt
index 0559eea213..975506cc8e 100644
--- a/tests/functional/g/globals.txt
+++ b/tests/functional/g/globals.txt
@@ -1,12 +1,14 @@
 global-at-module-level:5:0:5:11::Using the global statement at the module level:UNDEFINED
 undefined-variable:6:6:6:10::Undefined variable 'CSTE':UNDEFINED
-global-statement:14:4:14:19:fix_contant:Using the global statement:UNDEFINED
-global-variable-not-assigned:21:4:21:14:other:Using global for 'HOP' but no assignment is done:UNDEFINED
-undefined-variable:22:10:22:13:other:Undefined variable 'HOP':UNDEFINED
-global-variable-undefined:27:4:27:18:define_constant:Global variable 'SOMEVAR' undefined at the module level:UNDEFINED
-global-statement:33:4:33:14:global_with_import:Using the global statement:UNDEFINED
-global-variable-not-assigned:39:4:39:19:global_no_assign:Using global for 'CONSTANT' but no assignment is done:UNDEFINED
-global-statement:45:4:45:19:global_operator_assign:Using the global statement:UNDEFINED
-global-statement:52:4:52:19:global_function_assign:Using the global statement:UNDEFINED
-global-statement:62:4:62:15:override_func:Using the global statement:UNDEFINED
-global-statement:71:4:71:14:func:Using the global statement:UNDEFINED
+global-statement:17:4:17:19:fix_contant:Using the global statement:UNDEFINED
+global-variable-not-assigned:24:4:24:14:other:Using global for 'HOP' but no assignment is done:UNDEFINED
+undefined-variable:25:10:25:13:other:Undefined variable 'HOP':UNDEFINED
+global-variable-undefined:30:4:30:18:define_constant:Global variable 'SOMEVAR' undefined at the module level:UNDEFINED
+global-statement:36:4:36:14:global_with_import:Using the global statement:UNDEFINED
+global-variable-not-assigned:42:4:42:19:global_no_assign:Using global for 'CONSTANT' but no assignment is done:UNDEFINED
+global-statement:48:4:48:19:global_del:Using the global statement:UNDEFINED
+global-statement:55:4:55:19:global_operator_assign:Using the global statement:UNDEFINED
+global-statement:62:4:62:19:global_function_assign:Using the global statement:UNDEFINED
+global-statement:72:4:72:15:override_func:Using the global statement:UNDEFINED
+global-statement:81:4:81:14:func:Using the global statement:UNDEFINED
+global-statement:87:4:87:16:override_class:Using the global statement:UNDEFINED
diff --git a/tests/functional/i/implicit/implicit_str_concat_latin1.py b/tests/functional/i/implicit/implicit_str_concat_latin1.py
index cf8c3e6ab8..4c9a656cf4 100644
--- a/tests/functional/i/implicit/implicit_str_concat_latin1.py
+++ b/tests/functional/i/implicit/implicit_str_concat_latin1.py
@@ -1,4 +1,5 @@
 # coding: latin_1
+# -1: [bad-file-encoding]
 #pylint: disable=invalid-name,missing-docstring
 
 TOTO = ('Caf�', 'Caf�', 'Caf�')
diff --git a/tests/functional/i/implicit/implicit_str_concat_latin1.txt b/tests/functional/i/implicit/implicit_str_concat_latin1.txt
new file mode 100644
index 0000000000..2461245388
--- /dev/null
+++ b/tests/functional/i/implicit/implicit_str_concat_latin1.txt
@@ -0,0 +1 @@
+bad-file-encoding:1:0:1:None::PEP8 recommends UTF-8 as encoding for Python files:HIGH
diff --git a/tests/functional/i/import_error.py b/tests/functional/i/import_error.py
index a2183fcfba..2ce63544ba 100644
--- a/tests/functional/i/import_error.py
+++ b/tests/functional/i/import_error.py
@@ -30,7 +30,7 @@
     pass
 
 
-from functional.s.syntax_error import toto  # [no-name-in-module,syntax-error]
+from functional.s.syntax.syntax_error import toto  # [no-name-in-module,syntax-error]
 
 
 # Don't emit `import-error` or `no-name-in-module`
diff --git a/tests/functional/i/import_error.txt b/tests/functional/i/import_error.txt
index 4e7ab24235..28e94dc72e 100644
--- a/tests/functional/i/import_error.txt
+++ b/tests/functional/i/import_error.txt
@@ -1,5 +1,5 @@
 import-error:3:0:3:22::Unable to import 'totally_missing':UNDEFINED
 import-error:21:4:21:26::Unable to import 'maybe_missing_2':UNDEFINED
-no-name-in-module:33:0:33:42::No name 'syntax_error' in module 'functional.s':UNDEFINED
-syntax-error:33:0:None:None::Cannot import 'functional.s.syntax_error' due to syntax error 'invalid syntax (<unknown>, line 1)':UNDEFINED
+no-name-in-module:33:0:33:49::No name 'syntax_error' in module 'functional.s.syntax':UNDEFINED
+syntax-error:33:0:None:None::Cannot import 'functional.s.syntax.syntax_error' due to syntax error 'invalid syntax (<unknown>, line 1)':UNDEFINED
 multiple-imports:78:0:78:15::Multiple imports on one line (foo, bar):UNDEFINED
diff --git a/tests/functional/i/inconsistent/inconsistent_mro.txt b/tests/functional/i/inconsistent/inconsistent_mro.txt
index 8760dfae6f..ea5ca14233 100644
--- a/tests/functional/i/inconsistent/inconsistent_mro.txt
+++ b/tests/functional/i/inconsistent/inconsistent_mro.txt
@@ -1 +1 @@
-inconsistent-mro:8:0:9:8:Inconsistent:Inconsistent method resolution order for class 'Inconsistent':UNDEFINED
+inconsistent-mro:8:0:8:18:Inconsistent:Inconsistent method resolution order for class 'Inconsistent':UNDEFINED
diff --git a/tests/functional/i/inconsistent/inconsistent_returns.txt b/tests/functional/i/inconsistent/inconsistent_returns.txt
index cf67b13ea2..8e67a83f8f 100644
--- a/tests/functional/i/inconsistent/inconsistent_returns.txt
+++ b/tests/functional/i/inconsistent/inconsistent_returns.txt
@@ -1,17 +1,17 @@
-inconsistent-return-statements:160:0:162:29:explicit_implicit_returns:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:164:0:167:25:empty_explicit_returns:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:169:0:175:19:explicit_implicit_returns2:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:177:0:183:23:explicit_implicit_returns3:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:185:0:193:16:returns_missing_in_catched_exceptions:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:195:0:200:22:complex_func:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:203:4:208:26:inconsistent_returns_in_nested_function.not_consistent_returns_inner:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:211:0:215:22:bug_1771_counter_example:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:229:0:235:24:bug_1772_counter_example:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:237:0:244:14:bug_1794_inner_func_in_if_counter_example_1:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:246:0:253:14:bug_1794_inner_func_in_if_counter_example_2:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:255:0:265:18:bug_1794_inner_func_in_if_counter_example_3:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:262:8:265:18:bug_1794_inner_func_in_if_counter_example_3._inner2:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:267:0:275:12:bug_3468:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:277:0:289:13:bug_3468_variant:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:322:0:329:20:bug_pylint_3873_1:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
-inconsistent-return-statements:349:0:355:15:bug_pylint_4019_wrong:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:160:0:160:29:explicit_implicit_returns:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:164:0:164:26:empty_explicit_returns:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:169:0:169:30:explicit_implicit_returns2:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:177:0:177:30:explicit_implicit_returns3:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:185:0:185:41:returns_missing_in_catched_exceptions:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:195:0:195:16:complex_func:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:203:4:203:36:inconsistent_returns_in_nested_function.not_consistent_returns_inner:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:211:0:211:28:bug_1771_counter_example:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:229:0:229:28:bug_1772_counter_example:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:237:0:237:47:bug_1794_inner_func_in_if_counter_example_1:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:246:0:246:47:bug_1794_inner_func_in_if_counter_example_2:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:255:0:255:47:bug_1794_inner_func_in_if_counter_example_3:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:262:8:262:19:bug_1794_inner_func_in_if_counter_example_3._inner2:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:267:0:267:12:bug_3468:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:277:0:277:20:bug_3468_variant:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:322:0:322:21:bug_pylint_3873_1:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:349:0:349:25:bug_pylint_4019_wrong:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
diff --git a/tests/functional/i/inconsistent/inconsistent_returns_noreturn.txt b/tests/functional/i/inconsistent/inconsistent_returns_noreturn.txt
index 8e36f5b59d..0e3ca50745 100644
--- a/tests/functional/i/inconsistent/inconsistent_returns_noreturn.txt
+++ b/tests/functional/i/inconsistent/inconsistent_returns_noreturn.txt
@@ -1 +1 @@
-inconsistent-return-statements:32:0:42:44:bug_pylint_4122_wrong:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
+inconsistent-return-statements:32:0:32:25:bug_pylint_4122_wrong:Either all return statements in a function should return an expression, or none of them should.:UNDEFINED
diff --git a/tests/functional/i/inherit_non_class.txt b/tests/functional/i/inherit_non_class.txt
index da0f55df72..4f90838329 100644
--- a/tests/functional/i/inherit_non_class.txt
+++ b/tests/functional/i/inherit_non_class.txt
@@ -1,11 +1,11 @@
-inherit-non-class:21:0:22:40:Bad:Inheriting '1', which is not a class.:UNDEFINED
-inherit-non-class:24:0:25:38:Bad1:"Inheriting 'lambda abc: 42', which is not a class.":UNDEFINED
-inherit-non-class:27:0:28:53:Bad2:Inheriting 'object()', which is not a class.:UNDEFINED
-inherit-non-class:30:0:31:40:Bad3:Inheriting 'return_class', which is not a class.:UNDEFINED
-inherit-non-class:33:0:34:40:Bad4:Inheriting 'Empty()', which is not a class.:UNDEFINED
-inherit-non-class:68:0:69:8:NotInheritableBool:Inheriting 'bool', which is not a class.:UNDEFINED
-inherit-non-class:72:0:73:8:NotInheritableRange:Inheriting 'range', which is not a class.:UNDEFINED
-inherit-non-class:76:0:77:8:NotInheritableSlice:Inheriting 'slice', which is not a class.:UNDEFINED
-inherit-non-class:80:0:81:8:NotInheritableMemoryView:Inheriting 'memoryview', which is not a class.:UNDEFINED
-inherit-non-class:99:0:100:8:Child2:Inheriting 'ParentBad[int]', which is not a class.:UNDEFINED
+inherit-non-class:21:0:21:9:Bad:Inheriting '1', which is not a class.:UNDEFINED
+inherit-non-class:24:0:24:10:Bad1:"Inheriting 'lambda abc: 42', which is not a class.":UNDEFINED
+inherit-non-class:27:0:27:10:Bad2:Inheriting 'object()', which is not a class.:UNDEFINED
+inherit-non-class:30:0:30:10:Bad3:Inheriting 'return_class', which is not a class.:UNDEFINED
+inherit-non-class:33:0:33:10:Bad4:Inheriting 'Empty()', which is not a class.:UNDEFINED
+inherit-non-class:68:0:68:24:NotInheritableBool:Inheriting 'bool', which is not a class.:UNDEFINED
+inherit-non-class:72:0:72:25:NotInheritableRange:Inheriting 'range', which is not a class.:UNDEFINED
+inherit-non-class:76:0:76:25:NotInheritableSlice:Inheriting 'slice', which is not a class.:UNDEFINED
+inherit-non-class:80:0:80:30:NotInheritableMemoryView:Inheriting 'memoryview', which is not a class.:UNDEFINED
+inherit-non-class:99:0:99:12:Child2:Inheriting 'ParentBad[int]', which is not a class.:UNDEFINED
 unsubscriptable-object:103:13:103:18:Child3:Value 'Empty' is unsubscriptable:UNDEFINED
diff --git a/tests/functional/i/init_is_generator.txt b/tests/functional/i/init_is_generator.txt
index 3566e6f585..789e322e87 100644
--- a/tests/functional/i/init_is_generator.txt
+++ b/tests/functional/i/init_is_generator.txt
@@ -1 +1 @@
-init-is-generator:4:4:5:18:SomeClass.__init__:__init__ method is a generator:UNDEFINED
+init-is-generator:4:4:4:16:SomeClass.__init__:__init__ method is a generator:UNDEFINED
diff --git a/tests/functional/i/init_not_called.txt b/tests/functional/i/init_not_called.txt
index 9d04c923f1..ae5e8f91fa 100644
--- a/tests/functional/i/init_not_called.txt
+++ b/tests/functional/i/init_not_called.txt
@@ -1,2 +1,2 @@
-super-init-not-called:25:4:26:27:ZZZZ.__init__:__init__ method from base class 'BBBB' is not called:UNDEFINED
-super-init-not-called:58:4:59:20:AssignedInit.__init__:__init__ method from base class 'NewStyleC' is not called:UNDEFINED
+super-init-not-called:25:4:25:16:ZZZZ.__init__:__init__ method from base class 'BBBB' is not called:INFERENCE
+super-init-not-called:58:4:58:16:AssignedInit.__init__:__init__ method from base class 'NewStyleC' is not called:INFERENCE
diff --git a/tests/functional/i/invalid/b/invalid_bool_returned.txt b/tests/functional/i/invalid/b/invalid_bool_returned.txt
deleted file mode 100644
index 616209139a..0000000000
--- a/tests/functional/i/invalid/b/invalid_bool_returned.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-invalid-bool-returned:36:4:37:16:FirstBadBool.__bool__:__bool__ does not return bool:UNDEFINED
-invalid-bool-returned:43:4:44:21:SecondBadBool.__bool__:__bool__ does not return bool:UNDEFINED
-invalid-bool-returned:50:4:51:24:ThirdBadBool.__bool__:__bool__ does not return bool:UNDEFINED
diff --git a/tests/functional/i/invalid/b/invalid_bytes_returned.txt b/tests/functional/i/invalid/b/invalid_bytes_returned.txt
deleted file mode 100644
index 9d8f0ece69..0000000000
--- a/tests/functional/i/invalid/b/invalid_bytes_returned.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-invalid-bytes-returned:36:4:37:20:FirstBadBytes.__bytes__:__bytes__ does not return bytes:UNDEFINED
-invalid-bytes-returned:43:4:44:16:SecondBadBytes.__bytes__:__bytes__ does not return bytes:UNDEFINED
-invalid-bytes-returned:50:4:51:36:ThirdBadBytes.__bytes__:__bytes__ does not return bytes:UNDEFINED
diff --git a/tests/functional/i/invalid/g/invalid_getnewargs_returned.txt b/tests/functional/i/invalid/g/invalid_getnewargs_returned.txt
deleted file mode 100644
index 1c719317d8..0000000000
--- a/tests/functional/i/invalid/g/invalid_getnewargs_returned.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-invalid-getnewargs-returned:36:4:37:16:FirstBadGetNewArgs.__getnewargs__:__getnewargs__ does not return a tuple:UNDEFINED
-invalid-getnewargs-returned:43:4:44:26:SecondBadGetNewArgs.__getnewargs__:__getnewargs__ does not return a tuple:UNDEFINED
-invalid-getnewargs-returned:50:4:51:34:ThirdBadGetNewArgs.__getnewargs__:__getnewargs__ does not return a tuple:UNDEFINED
diff --git a/tests/functional/i/invalid/b/invalid_bool_returned.py b/tests/functional/i/invalid/invalid_bool_returned.py
similarity index 100%
rename from tests/functional/i/invalid/b/invalid_bool_returned.py
rename to tests/functional/i/invalid/invalid_bool_returned.py
diff --git a/tests/functional/i/invalid/invalid_bool_returned.txt b/tests/functional/i/invalid/invalid_bool_returned.txt
new file mode 100644
index 0000000000..f8c6fc125f
--- /dev/null
+++ b/tests/functional/i/invalid/invalid_bool_returned.txt
@@ -0,0 +1,3 @@
+invalid-bool-returned:36:4:36:16:FirstBadBool.__bool__:__bool__ does not return bool:UNDEFINED
+invalid-bool-returned:43:4:43:16:SecondBadBool.__bool__:__bool__ does not return bool:UNDEFINED
+invalid-bool-returned:50:4:50:16:ThirdBadBool.__bool__:__bool__ does not return bool:UNDEFINED
diff --git a/tests/functional/i/invalid/b/invalid_bytes_returned.py b/tests/functional/i/invalid/invalid_bytes_returned.py
similarity index 100%
rename from tests/functional/i/invalid/b/invalid_bytes_returned.py
rename to tests/functional/i/invalid/invalid_bytes_returned.py
diff --git a/tests/functional/i/invalid/invalid_bytes_returned.txt b/tests/functional/i/invalid/invalid_bytes_returned.txt
new file mode 100644
index 0000000000..c05ea92939
--- /dev/null
+++ b/tests/functional/i/invalid/invalid_bytes_returned.txt
@@ -0,0 +1,3 @@
+invalid-bytes-returned:36:4:36:17:FirstBadBytes.__bytes__:__bytes__ does not return bytes:UNDEFINED
+invalid-bytes-returned:43:4:43:17:SecondBadBytes.__bytes__:__bytes__ does not return bytes:UNDEFINED
+invalid-bytes-returned:50:4:50:17:ThirdBadBytes.__bytes__:__bytes__ does not return bytes:UNDEFINED
diff --git a/tests/functional/i/invalid/invalid_class_object.py b/tests/functional/i/invalid/invalid_class_object.py
index 367756eaa8..7c08ebae81 100644
--- a/tests/functional/i/invalid/invalid_class_object.py
+++ b/tests/functional/i/invalid/invalid_class_object.py
@@ -16,3 +16,17 @@ class B:
 A.__class__ = defaultdict
 A.__class__ = defaultdict(str)  # [invalid-class-object]
 A.__class__ = 1  # [invalid-class-object]
+
+
+# Here, ambiguity is found when inferring self.__class__
+class C:
+    @classmethod
+    def _new_instance(cls):
+        obj = C()
+        obj.__class__ = cls
+        return obj
+
+    def __deepcopy__(self, memo):
+        obj = C()
+        obj.__class__ = self.__class__
+        return obj
diff --git a/tests/functional/i/invalid/e/invalid_envvar_value.py b/tests/functional/i/invalid/invalid_envvar_value.py
similarity index 100%
rename from tests/functional/i/invalid/e/invalid_envvar_value.py
rename to tests/functional/i/invalid/invalid_envvar_value.py
diff --git a/tests/functional/i/invalid/e/invalid_envvar_value.txt b/tests/functional/i/invalid/invalid_envvar_value.txt
similarity index 100%
rename from tests/functional/i/invalid/e/invalid_envvar_value.txt
rename to tests/functional/i/invalid/invalid_envvar_value.txt
diff --git a/tests/functional/i/invalid/e/invalid_exceptions_caught.py b/tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_caught.py
similarity index 100%
rename from tests/functional/i/invalid/e/invalid_exceptions_caught.py
rename to tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_caught.py
diff --git a/tests/functional/i/invalid/e/invalid_exceptions_caught.rc b/tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_caught.rc
similarity index 100%
rename from tests/functional/i/invalid/e/invalid_exceptions_caught.rc
rename to tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_caught.rc
diff --git a/tests/functional/i/invalid/e/invalid_exceptions_caught.txt b/tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_caught.txt
similarity index 100%
rename from tests/functional/i/invalid/e/invalid_exceptions_caught.txt
rename to tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_caught.txt
diff --git a/tests/functional/i/invalid/e/invalid_exceptions_raised.py b/tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_raised.py
similarity index 84%
rename from tests/functional/i/invalid/e/invalid_exceptions_raised.py
rename to tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_raised.py
index 4753265457..3b4229741e 100644
--- a/tests/functional/i/invalid/e/invalid_exceptions_raised.py
+++ b/tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_raised.py
@@ -108,3 +108,21 @@ class Error(Exception):
 def bad_case10():
     """raise string"""
     raise "string"  # [raising-bad-type]
+
+
+class AmbiguousValue:
+    """Don't emit when there is ambiguity on the node for the exception."""
+    def __init__(self):
+        self.stored_exception = None
+
+    def fail(self):
+        try:
+            1 / 0
+        except ZeroDivisionError as zde:
+            self.stored_exception = zde
+
+    def raise_stored_exception(self):
+        if self.stored_exception is not None:
+            exc = self.stored_exception
+            self.stored_exception = None
+            raise exc
diff --git a/tests/functional/i/invalid/e/invalid_exceptions_raised.txt b/tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_raised.txt
similarity index 100%
rename from tests/functional/i/invalid/e/invalid_exceptions_raised.txt
rename to tests/functional/i/invalid/invalid_exceptions/invalid_exceptions_raised.txt
diff --git a/tests/functional/i/invalid/invalid_format_returned.txt b/tests/functional/i/invalid/invalid_format_returned.txt
index fc753eab3c..17ebefc960 100644
--- a/tests/functional/i/invalid/invalid_format_returned.txt
+++ b/tests/functional/i/invalid/invalid_format_returned.txt
@@ -1,3 +1,3 @@
-invalid-format-returned:36:4:37:21:FirstBadFormat.__format__:__format__ does not return str:UNDEFINED
-invalid-format-returned:43:4:44:16:SecondBadFormat.__format__:__format__ does not return str:UNDEFINED
-invalid-format-returned:50:4:51:36:ThirdBadFormat.__format__:__format__ does not return str:UNDEFINED
+invalid-format-returned:36:4:36:18:FirstBadFormat.__format__:__format__ does not return str:UNDEFINED
+invalid-format-returned:43:4:43:18:SecondBadFormat.__format__:__format__ does not return str:UNDEFINED
+invalid-format-returned:50:4:50:18:ThirdBadFormat.__format__:__format__ does not return str:UNDEFINED
diff --git a/tests/functional/i/invalid/g/invalid_getnewargs_ex_returned.py b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_ex_returned.py
similarity index 100%
rename from tests/functional/i/invalid/g/invalid_getnewargs_ex_returned.py
rename to tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_ex_returned.py
diff --git a/tests/functional/i/invalid/g/invalid_getnewargs_ex_returned.txt b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_ex_returned.txt
similarity index 59%
rename from tests/functional/i/invalid/g/invalid_getnewargs_ex_returned.txt
rename to tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_ex_returned.txt
index 198808e79e..b657c5f40b 100644
--- a/tests/functional/i/invalid/g/invalid_getnewargs_ex_returned.txt
+++ b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_ex_returned.txt
@@ -1,6 +1,6 @@
-invalid-getnewargs-ex-returned:36:4:37:16:FirstBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
-invalid-getnewargs-ex-returned:43:4:44:41:SecondBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
-invalid-getnewargs-ex-returned:50:4:51:41:ThirdBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
-invalid-getnewargs-ex-returned:57:4:58:29:FourthBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
-invalid-getnewargs-ex-returned:64:4:65:33:FifthBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
-invalid-getnewargs-ex-returned:71:4:72:29:SixthBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
+invalid-getnewargs-ex-returned:36:4:36:25:FirstBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
+invalid-getnewargs-ex-returned:43:4:43:25:SecondBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
+invalid-getnewargs-ex-returned:50:4:50:25:ThirdBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
+invalid-getnewargs-ex-returned:57:4:57:25:FourthBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
+invalid-getnewargs-ex-returned:64:4:64:25:FifthBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
+invalid-getnewargs-ex-returned:71:4:71:25:SixthBadGetNewArgsEx.__getnewargs_ex__:__getnewargs_ex__ does not return a tuple containing (tuple, dict):UNDEFINED
diff --git a/tests/functional/i/invalid/g/invalid_getnewargs_returned.py b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_returned.py
similarity index 100%
rename from tests/functional/i/invalid/g/invalid_getnewargs_returned.py
rename to tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_returned.py
diff --git a/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_returned.txt b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_returned.txt
new file mode 100644
index 0000000000..83c577bfac
--- /dev/null
+++ b/tests/functional/i/invalid/invalid_getnewargs/invalid_getnewargs_returned.txt
@@ -0,0 +1,3 @@
+invalid-getnewargs-returned:36:4:36:22:FirstBadGetNewArgs.__getnewargs__:__getnewargs__ does not return a tuple:UNDEFINED
+invalid-getnewargs-returned:43:4:43:22:SecondBadGetNewArgs.__getnewargs__:__getnewargs__ does not return a tuple:UNDEFINED
+invalid-getnewargs-returned:50:4:50:22:ThirdBadGetNewArgs.__getnewargs__:__getnewargs__ does not return a tuple:UNDEFINED
diff --git a/tests/functional/i/invalid/invalid_hash_returned.txt b/tests/functional/i/invalid/invalid_hash_returned.txt
index 3b5f2d6810..0184f5db5c 100644
--- a/tests/functional/i/invalid/invalid_hash_returned.txt
+++ b/tests/functional/i/invalid/invalid_hash_returned.txt
@@ -1,4 +1,4 @@
-invalid-hash-returned:36:4:37:17:FirstBadHash.__hash__:__hash__ does not return int:UNDEFINED
-invalid-hash-returned:43:4:44:21:SecondBadHash.__hash__:__hash__ does not return int:UNDEFINED
-invalid-hash-returned:50:4:51:19:ThirdBadHash.__hash__:__hash__ does not return int:UNDEFINED
-invalid-hash-returned:57:4:58:24:FourthBadHash.__hash__:__hash__ does not return int:UNDEFINED
+invalid-hash-returned:36:4:36:16:FirstBadHash.__hash__:__hash__ does not return int:UNDEFINED
+invalid-hash-returned:43:4:43:16:SecondBadHash.__hash__:__hash__ does not return int:UNDEFINED
+invalid-hash-returned:50:4:50:16:ThirdBadHash.__hash__:__hash__ does not return int:UNDEFINED
+invalid-hash-returned:57:4:57:16:FourthBadHash.__hash__:__hash__ does not return int:UNDEFINED
diff --git a/tests/functional/i/invalid/invalid_index_returned.txt b/tests/functional/i/invalid/invalid_index_returned.txt
index 4479b28cf1..5be63e6591 100644
--- a/tests/functional/i/invalid/invalid_index_returned.txt
+++ b/tests/functional/i/invalid/invalid_index_returned.txt
@@ -1,4 +1,4 @@
-invalid-index-returned:36:4:37:25:FirstBadIndex.__index__:__index__ does not return int:UNDEFINED
-invalid-index-returned:43:4:44:19:SecondBadIndex.__index__:__index__ does not return int:UNDEFINED
-invalid-index-returned:50:4:51:19:ThirdBadIndex.__index__:__index__ does not return int:UNDEFINED
-invalid-index-returned:57:4:58:24:FourthBadIndex.__index__:__index__ does not return int:UNDEFINED
+invalid-index-returned:36:4:36:17:FirstBadIndex.__index__:__index__ does not return int:UNDEFINED
+invalid-index-returned:43:4:43:17:SecondBadIndex.__index__:__index__ does not return int:UNDEFINED
+invalid-index-returned:50:4:50:17:ThirdBadIndex.__index__:__index__ does not return int:UNDEFINED
+invalid-index-returned:57:4:57:17:FourthBadIndex.__index__:__index__ does not return int:UNDEFINED
diff --git a/tests/functional/i/invalid/l/invalid_length_hint_returned.py b/tests/functional/i/invalid/invalid_length/invalid_length_hint_returned.py
similarity index 100%
rename from tests/functional/i/invalid/l/invalid_length_hint_returned.py
rename to tests/functional/i/invalid/invalid_length/invalid_length_hint_returned.py
diff --git a/tests/functional/i/invalid/l/invalid_length_hint_returned.txt b/tests/functional/i/invalid/invalid_length/invalid_length_hint_returned.txt
similarity index 53%
rename from tests/functional/i/invalid/l/invalid_length_hint_returned.txt
rename to tests/functional/i/invalid/invalid_length/invalid_length_hint_returned.txt
index 2447d07438..8856bc95e9 100644
--- a/tests/functional/i/invalid/l/invalid_length_hint_returned.txt
+++ b/tests/functional/i/invalid/invalid_length/invalid_length_hint_returned.txt
@@ -1,3 +1,3 @@
-invalid-length-hint-returned:38:4:39:17:FirstBadLengthHint.__length_hint__:__length_hint__ does not return non-negative integer:UNDEFINED
-invalid-length-hint-returned:45:4:46:18:SecondBadLengthHint.__length_hint__:__length_hint__ does not return non-negative integer:UNDEFINED
-invalid-length-hint-returned:52:4:53:24:ThirdBadLengthHint.__length_hint__:__length_hint__ does not return non-negative integer:UNDEFINED
+invalid-length-hint-returned:38:4:38:23:FirstBadLengthHint.__length_hint__:__length_hint__ does not return non-negative integer:UNDEFINED
+invalid-length-hint-returned:45:4:45:23:SecondBadLengthHint.__length_hint__:__length_hint__ does not return non-negative integer:UNDEFINED
+invalid-length-hint-returned:52:4:52:23:ThirdBadLengthHint.__length_hint__:__length_hint__ does not return non-negative integer:UNDEFINED
diff --git a/tests/functional/i/invalid/l/invalid_length_returned.py b/tests/functional/i/invalid/invalid_length/invalid_length_returned.py
similarity index 100%
rename from tests/functional/i/invalid/l/invalid_length_returned.py
rename to tests/functional/i/invalid/invalid_length/invalid_length_returned.py
diff --git a/tests/functional/i/invalid/invalid_length/invalid_length_returned.txt b/tests/functional/i/invalid/invalid_length/invalid_length_returned.txt
new file mode 100644
index 0000000000..f9ed7ac0e3
--- /dev/null
+++ b/tests/functional/i/invalid/invalid_length/invalid_length_returned.txt
@@ -0,0 +1,4 @@
+invalid-length-returned:38:4:38:15:FirstBadLen.__len__:__len__ does not return non-negative integer:UNDEFINED
+invalid-length-returned:45:4:45:15:SecondBadLen.__len__:__len__ does not return non-negative integer:UNDEFINED
+invalid-length-returned:52:4:52:15:ThirdBadLen.__len__:__len__ does not return non-negative integer:UNDEFINED
+invalid-length-returned:59:4:59:15:NonRegression.__len__:__len__ does not return non-negative integer:UNDEFINED
diff --git a/tests/functional/i/invalid/m/invalid_metaclass.py b/tests/functional/i/invalid/invalid_metaclass.py
similarity index 100%
rename from tests/functional/i/invalid/m/invalid_metaclass.py
rename to tests/functional/i/invalid/invalid_metaclass.py
diff --git a/tests/functional/i/invalid/invalid_metaclass.txt b/tests/functional/i/invalid/invalid_metaclass.txt
new file mode 100644
index 0000000000..006065705e
--- /dev/null
+++ b/tests/functional/i/invalid/invalid_metaclass.txt
@@ -0,0 +1,6 @@
+invalid-metaclass:37:0:37:18:FirstInvalid:Invalid metaclass 'int' used:UNDEFINED
+invalid-metaclass:41:0:41:19:SecondInvalid:Invalid metaclass 'InvalidAsMetaclass' used:UNDEFINED
+invalid-metaclass:45:0:45:18:ThirdInvalid:Invalid metaclass '2' used:UNDEFINED
+invalid-metaclass:49:0:49:19:FourthInvalid:Invalid metaclass 'Instance of invalid_metaclass.InvalidAsMetaclass' used:UNDEFINED
+invalid-metaclass:61:0:61:13:Invalid:Invalid metaclass 'int' used:UNDEFINED
+invalid-metaclass:65:0:65:19:InvalidSecond:Invalid metaclass '1' used:UNDEFINED
diff --git a/tests/functional/i/invalid/m/invalid_metaclass_py3.py b/tests/functional/i/invalid/invalid_metaclass_py3.py
similarity index 100%
rename from tests/functional/i/invalid/m/invalid_metaclass_py3.py
rename to tests/functional/i/invalid/invalid_metaclass_py3.py
diff --git a/tests/functional/i/invalid/invalid_name.py b/tests/functional/i/invalid/invalid_name.py
index 527064c44c..201d5bf9f3 100644
--- a/tests/functional/i/invalid/invalid_name.py
+++ b/tests/functional/i/invalid/invalid_name.py
@@ -58,13 +58,8 @@ def wrapper(*args, **kwargs):
     return real_decorator
 
 
-@dummy_decorator(1, [
-    0  # Fixing #119 should make this go away
-# C0103 always points here - line 61  # [invalid-name]
-
-
-])
-def a_very_very_very_long_function_name_WithCamelCase_to_make_it_sad():  # Should be line 65
+@dummy_decorator(1, [0])
+def a_very_very_very_long_function_name_WithCamelCase_to_make_it_sad():  # [invalid-name]
     """Docstring"""
     print('LOL')
 
diff --git a/tests/functional/i/invalid/invalid_name.txt b/tests/functional/i/invalid/invalid_name.txt
index 8f464f5d65..12199a97e4 100644
--- a/tests/functional/i/invalid/invalid_name.txt
+++ b/tests/functional/i/invalid/invalid_name.txt
@@ -1,8 +1,8 @@
 invalid-name:12:0:12:3::"Constant name ""aaa"" doesn't conform to UPPER_CASE naming style":HIGH
 invalid-name:16:4:16:8::"Constant name ""time"" doesn't conform to UPPER_CASE naming style":HIGH
-invalid-name:32:0:33:12:a:"Function name ""a"" doesn't conform to snake_case naming style":HIGH
+invalid-name:32:0:32:5:a:"Function name ""a"" doesn't conform to snake_case naming style":HIGH
 invalid-name:46:4:46:13::"Constant name ""Foocapfor"" doesn't conform to UPPER_CASE naming style":HIGH
-invalid-name:63:0:69:16:a_very_very_very_long_function_name_WithCamelCase_to_make_it_sad:"Function name ""a_very_very_very_long_function_name_WithCamelCase_to_make_it_sad"" doesn't conform to snake_case naming style":HIGH
-invalid-name:75:23:75:29:FooBar.__init__:"Argument name ""fooBar"" doesn't conform to snake_case naming style":HIGH
-invalid-name:81:8:81:14:FooBar.func1:"Argument name ""fooBar"" doesn't conform to snake_case naming style":HIGH
-invalid-name:101:8:101:15:FooBar.test_disable_mixed:"Argument name ""fooBar2"" doesn't conform to snake_case naming style":HIGH
+invalid-name:62:0:62:68:a_very_very_very_long_function_name_WithCamelCase_to_make_it_sad:"Function name ""a_very_very_very_long_function_name_WithCamelCase_to_make_it_sad"" doesn't conform to snake_case naming style":HIGH
+invalid-name:70:23:70:29:FooBar.__init__:"Argument name ""fooBar"" doesn't conform to snake_case naming style":HIGH
+invalid-name:76:8:76:14:FooBar.func1:"Argument name ""fooBar"" doesn't conform to snake_case naming style":HIGH
+invalid-name:96:8:96:15:FooBar.test_disable_mixed:"Argument name ""fooBar2"" doesn't conform to snake_case naming style":HIGH
diff --git a/tests/functional/i/invalid/invalid_name_issue_3405.py b/tests/functional/i/invalid/invalid_name/invalid_name_issue_3405.py
similarity index 100%
rename from tests/functional/i/invalid/invalid_name_issue_3405.py
rename to tests/functional/i/invalid/invalid_name/invalid_name_issue_3405.py
diff --git a/tests/functional/i/invalid/invalid_name_issue_3405.rc b/tests/functional/i/invalid/invalid_name/invalid_name_issue_3405.rc
similarity index 100%
rename from tests/functional/i/invalid/invalid_name_issue_3405.rc
rename to tests/functional/i/invalid/invalid_name/invalid_name_issue_3405.rc
diff --git a/tests/functional/i/invalid/invalid_name_issue_3405.txt b/tests/functional/i/invalid/invalid_name/invalid_name_issue_3405.txt
similarity index 100%
rename from tests/functional/i/invalid/invalid_name_issue_3405.txt
rename to tests/functional/i/invalid/invalid_name/invalid_name_issue_3405.txt
diff --git a/tests/functional/i/invalid/invalid_name_module_level.py b/tests/functional/i/invalid/invalid_name/invalid_name_module_level.py
similarity index 100%
rename from tests/functional/i/invalid/invalid_name_module_level.py
rename to tests/functional/i/invalid/invalid_name/invalid_name_module_level.py
diff --git a/tests/functional/i/invalid/invalid_name/invalid_name_module_level.txt b/tests/functional/i/invalid/invalid_name/invalid_name_module_level.txt
new file mode 100644
index 0000000000..eb095f2606
--- /dev/null
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_module_level.txt
@@ -0,0 +1 @@
+invalid-name:16:0:16:5:A:"Function name ""A"" doesn't conform to snake_case naming style":HIGH
diff --git a/tests/functional/i/invalid/invalid_name_multinaming_style.py b/tests/functional/i/invalid/invalid_name/invalid_name_multinaming_style.py
similarity index 100%
rename from tests/functional/i/invalid/invalid_name_multinaming_style.py
rename to tests/functional/i/invalid/invalid_name/invalid_name_multinaming_style.py
diff --git a/tests/functional/i/invalid/invalid_name_multinaming_style.rc b/tests/functional/i/invalid/invalid_name/invalid_name_multinaming_style.rc
similarity index 100%
rename from tests/functional/i/invalid/invalid_name_multinaming_style.rc
rename to tests/functional/i/invalid/invalid_name/invalid_name_multinaming_style.rc
diff --git a/tests/functional/i/invalid/invalid_name/invalid_name_multinaming_style.txt b/tests/functional/i/invalid/invalid_name/invalid_name_multinaming_style.txt
new file mode 100644
index 0000000000..2c7e14ccc7
--- /dev/null
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_multinaming_style.txt
@@ -0,0 +1 @@
+invalid-name:4:0:4:9:UPPER:"Function name ""UPPER"" doesn't conform to the `down` group in the '^(?:(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$' pattern":HIGH
diff --git a/tests/functional/i/invalid/invalid_name_property.py b/tests/functional/i/invalid/invalid_name/invalid_name_property.py
similarity index 100%
rename from tests/functional/i/invalid/invalid_name_property.py
rename to tests/functional/i/invalid/invalid_name/invalid_name_property.py
diff --git a/tests/functional/i/invalid/invalid_name_property.rc b/tests/functional/i/invalid/invalid_name/invalid_name_property.rc
similarity index 100%
rename from tests/functional/i/invalid/invalid_name_property.rc
rename to tests/functional/i/invalid/invalid_name/invalid_name_property.rc
diff --git a/tests/functional/i/invalid/invalid_name_property.txt b/tests/functional/i/invalid/invalid_name/invalid_name_property.txt
similarity index 60%
rename from tests/functional/i/invalid/invalid_name_property.txt
rename to tests/functional/i/invalid/invalid_name/invalid_name_property.txt
index dfbc2f4651..84d804ce04 100644
--- a/tests/functional/i/invalid/invalid_name_property.txt
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_property.txt
@@ -1,3 +1,3 @@
 invalid-name:9:16:9:17:custom_prop:"Argument name ""f"" doesn't conform to snake_case naming style":HIGH
-invalid-name:21:4:22:12:FooClass.bar:"Attribute name ""bar"" doesn't conform to '[A-Z]+' pattern":INFERENCE
-invalid-name:37:4:38:12:AnotherFooClass.foo:"Attribute name ""foo"" doesn't conform to '[A-Z]+' pattern":INFERENCE
+invalid-name:21:4:21:11:FooClass.bar:"Attribute name ""bar"" doesn't conform to '[A-Z]+' pattern":INFERENCE
+invalid-name:37:4:37:11:AnotherFooClass.foo:"Attribute name ""foo"" doesn't conform to '[A-Z]+' pattern":INFERENCE
diff --git a/tests/functional/i/invalid/invalid_name_module_level.txt b/tests/functional/i/invalid/invalid_name_module_level.txt
deleted file mode 100644
index 1d51c6b679..0000000000
--- a/tests/functional/i/invalid/invalid_name_module_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-invalid-name:16:0:17:18:A:"Function name ""A"" doesn't conform to snake_case naming style":HIGH
diff --git a/tests/functional/i/invalid/invalid_name_multinaming_style.txt b/tests/functional/i/invalid/invalid_name_multinaming_style.txt
deleted file mode 100644
index f948f48156..0000000000
--- a/tests/functional/i/invalid/invalid_name_multinaming_style.txt
+++ /dev/null
@@ -1 +0,0 @@
-invalid-name:4:0:5:59:UPPER:"Function name ""UPPER"" doesn't conform to the `down` group in the '^(?:(?P<UP>[A-Z]+)|(?P<down>[a-z]+))$' pattern":HIGH
diff --git a/tests/functional/i/invalid/invalid_overridden_method.txt b/tests/functional/i/invalid/invalid_overridden_method.txt
index 65a2d76ab2..5506109df0 100644
--- a/tests/functional/i/invalid/invalid_overridden_method.txt
+++ b/tests/functional/i/invalid/invalid_overridden_method.txt
@@ -1,6 +1,6 @@
-invalid-overridden-method:38:4:39:19:InvalidDerived.prop:Method 'prop' was expected to be 'property', found it instead as 'method':UNDEFINED
-invalid-overridden-method:41:4:42:19:InvalidDerived.async_method:Method 'async_method' was expected to be 'async', found it instead as 'non-async':UNDEFINED
-invalid-overridden-method:45:4:46:19:InvalidDerived.method_a:Method 'method_a' was expected to be 'method', found it instead as 'property':UNDEFINED
-invalid-overridden-method:48:4:49:19:InvalidDerived.method_b:Method 'method_b' was expected to be 'non-async', found it instead as 'async':UNDEFINED
-invalid-overridden-method:122:4:123:20:B.bar:Method 'bar' was expected to be 'property', found it instead as 'method':UNDEFINED
-invalid-overridden-method:126:4:127:20:B.bar2:Method 'bar2' was expected to be 'property', found it instead as 'method':UNDEFINED
+invalid-overridden-method:38:4:38:12:InvalidDerived.prop:Method 'prop' was expected to be 'property', found it instead as 'method':UNDEFINED
+invalid-overridden-method:41:4:41:20:InvalidDerived.async_method:Method 'async_method' was expected to be 'async', found it instead as 'non-async':UNDEFINED
+invalid-overridden-method:45:4:45:16:InvalidDerived.method_a:Method 'method_a' was expected to be 'method', found it instead as 'property':UNDEFINED
+invalid-overridden-method:48:4:48:22:InvalidDerived.method_b:Method 'method_b' was expected to be 'non-async', found it instead as 'async':UNDEFINED
+invalid-overridden-method:122:4:122:11:B.bar:Method 'bar' was expected to be 'property', found it instead as 'method':UNDEFINED
+invalid-overridden-method:126:4:126:12:B.bar2:Method 'bar2' was expected to be 'property', found it instead as 'method':UNDEFINED
diff --git a/tests/functional/i/invalid/invalid_repr_returned.txt b/tests/functional/i/invalid/invalid_repr_returned.txt
index 0f557701ab..53d00abe05 100644
--- a/tests/functional/i/invalid/invalid_repr_returned.txt
+++ b/tests/functional/i/invalid/invalid_repr_returned.txt
@@ -1,3 +1,3 @@
-invalid-repr-returned:36:4:37:21:FirstBadRepr.__repr__:__repr__ does not return str:UNDEFINED
-invalid-repr-returned:43:4:44:16:SecondBadRepr.__repr__:__repr__ does not return str:UNDEFINED
-invalid-repr-returned:50:4:51:34:ThirdBadRepr.__repr__:__repr__ does not return str:UNDEFINED
+invalid-repr-returned:36:4:36:16:FirstBadRepr.__repr__:__repr__ does not return str:UNDEFINED
+invalid-repr-returned:43:4:43:16:SecondBadRepr.__repr__:__repr__ does not return str:UNDEFINED
+invalid-repr-returned:50:4:50:16:ThirdBadRepr.__repr__:__repr__ does not return str:UNDEFINED
diff --git a/tests/functional/i/invalid/s/invalid_sequence_index.py b/tests/functional/i/invalid/invalid_sequence_index.py
similarity index 100%
rename from tests/functional/i/invalid/s/invalid_sequence_index.py
rename to tests/functional/i/invalid/invalid_sequence_index.py
diff --git a/tests/functional/i/invalid/s/invalid_sequence_index.txt b/tests/functional/i/invalid/invalid_sequence_index.txt
similarity index 100%
rename from tests/functional/i/invalid/s/invalid_sequence_index.txt
rename to tests/functional/i/invalid/invalid_sequence_index.txt
diff --git a/tests/functional/i/invalid/s/invalid_slice_index.py b/tests/functional/i/invalid/invalid_slice_index.py
similarity index 100%
rename from tests/functional/i/invalid/s/invalid_slice_index.py
rename to tests/functional/i/invalid/invalid_slice_index.py
diff --git a/tests/functional/i/invalid/s/invalid_slice_index.txt b/tests/functional/i/invalid/invalid_slice_index.txt
similarity index 100%
rename from tests/functional/i/invalid/s/invalid_slice_index.txt
rename to tests/functional/i/invalid/invalid_slice_index.txt
diff --git a/tests/functional/i/invalid/s/invalid_star_assignment_target.py b/tests/functional/i/invalid/invalid_star_assignment_target.py
similarity index 100%
rename from tests/functional/i/invalid/s/invalid_star_assignment_target.py
rename to tests/functional/i/invalid/invalid_star_assignment_target.py
diff --git a/tests/functional/i/invalid/s/invalid_star_assignment_target.txt b/tests/functional/i/invalid/invalid_star_assignment_target.txt
similarity index 100%
rename from tests/functional/i/invalid/s/invalid_star_assignment_target.txt
rename to tests/functional/i/invalid/invalid_star_assignment_target.txt
diff --git a/tests/functional/i/invalid/s/invalid_str_returned.py b/tests/functional/i/invalid/invalid_str_returned.py
similarity index 100%
rename from tests/functional/i/invalid/s/invalid_str_returned.py
rename to tests/functional/i/invalid/invalid_str_returned.py
diff --git a/tests/functional/i/invalid/invalid_str_returned.txt b/tests/functional/i/invalid/invalid_str_returned.txt
new file mode 100644
index 0000000000..4e7d96d555
--- /dev/null
+++ b/tests/functional/i/invalid/invalid_str_returned.txt
@@ -0,0 +1,3 @@
+invalid-str-returned:36:4:36:15:FirstBadStr.__str__:__str__ does not return str:UNDEFINED
+invalid-str-returned:43:4:43:15:SecondBadStr.__str__:__str__ does not return str:UNDEFINED
+invalid-str-returned:50:4:50:15:ThirdBadStr.__str__:__str__ does not return str:UNDEFINED
diff --git a/tests/functional/i/invalid/l/invalid_length_returned.txt b/tests/functional/i/invalid/l/invalid_length_returned.txt
deleted file mode 100644
index 776945e343..0000000000
--- a/tests/functional/i/invalid/l/invalid_length_returned.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-invalid-length-returned:38:4:39:17:FirstBadLen.__len__:__len__ does not return non-negative integer:UNDEFINED
-invalid-length-returned:45:4:46:18:SecondBadLen.__len__:__len__ does not return non-negative integer:UNDEFINED
-invalid-length-returned:52:4:53:24:ThirdBadLen.__len__:__len__ does not return non-negative integer:UNDEFINED
-invalid-length-returned:59:4:60:18:NonRegression.__len__:__len__ does not return non-negative integer:UNDEFINED
diff --git a/tests/functional/i/invalid/m/invalid_metaclass.txt b/tests/functional/i/invalid/m/invalid_metaclass.txt
deleted file mode 100644
index c5ca48d760..0000000000
--- a/tests/functional/i/invalid/m/invalid_metaclass.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-invalid-metaclass:37:0:38:8:FirstInvalid:Invalid metaclass 'int' used:UNDEFINED
-invalid-metaclass:41:0:42:8:SecondInvalid:Invalid metaclass 'InvalidAsMetaclass' used:UNDEFINED
-invalid-metaclass:45:0:46:8:ThirdInvalid:Invalid metaclass '2' used:UNDEFINED
-invalid-metaclass:49:0:50:8:FourthInvalid:Invalid metaclass 'Instance of invalid_metaclass.InvalidAsMetaclass' used:UNDEFINED
-invalid-metaclass:61:0:62:8:Invalid:Invalid metaclass 'int' used:UNDEFINED
-invalid-metaclass:65:0:66:8:InvalidSecond:Invalid metaclass '1' used:UNDEFINED
diff --git a/tests/functional/i/invalid/s/invalid_str_returned.txt b/tests/functional/i/invalid/s/invalid_str_returned.txt
deleted file mode 100644
index 522fdb9bff..0000000000
--- a/tests/functional/i/invalid/s/invalid_str_returned.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-invalid-str-returned:36:4:37:21:FirstBadStr.__str__:__str__ does not return str:UNDEFINED
-invalid-str-returned:43:4:44:16:SecondBadStr.__str__:__str__ does not return str:UNDEFINED
-invalid-str-returned:50:4:51:33:ThirdBadStr.__str__:__str__ does not return str:UNDEFINED
diff --git a/tests/functional/k/keyword_arg_before_vararg.txt b/tests/functional/k/keyword_arg_before_vararg.txt
index f20a319a71..87a88f1a4e 100644
--- a/tests/functional/k/keyword_arg_before_vararg.txt
+++ b/tests/functional/k/keyword_arg_before_vararg.txt
@@ -1,4 +1,4 @@
-keyword-arg-before-vararg:5:0:7:8:check_kwargs_before_args:Keyword argument before variable positional arguments list in the definition of check_kwargs_before_args function:UNDEFINED
-keyword-arg-before-vararg:14:4:16:12:AAAA.func_in_class:Keyword argument before variable positional arguments list in the definition of func_in_class function:UNDEFINED
-keyword-arg-before-vararg:19:4:21:12:AAAA.static_method_in_class:Keyword argument before variable positional arguments list in the definition of static_method_in_class function:UNDEFINED
-keyword-arg-before-vararg:24:4:26:12:AAAA.class_method_in_class:Keyword argument before variable positional arguments list in the definition of class_method_in_class function:UNDEFINED
+keyword-arg-before-vararg:5:0:5:28:check_kwargs_before_args:Keyword argument before variable positional arguments list in the definition of check_kwargs_before_args function:UNDEFINED
+keyword-arg-before-vararg:14:4:14:21:AAAA.func_in_class:Keyword argument before variable positional arguments list in the definition of func_in_class function:UNDEFINED
+keyword-arg-before-vararg:19:4:19:30:AAAA.static_method_in_class:Keyword argument before variable positional arguments list in the definition of static_method_in_class function:UNDEFINED
+keyword-arg-before-vararg:24:4:24:29:AAAA.class_method_in_class:Keyword argument before variable positional arguments list in the definition of class_method_in_class function:UNDEFINED
diff --git a/tests/functional/m/member/membership_protocol.py b/tests/functional/m/membership_protocol.py
similarity index 100%
rename from tests/functional/m/member/membership_protocol.py
rename to tests/functional/m/membership_protocol.py
diff --git a/tests/functional/m/member/membership_protocol.txt b/tests/functional/m/membership_protocol.txt
similarity index 100%
rename from tests/functional/m/member/membership_protocol.txt
rename to tests/functional/m/membership_protocol.txt
diff --git a/tests/functional/m/member/membership_protocol_py3.py b/tests/functional/m/membership_protocol_py3.py
similarity index 100%
rename from tests/functional/m/member/membership_protocol_py3.py
rename to tests/functional/m/membership_protocol_py3.py
diff --git a/tests/functional/m/member/membership_protocol_py3.txt b/tests/functional/m/membership_protocol_py3.txt
similarity index 100%
rename from tests/functional/m/member/membership_protocol_py3.txt
rename to tests/functional/m/membership_protocol_py3.txt
diff --git a/tests/functional/m/method_hidden.py b/tests/functional/m/method_hidden.py
index c5c8024501..e31bc16c4f 100644
--- a/tests/functional/m/method_hidden.py
+++ b/tests/functional/m/method_hidden.py
@@ -1,6 +1,6 @@
 # pylint: disable=too-few-public-methods, useless-object-inheritance,missing-docstring
 # pylint: disable=unused-private-member
-"""check method hidding ancestor attribute
+"""check method hiding ancestor attribute
 """
 from __future__ import print_function
 
diff --git a/tests/functional/m/method_hidden.txt b/tests/functional/m/method_hidden.txt
index c15486dce6..23651bd4a0 100644
--- a/tests/functional/m/method_hidden.txt
+++ b/tests/functional/m/method_hidden.txt
@@ -1,3 +1,3 @@
-method-hidden:18:4:20:19:Cdef.abcd:An attribute defined in functional.m.method_hidden line 12 hides this method:UNDEFINED
-method-hidden:86:4:87:12:One.one:An attribute defined in functional.m.method_hidden line 84 hides this method:UNDEFINED
-method-hidden:113:4:114:12:Child._protected:An attribute defined in functional.m.method_hidden line 109 hides this method:UNDEFINED
+method-hidden:18:4:18:12:Cdef.abcd:An attribute defined in functional.m.method_hidden line 12 hides this method:UNDEFINED
+method-hidden:86:4:86:11:One.one:An attribute defined in functional.m.method_hidden line 84 hides this method:UNDEFINED
+method-hidden:113:4:113:18:Child._protected:An attribute defined in functional.m.method_hidden line 109 hides this method:UNDEFINED
diff --git a/tests/functional/m/missing/missing_class_docstring.txt b/tests/functional/m/missing/missing_class_docstring.txt
index 2acd9bc197..4aaa0a8216 100644
--- a/tests/functional/m/missing/missing_class_docstring.txt
+++ b/tests/functional/m/missing/missing_class_docstring.txt
@@ -1 +1 @@
-missing-class-docstring:5:0:6:8:Klass:Missing class docstring:HIGH
+missing-class-docstring:5:0:5:11:Klass:Missing class docstring:HIGH
diff --git a/tests/functional/m/missing/missing_docstring.txt b/tests/functional/m/missing/missing_docstring.txt
index af030e11c4..4ed84ed06c 100644
--- a/tests/functional/m/missing/missing_docstring.txt
+++ b/tests/functional/m/missing/missing_docstring.txt
@@ -1,3 +1,3 @@
 missing-module-docstring:1:0:None:None::Missing module docstring:HIGH
-missing-class-docstring:21:0:22:8:ClassUndocumented:Missing class docstring:HIGH
-missing-function-docstring:25:0:26:8:public_undocumented:Missing function or method docstring:HIGH
+missing-class-docstring:21:0:21:23:ClassUndocumented:Missing class docstring:HIGH
+missing-function-docstring:25:0:25:23:public_undocumented:Missing function or method docstring:HIGH
diff --git a/tests/functional/m/missing/missing_docstring_new_style.txt b/tests/functional/m/missing/missing_docstring_new_style.txt
index f0a456c24a..645791a65f 100644
--- a/tests/functional/m/missing/missing_docstring_new_style.txt
+++ b/tests/functional/m/missing/missing_docstring_new_style.txt
@@ -1,5 +1,5 @@
 missing-module-docstring:1:0:None:None::Missing module docstring:HIGH
-missing-class-docstring:9:0:10:8:UndocumentedClass:Missing class docstring:HIGH
-missing-class-docstring:19:0:20:8:OtherClassUndocumented:Missing class docstring:HIGH
-missing-function-docstring:36:0:37:8:public_undocumented:Missing function or method docstring:HIGH
-missing-function-docstring:46:0:47:8:undocumented_other_function:Missing function or method docstring:HIGH
+missing-class-docstring:9:0:9:23:UndocumentedClass:Missing class docstring:HIGH
+missing-class-docstring:19:0:19:28:OtherClassUndocumented:Missing class docstring:HIGH
+missing-function-docstring:36:0:36:23:public_undocumented:Missing function or method docstring:HIGH
+missing-function-docstring:46:0:46:31:undocumented_other_function:Missing function or method docstring:HIGH
diff --git a/tests/functional/m/missing/missing_function_docstring.txt b/tests/functional/m/missing/missing_function_docstring.txt
index 9eea693c09..2f75b8e123 100644
--- a/tests/functional/m/missing/missing_function_docstring.txt
+++ b/tests/functional/m/missing/missing_function_docstring.txt
@@ -1,2 +1,2 @@
-missing-function-docstring:5:0:6:8:func:Missing function or method docstring:HIGH
-missing-function-docstring:18:4:19:12:MyClass.__init__:Missing function or method docstring:INFERENCE
+missing-function-docstring:5:0:5:8:func:Missing function or method docstring:HIGH
+missing-function-docstring:18:4:18:16:MyClass.__init__:Missing function or method docstring:INFERENCE
diff --git a/tests/functional/m/missing/missing_function_docstring_min_length.txt b/tests/functional/m/missing/missing_function_docstring_min_length.txt
index cf38aceee1..477c8ee8cc 100644
--- a/tests/functional/m/missing/missing_function_docstring_min_length.txt
+++ b/tests/functional/m/missing/missing_function_docstring_min_length.txt
@@ -1,2 +1,2 @@
-missing-function-docstring:9:0:11:8:func_two:Missing function or method docstring:HIGH
-missing-function-docstring:14:0:18:12:func_three:Missing function or method docstring:HIGH
+missing-function-docstring:9:0:9:12:func_two:Missing function or method docstring:HIGH
+missing-function-docstring:14:0:14:14:func_three:Missing function or method docstring:HIGH
diff --git a/tests/functional/m/missing/missing_function_docstring_rgx.txt b/tests/functional/m/missing/missing_function_docstring_rgx.txt
index ee085ec067..b3d5227a7e 100644
--- a/tests/functional/m/missing/missing_function_docstring_rgx.txt
+++ b/tests/functional/m/missing/missing_function_docstring_rgx.txt
@@ -1 +1 @@
-missing-function-docstring:10:4:11:19:Child.__eq__:Missing function or method docstring:INFERENCE
+missing-function-docstring:10:4:10:14:Child.__eq__:Missing function or method docstring:INFERENCE
diff --git a/tests/functional/m/missing/missing_self_argument.txt b/tests/functional/m/missing/missing_self_argument.txt
index 855f83f584..14a9a98633 100644
--- a/tests/functional/m/missing/missing_self_argument.txt
+++ b/tests/functional/m/missing/missing_self_argument.txt
@@ -1,3 +1,3 @@
-no-method-argument:12:4:13:47:MyClass.method:Method has no argument:UNDEFINED
-no-method-argument:15:4:17:20:MyClass.setup:Method has no argument:UNDEFINED
+no-method-argument:12:4:12:14:MyClass.method:Method has no argument:UNDEFINED
+no-method-argument:15:4:15:13:MyClass.setup:Method has no argument:UNDEFINED
 undefined-variable:17:8:17:12:MyClass.setup:Undefined variable 'self':UNDEFINED
diff --git a/tests/functional/m/modified_iterating.py b/tests/functional/m/modified_iterating.py
new file mode 100644
index 0000000000..8817c1db0e
--- /dev/null
+++ b/tests/functional/m/modified_iterating.py
@@ -0,0 +1,73 @@
+"""Tests for iterating-modified messages"""
+# pylint: disable=not-callable,unnecessary-comprehension
+
+import copy
+
+item_list = [1, 2, 3]
+for item in item_list:
+    item_list.append(item)  # [modified-iterating-list]
+
+for item in item_list:
+    item_list.remove(item)  # [modified-iterating-list]
+
+for item in item_list.copy():
+    item_list.append(item)
+    item_list.remove(item)
+
+for item in copy(item_list):
+    item_list.append(item)
+    item_list.remove(item)
+
+for item in [k for k in item_list]:
+    item_list.append(item)
+    item_list.remove(item)
+
+my_dict = {"1": 1, "2": 2, "3": 3}
+i = 1
+for item in my_dict:
+    item_list[0] = i  # for coverage, see reference at /pull/5628#discussion_r792181642
+    my_dict[i] = 1      # [modified-iterating-dict]
+    i += 1
+
+i = 1
+for item in my_dict.copy():
+    my_dict[i] = 1
+    i += 1
+
+item_set = {1, 2, 3}
+for item in item_set:
+    item_set.add(item + 10)  # [modified-iterating-set]
+
+for item in item_set.copy():
+    item_set.add(item + 10)
+
+for l in item_list:
+    for s in item_set:
+        item_list.append(1)  # [modified-iterating-list]
+        item_set.remove(4)  # [modified-iterating-set]
+    item_list.remove(1)  # [modified-iterating-list]
+
+# Check for nested for loops and changes to iterators
+for l in item_list:
+    item_list.append(1)  # [modified-iterating-list]
+    for _ in []:
+        for _ in []:
+            item_list.remove(1)  # [modified-iterating-list]
+            for _ in []:
+                item_list.append(1)  # [modified-iterating-list]
+
+
+def format_manifest_serializer_errors(errors):
+    """Regression test for issue #5969 - iter_obj is a function call."""
+    errors_messages = []
+    for key, value in errors.items():
+        for message in format_manifest_serializer_errors(value):
+            error_message = f"{key}: {message}"
+            errors_messages.append(error_message)
+    return errors_messages
+
+
+dict1 = {"1": 1}
+dict2 = {"2": 2}
+for item in dict1:
+    dict2[item] = 1
diff --git a/tests/functional/m/modified_iterating.txt b/tests/functional/m/modified_iterating.txt
new file mode 100644
index 0000000000..77001b1720
--- /dev/null
+++ b/tests/functional/m/modified_iterating.txt
@@ -0,0 +1,10 @@
+modified-iterating-list:8:4:8:26::Iterated list 'item_list' is being modified inside for loop body, consider iterating through a copy of it instead.:INFERENCE
+modified-iterating-list:11:4:11:26::Iterated list 'item_list' is being modified inside for loop body, consider iterating through a copy of it instead.:INFERENCE
+modified-iterating-dict:29:4:29:18::Iterated dict 'my_dict' is being modified inside for loop body, iterate through a copy of it instead.:INFERENCE
+modified-iterating-set:39:4:39:27::Iterated set 'item_set' is being modified inside for loop body, iterate through a copy of it instead.:INFERENCE
+modified-iterating-list:46:8:46:27::Iterated list 'item_list' is being modified inside for loop body, consider iterating through a copy of it instead.:INFERENCE
+modified-iterating-set:47:8:47:26::Iterated set 'item_set' is being modified inside for loop body, iterate through a copy of it instead.:INFERENCE
+modified-iterating-list:48:4:48:23::Iterated list 'item_list' is being modified inside for loop body, consider iterating through a copy of it instead.:INFERENCE
+modified-iterating-list:52:4:52:23::Iterated list 'item_list' is being modified inside for loop body, consider iterating through a copy of it instead.:INFERENCE
+modified-iterating-list:55:12:55:31::Iterated list 'item_list' is being modified inside for loop body, consider iterating through a copy of it instead.:INFERENCE
+modified-iterating-list:57:16:57:35::Iterated list 'item_list' is being modified inside for loop body, consider iterating through a copy of it instead.:INFERENCE
diff --git a/tests/functional/m/module___dict__.txt b/tests/functional/m/module___dict__.txt
index a465b1fe93..a62def231a 100644
--- a/tests/functional/m/module___dict__.txt
+++ b/tests/functional/m/module___dict__.txt
@@ -1 +1 @@
-used-before-assignment:5:6:5:14::Using variable '__dict__' before assignment:UNDEFINED
+used-before-assignment:5:6:5:14::Using variable '__dict__' before assignment:HIGH
diff --git a/tests/functional/n/name/namePresetCamelCase.txt b/tests/functional/n/name/namePresetCamelCase.txt
deleted file mode 100644
index 7b9ec86231..0000000000
--- a/tests/functional/n/name/namePresetCamelCase.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-invalid-name:3:0:3:13::"Constant name ""SOME_CONSTANT"" doesn't conform to camelCase naming style ('([^\\W\\dA-Z][^\\W_]*|__.*__)$' pattern)":HIGH
-invalid-name:10:0:19:79:MyClass:"Class name ""MyClass"" doesn't conform to camelCase naming style ('[^\\W\\dA-Z][^\\W_]+$' pattern)":HIGH
-invalid-name:22:0:23:8:say_hello:"Function name ""say_hello"" doesn't conform to camelCase naming style ('([^\\W\\dA-Z][^\\W_]{2,}|__[^\\W\\dA-Z_]\\w+__)$' pattern)":HIGH
diff --git a/tests/functional/n/name/name_good_bad_names_regex.txt b/tests/functional/n/name/name_good_bad_names_regex.txt
index 78d57990d6..66c1c99f15 100644
--- a/tests/functional/n/name/name_good_bad_names_regex.txt
+++ b/tests/functional/n/name/name_good_bad_names_regex.txt
@@ -1,3 +1,3 @@
 disallowed-name:5:0:5:26::"Disallowed name ""explicit_bad_some_constant""":UNDEFINED
 invalid-name:7:0:7:28::"Constant name ""snake_case_bad_SOME_CONSTANT"" doesn't conform to snake_case naming style ('([^\\W\\dA-Z][^\\WA-Z]*|__.*__)$' pattern)":HIGH
-disallowed-name:19:0:20:8:disallowed_2_snake_case:"Disallowed name ""disallowed_2_snake_case""":UNDEFINED
+disallowed-name:19:0:19:27:disallowed_2_snake_case:"Disallowed name ""disallowed_2_snake_case""":UNDEFINED
diff --git a/tests/functional/n/name/name_preset_snake_case.txt b/tests/functional/n/name/name_preset_snake_case.txt
index 664b2db90e..339f27bd8a 100644
--- a/tests/functional/n/name/name_preset_snake_case.txt
+++ b/tests/functional/n/name/name_preset_snake_case.txt
@@ -1,5 +1,5 @@
 invalid-name:6:0:6:13::"Constant name ""SOME_CONSTANT"" doesn't conform to snake_case naming style ('([^\\W\\dA-Z][^\\WA-Z]*|__.*__)$' pattern)":HIGH
-invalid-name:13:0:22:83:MyClass:"Class name ""MyClass"" doesn't conform to snake_case naming style ('[^\\W\\dA-Z][^\\WA-Z]+$' pattern)":HIGH
-invalid-name:25:0:26:8:sayHello:"Function name ""sayHello"" doesn't conform to snake_case naming style ('([^\\W\\dA-Z][^\\WA-Z]{2,}|_[^\\WA-Z]*|__[^\\WA-Z\\d_][^\\WA-Z]+__)$' pattern)":HIGH
-invalid-name:29:0:31:22:FooEnum:"Class name ""FooEnum"" doesn't conform to snake_case naming style ('[^\\W\\dA-Z][^\\WA-Z]+$' pattern)":HIGH
-invalid-name:34:0:35:45:Bar:"Class name ""Bar"" doesn't conform to snake_case naming style ('[^\\W\\dA-Z][^\\WA-Z]+$' pattern)":HIGH
+invalid-name:13:0:13:13:MyClass:"Class name ""MyClass"" doesn't conform to snake_case naming style ('[^\\W\\dA-Z][^\\WA-Z]+$' pattern)":HIGH
+invalid-name:25:0:25:12:sayHello:"Function name ""sayHello"" doesn't conform to snake_case naming style ('([^\\W\\dA-Z][^\\WA-Z]{2,}|_[^\\WA-Z]*|__[^\\WA-Z\\d_][^\\WA-Z]+__)$' pattern)":HIGH
+invalid-name:29:0:29:13:FooEnum:"Class name ""FooEnum"" doesn't conform to snake_case naming style ('[^\\W\\dA-Z][^\\WA-Z]+$' pattern)":HIGH
+invalid-name:34:0:34:9:Bar:"Class name ""Bar"" doesn't conform to snake_case naming style ('[^\\W\\dA-Z][^\\WA-Z]+$' pattern)":HIGH
diff --git a/tests/functional/n/name/name_styles.txt b/tests/functional/n/name/name_styles.txt
index a6d18a1667..ad7dad05fb 100644
--- a/tests/functional/n/name/name_styles.txt
+++ b/tests/functional/n/name/name_styles.txt
@@ -1,17 +1,17 @@
 invalid-name:11:0:11:14::"Constant name ""bad_const_name"" doesn't conform to UPPER_CASE naming style":HIGH
-invalid-name:14:0:17:24:BADFUNCTION_name:"Function name ""BADFUNCTION_name"" doesn't conform to snake_case naming style":HIGH
+invalid-name:14:0:14:20:BADFUNCTION_name:"Function name ""BADFUNCTION_name"" doesn't conform to snake_case naming style":HIGH
 invalid-name:16:4:16:17:BADFUNCTION_name:"Variable name ""BAD_LOCAL_VAR"" doesn't conform to snake_case naming style":HIGH
 invalid-name:20:21:20:29:func_bad_argname:"Argument name ""NOT_GOOD"" doesn't conform to snake_case naming style":HIGH
-invalid-name:30:0:31:32:bad_class_name:"Class name ""bad_class_name"" doesn't conform to PascalCase naming style":HIGH
+invalid-name:30:0:30:20:bad_class_name:"Class name ""bad_class_name"" doesn't conform to PascalCase naming style":HIGH
 invalid-name:41:8:41:27:CorrectClassName.__init__:"Attribute name ""_Bad_AtTR_name"" doesn't conform to snake_case naming style":HIGH
 invalid-name:42:8:42:28:CorrectClassName.__init__:"Attribute name ""Bad_PUBLIC_name"" doesn't conform to snake_case naming style":HIGH
-invalid-name:47:4:48:39:CorrectClassName.BadMethodName:"Method name ""BadMethodName"" doesn't conform to snake_case naming style":INFERENCE
-invalid-name:53:4:54:41:CorrectClassName.__DunDER_IS_not_free_for_all__:"Method name ""__DunDER_IS_not_free_for_all__"" doesn't conform to snake_case naming style":INFERENCE
+invalid-name:47:4:47:21:CorrectClassName.BadMethodName:"Method name ""BadMethodName"" doesn't conform to snake_case naming style":INFERENCE
+invalid-name:53:4:53:38:CorrectClassName.__DunDER_IS_not_free_for_all__:"Method name ""__DunDER_IS_not_free_for_all__"" doesn't conform to snake_case naming style":INFERENCE
 invalid-name:83:0:83:18::"Class name ""BAD_NAME_FOR_CLASS"" doesn't conform to PascalCase naming style":HIGH
 invalid-name:84:0:84:23::"Class name ""NEXT_BAD_NAME_FOR_CLASS"" doesn't conform to PascalCase naming style":HIGH
 invalid-name:91:0:91:11::"Class name ""NOT_CORRECT"" doesn't conform to PascalCase naming style":HIGH
 invalid-name:97:4:97:22:test_globals:"Constant name ""AlsoCorrect"" doesn't conform to UPPER_CASE naming style":HIGH
-invalid-name:110:4:112:12:FooClass.PROPERTY_NAME:"Attribute name ""PROPERTY_NAME"" doesn't conform to snake_case naming style":INFERENCE
-invalid-name:116:4:118:12:FooClass.ABSTRACT_PROPERTY_NAME:"Attribute name ""ABSTRACT_PROPERTY_NAME"" doesn't conform to snake_case naming style":INFERENCE
-invalid-name:121:4:123:12:FooClass.PROPERTY_NAME_SETTER:"Attribute name ""PROPERTY_NAME_SETTER"" doesn't conform to snake_case naming style":INFERENCE
+invalid-name:110:4:110:21:FooClass.PROPERTY_NAME:"Attribute name ""PROPERTY_NAME"" doesn't conform to snake_case naming style":INFERENCE
+invalid-name:116:4:116:30:FooClass.ABSTRACT_PROPERTY_NAME:"Attribute name ""ABSTRACT_PROPERTY_NAME"" doesn't conform to snake_case naming style":INFERENCE
+invalid-name:121:4:121:28:FooClass.PROPERTY_NAME_SETTER:"Attribute name ""PROPERTY_NAME_SETTER"" doesn't conform to snake_case naming style":INFERENCE
 invalid-name:152:4:152:17:FooEnum:"Class constant name ""bad_enum_name"" doesn't conform to UPPER_CASE naming style":HIGH
diff --git a/tests/functional/n/name/namePresetCamelCase.py b/tests/functional/n/namePresetCamelCase.py
similarity index 100%
rename from tests/functional/n/name/namePresetCamelCase.py
rename to tests/functional/n/namePresetCamelCase.py
diff --git a/tests/functional/n/name/namePresetCamelCase.rc b/tests/functional/n/namePresetCamelCase.rc
similarity index 100%
rename from tests/functional/n/name/namePresetCamelCase.rc
rename to tests/functional/n/namePresetCamelCase.rc
diff --git a/tests/functional/n/namePresetCamelCase.txt b/tests/functional/n/namePresetCamelCase.txt
new file mode 100644
index 0000000000..9461c6a536
--- /dev/null
+++ b/tests/functional/n/namePresetCamelCase.txt
@@ -0,0 +1,3 @@
+invalid-name:3:0:3:13::"Constant name ""SOME_CONSTANT"" doesn't conform to camelCase naming style ('([^\\W\\dA-Z][^\\W_]*|__.*__)$' pattern)":HIGH
+invalid-name:10:0:10:13:MyClass:"Class name ""MyClass"" doesn't conform to camelCase naming style ('[^\\W\\dA-Z][^\\W_]+$' pattern)":HIGH
+invalid-name:22:0:22:13:say_hello:"Function name ""say_hello"" doesn't conform to camelCase naming style ('([^\\W\\dA-Z][^\\W_]{2,}|__[^\\W\\dA-Z_]\\w+__)$' pattern)":HIGH
diff --git a/tests/functional/n/name/namedtuple_member_inference.py b/tests/functional/n/namedtuple_member_inference.py
similarity index 100%
rename from tests/functional/n/name/namedtuple_member_inference.py
rename to tests/functional/n/namedtuple_member_inference.py
diff --git a/tests/functional/n/name/namedtuple_member_inference.txt b/tests/functional/n/namedtuple_member_inference.txt
similarity index 100%
rename from tests/functional/n/name/namedtuple_member_inference.txt
rename to tests/functional/n/namedtuple_member_inference.txt
diff --git a/tests/functional/n/name/names_in__all__.py b/tests/functional/n/names_in__all__.py
similarity index 100%
rename from tests/functional/n/name/names_in__all__.py
rename to tests/functional/n/names_in__all__.py
diff --git a/tests/functional/n/name/names_in__all__.txt b/tests/functional/n/names_in__all__.txt
similarity index 100%
rename from tests/functional/n/name/names_in__all__.txt
rename to tests/functional/n/names_in__all__.txt
diff --git a/tests/functional/n/nan_comparison_check.py b/tests/functional/n/nan_comparison_check.py
index b9a720b9a8..99b921cdec 100644
--- a/tests/functional/n/nan_comparison_check.py
+++ b/tests/functional/n/nan_comparison_check.py
@@ -2,10 +2,12 @@
 # pylint: disable=literal-comparison,comparison-with-itself, import-error
 """Test detection of NaN value comparison."""
 import numpy
+
 x = 42
 a = x is numpy.NaN  # [nan-comparison]
 b = x == numpy.NaN  # [nan-comparison]
-c = x == float('nan')  # [nan-comparison]
+c = x == float("nan")  # [nan-comparison]
+d = x is float("nan")  # [nan-comparison]
 e = numpy.NaN == numpy.NaN  # [nan-comparison]
 f = x is 1
 g = 123 is "123"
@@ -13,9 +15,10 @@
 i = numpy.NaN != x  # [nan-comparison]
 
 j = x != numpy.NaN  # [nan-comparison]
-j1 = x != float('nan')  # [nan-comparison]
+j1 = x != float("nan")  # [nan-comparison]
+k = x is not numpy.NaN  # [nan-comparison]
 assert x == numpy.NaN  # [nan-comparison]
-assert x is not float('nan')  # [nan-comparison]
+assert x is not float("nan")  # [nan-comparison]
 if x == numpy.NaN:  # [nan-comparison]
     pass
 z = bool(x is numpy.NaN)  # [nan-comparison]
diff --git a/tests/functional/n/nan_comparison_check.txt b/tests/functional/n/nan_comparison_check.txt
index 162b2c3788..7c15fc952e 100644
--- a/tests/functional/n/nan_comparison_check.txt
+++ b/tests/functional/n/nan_comparison_check.txt
@@ -1,12 +1,14 @@
-nan-comparison:6:4:6:18::Comparison 'x is numpy.NaN' should be 'math.isnan(x)':UNDEFINED
-nan-comparison:7:4:7:18::Comparison 'x == numpy.NaN' should be 'math.isnan(x)':UNDEFINED
-nan-comparison:8:4:8:21::Comparison 'x == float('nan')' should be 'math.isnan(x)':UNDEFINED
-nan-comparison:9:4:9:26::Comparison 'numpy.NaN == numpy.NaN' should be 'math.isnan(numpy.NaN)':UNDEFINED
-nan-comparison:12:4:12:22::Comparison 'numpy.NaN is not x' should be 'not math.isnan(x)':UNDEFINED
-nan-comparison:13:4:13:18::Comparison 'numpy.NaN != x' should be 'not math.isnan(x)':UNDEFINED
-nan-comparison:15:4:15:18::Comparison 'x != numpy.NaN' should be 'not math.isnan(x)':UNDEFINED
-nan-comparison:16:5:16:22::Comparison 'x != float('nan')' should be 'not math.isnan(x)':UNDEFINED
-nan-comparison:17:7:17:21::Comparison 'x == numpy.NaN' should be 'math.isnan(x)':UNDEFINED
-nan-comparison:18:7:18:28::Comparison 'x is not float('nan')' should be 'not math.isnan(x)':UNDEFINED
-nan-comparison:19:3:19:17::Comparison 'x == numpy.NaN' should be 'math.isnan(x)':UNDEFINED
-nan-comparison:21:9:21:23::Comparison 'x is numpy.NaN' should be 'math.isnan(x)':UNDEFINED
+nan-comparison:7:4:7:18::Comparison 'x is numpy.NaN' should be 'math.isnan(x)':UNDEFINED
+nan-comparison:8:4:8:18::Comparison 'x == numpy.NaN' should be 'math.isnan(x)':UNDEFINED
+nan-comparison:9:4:9:21::Comparison 'x == float('nan')' should be 'math.isnan(x)':UNDEFINED
+nan-comparison:10:4:10:21::Comparison 'x is float('nan')' should be 'math.isnan(x)':UNDEFINED
+nan-comparison:11:4:11:26::Comparison 'numpy.NaN == numpy.NaN' should be 'math.isnan(numpy.NaN)':UNDEFINED
+nan-comparison:14:4:14:22::Comparison 'numpy.NaN is not x' should be 'not math.isnan(x)':UNDEFINED
+nan-comparison:15:4:15:18::Comparison 'numpy.NaN != x' should be 'not math.isnan(x)':UNDEFINED
+nan-comparison:17:4:17:18::Comparison 'x != numpy.NaN' should be 'not math.isnan(x)':UNDEFINED
+nan-comparison:18:5:18:22::Comparison 'x != float('nan')' should be 'not math.isnan(x)':UNDEFINED
+nan-comparison:19:4:19:22::Comparison 'x is not numpy.NaN' should be 'not math.isnan(x)':UNDEFINED
+nan-comparison:20:7:20:21::Comparison 'x == numpy.NaN' should be 'math.isnan(x)':UNDEFINED
+nan-comparison:21:7:21:28::Comparison 'x is not float('nan')' should be 'not math.isnan(x)':UNDEFINED
+nan-comparison:22:3:22:17::Comparison 'x == numpy.NaN' should be 'math.isnan(x)':UNDEFINED
+nan-comparison:24:9:24:23::Comparison 'x is numpy.NaN' should be 'math.isnan(x)':UNDEFINED
diff --git a/tests/functional/n/no/no_else_break.py b/tests/functional/n/no/no_else_break.py
index cf23f313ac..d40f19403c 100644
--- a/tests/functional/n/no/no_else_break.py
+++ b/tests/functional/n/no/no_else_break.py
@@ -1,4 +1,4 @@
-""" Test that superfluous else return are detected. """
+""" Test that superfluous else break are detected. """
 
 # pylint:disable=invalid-name,missing-docstring,unused-variable
 
diff --git a/tests/functional/n/no/no_else_break.txt b/tests/functional/n/no/no_else_break.txt
index 1eb2ccbbea..cf045f367b 100644
--- a/tests/functional/n/no/no_else_break.txt
+++ b/tests/functional/n/no/no_else_break.txt
@@ -1,7 +1,7 @@
-no-else-break:8:8:11:17:foo1:"Unnecessary ""else"" after ""break""":UNDEFINED
-no-else-break:16:8:21:17:foo2:"Unnecessary ""elif"" after ""break""":UNDEFINED
-no-else-break:28:12:33:21:foo3:"Unnecessary ""else"" after ""break""":UNDEFINED
-no-else-break:41:8:48:17:foo4:"Unnecessary ""else"" after ""break""":UNDEFINED
-no-else-break:54:8:63:17:foo5:"Unnecessary ""elif"" after ""break""":UNDEFINED
-no-else-break:70:12:74:21:foo6:"Unnecessary ""else"" after ""break""":UNDEFINED
-no-else-break:110:8:116:21:bar4:"Unnecessary ""else"" after ""break""":UNDEFINED
+no-else-break:8:8:11:17:foo1:"Unnecessary ""else"" after ""break"", remove the ""else"" and de-indent the code inside it":UNDEFINED
+no-else-break:16:8:21:17:foo2:"Unnecessary ""elif"" after ""break"", remove the leading ""el"" from ""elif""":UNDEFINED
+no-else-break:28:12:33:21:foo3:"Unnecessary ""else"" after ""break"", remove the ""else"" and de-indent the code inside it":UNDEFINED
+no-else-break:41:8:48:17:foo4:"Unnecessary ""else"" after ""break"", remove the ""else"" and de-indent the code inside it":UNDEFINED
+no-else-break:54:8:63:17:foo5:"Unnecessary ""elif"" after ""break"", remove the leading ""el"" from ""elif""":UNDEFINED
+no-else-break:70:12:74:21:foo6:"Unnecessary ""else"" after ""break"", remove the ""else"" and de-indent the code inside it":UNDEFINED
+no-else-break:110:8:116:21:bar4:"Unnecessary ""else"" after ""break"", remove the ""else"" and de-indent the code inside it":UNDEFINED
diff --git a/tests/functional/n/no/no_else_continue.py b/tests/functional/n/no/no_else_continue.py
index 37f70f121b..a6599c3363 100644
--- a/tests/functional/n/no/no_else_continue.py
+++ b/tests/functional/n/no/no_else_continue.py
@@ -1,4 +1,4 @@
-""" Test that superfluous else return are detected. """
+""" Test that superfluous else continue are detected. """
 
 # pylint:disable=invalid-name,missing-docstring,unused-variable
 
diff --git a/tests/functional/n/no/no_else_continue.txt b/tests/functional/n/no/no_else_continue.txt
index ad22f0e82e..f0e813e405 100644
--- a/tests/functional/n/no/no_else_continue.txt
+++ b/tests/functional/n/no/no_else_continue.txt
@@ -1,7 +1,7 @@
-no-else-continue:8:8:11:17:foo1:"Unnecessary ""else"" after ""continue""":UNDEFINED
-no-else-continue:16:8:21:17:foo2:"Unnecessary ""elif"" after ""continue""":UNDEFINED
-no-else-continue:28:12:33:24:foo3:"Unnecessary ""else"" after ""continue""":UNDEFINED
-no-else-continue:41:8:48:17:foo4:"Unnecessary ""else"" after ""continue""":UNDEFINED
-no-else-continue:54:8:63:17:foo5:"Unnecessary ""elif"" after ""continue""":UNDEFINED
-no-else-continue:70:12:74:21:foo6:"Unnecessary ""else"" after ""continue""":UNDEFINED
-no-else-continue:110:8:116:24:bar4:"Unnecessary ""else"" after ""continue""":UNDEFINED
+no-else-continue:8:8:11:17:foo1:"Unnecessary ""else"" after ""continue"", remove the ""else"" and de-indent the code inside it":UNDEFINED
+no-else-continue:16:8:21:17:foo2:"Unnecessary ""elif"" after ""continue"", remove the leading ""el"" from ""elif""":UNDEFINED
+no-else-continue:28:12:33:24:foo3:"Unnecessary ""else"" after ""continue"", remove the ""else"" and de-indent the code inside it":UNDEFINED
+no-else-continue:41:8:48:17:foo4:"Unnecessary ""else"" after ""continue"", remove the ""else"" and de-indent the code inside it":UNDEFINED
+no-else-continue:54:8:63:17:foo5:"Unnecessary ""elif"" after ""continue"", remove the leading ""el"" from ""elif""":UNDEFINED
+no-else-continue:70:12:74:21:foo6:"Unnecessary ""else"" after ""continue"", remove the ""else"" and de-indent the code inside it":UNDEFINED
+no-else-continue:110:8:116:24:bar4:"Unnecessary ""else"" after ""continue"", remove the ""else"" and de-indent the code inside it":UNDEFINED
diff --git a/tests/functional/n/no/no_else_raise.py b/tests/functional/n/no/no_else_raise.py
index ae807fae34..9a54dfc9f3 100644
--- a/tests/functional/n/no/no_else_raise.py
+++ b/tests/functional/n/no/no_else_raise.py
@@ -1,4 +1,4 @@
-""" Test that superfluous else return are detected. """
+""" Test that superfluous else raise are detected. """
 
 # pylint:disable=invalid-name,missing-docstring,unused-variable,raise-missing-from
 
diff --git a/tests/functional/n/no/no_else_raise.txt b/tests/functional/n/no/no_else_raise.txt
index 3906c34040..72f8f83766 100644
--- a/tests/functional/n/no/no_else_raise.txt
+++ b/tests/functional/n/no/no_else_raise.txt
@@ -1,7 +1,7 @@
-no-else-raise:6:4:11:26:foo1:"Unnecessary ""else"" after ""raise""":UNDEFINED
-no-else-raise:15:4:23:26:foo2:"Unnecessary ""elif"" after ""raise""":UNDEFINED
-no-else-raise:29:8:34:30:foo3:"Unnecessary ""else"" after ""raise""":UNDEFINED
-no-else-raise:41:4:48:13:foo4:"Unnecessary ""else"" after ""raise""":UNDEFINED
-no-else-raise:53:4:62:13:foo5:"Unnecessary ""elif"" after ""raise""":UNDEFINED
-no-else-raise:68:8:72:17:foo6:"Unnecessary ""else"" after ""raise""":UNDEFINED
-no-else-raise:104:4:110:33:bar4:"Unnecessary ""else"" after ""raise""":UNDEFINED
+no-else-raise:6:4:11:26:foo1:"Unnecessary ""else"" after ""raise"", remove the ""else"" and de-indent the code inside it":UNDEFINED
+no-else-raise:15:4:23:26:foo2:"Unnecessary ""elif"" after ""raise"", remove the leading ""el"" from ""elif""":UNDEFINED
+no-else-raise:29:8:34:30:foo3:"Unnecessary ""else"" after ""raise"", remove the ""else"" and de-indent the code inside it":UNDEFINED
+no-else-raise:41:4:48:13:foo4:"Unnecessary ""else"" after ""raise"", remove the ""else"" and de-indent the code inside it":UNDEFINED
+no-else-raise:53:4:62:13:foo5:"Unnecessary ""elif"" after ""raise"", remove the leading ""el"" from ""elif""":UNDEFINED
+no-else-raise:68:8:72:17:foo6:"Unnecessary ""else"" after ""raise"", remove the ""else"" and de-indent the code inside it":UNDEFINED
+no-else-raise:104:4:110:33:bar4:"Unnecessary ""else"" after ""raise"", remove the ""else"" and de-indent the code inside it":UNDEFINED
diff --git a/tests/functional/n/no/no_else_return.txt b/tests/functional/n/no/no_else_return.txt
index 7b5f0e0f36..c73b177da5 100644
--- a/tests/functional/n/no/no_else_return.txt
+++ b/tests/functional/n/no/no_else_return.txt
@@ -1,7 +1,7 @@
-no-else-return:6:4:11:16:foo1:"Unnecessary ""else"" after ""return""":UNDEFINED
-no-else-return:15:4:23:16:foo2:"Unnecessary ""elif"" after ""return""":UNDEFINED
-no-else-return:29:8:34:20:foo3:"Unnecessary ""else"" after ""return""":UNDEFINED
-no-else-return:41:4:48:13:foo4:"Unnecessary ""else"" after ""return""":UNDEFINED
-no-else-return:53:4:62:13:foo5:"Unnecessary ""elif"" after ""return""":UNDEFINED
-no-else-return:68:8:72:17:foo6:"Unnecessary ""else"" after ""return""":UNDEFINED
-no-else-return:104:4:110:23:bar4:"Unnecessary ""else"" after ""return""":UNDEFINED
+no-else-return:6:4:11:16:foo1:"Unnecessary ""else"" after ""return"", remove the ""else"" and de-indent the code inside it":UNDEFINED
+no-else-return:15:4:23:16:foo2:"Unnecessary ""elif"" after ""return"", remove the leading ""el"" from ""elif""":UNDEFINED
+no-else-return:29:8:34:20:foo3:"Unnecessary ""else"" after ""return"", remove the ""else"" and de-indent the code inside it":UNDEFINED
+no-else-return:41:4:48:13:foo4:"Unnecessary ""else"" after ""return"", remove the ""else"" and de-indent the code inside it":UNDEFINED
+no-else-return:53:4:62:13:foo5:"Unnecessary ""elif"" after ""return"", remove the leading ""el"" from ""elif""":UNDEFINED
+no-else-return:68:8:72:17:foo6:"Unnecessary ""else"" after ""return"", remove the ""else"" and de-indent the code inside it":UNDEFINED
+no-else-return:104:4:110:23:bar4:"Unnecessary ""else"" after ""return"", remove the ""else"" and de-indent the code inside it":UNDEFINED
diff --git a/tests/functional/n/no/no_member_binary_operations.py b/tests/functional/n/no/no_member_binary_operations.py
new file mode 100644
index 0000000000..e998932ebe
--- /dev/null
+++ b/tests/functional/n/no/no_member_binary_operations.py
@@ -0,0 +1,13 @@
+"""Tests for no-member in relation to binary operations."""
+# pylint: disable=too-few-public-methods, missing-class-docstring, missing-function-docstring
+
+# Test for: https://github.com/PyCQA/pylint/issues/4826
+class MyClass:
+    def __init__(self):
+        self.a_list = []
+        self.data = []
+
+    def operator(self):
+        for i in [self] + self.a_list:
+            for _ in i.data:
+                pass
diff --git a/tests/functional/n/no/no_self_argument.txt b/tests/functional/n/no/no_self_argument.txt
index 74f6ac7b1a..45d12cc321 100644
--- a/tests/functional/n/no/no_self_argument.txt
+++ b/tests/functional/n/no/no_self_argument.txt
@@ -1,2 +1,2 @@
-no-self-argument:8:4:10:16:NoSelfArgument.__init__:"Method should have ""self"" as first argument":UNDEFINED
-no-self-argument:12:4:14:18:NoSelfArgument.abdc:"Method should have ""self"" as first argument":UNDEFINED
+no-self-argument:8:4:8:16:NoSelfArgument.__init__:"Method should have ""self"" as first argument":UNDEFINED
+no-self-argument:12:4:12:12:NoSelfArgument.abdc:"Method should have ""self"" as first argument":UNDEFINED
diff --git a/tests/functional/n/no/no_self_argument_py37.txt b/tests/functional/n/no/no_self_argument_py37.txt
index 05cd3143d4..9f5779ab69 100644
--- a/tests/functional/n/no/no_self_argument_py37.txt
+++ b/tests/functional/n/no/no_self_argument_py37.txt
@@ -1 +1 @@
-no-self-argument:13:4:15:12:Toto.__class_other__:"Method should have ""self"" as first argument":UNDEFINED
+no-self-argument:13:4:13:23:Toto.__class_other__:"Method should have ""self"" as first argument":UNDEFINED
diff --git a/tests/functional/n/no/no_self_use.txt b/tests/functional/n/no/no_self_use.txt
index a349f0bc76..4cc4774ff2 100644
--- a/tests/functional/n/no/no_self_use.txt
+++ b/tests/functional/n/no/no_self_use.txt
@@ -1,2 +1,2 @@
-no-self-use:16:4:18:22:Toto.function_method:Method could be a function:UNDEFINED
-no-self-use:24:4:26:22:Toto.async_function_method:Method could be a function:UNDEFINED
+no-self-use:16:4:16:23:Toto.function_method:Method could be a function:UNDEFINED
+no-self-use:24:4:24:35:Toto.async_function_method:Method could be a function:UNDEFINED
diff --git a/tests/functional/n/non/non_ascii_name.py b/tests/functional/n/non/non_ascii_name.py
index 276a23f753..c8b08e6578 100644
--- a/tests/functional/n/non/non_ascii_name.py
+++ b/tests/functional/n/non/non_ascii_name.py
@@ -1,6 +1,6 @@
 """ Tests for non-ascii-name checker. """
 
-áéíóú = 4444 # [non-ascii-name]
+áéíóú = 4444  # [non-ascii-name]
 
-def úóíéá(): # [non-ascii-name]
+def úóíéá():  # [non-ascii-name]
     """yo"""
diff --git a/tests/functional/n/non/non_ascii_name.rc b/tests/functional/n/non/non_ascii_name.rc
deleted file mode 100644
index ff09ea1f60..0000000000
--- a/tests/functional/n/non/non_ascii_name.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-[testoptions]
-# This test cannot run on Windows due to Unicode error formatting.
-exclude_platforms=win32
diff --git a/tests/functional/n/non/non_ascii_name.txt b/tests/functional/n/non/non_ascii_name.txt
index ba5338bb96..41f1730612 100644
--- a/tests/functional/n/non/non_ascii_name.txt
+++ b/tests/functional/n/non/non_ascii_name.txt
@@ -1,2 +1,2 @@
-non-ascii-name:3:0:3:10::"Constant name ""áéíóú"" contains a non-ASCII unicode character":HIGH
-non-ascii-name:5:0:6:12:úóíéá:"Function name ""úóíéá"" contains a non-ASCII unicode character":HIGH
+non-ascii-name:3:0:3:10::"Variable name ""áéíóú"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:5:0:5:9:úóíéá:"Function name ""úóíéá"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non/non_ascii_name_backward_test_code.py b/tests/functional/n/non/non_ascii_name_backward_test_code.py
new file mode 100644
index 0000000000..36a22ca521
--- /dev/null
+++ b/tests/functional/n/non/non_ascii_name_backward_test_code.py
@@ -0,0 +1,7 @@
+""" Tests for non-ascii-name checker working as expected after a major refactor """
+# pylint: disable=C0144, use-symbolic-message-instead
+
+áéíóú = 4444
+
+def úóíéá():
+    """yo"""
diff --git a/tests/functional/n/non/non_ascii_name_backward_test_msg.py b/tests/functional/n/non/non_ascii_name_backward_test_msg.py
new file mode 100644
index 0000000000..e63f3a4db6
--- /dev/null
+++ b/tests/functional/n/non/non_ascii_name_backward_test_msg.py
@@ -0,0 +1,7 @@
+""" Tests for non-ascii-name checker working as expected after a major refactor """
+# pylint: disable=non-ascii-name
+
+áéíóú = 4444
+
+def úóíéá():
+    """yo"""
diff --git a/tests/functional/n/non/non_init_parent_called.txt b/tests/functional/n/non/non_init_parent_called.txt
index a6b50d5ce5..06de9a2443 100644
--- a/tests/functional/n/non/non_init_parent_called.txt
+++ b/tests/functional/n/non/non_init_parent_called.txt
@@ -2,5 +2,5 @@ import-error:7:0:7:18::Unable to import 'nonexistant':UNDEFINED
 non-parent-init-called:15:8:15:26:AAAA.__init__:__init__ method from a non direct base class 'BBBBMixin' is called:UNDEFINED
 no-member:23:50:23:77:CCC:Module 'functional.n.non.non_init_parent_called' has no 'BBBB' member:INFERENCE
 no-member:28:8:28:35:CCC.__init__:Module 'functional.n.non.non_init_parent_called' has no 'BBBB' member:INFERENCE
-super-init-not-called:49:4:51:25:Super2.__init__:__init__ method from base class 'dict' is not called:UNDEFINED
+super-init-not-called:49:4:49:16:Super2.__init__:__init__ method from base class 'dict' is not called:INFERENCE
 no-member:51:8:51:23:Super2.__init__:Super of 'Super2' has no '__woohoo__' member:INFERENCE
diff --git a/tests/functional/n/non/non_iterator_returned.txt b/tests/functional/n/non/non_iterator_returned.txt
index a5d3337dfe..a0d3d665f6 100644
--- a/tests/functional/n/non/non_iterator_returned.txt
+++ b/tests/functional/n/non/non_iterator_returned.txt
@@ -1,4 +1,4 @@
-non-iterator-returned:79:4:80:17:FirstBadIterator.__iter__:__iter__ returns non-iterator:UNDEFINED
-non-iterator-returned:86:4:87:19:SecondBadIterator.__iter__:__iter__ returns non-iterator:UNDEFINED
-non-iterator-returned:93:4:94:34:ThirdBadIterator.__iter__:__iter__ returns non-iterator:UNDEFINED
-non-iterator-returned:100:4:101:31:FourthBadIterator.__iter__:__iter__ returns non-iterator:UNDEFINED
+non-iterator-returned:79:4:79:16:FirstBadIterator.__iter__:__iter__ returns non-iterator:UNDEFINED
+non-iterator-returned:86:4:86:16:SecondBadIterator.__iter__:__iter__ returns non-iterator:UNDEFINED
+non-iterator-returned:93:4:93:16:ThirdBadIterator.__iter__:__iter__ returns non-iterator:UNDEFINED
+non-iterator-returned:100:4:100:16:FourthBadIterator.__iter__:__iter__ returns non-iterator:UNDEFINED
diff --git a/tests/regrtest_data/duplicate_data_raw_strings/__init__.py b/tests/functional/n/non_ascii_import/__init__.py
similarity index 100%
rename from tests/regrtest_data/duplicate_data_raw_strings/__init__.py
rename to tests/functional/n/non_ascii_import/__init__.py
diff --git a/tests/functional/n/non_ascii_import/non_ascii_import.py b/tests/functional/n/non_ascii_import/non_ascii_import.py
new file mode 100644
index 0000000000..76163b2862
--- /dev/null
+++ b/tests/functional/n/non_ascii_import/non_ascii_import.py
@@ -0,0 +1,13 @@
+"""Test that invalid module name imports causes correct error"""
+# pylint: disable=import-error, wrong-import-position, unused-wildcard-import, wildcard-import, wrong-import-order
+import sys
+import os
+
+# allow module imports to test that this is indeed a valid python file
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+sys.path.append(os.path.dirname(SCRIPT_DIR))
+
+import non_ascii_name_loł as ok
+from pathlib import *   # test that star imports work correctly and give no error
+
+print(ok)
diff --git a/tests/functional/n/non_ascii_import/non_ascii_import_as_bad.py b/tests/functional/n/non_ascii_import/non_ascii_import_as_bad.py
new file mode 100644
index 0000000000..df392961f4
--- /dev/null
+++ b/tests/functional/n/non_ascii_import/non_ascii_import_as_bad.py
@@ -0,0 +1,6 @@
+"""import non ascii alias"""
+import os.path as łos  # [non-ascii-module-import]
+
+
+# Usage should not raise a second error
+foo = łos.join("a", "b")
diff --git a/tests/functional/n/non_ascii_import/non_ascii_import_as_bad.txt b/tests/functional/n/non_ascii_import/non_ascii_import_as_bad.txt
new file mode 100644
index 0000000000..595d387f71
--- /dev/null
+++ b/tests/functional/n/non_ascii_import/non_ascii_import_as_bad.txt
@@ -0,0 +1 @@
+non-ascii-module-import:2:0:2:22::"Module name ""łos"" contains a non-ASCII character, use an ASCII-only alias for import.":HIGH
diff --git a/tests/functional/n/non_ascii_import/non_ascii_import_as_okay.py b/tests/functional/n/non_ascii_import/non_ascii_import_as_okay.py
new file mode 100644
index 0000000000..35f8513fa9
--- /dev/null
+++ b/tests/functional/n/non_ascii_import/non_ascii_import_as_okay.py
@@ -0,0 +1,12 @@
+"""Test that invalid module name do not cause errors when using an alias"""
+# pylint: disable=import-error, wrong-import-position
+import sys
+import os
+
+# allow module imports to test that this is indeed a valid python file
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+sys.path.append(os.path.dirname(SCRIPT_DIR))
+
+import non_ascii_name_loł as foobar
+
+print(foobar)
diff --git a/tests/functional/n/non_ascii_import/non_ascii_import_from_as.py b/tests/functional/n/non_ascii_import/non_ascii_import_from_as.py
new file mode 100644
index 0000000000..68beba0ec6
--- /dev/null
+++ b/tests/functional/n/non_ascii_import/non_ascii_import_from_as.py
@@ -0,0 +1,6 @@
+"""import as non ascii alias"""
+from os.path import join as łos  # [non-ascii-module-import]
+
+
+# Usage should not raise a second error
+foo = łos("a", "b")
diff --git a/tests/functional/n/non_ascii_import/non_ascii_import_from_as.txt b/tests/functional/n/non_ascii_import/non_ascii_import_from_as.txt
new file mode 100644
index 0000000000..58daa481ba
--- /dev/null
+++ b/tests/functional/n/non_ascii_import/non_ascii_import_from_as.txt
@@ -0,0 +1 @@
+non-ascii-module-import:2:0:2:32::"Module name ""łos"" contains a non-ASCII character, use an ASCII-only alias for import.":HIGH
diff --git a/tests/functional/n/non_ascii_name/__init__.py b/tests/functional/n/non_ascii_name/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_assignment_expressions.py b/tests/functional/n/non_ascii_name/non_ascii_name_assignment_expressions.py
new file mode 100644
index 0000000000..ac51b9c4dc
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_assignment_expressions.py
@@ -0,0 +1,4 @@
+"""Assigment Expression as defined in https://www.python.org/dev/peps/pep-0572/"""
+
+if (loł := __name__) == "__main__":   # [non-ascii-name]
+    print(loł)
diff --git a/tests/functional/s/super/superfluous_parens_walrus_py38.rc b/tests/functional/n/non_ascii_name/non_ascii_name_assignment_expressions.rc
similarity index 100%
rename from tests/functional/s/super/superfluous_parens_walrus_py38.rc
rename to tests/functional/n/non_ascii_name/non_ascii_name_assignment_expressions.rc
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_assignment_expressions.txt b/tests/functional/n/non_ascii_name/non_ascii_name_assignment_expressions.txt
new file mode 100644
index 0000000000..8a5acceb86
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_assignment_expressions.txt
@@ -0,0 +1 @@
+non-ascii-name:3:4:3:8::"Variable name ""loł"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_decorator.py b/tests/functional/n/non_ascii_name/non_ascii_name_decorator.py
new file mode 100644
index 0000000000..06900ac7ca
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_decorator.py
@@ -0,0 +1,19 @@
+"""
+Ensure that also decorator calls caught correctly
+Column and line not correctly detected with Python 3.8, so we
+skip it and only test versions after that.
+"""
+
+
+def decoractor_func(*args, **kwargs):
+    """A docstring"""
+    return lambda x: f"Foobar {args} {kwargs}"
+
+
+@decoractor_func(
+    aaaaaaaaaaaaaaaaaaalllllllooooooooooooonnngggggggggglllline=1,
+    normal=2,
+    fåling=3,  # [non-ascii-name]
+)
+def a_function():
+    """A docstring"""
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_decorator.rc b/tests/functional/n/non_ascii_name/non_ascii_name_decorator.rc
new file mode 100644
index 0000000000..16b75eea75
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_decorator.rc
@@ -0,0 +1,2 @@
+[testoptions]
+min_pyver=3.9
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_decorator.txt b/tests/functional/n/non_ascii_name/non_ascii_name_decorator.txt
new file mode 100644
index 0000000000..6c4944009d
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_decorator.txt
@@ -0,0 +1 @@
+non-ascii-name:16:4:16:13:a_function:"Argument name ""fåling"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_dict_kwargs.py b/tests/functional/n/non_ascii_name/non_ascii_name_dict_kwargs.py
new file mode 100644
index 0000000000..5d7b4c7f37
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_dict_kwargs.py
@@ -0,0 +1,13 @@
+"""
+We don't expect this to give any errors!
+"""
+
+
+def okay(**kwargs):
+    """print kwargs"""
+    print(kwargs)
+
+
+keyword_args = {"łol": "this would be hard to check against"}
+
+okay(**keyword_args)
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_for_loop.py b/tests/functional/n/non_ascii_name/non_ascii_name_for_loop.py
new file mode 100644
index 0000000000..59585645a7
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_for_loop.py
@@ -0,0 +1,14 @@
+"""invalid ascii char in a for loop"""
+
+import os
+
+
+def main():
+    """main func"""
+    # +2: [non-ascii-name]
+    a_variable = ""
+    for łol in os.listdir("."):
+        # Usage should not raise a second error
+        a_variable += (
+            f"{łol}                                                                       "
+        )
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_for_loop.txt b/tests/functional/n/non_ascii_name/non_ascii_name_for_loop.txt
new file mode 100644
index 0000000000..8995dc0eb3
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_for_loop.txt
@@ -0,0 +1 @@
+non-ascii-name:10:8:10:12:main:"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_function.py b/tests/functional/n/non_ascii_name/non_ascii_name_function.py
new file mode 100644
index 0000000000..e3c558ea65
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_function.py
@@ -0,0 +1,19 @@
+"""invalid ASCII char in a function definition"""
+# pylint: disable=invalid-name
+
+
+def sayHello():
+    """Greetings"""
+    print("Hello, World!")
+
+
+# +3: [non-ascii-name]
+
+
+def sayНello():
+    """From Russia with Love"""
+    print("Goodbye, World!")
+
+
+# Usage should not raise a second error
+sayНello()
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_function.txt b/tests/functional/n/non_ascii_name/non_ascii_name_function.txt
new file mode 100644
index 0000000000..c985a91ac2
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_function.txt
@@ -0,0 +1 @@
+non-ascii-name:13:0:13:12:sayНello:"Function name ""sayНello"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py38.py b/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py38.py
new file mode 100644
index 0000000000..a75e1c6b78
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py38.py
@@ -0,0 +1,24 @@
+"""
+non ascii variable defined in a function
+
+This test is only for 3.8 as the starting column is incorrect
+"""
+
+
+def okay(
+    just_some_thing_long_again: str,
+    lol_very_long_argument: str,
+    łol: str,  # [non-ascii-name]
+) -> bool:
+    """Be okay, yeah?"""
+    # Usage should not raise a second error
+    print(just_some_thing_long_again, lol_very_long_argument, łol)
+    return True
+
+
+# Usage should raise a second error
+okay(
+    "A          VVVVVVVEEEERRRRRRRRRRYYYYYYYYYY    LONG TIME               ",
+    lol_very_long_argument="a",
+    łol="b",  # [non-ascii-name]
+)
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py38.rc b/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py38.rc
new file mode 100644
index 0000000000..35b185fdbc
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py38.rc
@@ -0,0 +1,3 @@
+[testoptions]
+min_pyver=3.8
+max_pyver=3.9
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py38.txt b/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py38.txt
new file mode 100644
index 0000000000..7813364747
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py38.txt
@@ -0,0 +1,2 @@
+non-ascii-name:11:4:11:13:okay:"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:23:0:None:None::"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py39plus.py b/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py39plus.py
new file mode 100644
index 0000000000..a2d87ac4d7
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py39plus.py
@@ -0,0 +1,25 @@
+"""
+non ascii variable defined in a function
+
+This test is 3.9+ and not using 'min_pyver_end_position'
+as the starting column is also incorrect on < 3.9
+"""
+
+
+def okay(
+    just_some_thing_long_again: str,
+    lol_very_long_argument: str,
+    łol: str,  # [non-ascii-name]
+) -> bool:
+    """Be okay, yeah?"""
+    # Usage should not raise a second error
+    print(just_some_thing_long_again, lol_very_long_argument, łol)
+    return True
+
+
+# Usage should raise a second error
+okay(
+    "A          VVVVVVVEEEERRRRRRRRRRYYYYYYYYYY    LONG TIME               ",
+    lol_very_long_argument="a",
+    łol="b",  # [non-ascii-name]
+)
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py39plus.rc b/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py39plus.rc
new file mode 100644
index 0000000000..16b75eea75
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py39plus.rc
@@ -0,0 +1,2 @@
+[testoptions]
+min_pyver=3.9
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py39plus.txt b/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py39plus.txt
new file mode 100644
index 0000000000..0222308af6
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_function_argument_py39plus.txt
@@ -0,0 +1,2 @@
+non-ascii-name:12:4:12:13:okay:"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:24:4:24:12::"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_inline_var.py b/tests/functional/n/non_ascii_name/non_ascii_name_inline_var.py
new file mode 100644
index 0000000000..2d47e58c2d
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_inline_var.py
@@ -0,0 +1,8 @@
+"""inline loop non ascii variable definition"""
+import os
+
+
+foo = [
+    f"{łol}                                                                       "
+    for łol in os.listdir(".")  # [non-ascii-name]
+]
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_inline_var.txt b/tests/functional/n/non_ascii_name/non_ascii_name_inline_var.txt
new file mode 100644
index 0000000000..64515296b6
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_inline_var.txt
@@ -0,0 +1 @@
+non-ascii-name:7:8:7:12::"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py38.py b/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py38.py
new file mode 100644
index 0000000000..3c7b8c6835
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py38.py
@@ -0,0 +1,17 @@
+"""
+Defining non ASCII variables in a function call
+
+This test is only for 3.8 as the starting column is incorrect
+"""
+
+
+def okay(**kwargs):
+    """Print kwargs"""
+    print(kwargs)
+
+
+okay(
+    a_long_attribute_that_is_very_okay=1,
+    b_belongs_to_yet_another_okay_attributed=2,
+    łol=3,  # [non-ascii-name]
+)
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py38.rc b/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py38.rc
new file mode 100644
index 0000000000..35b185fdbc
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py38.rc
@@ -0,0 +1,3 @@
+[testoptions]
+min_pyver=3.8
+max_pyver=3.9
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py38.txt b/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py38.txt
new file mode 100644
index 0000000000..b43189658f
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py38.txt
@@ -0,0 +1 @@
+non-ascii-name:16:0:None:None::"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py39plus.py b/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py39plus.py
new file mode 100644
index 0000000000..0dfceb38f4
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py39plus.py
@@ -0,0 +1,18 @@
+"""
+Defining non ASCII variables in a function call
+
+This test is 3.9+ and not using 'min_pyver_end_position'
+as the starting column is also incorrect on < 3.9
+"""
+
+
+def okay(**kwargs):
+    """Print kwargs"""
+    print(kwargs)
+
+
+okay(
+    a_long_attribute_that_is_very_okay=1,
+    b_belongs_to_yet_another_okay_attributed=2,
+    łol=3,  # [non-ascii-name]
+)
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py39plus.rc b/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py39plus.rc
new file mode 100644
index 0000000000..16b75eea75
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py39plus.rc
@@ -0,0 +1,2 @@
+[testoptions]
+min_pyver=3.9
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py39plus.txt b/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py39plus.txt
new file mode 100644
index 0000000000..7595a9d082
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_kwargs_py39plus.txt
@@ -0,0 +1 @@
+non-ascii-name:17:4:17:10::"Argument name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_local.py b/tests/functional/n/non_ascii_name/non_ascii_name_local.py
new file mode 100644
index 0000000000..99423fdc8f
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_local.py
@@ -0,0 +1,9 @@
+"""Using non ascii variables in local"""
+
+
+def okay():
+    """docstring"""
+    łol = "foo"  # [non-ascii-name]
+    # Usage should not raise a second error
+    baring = łol
+    print(baring)
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_local.txt b/tests/functional/n/non_ascii_name/non_ascii_name_local.txt
new file mode 100644
index 0000000000..8e5e684fa9
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_local.txt
@@ -0,0 +1 @@
+non-ascii-name:6:4:6:8:okay:"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git "a/tests/functional/n/non_ascii_name/non_ascii_name_lo\305\202.py" "b/tests/functional/n/non_ascii_name/non_ascii_name_lo\305\202.py"
new file mode 100644
index 0000000000..bc59418e1e
--- /dev/null
+++ "b/tests/functional/n/non_ascii_name/non_ascii_name_lo\305\202.py"
@@ -0,0 +1 @@
+# [non-ascii-file-name]
diff --git "a/tests/functional/n/non_ascii_name/non_ascii_name_lo\305\202.txt" "b/tests/functional/n/non_ascii_name/non_ascii_name_lo\305\202.txt"
new file mode 100644
index 0000000000..eefaa197a9
--- /dev/null
+++ "b/tests/functional/n/non_ascii_name/non_ascii_name_lo\305\202.txt"
@@ -0,0 +1 @@
+non-ascii-file-name:1:0:None:None::"File name ""non_ascii_name_loł"" contains a non-ASCII character. PEP 3131 only allows non-ascii identifiers, not file names.":HIGH
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_pos_and_kwonly_function.py b/tests/functional/n/non_ascii_name/non_ascii_name_pos_and_kwonly_function.py
new file mode 100644
index 0000000000..651d78f894
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_pos_and_kwonly_function.py
@@ -0,0 +1,24 @@
+"""
+Test for names within keyword and position only function
+
+This test is 3.8+ as the columns are not correctly identified
+by the ast parser < 3.8
+"""
+# pylint: disable=unused-argument
+
+
+def name(
+    some_thing_long_but_okay,
+    not_okay_łol,  # [non-ascii-name]
+    not_okay_defaułt=None,  # [non-ascii-name]
+    /,
+    p_or_kw_okay=None,
+    p_or_kw_not_økay=None,  # [non-ascii-name]
+    *,
+    kw_arg_okay,
+    kw_arg_not_økay,  # [non-ascii-name]
+):
+    """
+    Do something!
+    """
+    return "Foobar"
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_pos_and_kwonly_function.rc b/tests/functional/n/non_ascii_name/non_ascii_name_pos_and_kwonly_function.rc
new file mode 100644
index 0000000000..85fc502b37
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_pos_and_kwonly_function.rc
@@ -0,0 +1,2 @@
+[testoptions]
+min_pyver=3.8
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_pos_and_kwonly_function.txt b/tests/functional/n/non_ascii_name/non_ascii_name_pos_and_kwonly_function.txt
new file mode 100644
index 0000000000..b13a1af3b2
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_pos_and_kwonly_function.txt
@@ -0,0 +1,4 @@
+non-ascii-name:12:4:12:17:name:"Argument name ""not_okay_łol"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:13:4:13:21:name:"Argument name ""not_okay_defaułt"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:16:4:16:21:name:"Argument name ""p_or_kw_not_økay"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:19:4:19:20:name:"Argument name ""kw_arg_not_økay"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_staticmethod.py b/tests/functional/n/non_ascii_name/non_ascii_name_staticmethod.py
new file mode 100644
index 0000000000..9b10f1cd46
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_staticmethod.py
@@ -0,0 +1,17 @@
+"""static method with non ascii characters"""
+
+
+class OkayClass:
+    """Class Docstring"""
+
+    def public(self):
+        """Say it load"""
+
+    @staticmethod
+    def umlaut_ä():  # [non-ascii-name]
+        """Say ä"""
+        return "ä"
+
+
+# Usage should not raise a second error
+OkayClass.umlaut_ä()
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_staticmethod.txt b/tests/functional/n/non_ascii_name/non_ascii_name_staticmethod.txt
new file mode 100644
index 0000000000..5aa2dc7e96
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_staticmethod.txt
@@ -0,0 +1 @@
+non-ascii-name:11:4:11:16:OkayClass.umlaut_ä:"Function name ""umlaut_ä"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_try_except.py b/tests/functional/n/non_ascii_name/non_ascii_name_try_except.py
new file mode 100644
index 0000000000..beccf4b9a9
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_try_except.py
@@ -0,0 +1,11 @@
+"""
+Also variables defined in except can't contain non ascii chars
+"""
+
+
+try:
+    raise AttributeError("Test")
+    # +1: [non-ascii-name]
+except AttributeError as łol:
+    # Usage should not raise a second error
+    foo = łol
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_try_except.txt b/tests/functional/n/non_ascii_name/non_ascii_name_try_except.txt
new file mode 100644
index 0000000000..f6b0d6c6c4
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_try_except.txt
@@ -0,0 +1 @@
+non-ascii-name:9:0:11:14::"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_variable.py b/tests/functional/n/non_ascii_name/non_ascii_name_variable.py
new file mode 100644
index 0000000000..2994dfa475
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_variable.py
@@ -0,0 +1,9 @@
+"""
+Simply variable test
+"""
+# pylint: disable=invalid-name
+
+# Test invalid variable name
+łol = "Foobar"  # [non-ascii-name]
+# Usage should not raise a second error
+łol += "-"  # [non-ascii-name]
diff --git a/tests/functional/n/non_ascii_name/non_ascii_name_variable.txt b/tests/functional/n/non_ascii_name/non_ascii_name_variable.txt
new file mode 100644
index 0000000000..5c142ee7e4
--- /dev/null
+++ b/tests/functional/n/non_ascii_name/non_ascii_name_variable.txt
@@ -0,0 +1,2 @@
+non-ascii-name:7:0:7:4::"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
+non-ascii-name:9:0:9:4::"Variable name ""łol"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name_class/__init__.py b/tests/functional/n/non_ascii_name_class/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/n/non_ascii_name_class/non_ascii_name_class.py b/tests/functional/n/non_ascii_name_class/non_ascii_name_class.py
new file mode 100644
index 0000000000..edcdae6435
--- /dev/null
+++ b/tests/functional/n/non_ascii_name_class/non_ascii_name_class.py
@@ -0,0 +1,23 @@
+""" Non ASCII char in class name
+
+Note that the end line parameter here seems to be off.
+We would expect it to be the same as the start, as we only refer
+to the class Name and not the complete class definition.
+But this is not possible atm with pylint.
+"""
+# pylint: disable=too-few-public-methods
+
+
+class НoldIt:  # [non-ascii-name]
+    """nice classs"""
+
+    def public(self):
+        """do something"""
+        print(self)
+
+
+def main():
+    """Main function"""
+    # Usage should not raise a second error
+    foobar = НoldIt()
+    print(foobar)
diff --git a/tests/functional/n/non_ascii_name_class/non_ascii_name_class.txt b/tests/functional/n/non_ascii_name_class/non_ascii_name_class.txt
new file mode 100644
index 0000000000..eda2ba0986
--- /dev/null
+++ b/tests/functional/n/non_ascii_name_class/non_ascii_name_class.txt
@@ -0,0 +1 @@
+non-ascii-name:11:0:11:12:НoldIt:"Class name ""НoldIt"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name_class/non_ascii_name_class_attribute.py b/tests/functional/n/non_ascii_name_class/non_ascii_name_class_attribute.py
new file mode 100644
index 0000000000..07d95bba56
--- /dev/null
+++ b/tests/functional/n/non_ascii_name_class/non_ascii_name_class_attribute.py
@@ -0,0 +1,25 @@
+"""Non ASCII name in class variable"""
+
+
+class OkayIsh:
+    """Class docstring"""
+
+    def public(self):
+        """Be public!"""
+        print(self)
+
+    def __init__(self):
+        self.łoopback = "invalid"  # [non-ascii-name]
+
+    def foobar(self):
+        """do something"""
+        # Usage should not raise a second error
+        return self.łoopback
+
+def main():
+    """main function"""
+    # Usage should not raise a second error
+    barrrr = OkayIsh()
+    barrrr.foobar()
+    test = barrrr.łoopback
+    print(test)
diff --git a/tests/functional/n/non_ascii_name_class/non_ascii_name_class_attribute.txt b/tests/functional/n/non_ascii_name_class/non_ascii_name_class_attribute.txt
new file mode 100644
index 0000000000..7e3f5327c2
--- /dev/null
+++ b/tests/functional/n/non_ascii_name_class/non_ascii_name_class_attribute.txt
@@ -0,0 +1 @@
+non-ascii-name:12:8:12:22:OkayIsh.__init__:"Attribute name ""łoopback"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name_class/non_ascii_name_class_constant.py b/tests/functional/n/non_ascii_name_class/non_ascii_name_class_constant.py
new file mode 100644
index 0000000000..c3f96cadd9
--- /dev/null
+++ b/tests/functional/n/non_ascii_name_class/non_ascii_name_class_constant.py
@@ -0,0 +1,23 @@
+"""non ASCII name in global class variable/class constant"""
+
+
+class OkayIsh:
+    """Class docstring"""
+    ŁOOPBACK = "invalid"  # [non-ascii-name]
+
+
+    def more_public(self):
+        """yet another public method"""
+        print(self)
+
+    def public(self):
+        """something public"""
+        print(self)
+
+
+
+def main():
+    """Main func"""
+    # Usage should not raise a second error
+    foobar = OkayIsh.ŁOOPBACK
+    print(foobar)
diff --git a/tests/functional/n/non_ascii_name_class/non_ascii_name_class_constant.txt b/tests/functional/n/non_ascii_name_class/non_ascii_name_class_constant.txt
new file mode 100644
index 0000000000..26cf27ef78
--- /dev/null
+++ b/tests/functional/n/non_ascii_name_class/non_ascii_name_class_constant.txt
@@ -0,0 +1 @@
+non-ascii-name:6:4:6:13:OkayIsh:"Attribute name ""ŁOOPBACK"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/non_ascii_name_class/non_ascii_name_class_method.py b/tests/functional/n/non_ascii_name_class/non_ascii_name_class_method.py
new file mode 100644
index 0000000000..ec05b4cf96
--- /dev/null
+++ b/tests/functional/n/non_ascii_name_class/non_ascii_name_class_method.py
@@ -0,0 +1,18 @@
+"""Non ASCII char in classmethod"""
+
+
+class OkayClass:
+    """We need a class docstring?"""
+
+    def public(self):
+        """Say something"""
+        print(self)
+
+    @classmethod
+    def umlaut_ä(cls):  # [non-ascii-name]
+        """do something"""
+        return "ä"
+
+
+# Usage should not raise a second error
+OkayClass.umlaut_ä()
diff --git a/tests/functional/n/non_ascii_name_class/non_ascii_name_class_method.txt b/tests/functional/n/non_ascii_name_class/non_ascii_name_class_method.txt
new file mode 100644
index 0000000000..43249c212f
--- /dev/null
+++ b/tests/functional/n/non_ascii_name_class/non_ascii_name_class_method.txt
@@ -0,0 +1 @@
+non-ascii-name:12:4:12:16:OkayClass.umlaut_ä:"Function name ""umlaut_ä"" contains a non-ASCII character, consider renaming it.":HIGH
diff --git a/tests/functional/n/nonexistent_operator.py b/tests/functional/n/nonexistent_operator.py
index f05a649478..e092986bb6 100644
--- a/tests/functional/n/nonexistent_operator.py
+++ b/tests/functional/n/nonexistent_operator.py
@@ -13,3 +13,7 @@
 b = a
 --a # [nonexistent-operator]
 c = (--a) * b # [nonexistent-operator]
+c = -(-a)
+c = +(+a)
+c = - -a
+c = + +a
diff --git a/tests/functional/n/nonlocal_and_global.txt b/tests/functional/n/nonlocal_and_global.txt
index 2bc929cdb6..8cf0948f71 100644
--- a/tests/functional/n/nonlocal_and_global.txt
+++ b/tests/functional/n/nonlocal_and_global.txt
@@ -1 +1 @@
-nonlocal-and-global:4:0:6:18:bad:Name 'missing' is nonlocal and global:UNDEFINED
+nonlocal-and-global:4:0:4:7:bad:Name 'missing' is nonlocal and global:UNDEFINED
diff --git a/tests/functional/n/nonlocal_without_binding.py b/tests/functional/n/nonlocal_without_binding.py
index 22887bcee6..593d924ee9 100644
--- a/tests/functional/n/nonlocal_without_binding.py
+++ b/tests/functional/n/nonlocal_without_binding.py
@@ -40,3 +40,17 @@ class Class:
         local = 1
 
     return local + nonlocal_
+
+
+def function():
+    """Test for `unused-variable` when multiple-assignment contains a `nonlocal`"""
+    myint, mylist = 0, []
+
+    print(mylist)
+
+    def inner():
+        nonlocal myint
+        mylist.append(myint)
+        myint += 1
+
+    return inner()
diff --git a/tests/functional/n/not_callable.py b/tests/functional/n/not_callable.py
index 38232dc465..d0ae5ae3b9 100644
--- a/tests/functional/n/not_callable.py
+++ b/tests/functional/n/not_callable.py
@@ -127,7 +127,7 @@ class UnknownBaseCallable(missing.Blah):
 UnknownBaseCallable()()
 
 # Regression test for #4426
-# If property is inferrable we shouldn't double emit the message
+# If property is inferable we shouldn't double emit the message
 # See: https://github.com/PyCQA/pylint/issues/4426
 class ClassWithProperty:
     @property
@@ -136,13 +136,25 @@ def value(self):
 
 CLASS_WITH_PROP = ClassWithProperty().value()  # [not-callable]
 
-# Test typing.Namedtuple not callable
+# Test typing.Namedtuple is callable
 # See: https://github.com/PyCQA/pylint/issues/1295
 import typing
 
 Named = typing.NamedTuple("Named", [("foo", int), ("bar", int)])
 named = Named(1, 2)
 
+
+# NamedTuple is callable, even if it aliased to a attribute
+# See https://github.com/PyCQA/pylint/issues/1730
+class TestNamedTuple:
+    def __init__(self, field: str) -> None:
+        self.my_tuple = typing.NamedTuple("Tuple", [(field, int)])
+        self.item: self.my_tuple
+
+    def set_item(self, item: int) -> None:
+        self.item = self.my_tuple(item)
+
+
 # Test descriptor call
 def func():
     pass
@@ -188,3 +200,27 @@ def get_number(arg):
 
 
 get_number(10)()  # [not-callable]
+
+class Klass:
+    def __init__(self):
+        self._x = None
+
+    @property
+    def myproperty(self):
+        if self._x is None:
+            self._x = lambda: None
+        return self._x
+
+myobject = Klass()
+myobject.myproperty()
+
+class Klass2:
+    @property
+    def something(self):
+        if __file__.startswith('s'):
+            return str
+
+        return 'abcd'
+
+obj2 = Klass2()
+obj2.something()
diff --git a/tests/functional/n/not_callable.txt b/tests/functional/n/not_callable.txt
index f079bbfe83..e8a06b0030 100644
--- a/tests/functional/n/not_callable.txt
+++ b/tests/functional/n/not_callable.txt
@@ -7,4 +7,4 @@ not-callable:32:12:32:17::INT is not callable:UNDEFINED
 not-callable:67:0:67:13::PROP.test is not callable:UNDEFINED
 not-callable:68:0:68:13::PROP.custom is not callable:UNDEFINED
 not-callable:137:18:137:45::ClassWithProperty().value is not callable:UNDEFINED
-not-callable:190:0:190:16::get_number(10) is not callable:UNDEFINED
+not-callable:202:0:202:16::get_number(10) is not callable:UNDEFINED
diff --git a/tests/functional/o/overloaded_operator.py b/tests/functional/o/overloaded_operator.py
index c305af689a..c14fb651f1 100644
--- a/tests/functional/o/overloaded_operator.py
+++ b/tests/functional/o/overloaded_operator.py
@@ -18,4 +18,4 @@ def randint(maximum):
 
     return int(5)
 
-print(randint(1).astype()) # we don't wan't an error for astype access
+print(randint(1).astype()) # we don't want an error for astype access
diff --git a/tests/functional/o/overridden_final_method_py38.py b/tests/functional/o/overridden_final_method_py38.py
index d7b27b6e9a..d74a34051a 100644
--- a/tests/functional/o/overridden_final_method_py38.py
+++ b/tests/functional/o/overridden_final_method_py38.py
@@ -14,3 +14,18 @@ def my_method(self):
 class Subclass(Base):
     def my_method(self): # [overridden-final-method]
         pass
+
+# Check for crash on method definitions not at top level of class
+# https://github.com/PyCQA/pylint/issues/5648
+class BaseConditional:
+
+    create_final_method = True
+    if create_final_method:
+        @final
+        def my_method(self):
+            pass
+
+class Subclass2(BaseConditional):
+
+    def my_method(self): # [overridden-final-method]
+        pass
diff --git a/tests/functional/o/overridden_final_method_py38.txt b/tests/functional/o/overridden_final_method_py38.txt
index 28ca17c00f..d5c4374db9 100644
--- a/tests/functional/o/overridden_final_method_py38.txt
+++ b/tests/functional/o/overridden_final_method_py38.txt
@@ -1 +1,2 @@
-overridden-final-method:15:4:16:12:Subclass.my_method:Method 'my_method' overrides a method decorated with typing.final which is defined in class 'Base':UNDEFINED
+overridden-final-method:15:4:15:17:Subclass.my_method:Method 'my_method' overrides a method decorated with typing.final which is defined in class 'Base':UNDEFINED
+overridden-final-method:30:4:30:17:Subclass2.my_method:Method 'my_method' overrides a method decorated with typing.final which is defined in class 'BaseConditional':UNDEFINED
diff --git a/tests/functional/o/overridden_final_method_regression.py b/tests/functional/o/overridden_final_method_regression.py
new file mode 100644
index 0000000000..a1f72b3807
--- /dev/null
+++ b/tests/functional/o/overridden_final_method_regression.py
@@ -0,0 +1,6 @@
+"""Test a crash regression for the overridden-final-method checker on uninferable decorators"""
+
+
+@unknown_decorator  # [undefined-variable]
+def crash_test():
+    """A docstring"""
diff --git a/tests/functional/o/overridden_final_method_regression.txt b/tests/functional/o/overridden_final_method_regression.txt
new file mode 100644
index 0000000000..a8cb239542
--- /dev/null
+++ b/tests/functional/o/overridden_final_method_regression.txt
@@ -0,0 +1 @@
+undefined-variable:4:1:4:18:crash_test:Undefined variable 'unknown_decorator':UNDEFINED
diff --git a/tests/functional/p/postponed_evaluation_not_activated.txt b/tests/functional/p/postponed_evaluation_not_activated.txt
index 30568e4a5e..8d9630e04c 100644
--- a/tests/functional/p/postponed_evaluation_not_activated.txt
+++ b/tests/functional/p/postponed_evaluation_not_activated.txt
@@ -1,2 +1,2 @@
 undefined-variable:6:36:6:41:Class.from_string:Undefined variable 'Class':UNDEFINED
-used-before-assignment:9:30:9:40:Class.validate_b:Using variable 'OtherClass' before assignment:UNDEFINED
+used-before-assignment:9:30:9:40:Class.validate_b:Using variable 'OtherClass' before assignment:HIGH
diff --git a/tests/functional/p/property_with_parameters.txt b/tests/functional/p/property_with_parameters.txt
index 326f195436..bc07bc6d19 100644
--- a/tests/functional/p/property_with_parameters.txt
+++ b/tests/functional/p/property_with_parameters.txt
@@ -1 +1 @@
-property-with-parameters:7:4:8:29:Cls.attribute:Cannot have defined parameters for properties:UNDEFINED
+property-with-parameters:7:4:7:17:Cls.attribute:Cannot have defined parameters for properties:UNDEFINED
diff --git a/tests/functional/p/protected_access.py b/tests/functional/p/protected_access.py
index 39769fe76a..8d2f945d28 100644
--- a/tests/functional/p/protected_access.py
+++ b/tests/functional/p/protected_access.py
@@ -27,3 +27,17 @@ def nargs(self):
 class Application(metaclass=MC):
     def __no_special__(cls):
         nargs = obj._nargs  # [protected-access]
+
+
+class Light:
+    @property
+    def _light_internal(self) -> None:
+        return None
+
+    @staticmethod
+    def func(light) -> None:
+        print(light._light_internal)  # [protected-access]
+
+
+def func(light: Light) -> None:
+    print(light._light_internal)  # [protected-access]
diff --git a/tests/functional/p/protected_access.txt b/tests/functional/p/protected_access.txt
index 570a906381..50e6c5d5b6 100644
--- a/tests/functional/p/protected_access.txt
+++ b/tests/functional/p/protected_access.txt
@@ -1,2 +1,4 @@
 protected-access:17:0:17:9::Access to a protected member _teta of a client class:UNDEFINED
 protected-access:29:16:29:26:Application.__no_special__:Access to a protected member _nargs of a client class:UNDEFINED
+protected-access:39:14:39:35:Light.func:Access to a protected member _light_internal of a client class:UNDEFINED
+protected-access:43:10:43:31:func:Access to a protected member _light_internal of a client class:UNDEFINED
diff --git a/tests/functional/p/protocol_classes.txt b/tests/functional/p/protocol_classes.txt
index f08492c277..c9d3861467 100644
--- a/tests/functional/p/protocol_classes.txt
+++ b/tests/functional/p/protocol_classes.txt
@@ -1,3 +1,3 @@
-no-self-use:31:4:32:11:HasherFake.update:Method could be a function:UNDEFINED
+no-self-use:31:4:31:14:HasherFake.update:Method could be a function:UNDEFINED
 unused-argument:31:21:31:32:HasherFake.update:Unused argument 'blob':INFERENCE
-no-self-use:33:4:34:11:HasherFake.digest:Method could be a function:UNDEFINED
+no-self-use:33:4:33:14:HasherFake.digest:Method could be a function:UNDEFINED
diff --git a/tests/functional/p/py_version_35.py b/tests/functional/p/py_version_35.py
new file mode 100644
index 0000000000..2772501831
--- /dev/null
+++ b/tests/functional/p/py_version_35.py
@@ -0,0 +1,5 @@
+"""No warnings should be emitted for features that require Python > 3.5"""
+# pylint: disable=invalid-name
+
+# consider-using-f-string -> requires Python 3.6
+"Hello {}".format("World")
diff --git a/tests/functional/p/py_version_35.rc b/tests/functional/p/py_version_35.rc
new file mode 100644
index 0000000000..2d8d651971
--- /dev/null
+++ b/tests/functional/p/py_version_35.rc
@@ -0,0 +1,2 @@
+[MASTER]
+py-version=3.5
diff --git a/tests/functional/r/raise/raise_missing_from.py b/tests/functional/r/raise_missing_from.py
similarity index 100%
rename from tests/functional/r/raise/raise_missing_from.py
rename to tests/functional/r/raise_missing_from.py
diff --git a/tests/functional/r/raise/raise_missing_from.txt b/tests/functional/r/raise_missing_from.txt
similarity index 100%
rename from tests/functional/r/raise/raise_missing_from.txt
rename to tests/functional/r/raise_missing_from.txt
diff --git a/tests/functional/r/raise/raising_bad_type.py b/tests/functional/r/raising/raising_bad_type.py
similarity index 100%
rename from tests/functional/r/raise/raising_bad_type.py
rename to tests/functional/r/raising/raising_bad_type.py
diff --git a/tests/functional/r/raise/raising_bad_type.txt b/tests/functional/r/raising/raising_bad_type.txt
similarity index 100%
rename from tests/functional/r/raise/raising_bad_type.txt
rename to tests/functional/r/raising/raising_bad_type.txt
diff --git a/tests/functional/r/raise/raising_format_tuple.py b/tests/functional/r/raising/raising_format_tuple.py
similarity index 100%
rename from tests/functional/r/raise/raising_format_tuple.py
rename to tests/functional/r/raising/raising_format_tuple.py
diff --git a/tests/functional/r/raise/raising_format_tuple.txt b/tests/functional/r/raising/raising_format_tuple.txt
similarity index 100%
rename from tests/functional/r/raise/raising_format_tuple.txt
rename to tests/functional/r/raising/raising_format_tuple.txt
diff --git a/tests/functional/r/raise/raising_non_exception.py b/tests/functional/r/raising/raising_non_exception.py
similarity index 100%
rename from tests/functional/r/raise/raising_non_exception.py
rename to tests/functional/r/raising/raising_non_exception.py
diff --git a/tests/functional/r/raise/raising_non_exception.txt b/tests/functional/r/raising/raising_non_exception.txt
similarity index 100%
rename from tests/functional/r/raise/raising_non_exception.txt
rename to tests/functional/r/raising/raising_non_exception.txt
diff --git a/tests/functional/r/raise/raising_self.py b/tests/functional/r/raising/raising_self.py
similarity index 100%
rename from tests/functional/r/raise/raising_self.py
rename to tests/functional/r/raising/raising_self.py
diff --git a/tests/functional/r/redefined_argument_from_local.py b/tests/functional/r/redefined/redefined_argument_from_local.py
similarity index 100%
rename from tests/functional/r/redefined_argument_from_local.py
rename to tests/functional/r/redefined/redefined_argument_from_local.py
diff --git a/tests/functional/r/redefined_argument_from_local.txt b/tests/functional/r/redefined/redefined_argument_from_local.txt
similarity index 100%
rename from tests/functional/r/redefined_argument_from_local.txt
rename to tests/functional/r/redefined/redefined_argument_from_local.txt
diff --git a/tests/functional/r/redefined_builtin.py b/tests/functional/r/redefined/redefined_builtin.py
similarity index 100%
rename from tests/functional/r/redefined_builtin.py
rename to tests/functional/r/redefined/redefined_builtin.py
diff --git a/tests/functional/r/redefined_builtin.rc b/tests/functional/r/redefined/redefined_builtin.rc
similarity index 100%
rename from tests/functional/r/redefined_builtin.rc
rename to tests/functional/r/redefined/redefined_builtin.rc
diff --git a/tests/functional/r/redefined_builtin.txt b/tests/functional/r/redefined/redefined_builtin.txt
similarity index 100%
rename from tests/functional/r/redefined_builtin.txt
rename to tests/functional/r/redefined/redefined_builtin.txt
diff --git a/tests/functional/r/redefined_builtin_allowed.py b/tests/functional/r/redefined/redefined_builtin_allowed.py
similarity index 100%
rename from tests/functional/r/redefined_builtin_allowed.py
rename to tests/functional/r/redefined/redefined_builtin_allowed.py
diff --git a/tests/functional/r/redefined_builtin_allowed.rc b/tests/functional/r/redefined/redefined_builtin_allowed.rc
similarity index 100%
rename from tests/functional/r/redefined_builtin_allowed.rc
rename to tests/functional/r/redefined/redefined_builtin_allowed.rc
diff --git a/tests/functional/r/redefined_builtin_allowed.txt b/tests/functional/r/redefined/redefined_builtin_allowed.txt
similarity index 100%
rename from tests/functional/r/redefined_builtin_allowed.txt
rename to tests/functional/r/redefined/redefined_builtin_allowed.txt
diff --git a/tests/functional/r/redefined/redefined_except_handler.py b/tests/functional/r/redefined/redefined_except_handler.py
new file mode 100644
index 0000000000..47591034a2
--- /dev/null
+++ b/tests/functional/r/redefined/redefined_except_handler.py
@@ -0,0 +1,72 @@
+"""Tests for except handlers that shadow outer except handlers or exceptions.
+
+See: https://github.com/PyCQA/pylint/issues/5370
+"""
+
+try:
+    pass
+except ImportError as err:
+    try:
+        pass
+    except ImportError as err:  # [redefined-outer-name]
+        pass
+    print(err)
+
+try:
+    pass
+except ImportError as err:
+    try:
+        pass
+    except ImportError as err2:
+        pass
+    print(err)
+
+try:
+    try:
+        pass
+    except ImportError as err:
+        pass
+except ImportError:
+    try:
+        pass
+    except ImportError as err:
+        pass
+    print(err)
+
+
+try:
+    try:
+        pass
+    except ImportError as err:
+        pass
+except ImportError as err:
+    try:
+        pass
+    except ImportError:
+        pass
+    print(err)
+
+try:
+    pass
+except ImportError as err:
+    try:
+        pass
+    except ImportError as err2:
+        try:
+            pass
+        except ImportError as err:  # [redefined-outer-name]
+            pass
+    print(err)
+
+
+class CustomException(Exception):
+    """https://github.com/PyCQA/pylint/issues/4434"""
+
+
+def func():
+    """Override CustomException by except .. as .."""
+    try:
+        raise CustomException('Test')  # [used-before-assignment]
+    # pylint:disable-next=invalid-name, unused-variable
+    except IOError as CustomException:  # [redefined-outer-name]
+        pass
diff --git a/tests/functional/r/redefined/redefined_except_handler.txt b/tests/functional/r/redefined/redefined_except_handler.txt
new file mode 100644
index 0000000000..1184bdd816
--- /dev/null
+++ b/tests/functional/r/redefined/redefined_except_handler.txt
@@ -0,0 +1,4 @@
+redefined-outer-name:11:4:12:12::Redefining name 'err' from outer scope (line 8):UNDEFINED
+redefined-outer-name:57:8:58:16::Redefining name 'err' from outer scope (line 51):UNDEFINED
+used-before-assignment:69:14:69:29:func:Using variable 'CustomException' before assignment:HIGH
+redefined-outer-name:71:4:72:12:func:Redefining name 'CustomException' from outer scope (line 62):UNDEFINED
diff --git a/tests/functional/r/redefined_outer_name_type_checking.py b/tests/functional/r/redefined/redefined_outer_name_type_checking.py
similarity index 100%
rename from tests/functional/r/redefined_outer_name_type_checking.py
rename to tests/functional/r/redefined/redefined_outer_name_type_checking.py
diff --git a/tests/functional/r/redefined_outer_name_type_checking.rc b/tests/functional/r/redefined/redefined_outer_name_type_checking.rc
similarity index 100%
rename from tests/functional/r/redefined_outer_name_type_checking.rc
rename to tests/functional/r/redefined/redefined_outer_name_type_checking.rc
diff --git a/tests/functional/r/redefined/redefined_slots.py b/tests/functional/r/redefined/redefined_slots.py
new file mode 100644
index 0000000000..28f05fbfd4
--- /dev/null
+++ b/tests/functional/r/redefined/redefined_slots.py
@@ -0,0 +1,39 @@
+"""Checks that a subclass does not redefine a slot which has been defined in a parent class."""
+
+# pylint: disable=too-few-public-methods, invalid-slots-object
+
+from collections import deque
+
+
+class Base:
+    """Class defining the `a`, `b` & `deque.__name__` slots"""
+    __slots__ = ("a", "b", deque.__name__)
+
+
+class Subclass1(Base):
+    """Redefining the `a` & `deque.__name__` slots & adding the `d` & `e` slots"""
+    __slots__ = ("a", deque.__name__, "d", "e")  # [redefined-slots-in-subclass]
+
+
+class Subclass2(Base):
+    """Adding the `f`, `g` & `h` slots"""
+    __slots__ = ("f", "g", "h")
+
+
+class Base2:
+    """Class defining the `i`, `j` & `k` slots"""
+    __slots__ = ("i", "j", "k")
+
+
+class Subclass3(Base, Base2):
+    """Adding the `l`, `m`, `n` slots
+       Redefining the `a`, `b`, & `c` slot already defined in `Base`
+       Redefining the `i`, `j`, `k` slot already defined in `Base2`
+    """
+    __slots__ = ("a", "b", "c", "i", "j", "k", "l", "m", "n")  # [redefined-slots-in-subclass]
+
+
+# https://github.com/PyCQA/pylint/issues/6100
+class MyClass:
+    """No crash when the type of the slot is not a Const or a str"""
+    __slots__ = [str]
diff --git a/tests/functional/r/redefined/redefined_slots.txt b/tests/functional/r/redefined/redefined_slots.txt
new file mode 100644
index 0000000000..f5d7ee2620
--- /dev/null
+++ b/tests/functional/r/redefined/redefined_slots.txt
@@ -0,0 +1,2 @@
+redefined-slots-in-subclass:15:16:15:47:Subclass1:Redefined slots ['a', 'deque'] in subclass:UNDEFINED
+redefined-slots-in-subclass:33:16:33:61:Subclass3:Redefined slots ['a', 'b', 'i', 'j', 'k'] in subclass:UNDEFINED
diff --git a/tests/functional/r/regression/regression_2443_duplicate_bases.py b/tests/functional/r/regression/regression_2443_duplicate_bases.py
index f32490c44a..b5ea1c9f98 100644
--- a/tests/functional/r/regression/regression_2443_duplicate_bases.py
+++ b/tests/functional/r/regression/regression_2443_duplicate_bases.py
@@ -1,4 +1,4 @@
-# pylint: disable=missing-docstring, too-many-ancestors,too-few-public-methods
+# pylint: disable=missing-docstring, too-many-ancestors,too-few-public-methods, typevar-name-incorrect-variance
 from typing import Generic, TypeVar
 
 IN = TypeVar('IN', contravariant=True)
diff --git a/tests/functional/r/regression/regression_2913.py b/tests/functional/r/regression/regression_2913.py
index f36adb4599..9bcc963faa 100644
--- a/tests/functional/r/regression/regression_2913.py
+++ b/tests/functional/r/regression/regression_2913.py
@@ -14,6 +14,6 @@ class BaseCorrect:  # pylint: disable=too-few-public-methods
     """My base class."""
 
 
-class BaseInner:  # [too-few-public-methods]
+class BaseInner:
     # pylint: disable=too-few-public-methods
     """My base class."""
diff --git a/tests/functional/r/regression/regression_2913.txt b/tests/functional/r/regression/regression_2913.txt
deleted file mode 100644
index f30ae1ae92..0000000000
--- a/tests/functional/r/regression/regression_2913.txt
+++ /dev/null
@@ -1 +0,0 @@
-too-few-public-methods:17:0:19:24:BaseInner:Too few public methods (0/2):UNDEFINED
diff --git a/tests/functional/r/regression/regression_4680.txt b/tests/functional/r/regression/regression_4680.txt
index 19732c5d1e..072e54f394 100644
--- a/tests/functional/r/regression/regression_4680.txt
+++ b/tests/functional/r/regression/regression_4680.txt
@@ -1,2 +1,2 @@
 import-error:3:0:3:14::Unable to import 'pkg.sub':UNDEFINED
-undefined-variable:10:0:11:8:FailedTwo:Undefined variable 'ab':UNDEFINED
+undefined-variable:10:0:10:15:FailedTwo:Undefined variable 'ab':UNDEFINED
diff --git a/tests/functional/r/regression/regression_4723.txt b/tests/functional/r/regression/regression_4723.txt
index a187311baa..74d3df5a22 100644
--- a/tests/functional/r/regression/regression_4723.txt
+++ b/tests/functional/r/regression/regression_4723.txt
@@ -1 +1 @@
-no-method-argument:15:4:16:12:B.play:Method has no argument:UNDEFINED
+no-method-argument:15:4:15:12:B.play:Method has no argument:UNDEFINED
diff --git a/tests/functional/r/regression/regression_issue_4631.rc b/tests/functional/r/regression/regression_issue_4631.rc
index 44c9b77eed..88cdb85bfa 100644
--- a/tests/functional/r/regression/regression_issue_4631.rc
+++ b/tests/functional/r/regression/regression_issue_4631.rc
@@ -1,2 +1,2 @@
-[testoptions]
+[MASTER]
 limit-inference-results=0
diff --git a/tests/functional/r/regression/regression_no_value_for_parameter.py b/tests/functional/r/regression/regression_no_value_for_parameter.py
index 6dd2ea4913..d9675e6141 100644
--- a/tests/functional/r/regression/regression_no_value_for_parameter.py
+++ b/tests/functional/r/regression/regression_no_value_for_parameter.py
@@ -28,9 +28,20 @@ def varargs_good(*parts):
 
 
 def varargs_no_expr(*parts):
-    """False positive below this line"""
+    """False positives below this line"""
     ret = os.path.join(*parts)
-    return ret
+    if ret:
+        return ret
+    print(os.path.join(*parts))
+    if os.path.join(*parts):
+        print()
+    elif os.path.join(*parts):
+        print()
+    while os.path.join(*parts):
+        print()
+    with os.path.join(*parts): # pylint:disable=not-context-manager
+        print()
+    return os.path.join(*parts) + os.path.join(*parts) - os.path.join(*parts)
 
 
 def kwargs_good(**kwargs):
@@ -39,4 +50,15 @@ def kwargs_good(**kwargs):
 
 def kwargs_no_expr(**kwargs):
     ret = func(**kwargs)
-    return ret
+    if ret:
+        return ret
+    print(func(**kwargs))
+    if func(**kwargs):
+        print()
+    elif func(**kwargs):
+        print()
+    while func(**kwargs):
+        print()
+    with func(**kwargs): # pylint:disable=not-context-manager
+        print()
+    return func(**kwargs) + func(**kwargs) - func(**kwargs)
diff --git a/tests/functional/r/regression/regression_property_no_member_3269.py b/tests/functional/r/regression/regression_property_no_member_3269.py
index 784dd90d40..5fa85b6eaf 100644
--- a/tests/functional/r/regression/regression_property_no_member_3269.py
+++ b/tests/functional/r/regression/regression_property_no_member_3269.py
@@ -16,7 +16,7 @@ class B:
     @property
     def test(self):
         """Overriding implementation of prop which calls the parent"""
-        return A.test.fget(self) + " overriden"
+        return A.test.fget(self) + " overridden"
 
 
 if __name__ == "__main__":
diff --git a/tests/functional/r/regression_02/regression_5408.py b/tests/functional/r/regression_02/regression_5408.py
new file mode 100644
index 0000000000..b9bcdb9e83
--- /dev/null
+++ b/tests/functional/r/regression_02/regression_5408.py
@@ -0,0 +1,37 @@
+"""Regression test for issue 5408.
+
+Recursion error for self-referencing class attribute.
+See: https://github.com/PyCQA/pylint/issues/5408
+"""
+
+# pylint: disable=missing-docstring, too-few-public-methods, invalid-name, inherit-non-class
+# pylint: disable=no-self-argument
+
+
+class MyInnerClass:
+    ...
+
+
+class MySubClass:
+    inner_class = MyInnerClass
+
+
+class MyClass:
+    sub_class = MySubClass()
+
+
+def get_unpatched_class(cls):
+    return cls
+
+
+def get_unpatched(item):
+    lookup = get_unpatched_class if isinstance(item, type) else lambda item: None
+    return lookup(item)
+
+
+_Child = get_unpatched(MyClass.sub_class.inner_class)
+
+
+class Child(_Child):
+    def patch(cls):
+        MyClass.sub_class.inner_class = cls
diff --git a/tests/functional/r/regression_02/regression_5461.py b/tests/functional/r/regression_02/regression_5461.py
new file mode 100644
index 0000000000..39daf7b9bb
--- /dev/null
+++ b/tests/functional/r/regression_02/regression_5461.py
@@ -0,0 +1,6 @@
+"""Regression test for issue 5461
+Crash on list comprehension with it used `type` as variable name
+
+See: https://github.com/PyCQA/pylint/issues/5461
+"""
+var = [type for type in [] if type["id"]]
diff --git a/tests/functional/r/regression_02/regression_5479.py b/tests/functional/r/regression_02/regression_5479.py
new file mode 100644
index 0000000000..adc20f26ca
--- /dev/null
+++ b/tests/functional/r/regression_02/regression_5479.py
@@ -0,0 +1,31 @@
+"""Test for a regression on slots and annotated assignments.
+Reported in https://github.com/PyCQA/pylint/issues/5479
+"""
+# pylint: disable=too-few-public-methods, unused-private-member, missing-class-docstring, missing-function-docstring
+
+from __future__ import annotations
+
+import asyncio
+
+
+class Connector:
+    __slots__ = ("_Connector__reader", "_Connector__writer")
+
+    __reader: asyncio.StreamReader
+    __writer: asyncio.StreamWriter
+
+    def __init__(self) -> None:
+        raise TypeError("Use connect() instead")
+
+    @classmethod
+    async def connect(cls, socket: str) -> Connector:
+        self = cls.__new__(cls)
+        self.__reader, self.__writer = await asyncio.open_unix_connection(socket)
+        return self
+
+
+async def main():
+    conn = await Connector.connect("/tmp/mysocket")  # [unused-variable]
+
+
+asyncio.run(main())
diff --git a/tests/functional/r/regression_02/regression_5479.rc b/tests/functional/r/regression_02/regression_5479.rc
new file mode 100644
index 0000000000..5793d19de2
--- /dev/null
+++ b/tests/functional/r/regression_02/regression_5479.rc
@@ -0,0 +1,3 @@
+[testoptions]
+min_pyver=3.7
+except_implementations=PyPy
diff --git a/tests/functional/r/regression_02/regression_5479.txt b/tests/functional/r/regression_02/regression_5479.txt
new file mode 100644
index 0000000000..b7771bd930
--- /dev/null
+++ b/tests/functional/r/regression_02/regression_5479.txt
@@ -0,0 +1 @@
+unused-variable:28:4:28:8:main:Unused variable 'conn':UNDEFINED
diff --git a/tests/functional/r/regression_02/regression_distutil_import_error_73.py b/tests/functional/r/regression_02/regression_distutil_import_error_73.py
new file mode 100644
index 0000000000..d40c0973fe
--- /dev/null
+++ b/tests/functional/r/regression_02/regression_distutil_import_error_73.py
@@ -0,0 +1,15 @@
+"""
+Regression test to check that distutils can be imported
+See https://github.com/PyCQA/pylint/issues/73
+
+See also:
+https://github.com/PyCQA/pylint/issues/2955
+https://github.com/PyCQA/astroid/pull/1321
+"""
+
+# pylint: disable=unused-import, deprecated-module
+
+import distutils.version
+from distutils.util import strtobool
+from distutils import doesnottexists # [no-name-in-module]
+from distutils.doesnottexists import nope # [no-name-in-module, import-error]
diff --git a/tests/functional/r/regression_02/regression_distutil_import_error_73.txt b/tests/functional/r/regression_02/regression_distutil_import_error_73.txt
new file mode 100644
index 0000000000..85177f1901
--- /dev/null
+++ b/tests/functional/r/regression_02/regression_distutil_import_error_73.txt
@@ -0,0 +1,3 @@
+no-name-in-module:14:0:14:36::No name 'doesnottexists' in module 'distutils':UNDEFINED
+import-error:15:0:15:41::Unable to import 'distutils.doesnottexists':UNDEFINED
+no-name-in-module:15:0:15:41::No name 'doesnottexists' in module 'distutils':UNDEFINED
diff --git a/tests/functional/r/regression_02/regression_node_statement.py b/tests/functional/r/regression_02/regression_node_statement.py
new file mode 100644
index 0000000000..bd982480be
--- /dev/null
+++ b/tests/functional/r/regression_02/regression_node_statement.py
@@ -0,0 +1,18 @@
+"""Test to see we don't crash on this code in pandas.
+See: https://github.com/pandas-dev/pandas/blob/master/pandas/core/arrays/sparse/array.py
+Code written by Guido van Rossum here: https://github.com/python/typing/issues/684"""
+# pylint: disable=no-member, redefined-builtin, invalid-name, missing-class-docstring
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from enum import Enum
+
+    class ellipsis(Enum):
+        Ellipsis = "..."
+
+    Ellipsis = ellipsis.Ellipsis
+
+
+else:
+    ellipsis = type(Ellipsis)
diff --git a/tests/functional/r/regression_02/regression_node_statement_two.py b/tests/functional/r/regression_02/regression_node_statement_two.py
new file mode 100644
index 0000000000..e2db947915
--- /dev/null
+++ b/tests/functional/r/regression_02/regression_node_statement_two.py
@@ -0,0 +1,29 @@
+"""Test to see we don't crash on this code in pandas.
+See: https://github.com/pandas-dev/pandas/blob/master/pandas/core/indexes/period.py
+Reported in https://github.com/PyCQA/pylint/issues/5382
+"""
+# pylint: disable=missing-function-docstring, missing-class-docstring, no-self-use, unused-argument
+# pylint: disable=too-few-public-methods, no-method-argument, invalid-name
+
+
+def my_decorator(*params):
+    def decorator(decorated):
+        return decorated
+
+    return decorator
+
+
+class ClassWithProperty:
+    def f():
+        return "string"
+
+    f.__name__ = "name"
+    f.__doc__ = "docstring"
+
+    hour = property(f)
+
+
+class ClassWithDecorator:
+    @my_decorator(ClassWithProperty.hour.fget)
+    def my_property(self) -> str:
+        return "a string"
diff --git a/tests/functional/r/regression/regression_too_many_arguments_2335.py b/tests/functional/r/regression_02/regression_too_many_arguments_2335.py
similarity index 100%
rename from tests/functional/r/regression/regression_too_many_arguments_2335.py
rename to tests/functional/r/regression_02/regression_too_many_arguments_2335.py
diff --git a/tests/functional/r/return_in_init.txt b/tests/functional/r/return_in_init.txt
index 3accd68341..7586c50391 100644
--- a/tests/functional/r/return_in_init.txt
+++ b/tests/functional/r/return_in_init.txt
@@ -1 +1 @@
-return-in-init:5:4:6:16:MyClass.__init__:Explicit return in __init__:UNDEFINED
+return-in-init:5:4:5:16:MyClass.__init__:Explicit return in __init__:UNDEFINED
diff --git a/tests/functional/s/signature_differs.txt b/tests/functional/s/signature_differs.txt
index 4311f4ef18..8c355bc6c3 100644
--- a/tests/functional/s/signature_differs.txt
+++ b/tests/functional/s/signature_differs.txt
@@ -1 +1 @@
-signature-differs:21:4:22:24:Cdef.abcd:Signature differs from overridden 'abcd' method:UNDEFINED
+signature-differs:21:4:21:12:Cdef.abcd:Signature differs from overridden 'abcd' method:UNDEFINED
diff --git a/tests/functional/s/simplifiable/simplify_chained_comparison.py b/tests/functional/s/simplify_chained_comparison.py
similarity index 100%
rename from tests/functional/s/simplifiable/simplify_chained_comparison.py
rename to tests/functional/s/simplify_chained_comparison.py
diff --git a/tests/functional/s/simplifiable/simplify_chained_comparison.txt b/tests/functional/s/simplify_chained_comparison.txt
similarity index 100%
rename from tests/functional/s/simplifiable/simplify_chained_comparison.txt
rename to tests/functional/s/simplify_chained_comparison.txt
diff --git a/tests/functional/s/singledispatch_functions.txt b/tests/functional/s/singledispatch_functions.txt
index 1879d136da..88973375f5 100644
--- a/tests/functional/s/singledispatch_functions.txt
+++ b/tests/functional/s/singledispatch_functions.txt
@@ -1,5 +1,5 @@
 unused-variable:60:4:60:10:_:Unused variable 'unused':UNDEFINED
 unused-argument:65:24:65:27:not_single_dispatch:Unused argument 'arg':HIGH
 unused-argument:70:24:70:27:bad_single_dispatch:Unused argument 'arg':HIGH
-function-redefined:75:0:76:13:bad_single_dispatch:function already defined line 70:UNDEFINED
+function-redefined:75:0:75:23:bad_single_dispatch:function already defined line 70:UNDEFINED
 unused-argument:75:24:75:27:bad_single_dispatch:Unused argument 'arg':HIGH
diff --git a/tests/functional/s/singleton_comparison.py b/tests/functional/s/singleton_comparison.py
index 771a1d3cb2..8bfd0e8876 100644
--- a/tests/functional/s/singleton_comparison.py
+++ b/tests/functional/s/singleton_comparison.py
@@ -9,6 +9,8 @@
 g = 123 is "123"
 h = None is x
 i = None == x  # [singleton-comparison]
+i1 = True == x  # [singleton-comparison]
+i2 = False == x  # [singleton-comparison]
 
 j = x != True  # [singleton-comparison]
 j1 = x != False  # [singleton-comparison]
diff --git a/tests/functional/s/singleton_comparison.txt b/tests/functional/s/singleton_comparison.txt
index 12d3414307..d095331dea 100644
--- a/tests/functional/s/singleton_comparison.txt
+++ b/tests/functional/s/singleton_comparison.txt
@@ -3,10 +3,12 @@ singleton-comparison:5:4:5:13::Comparison 'x == True' should be 'x is True' if c
 singleton-comparison:6:4:6:14::Comparison 'x == False' should be 'x is False' if checking for the singleton value False, or 'not x' if testing for falsiness:UNDEFINED
 singleton-comparison:7:4:7:16::Comparison 'True == True' should be 'True is True' if checking for the singleton value True, or 'bool(True)' if testing for truthiness:UNDEFINED
 singleton-comparison:11:4:11:13::Comparison 'None == x' should be 'None is x':UNDEFINED
-singleton-comparison:13:4:13:13::Comparison 'x != True' should be 'x is not True' if checking for the singleton value True, or 'not x' if testing for falsiness:UNDEFINED
-singleton-comparison:14:5:14:15::Comparison 'x != False' should be 'x is not False' if checking for the singleton value False, or 'bool(x)' if testing for truthiness:UNDEFINED
-singleton-comparison:15:5:15:14::Comparison 'x != None' should be 'x is not None':UNDEFINED
-singleton-comparison:16:7:16:16::Comparison 'x == True' should be 'x is True' if checking for the singleton value True, or 'x' if testing for truthiness:UNDEFINED
-singleton-comparison:17:7:17:17::Comparison 'x != False' should be 'x is not False' if checking for the singleton value False, or 'x' if testing for truthiness:UNDEFINED
-singleton-comparison:18:3:18:12::Comparison 'x == True' should be 'x is True' if checking for the singleton value True, or 'x' if testing for truthiness:UNDEFINED
-singleton-comparison:20:9:20:18::Comparison 'x == True' should be 'x is True' if checking for the singleton value True, or 'x' if testing for truthiness:UNDEFINED
+singleton-comparison:12:5:12:14::Comparison 'True == x' should be 'True is x' if checking for the singleton value True, or 'bool(x)' if testing for truthiness:UNDEFINED
+singleton-comparison:13:5:13:15::Comparison 'False == x' should be 'False is x' if checking for the singleton value False, or 'not x' if testing for falsiness:UNDEFINED
+singleton-comparison:15:4:15:13::Comparison 'x != True' should be 'x is not True' if checking for the singleton value True, or 'not x' if testing for falsiness:UNDEFINED
+singleton-comparison:16:5:16:15::Comparison 'x != False' should be 'x is not False' if checking for the singleton value False, or 'bool(x)' if testing for truthiness:UNDEFINED
+singleton-comparison:17:5:17:14::Comparison 'x != None' should be 'x is not None':UNDEFINED
+singleton-comparison:18:7:18:16::Comparison 'x == True' should be 'x is True' if checking for the singleton value True, or 'x' if testing for truthiness:UNDEFINED
+singleton-comparison:19:7:19:17::Comparison 'x != False' should be 'x is not False' if checking for the singleton value False, or 'x' if testing for truthiness:UNDEFINED
+singleton-comparison:20:3:20:12::Comparison 'x == True' should be 'x is True' if checking for the singleton value True, or 'x' if testing for truthiness:UNDEFINED
+singleton-comparison:22:9:22:18::Comparison 'x == True' should be 'x is True' if checking for the singleton value True, or 'x' if testing for truthiness:UNDEFINED
diff --git a/tests/functional/s/slots_checks.txt b/tests/functional/s/slots_checks.txt
index c3069131b9..17b3195522 100644
--- a/tests/functional/s/slots_checks.txt
+++ b/tests/functional/s/slots_checks.txt
@@ -1,11 +1,11 @@
-invalid-slots:36:0:37:20:Bad:Invalid __slots__ object:UNDEFINED
-invalid-slots:39:0:40:17:SecondBad:Invalid __slots__ object:UNDEFINED
+invalid-slots:36:0:36:9:Bad:Invalid __slots__ object:UNDEFINED
+invalid-slots:39:0:39:15:SecondBad:Invalid __slots__ object:UNDEFINED
 invalid-slots-object:43:22:43:23:ThirdBad:Invalid object '2' in __slots__, must contain only non empty strings:UNDEFINED
-invalid-slots:45:0:46:29:FourthBad:Invalid __slots__ object:UNDEFINED
+invalid-slots:45:0:45:15:FourthBad:Invalid __slots__ object:UNDEFINED
 invalid-slots-object:49:27:49:29:FifthBad:"Invalid object ""''"" in __slots__, must contain only non empty strings":UNDEFINED
-single-string-used-for-slots:51:0:52:19:SixthBad:Class __slots__ should be a non-string iterable:UNDEFINED
-single-string-used-for-slots:54:0:55:23:SeventhBad:Class __slots__ should be a non-string iterable:UNDEFINED
-single-string-used-for-slots:57:0:58:30:EighthBad:Class __slots__ should be a non-string iterable:UNDEFINED
+single-string-used-for-slots:51:0:51:14:SixthBad:Class __slots__ should be a non-string iterable:UNDEFINED
+single-string-used-for-slots:54:0:54:16:SeventhBad:Class __slots__ should be a non-string iterable:UNDEFINED
+single-string-used-for-slots:57:0:57:15:EighthBad:Class __slots__ should be a non-string iterable:UNDEFINED
 class-variable-slots-conflict:85:17:85:24:ValueInSlotConflict:Value 'first' in slots conflicts with class variable:UNDEFINED
 class-variable-slots-conflict:85:45:85:53:ValueInSlotConflict:Value 'fourth' in slots conflicts with class variable:UNDEFINED
 class-variable-slots-conflict:85:36:85:43:ValueInSlotConflict:Value 'third' in slots conflicts with class variable:UNDEFINED
diff --git a/tests/functional/s/statement_without_effect.py b/tests/functional/s/statement_without_effect.py
index 53da873d88..31fc7250f0 100644
--- a/tests/functional/s/statement_without_effect.py
+++ b/tests/functional/s/statement_without_effect.py
@@ -1,5 +1,5 @@
 """Test for statements without effects."""
-# pylint: disable=too-few-public-methods, useless-object-inheritance, unnecessary-comprehension, use-list-literal
+# pylint: disable=too-few-public-methods, useless-object-inheritance, unnecessary-comprehension, unnecessary-ellipsis, use-list-literal
 
 # +1:[pointless-string-statement]
 """inline doc string should use a separated message"""
diff --git a/tests/functional/s/subclassed_final_class_py38.txt b/tests/functional/s/subclassed_final_class_py38.txt
index d7de834b1d..9dec8110e8 100644
--- a/tests/functional/s/subclassed_final_class_py38.txt
+++ b/tests/functional/s/subclassed_final_class_py38.txt
@@ -1 +1 @@
-subclassed-final-class:14:0:15:8:Subclass:"Class 'Subclass' is a subclass of a class decorated with typing.final: 'Base'":UNDEFINED
+subclassed-final-class:14:0:14:14:Subclass:"Class 'Subclass' is a subclass of a class decorated with typing.final: 'Base'":UNDEFINED
diff --git a/tests/functional/s/super/super_init_not_called.py b/tests/functional/s/super/super_init_not_called.py
index 5f2bf9ee8a..90a884b0b0 100644
--- a/tests/functional/s/super/super_init_not_called.py
+++ b/tests/functional/s/super/super_init_not_called.py
@@ -1,13 +1,57 @@
-"""This should not emit a super-init-not-called warning. It previously did this, because
-``next(node.infer())`` was used in that checker's logic and the first inferred node
-was an Uninferable object, leading to this false positive."""
-# pylint: disable=too-few-public-methods
+"""Tests for super-init-not-called."""
+# pylint: disable=too-few-public-methods, missing-class-docstring
 
 import ctypes
 
 
 class Foo(ctypes.BigEndianStructure):
-    """A class"""
+    """This class should not emit a super-init-not-called warning.
+
+    It previously did, because ``next(node.infer())`` was used in that checker's logic
+    and the first inferred node was an Uninferable object, leading to this false positive.
+    """
 
     def __init__(self):
         ctypes.BigEndianStructure.__init__(self)
+
+
+class UninferableChild(UninferableParent):  # [undefined-variable]
+    """An implementation that test if we don't crash on uninferable parents."""
+
+    def __init__(self):
+        ...
+
+
+# Tests for not calling the init of a parent that does not define one
+# but inherits it.
+class GrandParentWithInit:
+    def __init__(self):
+        print(self)
+
+
+class ParentWithoutInit(GrandParentWithInit):
+    pass
+
+
+class ChildOne(ParentWithoutInit, GrandParentWithInit):
+    """Since ParentWithoutInit calls GrandParentWithInit it doesn't need to be called."""
+
+    def __init__(self):
+        GrandParentWithInit.__init__(self)
+
+
+class ChildTwo(ParentWithoutInit):
+    def __init__(self):
+        ParentWithoutInit.__init__(self)
+
+
+class ChildThree(ParentWithoutInit):
+    def __init__(self):  # [super-init-not-called]
+        ...
+
+
+# Regression test as reported in
+# https://github.com/PyCQA/pylint/issues/6027
+class MyUnion(ctypes.Union):
+    def __init__(self):  # [super-init-not-called]
+        pass
diff --git a/tests/functional/s/super/super_init_not_called.txt b/tests/functional/s/super/super_init_not_called.txt
new file mode 100644
index 0000000000..aafaa2023c
--- /dev/null
+++ b/tests/functional/s/super/super_init_not_called.txt
@@ -0,0 +1,3 @@
+undefined-variable:18:23:18:40:UninferableChild:Undefined variable 'UninferableParent':UNDEFINED
+super-init-not-called:49:4:49:16:ChildThree.__init__:__init__ method from base class 'ParentWithoutInit' is not called:INFERENCE
+super-init-not-called:56:4:56:16:MyUnion.__init__:__init__ method from base class 'Union' is not called:INFERENCE
diff --git a/tests/functional/s/super/super_init_not_called_extensions.py b/tests/functional/s/super/super_init_not_called_extensions.py
new file mode 100644
index 0000000000..241e0008a1
--- /dev/null
+++ b/tests/functional/s/super/super_init_not_called_extensions.py
@@ -0,0 +1,22 @@
+"""Tests for super-init-not-called."""
+# pylint: disable=too-few-public-methods
+
+from typing_extensions import Protocol as ExtensionProtocol
+
+
+class TestProto(ExtensionProtocol):
+    """A protocol without __init__ using Protocol from typing_extensions."""
+
+
+class TestParent(TestProto):
+    """An implementation."""
+
+    def __init__(self):
+        ...
+
+
+class TestChild(TestParent):
+    """An implementation which should call the init of TestParent."""
+
+    def __init__(self):  # [super-init-not-called]
+        ...
diff --git a/tests/functional/s/super/super_init_not_called_extensions.rc b/tests/functional/s/super/super_init_not_called_extensions.rc
new file mode 100644
index 0000000000..d584aa9595
--- /dev/null
+++ b/tests/functional/s/super/super_init_not_called_extensions.rc
@@ -0,0 +1,2 @@
+[testoptions]
+max_pyver=3.9
diff --git a/tests/functional/s/super/super_init_not_called_extensions.txt b/tests/functional/s/super/super_init_not_called_extensions.txt
new file mode 100644
index 0000000000..b80cb80be4
--- /dev/null
+++ b/tests/functional/s/super/super_init_not_called_extensions.txt
@@ -0,0 +1 @@
+super-init-not-called:21:4:21:16:TestChild.__init__:__init__ method from base class 'TestParent' is not called:INFERENCE
diff --git a/tests/functional/s/super/super_init_not_called_extensions_py310.py b/tests/functional/s/super/super_init_not_called_extensions_py310.py
new file mode 100644
index 0000000000..241e0008a1
--- /dev/null
+++ b/tests/functional/s/super/super_init_not_called_extensions_py310.py
@@ -0,0 +1,22 @@
+"""Tests for super-init-not-called."""
+# pylint: disable=too-few-public-methods
+
+from typing_extensions import Protocol as ExtensionProtocol
+
+
+class TestProto(ExtensionProtocol):
+    """A protocol without __init__ using Protocol from typing_extensions."""
+
+
+class TestParent(TestProto):
+    """An implementation."""
+
+    def __init__(self):
+        ...
+
+
+class TestChild(TestParent):
+    """An implementation which should call the init of TestParent."""
+
+    def __init__(self):  # [super-init-not-called]
+        ...
diff --git a/tests/functional/s/super/super_init_not_called_extensions_py310.rc b/tests/functional/s/super/super_init_not_called_extensions_py310.rc
new file mode 100644
index 0000000000..3ab4e08e91
--- /dev/null
+++ b/tests/functional/s/super/super_init_not_called_extensions_py310.rc
@@ -0,0 +1,4 @@
+[testoptions]
+# Windows test environments on >= 3.10 don't have typing_extensions
+exclude_platforms=win32
+min_pyver=3.10
diff --git a/tests/functional/s/super/super_init_not_called_extensions_py310.txt b/tests/functional/s/super/super_init_not_called_extensions_py310.txt
new file mode 100644
index 0000000000..b80cb80be4
--- /dev/null
+++ b/tests/functional/s/super/super_init_not_called_extensions_py310.txt
@@ -0,0 +1 @@
+super-init-not-called:21:4:21:16:TestChild.__init__:__init__ method from base class 'TestParent' is not called:INFERENCE
diff --git a/tests/functional/s/super/super_init_not_called_py38.py b/tests/functional/s/super/super_init_not_called_py38.py
new file mode 100644
index 0000000000..458707da0a
--- /dev/null
+++ b/tests/functional/s/super/super_init_not_called_py38.py
@@ -0,0 +1,20 @@
+"""Tests for super-init-not-called with Protocol."""
+# pylint: disable=too-few-public-methods
+
+from abc import abstractmethod
+from typing import Protocol
+
+
+class MyProtocol(Protocol):
+    """A protocol."""
+
+    @abstractmethod
+    def __init__(self) -> None:
+        raise NotImplementedError
+
+
+class ProtocolImplimentation(MyProtocol):
+    """An implementation."""
+
+    def __init__(self) -> None:
+        ...
diff --git a/tests/functional/s/super/super_init_not_called_py38.rc b/tests/functional/s/super/super_init_not_called_py38.rc
new file mode 100644
index 0000000000..85fc502b37
--- /dev/null
+++ b/tests/functional/s/super/super_init_not_called_py38.rc
@@ -0,0 +1,2 @@
+[testoptions]
+min_pyver=3.8
diff --git a/tests/functional/s/super/superfluous_parens.py b/tests/functional/s/superfluous_parens.py
similarity index 93%
rename from tests/functional/s/super/superfluous_parens.py
rename to tests/functional/s/superfluous_parens.py
index 22c4c3ab4b..ee835f6d08 100644
--- a/tests/functional/s/super/superfluous_parens.py
+++ b/tests/functional/s/superfluous_parens.py
@@ -44,8 +44,11 @@ def function_A():
 def function_B(var):
     return (var.startswith(('A', 'B', 'C')) or var == 'D')
 
+def function_C(first, second):
+    return (first or second) in (0, 1)
+
 # TODO: Test string combinations, see https://github.com/PyCQA/pylint/issues/4792
-# Lines 45, 46 & 47 should raise the superfluous-parens message
+# The lines with "+" should raise the superfluous-parens message
 J = "TestString"
 K = ("Test " + "String")
 L = ("Test " + "String") in I
diff --git a/tests/functional/s/super/superfluous_parens.txt b/tests/functional/s/superfluous_parens.txt
similarity index 100%
rename from tests/functional/s/super/superfluous_parens.txt
rename to tests/functional/s/superfluous_parens.txt
diff --git a/tests/functional/s/super/superfluous_parens_walrus_py38.py b/tests/functional/s/superfluous_parens_walrus_py38.py
similarity index 100%
rename from tests/functional/s/super/superfluous_parens_walrus_py38.py
rename to tests/functional/s/superfluous_parens_walrus_py38.py
diff --git a/tests/functional/s/superfluous_parens_walrus_py38.rc b/tests/functional/s/superfluous_parens_walrus_py38.rc
new file mode 100644
index 0000000000..85fc502b37
--- /dev/null
+++ b/tests/functional/s/superfluous_parens_walrus_py38.rc
@@ -0,0 +1,2 @@
+[testoptions]
+min_pyver=3.8
diff --git a/tests/functional/s/super/superfluous_parens_walrus_py38.txt b/tests/functional/s/superfluous_parens_walrus_py38.txt
similarity index 100%
rename from tests/functional/s/super/superfluous_parens_walrus_py38.txt
rename to tests/functional/s/superfluous_parens_walrus_py38.txt
diff --git a/tests/functional/s/symlink/_binding/__init__.py b/tests/functional/s/symlink/_binding/__init__.py
new file mode 120000
index 0000000000..dda2f5dc5f
--- /dev/null
+++ b/tests/functional/s/symlink/_binding/__init__.py
@@ -0,0 +1 @@
+../symlink_module/__init__.py
\ No newline at end of file
diff --git a/tests/functional/s/symlink/_binding/symlink_module.py b/tests/functional/s/symlink/_binding/symlink_module.py
new file mode 120000
index 0000000000..af65afbc35
--- /dev/null
+++ b/tests/functional/s/symlink/_binding/symlink_module.py
@@ -0,0 +1 @@
+../symlink_module/symlink_module.py
\ No newline at end of file
diff --git a/tests/functional/s/symlink/symlink_module/__init__.py b/tests/functional/s/symlink/symlink_module/__init__.py
new file mode 100644
index 0000000000..cc8f6e4111
--- /dev/null
+++ b/tests/functional/s/symlink/symlink_module/__init__.py
@@ -0,0 +1,3 @@
+"""Example taken from issue #1470"""
+
+from symlinked_module import func
diff --git a/tests/functional/s/symlink/symlink_module/symlink_module.py b/tests/functional/s/symlink/symlink_module/symlink_module.py
new file mode 100644
index 0000000000..c28a97a303
--- /dev/null
+++ b/tests/functional/s/symlink/symlink_module/symlink_module.py
@@ -0,0 +1,6 @@
+"""Example taken from issue #1470"""
+
+
+def func():
+    """Both module should be parsed without problem"""
+    return 1
diff --git a/tests/functional/s/syntax_error.py b/tests/functional/s/syntax/syntax_error.py
similarity index 100%
rename from tests/functional/s/syntax_error.py
rename to tests/functional/s/syntax/syntax_error.py
diff --git a/tests/functional/s/syntax_error.rc b/tests/functional/s/syntax/syntax_error.rc
similarity index 100%
rename from tests/functional/s/syntax_error.rc
rename to tests/functional/s/syntax/syntax_error.rc
diff --git a/tests/functional/s/syntax_error.txt b/tests/functional/s/syntax/syntax_error.txt
similarity index 100%
rename from tests/functional/s/syntax_error.txt
rename to tests/functional/s/syntax/syntax_error.txt
diff --git a/tests/functional/s/syntax_error_jython.py b/tests/functional/s/syntax/syntax_error_jython.py
similarity index 100%
rename from tests/functional/s/syntax_error_jython.py
rename to tests/functional/s/syntax/syntax_error_jython.py
diff --git a/tests/functional/s/syntax_error_jython.rc b/tests/functional/s/syntax/syntax_error_jython.rc
similarity index 100%
rename from tests/functional/s/syntax_error_jython.rc
rename to tests/functional/s/syntax/syntax_error_jython.rc
diff --git a/tests/functional/s/syntax_error_jython.txt b/tests/functional/s/syntax/syntax_error_jython.txt
similarity index 100%
rename from tests/functional/s/syntax_error_jython.txt
rename to tests/functional/s/syntax/syntax_error_jython.txt
diff --git a/tests/functional/t/too/too_few_public_methods.txt b/tests/functional/t/too/too_few_public_methods.txt
index 854a780785..24f46d08f9 100644
--- a/tests/functional/t/too/too_few_public_methods.txt
+++ b/tests/functional/t/too/too_few_public_methods.txt
@@ -1 +1 @@
-too-few-public-methods:8:0:17:19:Aaaa:Too few public methods (1/2):UNDEFINED
+too-few-public-methods:8:0:8:10:Aaaa:Too few public methods (1/2):UNDEFINED
diff --git a/tests/functional/t/too/too_few_public_methods_excluded.py b/tests/functional/t/too/too_few_public_methods_excluded.py
index 35ba873ee5..2ee8f1c4a4 100644
--- a/tests/functional/t/too/too_few_public_methods_excluded.py
+++ b/tests/functional/t/too/too_few_public_methods_excluded.py
@@ -9,6 +9,5 @@ class MyJsonEncoder(JSONEncoder):
     ...
 
 class InheritedInModule(Control):
-    """This class inherits from a class that doesn't have enough mehods,
+    """This class inherits from a class that doesn't have enough methods,
     and its parent is excluded via config, so it doesn't raise."""
-    ...
diff --git a/tests/functional/t/too/too_few_public_methods_excluded.rc b/tests/functional/t/too/too_few_public_methods_excluded.rc
index 00c025832c..b6a2cc9378 100644
--- a/tests/functional/t/too/too_few_public_methods_excluded.rc
+++ b/tests/functional/t/too/too_few_public_methods_excluded.rc
@@ -1,4 +1,4 @@
-[testoptions]
+[DESIGN]
 min-public-methods=10  # to combat inherited methods
 
 exclude-too-few-public-methods=json.*,^.*Control$
diff --git a/tests/functional/t/too/too_few_public_methods_excluded.txt b/tests/functional/t/too/too_few_public_methods_excluded.txt
index 00ceaea786..b007f9b183 100644
--- a/tests/functional/t/too/too_few_public_methods_excluded.txt
+++ b/tests/functional/t/too/too_few_public_methods_excluded.txt
@@ -1 +1 @@
-too-few-public-methods:4:0:5:7:Control:Too few public methods (0/10):UNDEFINED
+too-few-public-methods:4:0:4:13:Control:Too few public methods (0/10):UNDEFINED
diff --git a/tests/functional/t/too/too_many_ancestors.txt b/tests/functional/t/too/too_many_ancestors.txt
index 204e2e5993..b4d4ecd6f5 100644
--- a/tests/functional/t/too/too_many_ancestors.txt
+++ b/tests/functional/t/too/too_many_ancestors.txt
@@ -1,2 +1,2 @@
-too-many-ancestors:21:0:22:8:Iiii:Too many ancestors (8/7):UNDEFINED
-too-many-ancestors:24:0:25:8:Jjjj:Too many ancestors (9/7):UNDEFINED
+too-many-ancestors:21:0:21:10:Iiii:Too many ancestors (8/7):UNDEFINED
+too-many-ancestors:24:0:24:10:Jjjj:Too many ancestors (9/7):UNDEFINED
diff --git a/tests/functional/t/too/too_many_ancestors_ignored_parents.rc b/tests/functional/t/too/too_many_ancestors_ignored_parents.rc
index 1d06dad25d..aa652704b7 100644
--- a/tests/functional/t/too/too_many_ancestors_ignored_parents.rc
+++ b/tests/functional/t/too/too_many_ancestors_ignored_parents.rc
@@ -1,3 +1,3 @@
-[testoptions]
+[DESIGN]
 max-parents=2
 ignored-parents=functional.t.too.too_many_ancestors_ignored_parents.E
diff --git a/tests/functional/t/too/too_many_ancestors_ignored_parents.txt b/tests/functional/t/too/too_many_ancestors_ignored_parents.txt
index 6ba1a7d296..fcbafdeb05 100644
--- a/tests/functional/t/too/too_many_ancestors_ignored_parents.txt
+++ b/tests/functional/t/too/too_many_ancestors_ignored_parents.txt
@@ -1 +1 @@
-too-many-ancestors:39:0:40:19:A:Too many ancestors (3/2):UNDEFINED
+too-many-ancestors:39:0:39:7:A:Too many ancestors (3/2):UNDEFINED
diff --git a/tests/functional/t/too/too_many_arguments.txt b/tests/functional/t/too/too_many_arguments.txt
index 71d1bfd395..f9749e9495 100644
--- a/tests/functional/t/too/too_many_arguments.txt
+++ b/tests/functional/t/too/too_many_arguments.txt
@@ -1 +1 @@
-too-many-arguments:3:0:4:63:stupid_function:Too many arguments (9/5):UNDEFINED
+too-many-arguments:3:0:3:19:stupid_function:Too many arguments (9/5):UNDEFINED
diff --git a/tests/functional/t/too/too_many_branches.txt b/tests/functional/t/too/too_many_branches.txt
index f74a70b6aa..3d37bb6df5 100644
--- a/tests/functional/t/too/too_many_branches.txt
+++ b/tests/functional/t/too/too_many_branches.txt
@@ -1 +1 @@
-too-many-branches:3:0:30:12:wrong:Too many branches (13/12):UNDEFINED
+too-many-branches:3:0:3:9:wrong:Too many branches (13/12):UNDEFINED
diff --git a/tests/functional/t/too/too_many_function_args.py b/tests/functional/t/too/too_many_function_args.py
new file mode 100644
index 0000000000..c5ca4f78eb
--- /dev/null
+++ b/tests/functional/t/too/too_many_function_args.py
@@ -0,0 +1,19 @@
+"""https://github.com/PyCQA/pylint/issues/3675"""
+
+
+def noop(x):  # pylint: disable=invalid-name
+    """Return value unchanged"""
+    return x
+
+
+def add(x, y):  # pylint: disable=invalid-name
+    """Add two values"""
+    return x + y
+
+
+def main(param):
+    """Should not emit too-many-function-args"""
+    tmp = noop  # matched first
+    if param == 0:
+        tmp = add
+    return tmp(1, 1.01)
diff --git a/tests/functional/t/too/too_many_instance_attributes.txt b/tests/functional/t/too/too_many_instance_attributes.txt
index fd1e2e58e5..d3f1282228 100644
--- a/tests/functional/t/too/too_many_instance_attributes.txt
+++ b/tests/functional/t/too/too_many_instance_attributes.txt
@@ -1 +1 @@
-too-many-instance-attributes:4:0:27:26:Aaaa:Too many instance attributes (21/7):UNDEFINED
+too-many-instance-attributes:4:0:4:10:Aaaa:Too many instance attributes (21/7):UNDEFINED
diff --git a/tests/functional/t/too/too_many_locals.txt b/tests/functional/t/too/too_many_locals.txt
index 5d2055c0c3..19272626f1 100644
--- a/tests/functional/t/too/too_many_locals.txt
+++ b/tests/functional/t/too/too_many_locals.txt
@@ -1,3 +1,3 @@
-too-many-locals:4:0:9:51:function:Too many local variables (16/15):UNDEFINED
-too-many-locals:12:0:30:17:too_many_locals_function:Too many local variables (16/15):UNDEFINED
-too-many-arguments:32:0:39:15:too_many_arguments_function:Too many arguments (6/5):UNDEFINED
+too-many-locals:4:0:4:12:function:Too many local variables (16/15):UNDEFINED
+too-many-locals:12:0:12:28:too_many_locals_function:Too many local variables (16/15):UNDEFINED
+too-many-arguments:32:0:32:31:too_many_arguments_function:Too many arguments (6/5):UNDEFINED
diff --git a/tests/functional/t/too/too_many_public_methods.txt b/tests/functional/t/too/too_many_public_methods.txt
index 799640bbb1..2d5ac78ba4 100644
--- a/tests/functional/t/too/too_many_public_methods.txt
+++ b/tests/functional/t/too/too_many_public_methods.txt
@@ -1 +1 @@
-too-many-public-methods:3:0:72:24:Aaaa:Too many public methods (21/20):UNDEFINED
+too-many-public-methods:3:0:3:10:Aaaa:Too many public methods (21/20):UNDEFINED
diff --git a/tests/functional/t/too/too_many_return_statements.txt b/tests/functional/t/too/too_many_return_statements.txt
index 5e4de80285..815cacf28e 100644
--- a/tests/functional/t/too/too_many_return_statements.txt
+++ b/tests/functional/t/too/too_many_return_statements.txt
@@ -1 +1 @@
-too-many-return-statements:3:0:24:15:stupid_function:Too many return statements (11/6):UNDEFINED
+too-many-return-statements:3:0:3:19:stupid_function:Too many return statements (11/6):UNDEFINED
diff --git a/tests/functional/t/too/too_many_statements.rc b/tests/functional/t/too/too_many_statements.rc
index d6d22f2372..19e0d5151f 100644
--- a/tests/functional/t/too/too_many_statements.rc
+++ b/tests/functional/t/too/too_many_statements.rc
@@ -1,2 +1,2 @@
-[testoptions]
+[DESIGN]
 max-statements=5
diff --git a/tests/functional/t/too/too_many_statements.txt b/tests/functional/t/too/too_many_statements.txt
index 0e74c361ba..b78c4b9a54 100644
--- a/tests/functional/t/too/too_many_statements.txt
+++ b/tests/functional/t/too/too_many_statements.txt
@@ -1,3 +1,3 @@
-too-many-statements:5:0:60:16:stupid_function:Too many statements (55/5):UNDEFINED
-too-many-statements:62:0:125:13:long_function_with_inline_def:Too many statements (62/5):UNDEFINED
-too-many-statements:128:0:133:12:exmaple_function:Too many statements (6/5):UNDEFINED
+too-many-statements:5:0:5:19:stupid_function:Too many statements (55/5):UNDEFINED
+too-many-statements:62:0:62:33:long_function_with_inline_def:Too many statements (62/5):UNDEFINED
+too-many-statements:128:0:128:20:exmaple_function:Too many statements (6/5):UNDEFINED
diff --git a/tests/functional/t/typevar_name_incorrect_variance.py b/tests/functional/t/typevar_name_incorrect_variance.py
new file mode 100644
index 0000000000..bb8a898801
--- /dev/null
+++ b/tests/functional/t/typevar_name_incorrect_variance.py
@@ -0,0 +1,69 @@
+"""Test case for typevar-name-incorrect-variance."""
+
+from typing import TypeVar
+
+# Type variables without variance
+T = TypeVar("T")
+T_co = TypeVar("T_co")  # [typevar-name-incorrect-variance]
+T_contra = TypeVar("T_contra")  # [typevar-name-incorrect-variance]
+ScoresT_contra = TypeVar("ScoresT_contra")  # [typevar-name-incorrect-variance]
+
+# Type variables not starting with T
+N = TypeVar("N")
+N_co = TypeVar("N_co", covariant=True)
+N_contra = TypeVar("N_contra", contravariant=True)
+
+# Tests for combinations with contravariance
+CT_co = TypeVar("CT_co", contravariant=True)  # [typevar-name-incorrect-variance]
+CT_contra = TypeVar("CT_contra")  # [typevar-name-incorrect-variance]
+CT_contra = TypeVar("CT_contra", contravariant=True)
+
+# Tests for combinations with covariance
+VT = TypeVar("VT", covariant=True)  # [typevar-name-incorrect-variance]
+VT_contra = TypeVar("VT_contra", covariant=True)  # [typevar-name-incorrect-variance]
+VT_co = TypeVar("VT_co", covariant=True)
+
+# Tests for combinations with bound
+VT = TypeVar("VT", bound=int)
+VT_co = TypeVar("VT_co", bound=int)  # [typevar-name-incorrect-variance]
+VT_contra = TypeVar("VT_contra", bound=int)  # [typevar-name-incorrect-variance]
+
+VT = TypeVar("VT", bound=int, covariant=True)  # [typevar-name-incorrect-variance]
+VT_co = TypeVar("VT_co", bound=int, covariant=True)
+VT_contra = TypeVar(  # [typevar-name-incorrect-variance]
+    "VT_contra", bound=int, covariant=True
+)
+
+VT = TypeVar("VT", bound=int, covariant=False)
+VT_co = TypeVar(  # [typevar-name-incorrect-variance]
+    "VT_co", bound=int, covariant=False
+)
+VT_contra = TypeVar(  # [typevar-name-incorrect-variance]
+    "VT_contra", bound=int, covariant=False
+)
+
+VT = TypeVar("VT", bound=int, contravariant=True)  # [typevar-name-incorrect-variance]
+VT_co = TypeVar(  # [typevar-name-incorrect-variance]
+    "VT_co", bound=int, contravariant=True
+)
+VT_contra = TypeVar("VT_contra", bound=int, contravariant=True)
+
+VT = TypeVar("VT", bound=int, contravariant=False)
+VT_co = TypeVar(  # [typevar-name-incorrect-variance]
+    "VT_co", bound=int, contravariant=False
+)
+VT_contra = TypeVar(  # [typevar-name-incorrect-variance]
+    "VT_contra", bound=int, contravariant=False
+)
+
+# Tests for combinations with tuple assignment
+(
+    VT,  # [typevar-name-incorrect-variance]
+    VT_contra,  # [typevar-name-incorrect-variance]
+) = TypeVar("VT", covariant=True), TypeVar("VT_contra", covariant=True)
+VT_co, VT_contra = TypeVar(  # [typevar-name-incorrect-variance]
+    "VT_co", covariant=True
+), TypeVar("VT_contra", covariant=True)
+VAR, VT_contra = "a string", TypeVar(  # [typevar-name-incorrect-variance]
+    "VT_contra", covariant=True
+)
diff --git a/tests/functional/t/typevar_name_incorrect_variance.txt b/tests/functional/t/typevar_name_incorrect_variance.txt
new file mode 100644
index 0000000000..d4dcfd2f9a
--- /dev/null
+++ b/tests/functional/t/typevar_name_incorrect_variance.txt
@@ -0,0 +1,21 @@
+typevar-name-incorrect-variance:7:0:7:4::"Type variable ""T_co"" is invariant, use ""T"" instead":INFERENCE
+typevar-name-incorrect-variance:8:0:8:8::"Type variable ""T_contra"" is invariant, use ""T"" instead":INFERENCE
+typevar-name-incorrect-variance:9:0:9:14::"Type variable ""ScoresT_contra"" is invariant, use ""ScoresT"" instead":INFERENCE
+typevar-name-incorrect-variance:17:0:17:5::"Type variable ""CT_co"" is contravariant, use ""CT_contra"" instead":INFERENCE
+typevar-name-incorrect-variance:18:0:18:9::"Type variable ""CT_contra"" is invariant, use ""CT"" instead":INFERENCE
+typevar-name-incorrect-variance:22:0:22:2::"Type variable ""VT"" is covariant, use ""VT_co"" instead":INFERENCE
+typevar-name-incorrect-variance:23:0:23:9::"Type variable ""VT_contra"" is covariant, use ""VT_co"" instead":INFERENCE
+typevar-name-incorrect-variance:28:0:28:5::"Type variable ""VT_co"" is invariant, use ""VT"" instead":INFERENCE
+typevar-name-incorrect-variance:29:0:29:9::"Type variable ""VT_contra"" is invariant, use ""VT"" instead":INFERENCE
+typevar-name-incorrect-variance:31:0:31:2::"Type variable ""VT"" is covariant, use ""VT_co"" instead":INFERENCE
+typevar-name-incorrect-variance:33:0:33:9::"Type variable ""VT_contra"" is covariant, use ""VT_co"" instead":INFERENCE
+typevar-name-incorrect-variance:38:0:38:5::"Type variable ""VT_co"" is invariant, use ""VT"" instead":INFERENCE
+typevar-name-incorrect-variance:41:0:41:9::"Type variable ""VT_contra"" is invariant, use ""VT"" instead":INFERENCE
+typevar-name-incorrect-variance:45:0:45:2::"Type variable ""VT"" is contravariant, use ""VT_contra"" instead":INFERENCE
+typevar-name-incorrect-variance:46:0:46:5::"Type variable ""VT_co"" is contravariant, use ""VT_contra"" instead":INFERENCE
+typevar-name-incorrect-variance:52:0:52:5::"Type variable ""VT_co"" is invariant, use ""VT"" instead":INFERENCE
+typevar-name-incorrect-variance:55:0:55:9::"Type variable ""VT_contra"" is invariant, use ""VT"" instead":INFERENCE
+typevar-name-incorrect-variance:61:4:61:6::"Type variable ""VT"" is covariant, use ""VT_co"" instead":INFERENCE
+typevar-name-incorrect-variance:62:4:62:13::"Type variable ""VT_contra"" is covariant, use ""VT_co"" instead":INFERENCE
+typevar-name-incorrect-variance:64:7:64:16::"Type variable ""VT_contra"" is covariant, use ""VT_co"" instead":INFERENCE
+typevar-name-incorrect-variance:67:5:67:14::"Type variable ""VT_contra"" is covariant, use ""VT_co"" instead":INFERENCE
diff --git a/tests/functional/t/typevar_naming_style_default.py b/tests/functional/t/typevar_naming_style_default.py
new file mode 100644
index 0000000000..5841fc28d8
--- /dev/null
+++ b/tests/functional/t/typevar_naming_style_default.py
@@ -0,0 +1,52 @@
+"""Test case for typevar-name-incorrect-variance with default settings"""
+# pylint: disable=too-few-public-methods
+
+from typing import TypeVar
+
+# PascalCase names with prefix
+GoodNameT = TypeVar("GoodNameT")
+_T = TypeVar("_T")
+_GoodNameT = TypeVar("_GoodNameT")
+__GoodNameT = TypeVar("__GoodNameT")
+GoodNameWithoutContra = TypeVar(  # [typevar-name-incorrect-variance]
+    "GoodNameWithoutContra", contravariant=True
+)
+GoodNameT_co = TypeVar("GoodNameT_co", covariant=True)
+GoodNameT_contra = TypeVar("GoodNameT_contra", contravariant=True)
+GoodBoundNameT = TypeVar("GoodBoundNameT", bound=int)
+
+# Some of these will create a RunTime error but serve as a regression test
+T = TypeVar(  # [typevar-name-incorrect-variance]
+    "T", covariant=True, contravariant=True
+)
+T = TypeVar("T", covariant=False, contravariant=False)
+T_co = TypeVar("T_co", covariant=True, contravariant=True)
+T_contra = TypeVar(  # [typevar-name-incorrect-variance]
+    "T_contra", covariant=True, contravariant=True
+)
+T_co = TypeVar("T_co", covariant=True, contravariant=False)
+T_contra = TypeVar("T_contra", covariant=False, contravariant=True)
+
+# PascalCase names without prefix
+AnyStr = TypeVar("AnyStr")
+DeviceTypeT = TypeVar("DeviceTypeT")
+HVACModeT = TypeVar("HVACModeT")
+_IPAddress = TypeVar("_IPAddress")
+CALLABLE_T = TypeVar("CALLABLE_T")  # [invalid-name]
+DeviceType = TypeVar("DeviceType")  # [invalid-name]
+IPAddressU = TypeVar("IPAddressU")  # [invalid-name]
+
+# camelCase names with prefix
+badName = TypeVar("badName")  # [invalid-name]
+badName_co = TypeVar("badName_co", covariant=True)  # [invalid-name]
+badName_contra = TypeVar("badName_contra", contravariant=True)  # [invalid-name]
+
+# PascalCase names with lower letter prefix in tuple assignment
+(
+    a_BadName,  # [invalid-name]
+    a_BadNameWithoutContra,  # [invalid-name, typevar-name-incorrect-variance]
+) = TypeVar("a_BadName"), TypeVar("a_BadNameWithoutContra", contravariant=True)
+GoodName_co, a_BadName_contra = TypeVar(  # [invalid-name]
+    "GoodName_co", covariant=True
+), TypeVar("a_BadName_contra", contravariant=True)
+GoodName_co, VAR = TypeVar("GoodName_co", covariant=True), "a string"
diff --git a/tests/functional/t/typevar_naming_style_default.txt b/tests/functional/t/typevar_naming_style_default.txt
new file mode 100644
index 0000000000..9a3c4d6e08
--- /dev/null
+++ b/tests/functional/t/typevar_naming_style_default.txt
@@ -0,0 +1,13 @@
+typevar-name-incorrect-variance:11:0:11:21::"Type variable ""GoodNameWithoutContra"" is contravariant, use ""GoodNameWithoutContra_contra"" instead":INFERENCE
+typevar-name-incorrect-variance:19:0:19:1::"Type variable ""T"" is covariant, use ""T_co"" instead":INFERENCE
+typevar-name-incorrect-variance:24:0:24:8::"Type variable ""T_contra"" is covariant, use ""T_co"" instead":INFERENCE
+invalid-name:35:0:35:10::"Type variable name ""CALLABLE_T"" doesn't conform to predefined naming style":HIGH
+invalid-name:36:0:36:10::"Type variable name ""DeviceType"" doesn't conform to predefined naming style":HIGH
+invalid-name:37:0:37:10::"Type variable name ""IPAddressU"" doesn't conform to predefined naming style":HIGH
+invalid-name:40:0:40:7::"Type variable name ""badName"" doesn't conform to predefined naming style":HIGH
+invalid-name:41:0:41:10::"Type variable name ""badName_co"" doesn't conform to predefined naming style":HIGH
+invalid-name:42:0:42:14::"Type variable name ""badName_contra"" doesn't conform to predefined naming style":HIGH
+invalid-name:46:4:46:13::"Type variable name ""a_BadName"" doesn't conform to predefined naming style":HIGH
+invalid-name:47:4:47:26::"Type variable name ""a_BadNameWithoutContra"" doesn't conform to predefined naming style":HIGH
+typevar-name-incorrect-variance:47:4:47:26::"Type variable ""a_BadNameWithoutContra"" is contravariant, use ""a_BadNameWithoutContra_contra"" instead":INFERENCE
+invalid-name:49:13:49:29::"Type variable name ""a_BadName_contra"" doesn't conform to predefined naming style":HIGH
diff --git a/tests/functional/t/typevar_naming_style_rgx.py b/tests/functional/t/typevar_naming_style_rgx.py
new file mode 100644
index 0000000000..c08eb9e41d
--- /dev/null
+++ b/tests/functional/t/typevar_naming_style_rgx.py
@@ -0,0 +1,15 @@
+"""Test case for typevar-name-missing-variance with non-default settings"""
+
+from typing import TypeVar
+
+# Name set by regex pattern
+TypeVarsShouldBeLikeThis = TypeVar("TypeVarsShouldBeLikeThis")
+TypeVarsShouldBeLikeThis_contra = TypeVar(
+    "TypeVarsShouldBeLikeThis_contra", contravariant=True
+)
+TypeVarsShouldBeLikeThis_co = TypeVar("TypeVarsShouldBeLikeThis_co", covariant=True)
+
+# Name using the standard style
+GoodNameT = TypeVar("GoodNameT")  # [invalid-name]
+GoodNameT_co = TypeVar("GoodNameT_co", covariant=True)  # [invalid-name]
+GoodNameT_contra = TypeVar("GoodNameT_contra", contravariant=True)  # [invalid-name]
diff --git a/tests/functional/t/typevar_naming_style_rgx.rc b/tests/functional/t/typevar_naming_style_rgx.rc
new file mode 100644
index 0000000000..347da995e9
--- /dev/null
+++ b/tests/functional/t/typevar_naming_style_rgx.rc
@@ -0,0 +1,2 @@
+[BASIC]
+typevar-rgx=TypeVarsShouldBeLikeThis(_co(ntra)?)?$
diff --git a/tests/functional/t/typevar_naming_style_rgx.txt b/tests/functional/t/typevar_naming_style_rgx.txt
new file mode 100644
index 0000000000..0b291bbf37
--- /dev/null
+++ b/tests/functional/t/typevar_naming_style_rgx.txt
@@ -0,0 +1,3 @@
+invalid-name:13:0:13:9::"Type variable name ""GoodNameT"" doesn't conform to 'TypeVarsShouldBeLikeThis(_co(ntra)?)?$' pattern":HIGH
+invalid-name:14:0:14:12::"Type variable name ""GoodNameT_co"" doesn't conform to 'TypeVarsShouldBeLikeThis(_co(ntra)?)?$' pattern":HIGH
+invalid-name:15:0:15:16::"Type variable name ""GoodNameT_contra"" doesn't conform to 'TypeVarsShouldBeLikeThis(_co(ntra)?)?$' pattern":HIGH
diff --git a/tests/functional/t/typing_use.txt b/tests/functional/t/typing_use.txt
index 26d353a526..0007db21d5 100644
--- a/tests/functional/t/typing_use.txt
+++ b/tests/functional/t/typing_use.txt
@@ -1 +1 @@
-function-redefined:21:0:23:18:double_with_docstring:function already defined line 16:UNDEFINED
+function-redefined:21:0:21:25:double_with_docstring:function already defined line 16:UNDEFINED
diff --git a/tests/functional/u/unbalanced_tuple_unpacking.py b/tests/functional/u/unbalanced_tuple_unpacking.py
index ed807c0d7b..a4b72f8a80 100644
--- a/tests/functional/u/unbalanced_tuple_unpacking.py
+++ b/tests/functional/u/unbalanced_tuple_unpacking.py
@@ -1,57 +1,68 @@
 """Check possible unbalanced tuple unpacking """
 from __future__ import absolute_import
-from functional.u.unpacking import unpack
+from typing import NamedTuple
+from functional.u.unpacking.unpacking import unpack
+
+# pylint: disable=missing-class-docstring, missing-function-docstring, using-constant-test, useless-object-inheritance,import-outside-toplevel
 
-# pylint: disable=using-constant-test, useless-object-inheritance,import-outside-toplevel
 
 def do_stuff():
     """This is not right."""
-    first, second = 1, 2, 3 # [unbalanced-tuple-unpacking]
+    first, second = 1, 2, 3  # [unbalanced-tuple-unpacking]
     return first + second
 
+
 def do_stuff1():
     """This is not right."""
-    first, second = [1, 2, 3] # [unbalanced-tuple-unpacking]
+    first, second = [1, 2, 3]  # [unbalanced-tuple-unpacking]
     return first + second
 
+
 def do_stuff2():
     """This is not right."""
-    (first, second) = 1, 2, 3 # [unbalanced-tuple-unpacking]
+    (first, second) = 1, 2, 3  # [unbalanced-tuple-unpacking]
     return first + second
 
+
 def do_stuff3():
     """This is not right."""
     first, second = range(100)
     return first + second
 
+
 def do_stuff4():
-    """ This is right """
+    """This is right"""
     first, second = 1, 2
     return first + second
 
+
 def do_stuff5():
-    """ This is also right """
+    """This is also right"""
     first, second = (1, 2)
     return first + second
 
+
 def do_stuff6():
-    """ This is right """
+    """This is right"""
     (first, second) = (1, 2)
     return first + second
 
+
 def temp():
-    """ This is not weird """
+    """This is not weird"""
     if True:
         return [1, 2]
     return [2, 3, 4]
 
+
 def do_stuff7():
-    """ This is not right, but we're not sure """
+    """This is not right, but we're not sure"""
     first, second = temp()
     return first + second
 
+
 def temp2():
-    """ This is weird, but correct """
+    """This is weird, but correct"""
     if True:
         return (1, 2)
 
@@ -59,30 +70,34 @@ def temp2():
         return (2, 3)
     return (4, 5)
 
+
 def do_stuff8():
-    """ This is correct """
+    """This is correct"""
     first, second = temp2()
     return first + second
 
+
 def do_stuff9():
-    """ This is not correct """
-    first, second = unpack() # [unbalanced-tuple-unpacking]
+    """This is not correct"""
+    first, second = unpack()  # [unbalanced-tuple-unpacking]
     return first + second
 
+
 class UnbalancedUnpacking(object):
-    """ Test unbalanced tuple unpacking in instance attributes. """
+    """Test unbalanced tuple unpacking in instance attributes."""
+
     # pylint: disable=attribute-defined-outside-init, invalid-name, too-few-public-methods
     def test(self):
-        """ unpacking in instance attributes """
+        """unpacking in instance attributes"""
         # we're not sure if temp() returns two or three values
         # so we shouldn't emit an error
         self.a, self.b = temp()
         self.a, self.b = temp2()
-        self.a, self.b = unpack() # [unbalanced-tuple-unpacking]
+        self.a, self.b = unpack()  # [unbalanced-tuple-unpacking]
 
 
 def issue329(*args):
-    """ Don't emit unbalanced tuple unpacking if the
+    """Don't emit unbalanced tuple unpacking if the
     rhs of the assignment is a variable-length argument,
     because we don't know the actual length of the tuple.
     """
@@ -96,6 +111,7 @@ def test_decimal():
     See astroid https://bitbucket.org/logilab/astroid/issues/92/
     """
     from decimal import Decimal
+
     dec = Decimal(2)
     first, second, third = dec.as_tuple()
     return first, second, third
@@ -104,5 +120,43 @@ def test_decimal():
 def test_issue_559():
     """Test that we don't have a false positive wrt to issue #559."""
     from ctypes import c_int
+
     root_x, root_y, win_x, win_y = [c_int()] * 4
     return root_x, root_y, win_x, win_y
+
+
+class MyClass(NamedTuple):
+    first: float
+    second: float
+    third: float = 1.0
+
+    def my_sum(self):
+        """Unpack 3 variables"""
+        first, second, third = self
+        return first + second + third
+
+    def sum_unpack_3_into_4(self):
+        """Attempt to unpack 3 variables into 4"""
+        first, second, third, fourth = self  # [unbalanced-tuple-unpacking]
+        return first + second + third + fourth
+
+    def sum_unpack_3_into_2(self):
+        """Attempt to unpack 3 variables into 2"""
+        first, second = self  # [unbalanced-tuple-unpacking]
+        return first + second
+
+
+def my_function(mystring):
+    """The number of items on the right-hand-side of the assignment to this function is not known"""
+    mylist = []
+    for item in mystring:
+        mylist.append(item)
+    return mylist
+
+
+a, b = my_function("12")  # [unbalanced-tuple-unpacking]
+c = my_function("12")
+d, *_ = my_function("12")
+
+# https://github.com/PyCQA/pylint/issues/5998
+x, y, z = (1, 2)  # [unbalanced-tuple-unpacking]
diff --git a/tests/functional/u/unbalanced_tuple_unpacking.txt b/tests/functional/u/unbalanced_tuple_unpacking.txt
index 20aa5f40f8..e320698477 100644
--- a/tests/functional/u/unbalanced_tuple_unpacking.txt
+++ b/tests/functional/u/unbalanced_tuple_unpacking.txt
@@ -1,5 +1,9 @@
-unbalanced-tuple-unpacking:9:4:9:27:do_stuff:"Possible unbalanced tuple unpacking with sequence (1, 2, 3): left side has 2 label(s), right side has 3 value(s)":UNDEFINED
-unbalanced-tuple-unpacking:14:4:14:29:do_stuff1:"Possible unbalanced tuple unpacking with sequence [1, 2, 3]: left side has 2 label(s), right side has 3 value(s)":UNDEFINED
-unbalanced-tuple-unpacking:19:4:19:29:do_stuff2:"Possible unbalanced tuple unpacking with sequence (1, 2, 3): left side has 2 label(s), right side has 3 value(s)":UNDEFINED
-unbalanced-tuple-unpacking:69:4:69:28:do_stuff9:"Possible unbalanced tuple unpacking with sequence defined at line 7 of functional.u.unpacking: left side has 2 label(s), right side has 3 value(s)":UNDEFINED
-unbalanced-tuple-unpacking:81:8:81:33:UnbalancedUnpacking.test:"Possible unbalanced tuple unpacking with sequence defined at line 7 of functional.u.unpacking: left side has 2 label(s), right side has 3 value(s)":UNDEFINED
+unbalanced-tuple-unpacking:11:4:11:27:do_stuff:"Possible unbalanced tuple unpacking with sequence (1, 2, 3): left side has 2 label(s), right side has 3 value(s)":UNDEFINED
+unbalanced-tuple-unpacking:17:4:17:29:do_stuff1:"Possible unbalanced tuple unpacking with sequence [1, 2, 3]: left side has 2 label(s), right side has 3 value(s)":UNDEFINED
+unbalanced-tuple-unpacking:23:4:23:29:do_stuff2:"Possible unbalanced tuple unpacking with sequence (1, 2, 3): left side has 2 label(s), right side has 3 value(s)":UNDEFINED
+unbalanced-tuple-unpacking:82:4:82:28:do_stuff9:"Possible unbalanced tuple unpacking with sequence defined at line 7 of functional.u.unpacking.unpacking: left side has 2 label(s), right side has 3 value(s)":UNDEFINED
+unbalanced-tuple-unpacking:96:8:96:33:UnbalancedUnpacking.test:"Possible unbalanced tuple unpacking with sequence defined at line 7 of functional.u.unpacking.unpacking: left side has 2 label(s), right side has 3 value(s)":UNDEFINED
+unbalanced-tuple-unpacking:140:8:140:43:MyClass.sum_unpack_3_into_4:"Possible unbalanced tuple unpacking with sequence defined at line 128: left side has 4 label(s), right side has 3 value(s)":UNDEFINED
+unbalanced-tuple-unpacking:145:8:145:28:MyClass.sum_unpack_3_into_2:"Possible unbalanced tuple unpacking with sequence defined at line 128: left side has 2 label(s), right side has 3 value(s)":UNDEFINED
+unbalanced-tuple-unpacking:157:0:157:24::"Possible unbalanced tuple unpacking with sequence defined at line 151: left side has 2 label(s), right side has 0 value(s)":UNDEFINED
+unbalanced-tuple-unpacking:162:0:162:16::"Possible unbalanced tuple unpacking with sequence (1, 2): left side has 3 label(s), right side has 2 value(s)":UNDEFINED
diff --git a/tests/functional/u/undefined/undefined_variable.py b/tests/functional/u/undefined/undefined_variable.py
index f4f22e5238..22595b42c7 100644
--- a/tests/functional/u/undefined/undefined_variable.py
+++ b/tests/functional/u/undefined/undefined_variable.py
@@ -4,7 +4,7 @@
 from __future__ import print_function
 
 # pylint: disable=wrong-import-position
-from typing import TYPE_CHECKING, List
+from typing import TYPE_CHECKING
 
 DEFINED = 1
 
@@ -35,7 +35,7 @@ def bad_default(var, default=unknown2):  # [undefined-variable]
 LMBD2 = lambda x, y: x+z  # [undefined-variable]
 
 try:
-    POUET # don't catch me
+    POUET # [used-before-assignment]
 except NameError:
     POUET = 'something'
 
@@ -45,7 +45,7 @@ def bad_default(var, default=unknown2):  # [undefined-variable]
     POUETT = 'something'
 
 try:
-    POUETTT # don't catch me
+    POUETTT # [used-before-assignment]
 except: # pylint:disable = bare-except
     POUETTT = 'something'
 
@@ -133,7 +133,7 @@ class Ancestor1(object):
     """ No op """
 
 NANA = BAT # [undefined-variable]
-del BAT
+del BAT  # [undefined-variable]
 
 
 class KeywordArgument(object):
@@ -340,40 +340,6 @@ def decorated4(x):
     from types import GenericAlias
     object().__class_getitem__ = classmethod(GenericAlias)
 
-# Tests for annotation of variables and potentially undefinition
-
-def value_and_type_assignment():
-    """The variable assigned a value and type"""
-    variable: int = 2
-    print(variable)
-
-
-def only_type_assignment():
-    """The variable never gets assigned a value"""
-    variable: int
-    print(variable)  # [undefined-variable]
-
-
-def both_type_and_value_assignment():
-    """The variable first gets a type and subsequently a value"""
-    variable: int
-    variable = 1
-    print(variable)
-
-
-def value_assignment_after_access():
-    """The variable gets a value after it has been accessed"""
-    variable: int
-    print(variable)  # [undefined-variable]
-    variable = 1
-
-
-def value_assignment_from_iterator():
-    """The variables gets a value from an iterator"""
-    variable: int
-    for variable in (1, 2):
-        print(variable)
-
 
 GLOBAL_VAR: int
 GLOBAL_VAR_TWO: int
@@ -392,36 +358,10 @@ def global_var_mixed_assignment():
 GLOBAL_VAR_TWO: int
 
 
-def assignment_in_comprehension():
-    """A previously typed variables gets used in a comprehension. Don't crash!"""
-    some_list: List[int]
-    some_list = [1, 2, 3]
-    some_list = [i * 2 for i in some_list]
-
-
-def decorator_returning_function():
-    """A decorator that returns a wrapper function with decoupled typing"""
-    def wrapper_with_decoupled_typing():
-        print(var)
-
-    var: int
-    var = 2
-    return wrapper_with_decoupled_typing
-
-
-def decorator_returning_incorrect_function():
-    """A decorator that returns a wrapper function with decoupled typing"""
-    def wrapper_with_type_and_no_value():
-        print(var) # [undefined-variable]
-
-    var: int
-    return wrapper_with_type_and_no_value
-
-
-def typing_and_value_assignment_with_tuple_assignment():
-    """The typed variables get assigned with a tuple assignment"""
-    var_one: int
-    var_two: int
-    var_one, var_two = 1, 1
-    print(var_one)
-    print(var_two)
+class RepeatedReturnAnnotations:
+    def x(self, o: RepeatedReturnAnnotations) -> bool:  # [undefined-variable]
+        pass
+    def y(self) -> RepeatedReturnAnnotations:  # [undefined-variable]
+        pass
+    def z(self) -> RepeatedReturnAnnotations:  # [undefined-variable]
+        pass
diff --git a/tests/functional/u/undefined/undefined_variable.txt b/tests/functional/u/undefined/undefined_variable.txt
index c5a70f7a76..74ec800885 100644
--- a/tests/functional/u/undefined/undefined_variable.txt
+++ b/tests/functional/u/undefined/undefined_variable.txt
@@ -8,29 +8,32 @@ undefined-variable:31:4:31:10:bad_default:Undefined variable 'augvar':UNDEFINED
 undefined-variable:32:8:32:14:bad_default:Undefined variable 'vardel':UNDEFINED
 undefined-variable:34:19:34:31:<lambda>:Undefined variable 'doesnotexist':UNDEFINED
 undefined-variable:35:23:35:24:<lambda>:Undefined variable 'z':UNDEFINED
-used-before-assignment:43:4:43:10::Using variable 'POUETT' before assignment:UNDEFINED
-used-before-assignment:56:4:56:9::Using variable 'PLOUF' before assignment:UNDEFINED
-used-before-assignment:65:11:65:14:if_branch_test:Using variable 'xxx' before assignment:UNDEFINED
-used-before-assignment:91:23:91:32:test_arguments:Using variable 'TestClass' before assignment:UNDEFINED
-used-before-assignment:95:16:95:24:TestClass:Using variable 'Ancestor' before assignment:UNDEFINED
-used-before-assignment:98:26:98:35:TestClass.MissingAncestor:Using variable 'Ancestor1' before assignment:UNDEFINED
-used-before-assignment:105:36:105:41:TestClass.test1.UsingBeforeDefinition:Using variable 'Empty' before assignment:UNDEFINED
+used-before-assignment:38:4:38:9::Using variable 'POUET' before assignment:CONTROL_FLOW
+used-before-assignment:43:4:43:10::Using variable 'POUETT' before assignment:CONTROL_FLOW
+used-before-assignment:48:4:48:11::Using variable 'POUETTT' before assignment:CONTROL_FLOW
+used-before-assignment:56:4:56:9::Using variable 'PLOUF' before assignment:CONTROL_FLOW
+used-before-assignment:65:11:65:14:if_branch_test:Using variable 'xxx' before assignment:HIGH
+used-before-assignment:91:23:91:32:test_arguments:Using variable 'TestClass' before assignment:HIGH
+used-before-assignment:95:16:95:24:TestClass:Using variable 'Ancestor' before assignment:HIGH
+used-before-assignment:98:26:98:35:TestClass.MissingAncestor:Using variable 'Ancestor1' before assignment:HIGH
+used-before-assignment:105:36:105:41:TestClass.test1.UsingBeforeDefinition:Using variable 'Empty' before assignment:HIGH
 undefined-variable:119:10:119:14:Self:Undefined variable 'Self':UNDEFINED
 undefined-variable:135:7:135:10::Undefined variable 'BAT':UNDEFINED
-used-before-assignment:146:31:146:38:KeywordArgument.test1:Using variable 'enabled' before assignment:UNDEFINED
+undefined-variable:136:4:136:7::Undefined variable 'BAT':UNDEFINED
+used-before-assignment:146:31:146:38:KeywordArgument.test1:Using variable 'enabled' before assignment:HIGH
 undefined-variable:149:32:149:40:KeywordArgument.test2:Undefined variable 'disabled':UNDEFINED
 undefined-variable:154:22:154:25:KeywordArgument.<lambda>:Undefined variable 'arg':UNDEFINED
 undefined-variable:166:4:166:13::Undefined variable 'unicode_2':UNDEFINED
 undefined-variable:171:4:171:13::Undefined variable 'unicode_3':UNDEFINED
 undefined-variable:226:25:226:37:LambdaClass4.<lambda>:Undefined variable 'LambdaClass4':UNDEFINED
 undefined-variable:234:25:234:37:LambdaClass5.<lambda>:Undefined variable 'LambdaClass5':UNDEFINED
-used-before-assignment:255:26:255:34:func_should_fail:Using variable 'datetime' before assignment:UNDEFINED
+used-before-assignment:255:26:255:34:func_should_fail:Using variable 'datetime' before assignment:HIGH
 undefined-variable:282:18:282:24:not_using_loop_variable_accordingly:Undefined variable 'iteree':UNDEFINED
 undefined-variable:293:27:293:28:undefined_annotation:Undefined variable 'x':UNDEFINED
-used-before-assignment:294:7:294:8:undefined_annotation:Using variable 'x' before assignment:UNDEFINED
+used-before-assignment:294:7:294:8:undefined_annotation:Using variable 'x' before assignment:HIGH
 undefined-variable:324:11:324:12:decorated3:Undefined variable 'x':UNDEFINED
 undefined-variable:329:19:329:20:decorated4:Undefined variable 'y':UNDEFINED
-undefined-variable:354:10:354:18:only_type_assignment:Undefined variable 'variable':UNDEFINED
-undefined-variable:367:10:367:18:value_assignment_after_access:Undefined variable 'variable':UNDEFINED
-undefined-variable:384:10:384:20:global_var_mixed_assignment:Undefined variable 'GLOBAL_VAR':UNDEFINED
-undefined-variable:415:14:415:17:decorator_returning_incorrect_function.wrapper_with_type_and_no_value:Undefined variable 'var':UNDEFINED
+undefined-variable:350:10:350:20:global_var_mixed_assignment:Undefined variable 'GLOBAL_VAR':HIGH
+undefined-variable:362:19:362:44:RepeatedReturnAnnotations.x:Undefined variable 'RepeatedReturnAnnotations':UNDEFINED
+undefined-variable:364:19:364:44:RepeatedReturnAnnotations.y:Undefined variable 'RepeatedReturnAnnotations':UNDEFINED
+undefined-variable:366:19:366:44:RepeatedReturnAnnotations.z:Undefined variable 'RepeatedReturnAnnotations':UNDEFINED
diff --git a/tests/functional/u/undefined/undefined_variable_py30.txt b/tests/functional/u/undefined/undefined_variable_py30.txt
index 364b5a1487..31c1ef9f49 100644
--- a/tests/functional/u/undefined/undefined_variable_py30.txt
+++ b/tests/functional/u/undefined/undefined_variable_py30.txt
@@ -4,7 +4,7 @@ undefined-variable:36:25:36:28:Undefined1.InnerScope.test1:Undefined variable 'A
 undefined-variable:51:28:51:32:FalsePositive342.test_bad:Undefined variable 'trop':UNDEFINED
 undefined-variable:54:31:54:36:FalsePositive342.test_bad1:Undefined variable 'trop1':UNDEFINED
 undefined-variable:57:31:57:36:FalsePositive342.test_bad2:Undefined variable 'trop2':UNDEFINED
-undefined-variable:63:0:64:27:Bad:Undefined variable 'ABCMet':UNDEFINED
-undefined-variable:66:0:67:35:SecondBad:Undefined variable 'ab':UNDEFINED
+undefined-variable:63:0:63:9:Bad:Undefined variable 'ABCMet':UNDEFINED
+undefined-variable:66:0:66:15:SecondBad:Undefined variable 'ab':UNDEFINED
 undefined-variable:97:53:97:61:InheritingClass:Undefined variable 'variable':UNDEFINED
-undefined-variable:103:0:104:8:Inheritor:Undefined variable 'DefinedTooLate':UNDEFINED
+undefined-variable:103:0:103:15:Inheritor:Undefined variable 'DefinedTooLate':UNDEFINED
diff --git a/tests/functional/u/undefined/undefined_variable_py38.py b/tests/functional/u/undefined/undefined_variable_py38.py
index 3c00bfd854..93ba1eb2ba 100644
--- a/tests/functional/u/undefined/undefined_variable_py38.py
+++ b/tests/functional/u/undefined/undefined_variable_py38.py
@@ -11,10 +11,10 @@ def typing_and_assignment_expression():
         print(var)
 
 
-def typing_and_self_referncing_assignment_expression():
+def typing_and_self_referencing_assignment_expression():
     """The variable gets assigned in an assignment expression that references itself"""
     var: int
-    if (var := var ** 2): # [undefined-variable]
+    if (var := var ** 2):  # false negative: https://github.com/PyCQA/pylint/issues/5653
         print(var)
 
 
@@ -97,3 +97,75 @@ def no_parameters_in_function_default() -> None:
 COMPREHENSION_FIVE = {i: (else_assign_2 := i) if False else 0 for i in range(10)}
 
 print(else_assign_2)  # [undefined-variable]
+
+
+# Tests for assignment expressions in lambda statements
+
+things = []
+sorted_things = sorted(
+    things,
+    key=lambda thing: x_0
+    if (x_0 := thing.this_value) < (x_1 := thing.that_value)
+    else x_1,
+)
+
+
+# Tests for type annotation reused in comprehension
+
+def type_annotation_used_after_comprehension():
+    """https://github.com/PyCQA/pylint/issues/5326#issuecomment-982635371"""
+    my_int: int
+    ints = [my_int + 1 for my_int in range(5)]
+
+    for my_int in ints:
+        print(my_int)
+
+
+def type_annotation_unused_after_comprehension():
+    """https://github.com/PyCQA/pylint/issues/5326"""
+    my_int: int
+    _ = [print(sep=my_int, end=my_int) for my_int in range(10)]
+
+
+def type_annotation_used_improperly_after_comprehension():
+    """https://github.com/PyCQA/pylint/issues/5654"""
+    my_int: int
+    _ = [print(sep=my_int, end=my_int) for my_int in range(10)]
+    print(my_int)  # [used-before-assignment]
+
+
+def type_annotation_used_improperly_after_comprehension_2():
+    """Same case as above but with positional arguments"""
+    my_int: int
+    _ = [print(my_int, my_int) for my_int in range(10)]
+    print(my_int)  # [used-before-assignment]
+
+
+# Tests for named expressions (walrus operator)
+
+# Expression in ternary operator: positional argument
+print(sep=colon if (colon := ":") else None)
+
+
+class Dummy:
+    """Expression in ternary operator: keyword argument"""
+    # pylint: disable=too-few-public-methods
+    def __init__(self, value):
+        self.value = value
+
+
+dummy = Dummy(value=val if (val := 'something') else 'anything')
+
+def expression_in_ternary_operator_inside_container():
+    """Named expression in ternary operator: inside container"""
+    return [val2 if (val2 := 'something') else 'anything']
+
+
+def expression_in_ternary_operator_inside_container_tuple():
+    """Same case, using a tuple inside a 1-element list"""
+    return [(val3, val3) if (val3 := 'something') else 'anything']
+
+
+def expression_in_ternary_operator_inside_container_wrong_position():
+    """2-element list where named expression comes too late"""
+    return [val3, val3 if (val3 := 'something') else 'anything']  # [used-before-assignment]
diff --git a/tests/functional/u/undefined/undefined_variable_py38.txt b/tests/functional/u/undefined/undefined_variable_py38.txt
index 6d7035ee11..e912cbbf98 100644
--- a/tests/functional/u/undefined/undefined_variable_py38.txt
+++ b/tests/functional/u/undefined/undefined_variable_py38.txt
@@ -1,5 +1,7 @@
-undefined-variable:17:15:17:18:typing_and_self_referncing_assignment_expression:Undefined variable 'var':UNDEFINED
 undefined-variable:42:6:42:16::Undefined variable 'no_default':UNDEFINED
 undefined-variable:50:6:50:22::Undefined variable 'again_no_default':UNDEFINED
-undefined-variable:76:6:76:19::Undefined variable 'else_assign_1':UNDEFINED
-undefined-variable:99:6:99:19::Undefined variable 'else_assign_2':UNDEFINED
+undefined-variable:76:6:76:19::Undefined variable 'else_assign_1':INFERENCE
+undefined-variable:99:6:99:19::Undefined variable 'else_assign_2':INFERENCE
+used-before-assignment:134:10:134:16:type_annotation_used_improperly_after_comprehension:Using variable 'my_int' before assignment:HIGH
+used-before-assignment:141:10:141:16:type_annotation_used_improperly_after_comprehension_2:Using variable 'my_int' before assignment:HIGH
+used-before-assignment:171:12:171:16:expression_in_ternary_operator_inside_container_wrong_position:Using variable 'val3' before assignment:HIGH
diff --git a/tests/functional/u/unexpected_keyword_arg.py b/tests/functional/u/unexpected_keyword_arg.py
new file mode 100644
index 0000000000..e7b648899e
--- /dev/null
+++ b/tests/functional/u/unexpected_keyword_arg.py
@@ -0,0 +1,118 @@
+"""Tests for unexpected-keyword-arg"""
+# pylint: disable=undefined-variable, too-few-public-methods, missing-function-docstring, missing-class-docstring
+
+
+def non_param_decorator(func):
+    """Decorator without a parameter"""
+
+    def new_func():
+        func()
+
+    return new_func
+
+
+def param_decorator(func):
+    """Decorator with a parameter"""
+
+    def new_func(internal_arg=3):
+        func(junk=internal_arg)
+
+    return new_func
+
+
+def kwargs_decorator(func):
+    """Decorator with kwargs.
+    The if ... else makes the double decoration with param_decorator valid.
+    """
+
+    def new_func(**kwargs):
+        if "internal_arg" in kwargs:
+            func(junk=kwargs["internal_arg"])
+        else:
+            func(junk=kwargs["junk"])
+
+    return new_func
+
+
+@non_param_decorator
+def do_something(junk=None):
+    """A decorated function. This should not be passed a keyword argument"""
+    print(junk)
+
+
+do_something(internal_arg=2)  # [unexpected-keyword-arg]
+
+
+@param_decorator
+def do_something_decorated(junk=None):
+    """A decorated function. This should be passed a keyword argument"""
+    print(junk)
+
+
+do_something_decorated(internal_arg=2)
+
+
+@kwargs_decorator
+def do_something_decorated_too(junk=None):
+    """A decorated function. This should be passed a keyword argument"""
+    print(junk)
+
+
+do_something_decorated_too(internal_arg=2)
+
+
+@non_param_decorator
+@kwargs_decorator
+def do_something_double_decorated(junk=None):
+    """A decorated function. This should not be passed a keyword argument.
+    non_param_decorator will raise an exception if a keyword argument is passed.
+    """
+    print(junk)
+
+
+do_something_double_decorated(internal_arg=2)  # [unexpected-keyword-arg]
+
+
+@param_decorator
+@kwargs_decorator
+def do_something_double_decorated_correct(junk=None):
+    """A decorated function. This should be passed a keyword argument"""
+    print(junk)
+
+
+do_something_double_decorated_correct(internal_arg=2)
+
+
+# Test that we don't crash on Class decoration
+class DecoratorClass:
+    pass
+
+
+@DecoratorClass
+def crash_test():
+    pass
+
+
+crash_test(internal_arg=2)  # [unexpected-keyword-arg]
+
+
+# Test that we don't emit a false positive for uninferable decorators
+@unknown_decorator
+def crash_test_two():
+    pass
+
+
+crash_test_two(internal_arg=2)
+
+
+# Test that we don't crash on decorators that don't return anything
+def no_return_decorator(func):
+    print(func)
+
+
+@no_return_decorator
+def test_no_return():
+    pass
+
+
+test_no_return(internal_arg=2)  # [unexpected-keyword-arg]
diff --git a/tests/functional/u/unexpected_keyword_arg.txt b/tests/functional/u/unexpected_keyword_arg.txt
new file mode 100644
index 0000000000..3cc968e883
--- /dev/null
+++ b/tests/functional/u/unexpected_keyword_arg.txt
@@ -0,0 +1,4 @@
+unexpected-keyword-arg:43:0:43:28::Unexpected keyword argument 'internal_arg' in function call:UNDEFINED
+unexpected-keyword-arg:73:0:73:45::Unexpected keyword argument 'internal_arg' in function call:UNDEFINED
+unexpected-keyword-arg:96:0:96:26::Unexpected keyword argument 'internal_arg' in function call:UNDEFINED
+unexpected-keyword-arg:118:0:118:30::Unexpected keyword argument 'internal_arg' in function call:UNDEFINED
diff --git a/tests/functional/u/unexpected_special_method_signature.py b/tests/functional/u/unexpected_special_method_signature.py
index aba6811b92..e4d14bc489 100644
--- a/tests/functional/u/unexpected_special_method_signature.py
+++ b/tests/functional/u/unexpected_special_method_signature.py
@@ -30,6 +30,12 @@ def __iter__(): # [no-method-argument]
     def __getattr__(self, nanana): # [unexpected-special-method-signature]
         pass
 
+    def __subclasses__(self, blabla):  # [unexpected-special-method-signature]
+        pass
+
+    @classmethod
+    def __init_subclass__(cls, blabla):  # [unexpected-special-method-signature]
+        pass
 
 class FirstBadContextManager(object):
     def __enter__(self):
diff --git a/tests/functional/u/unexpected_special_method_signature.txt b/tests/functional/u/unexpected_special_method_signature.txt
index 9751b6447e..072e78b83f 100644
--- a/tests/functional/u/unexpected_special_method_signature.txt
+++ b/tests/functional/u/unexpected_special_method_signature.txt
@@ -1,16 +1,18 @@
-unexpected-special-method-signature:8:4:9:12:Invalid.__enter__:The special method '__enter__' expects 0 param(s), 1 was given:UNDEFINED
-unexpected-special-method-signature:11:4:12:12:Invalid.__del__:The special method '__del__' expects 0 param(s), 1 was given:UNDEFINED
-unexpected-special-method-signature:14:4:15:12:Invalid.__format__:The special method '__format__' expects 1 param(s), 2 were given:UNDEFINED
-unexpected-special-method-signature:17:4:18:12:Invalid.__setattr__:The special method '__setattr__' expects 2 param(s), 0 was given:UNDEFINED
-unexpected-special-method-signature:20:4:21:12:Invalid.__round__:The special method '__round__' expects between 0 or 1 param(s), 2 were given:UNDEFINED
-unexpected-special-method-signature:23:4:24:12:Invalid.__deepcopy__:The special method '__deepcopy__' expects 1 param(s), 2 were given:UNDEFINED
-no-method-argument:26:4:27:12:Invalid.__iter__:Method has no argument:UNDEFINED
-unexpected-special-method-signature:30:4:31:12:Invalid.__getattr__:The special method '__getattr__' expects 1 param(s), 2 were given:UNDEFINED
-unexpected-special-method-signature:37:4:38:12:FirstBadContextManager.__exit__:The special method '__exit__' expects 3 param(s), 1 was given:UNDEFINED
-unexpected-special-method-signature:43:4:44:12:SecondBadContextManager.__exit__:The special method '__exit__' expects 3 param(s), 4 were given:UNDEFINED
-unexpected-special-method-signature:51:4:52:12:ThirdBadContextManager.__exit__:The special method '__exit__' expects 3 param(s), 4 were given:UNDEFINED
-unexpected-special-method-signature:57:4:58:12:Async.__aiter__:The special method '__aiter__' expects 0 param(s), 1 was given:UNDEFINED
-unexpected-special-method-signature:59:4:60:12:Async.__anext__:The special method '__anext__' expects 0 param(s), 2 were given:UNDEFINED
-unexpected-special-method-signature:61:4:62:12:Async.__await__:The special method '__await__' expects 0 param(s), 1 was given:UNDEFINED
-unexpected-special-method-signature:63:4:64:12:Async.__aenter__:The special method '__aenter__' expects 0 param(s), 1 was given:UNDEFINED
-unexpected-special-method-signature:65:4:66:12:Async.__aexit__:The special method '__aexit__' expects 3 param(s), 0 was given:UNDEFINED
+unexpected-special-method-signature:8:4:8:17:Invalid.__enter__:The special method '__enter__' expects 0 param(s), 1 was given:UNDEFINED
+unexpected-special-method-signature:11:4:11:15:Invalid.__del__:The special method '__del__' expects 0 param(s), 1 was given:UNDEFINED
+unexpected-special-method-signature:14:4:14:18:Invalid.__format__:The special method '__format__' expects 1 param(s), 2 were given:UNDEFINED
+unexpected-special-method-signature:17:4:17:19:Invalid.__setattr__:The special method '__setattr__' expects 2 param(s), 0 was given:UNDEFINED
+unexpected-special-method-signature:20:4:20:17:Invalid.__round__:The special method '__round__' expects between 0 or 1 param(s), 2 were given:UNDEFINED
+unexpected-special-method-signature:23:4:23:20:Invalid.__deepcopy__:The special method '__deepcopy__' expects 1 param(s), 2 were given:UNDEFINED
+no-method-argument:26:4:26:16:Invalid.__iter__:Method has no argument:UNDEFINED
+unexpected-special-method-signature:30:4:30:19:Invalid.__getattr__:The special method '__getattr__' expects 1 param(s), 2 were given:UNDEFINED
+unexpected-special-method-signature:33:4:33:22:Invalid.__subclasses__:The special method '__subclasses__' expects 0 param(s), 1 was given:UNDEFINED
+unexpected-special-method-signature:37:4:37:25:Invalid.__init_subclass__:The special method '__init_subclass__' expects 0 param(s), 1 was given:UNDEFINED
+unexpected-special-method-signature:43:4:43:16:FirstBadContextManager.__exit__:The special method '__exit__' expects 3 param(s), 1 was given:UNDEFINED
+unexpected-special-method-signature:49:4:49:16:SecondBadContextManager.__exit__:The special method '__exit__' expects 3 param(s), 4 were given:UNDEFINED
+unexpected-special-method-signature:57:4:57:16:ThirdBadContextManager.__exit__:The special method '__exit__' expects 3 param(s), 4 were given:UNDEFINED
+unexpected-special-method-signature:63:4:63:17:Async.__aiter__:The special method '__aiter__' expects 0 param(s), 1 was given:UNDEFINED
+unexpected-special-method-signature:65:4:65:17:Async.__anext__:The special method '__anext__' expects 0 param(s), 2 were given:UNDEFINED
+unexpected-special-method-signature:67:4:67:17:Async.__await__:The special method '__await__' expects 0 param(s), 1 was given:UNDEFINED
+unexpected-special-method-signature:69:4:69:18:Async.__aenter__:The special method '__aenter__' expects 0 param(s), 1 was given:UNDEFINED
+unexpected-special-method-signature:71:4:71:17:Async.__aexit__:The special method '__aexit__' expects 3 param(s), 0 was given:UNDEFINED
diff --git a/tests/functional/u/ungrouped_imports_suppression.py b/tests/functional/u/ungrouped_imports_suppression.py
new file mode 100644
index 0000000000..9b482b355a
--- /dev/null
+++ b/tests/functional/u/ungrouped_imports_suppression.py
@@ -0,0 +1,15 @@
+"""Check ungrouped import and interaction with useless-suppression.
+
+Previously disabling ungrouped-imports would always lead to useless-suppression.
+"""
+# pylint: enable=useless-suppression
+# pylint: disable=unused-import, wrong-import-order
+
+import logging.config
+import os.path
+from astroid import are_exclusive  # pylint: disable=ungrouped-imports # [useless-suppression]
+import logging.handlers  # pylint: disable=ungrouped-imports # This should not raise useless-suppression
+try:
+    import os  # [ungrouped-imports]
+except ImportError:
+    pass
diff --git a/tests/functional/u/ungrouped_imports_suppression.txt b/tests/functional/u/ungrouped_imports_suppression.txt
new file mode 100644
index 0000000000..3ba8b0ea0f
--- /dev/null
+++ b/tests/functional/u/ungrouped_imports_suppression.txt
@@ -0,0 +1,2 @@
+useless-suppression:10:0:None:None::Useless suppression of 'ungrouped-imports':UNDEFINED
+ungrouped-imports:13:4:13:13::Imports from package os are not grouped:UNDEFINED
diff --git a/tests/functional/u/unicode/unicode_bidi_commenting_out.py b/tests/functional/u/unicode/unicode_bidi_commenting_out.py
new file mode 100644
index 0000000000..f5a1275fd9
--- /dev/null
+++ b/tests/functional/u/unicode/unicode_bidi_commenting_out.py
@@ -0,0 +1,12 @@
+"""
+Example #1 of trojan unicode, see https://trojansource.codes/
+Taken from https://github.com/nickboucher/trojan-source/tree/main/Python
+"""
+
+
+def a_function():
+    """A simple function"""
+    access_level = "user"
+    # +1: [bidirectional-unicode]
+    if access_level != "none‮⁦":  # Check if admin ⁩⁦' and access_level != 'user
+        print("You are an admin.")
diff --git a/tests/functional/u/unicode/unicode_bidi_commenting_out.txt b/tests/functional/u/unicode/unicode_bidi_commenting_out.txt
new file mode 100644
index 0000000000..7c1d4f4289
--- /dev/null
+++ b/tests/functional/u/unicode/unicode_bidi_commenting_out.txt
@@ -0,0 +1 @@
+bidirectional-unicode:11:0:11:80::Contains control characters that can permit obfuscated code executed differently than displayed:HIGH
diff --git a/tests/functional/u/unicode/unicode_bidi_early_return.py b/tests/functional/u/unicode/unicode_bidi_early_return.py
new file mode 100644
index 0000000000..1de7a50406
--- /dev/null
+++ b/tests/functional/u/unicode/unicode_bidi_early_return.py
@@ -0,0 +1,19 @@
+"""
+Example #2 of trojan unicode, see https://trojansource.codes/
+Taken from https://github.com/nickboucher/trojan-source/tree/main/Python
+"""
+# pylint: disable=unreachable
+
+bank = {"alice": 100}
+
+# +4: [bidirectional-unicode]
+
+
+def subtract_funds(account: str, amount: int):
+    """Subtract funds from bank account then ⁧"""
+    return
+    bank[account] -= amount
+    return
+
+
+subtract_funds("alice", 50)
diff --git a/tests/functional/u/unicode/unicode_bidi_early_return.txt b/tests/functional/u/unicode/unicode_bidi_early_return.txt
new file mode 100644
index 0000000000..576edc887f
--- /dev/null
+++ b/tests/functional/u/unicode/unicode_bidi_early_return.txt
@@ -0,0 +1 @@
+bidirectional-unicode:13:0:13:49::Contains control characters that can permit obfuscated code executed differently than displayed:HIGH
diff --git a/tests/functional/u/unicode/unicode_bidi_pep672.py b/tests/functional/u/unicode/unicode_bidi_pep672.py
new file mode 100644
index 0000000000..710167c093
--- /dev/null
+++ b/tests/functional/u/unicode/unicode_bidi_pep672.py
@@ -0,0 +1,8 @@
+"""
+Example of trojan unicode, see https://trojansource.codes/
+This example was taken from PEP672
+"""
+# pylint: disable=invalid-name
+
+# +1: [bidirectional-unicode]
+example = "x‏" * 100  #    "‏x" is assigned
diff --git a/tests/functional/u/unicode/unicode_bidi_pep672.txt b/tests/functional/u/unicode/unicode_bidi_pep672.txt
new file mode 100644
index 0000000000..c4d3dcf5c9
--- /dev/null
+++ b/tests/functional/u/unicode/unicode_bidi_pep672.txt
@@ -0,0 +1 @@
+bidirectional-unicode:8:0:8:43::Contains control characters that can permit obfuscated code executed differently than displayed:HIGH
diff --git a/tests/functional/u/unnecessary/unnecessary_comprehension.py b/tests/functional/u/unnecessary/unnecessary_comprehension.py
index 3d76f6e66c..2647898c90 100644
--- a/tests/functional/u/unnecessary/unnecessary_comprehension.py
+++ b/tests/functional/u/unnecessary/unnecessary_comprehension.py
@@ -14,14 +14,14 @@
 [(x, y, 1) for x, y in iterable]  # exclude useful comprehensions
 # Test case for issue #4499
 a_dict = {}
-[(k, v) for k, v in a_dict.items()]  # [unnecessary-comprehension]
+item = [(k, v) for k, v in a_dict.items()]  # [unnecessary-comprehension]
 
 # Set comprehensions
 {x for x in iterable}  # [unnecessary-comprehension]
 {y for x in iterable}  # expression != target_list
 {x for x,y,z in iterable}  # expression != target_list
 {(x,y,z) for x,y,z in iterable}  # [unnecessary-comprehension]
-{(x,y,z) for (x, y, z) in iterable}  # [unnecessary-comprehension]
+item = {(x,y,z) for (x, y, z) in iterable}  # [unnecessary-comprehension]
 {(x,y,z) for x in iterable}  # expression != target_list
 {(x,y,(a,b,c)) for x in iterable}  # expression != target_list
 {x for x, *y in iterable}  # expression != target_list
@@ -44,6 +44,6 @@
 my_set = set()
 
 [elem for elem in my_list]  # [unnecessary-comprehension]
-{k: v for k, v in my_dict.items()} # [unnecessary-comprehension]
+items = {k: v for k, v in my_dict.items()} # [unnecessary-comprehension]
 {k: my_dict[k] for k in my_dict} # [consider-using-dict-items]
 {elem for elem in my_set}  # [unnecessary-comprehension]
diff --git a/tests/functional/u/unnecessary/unnecessary_comprehension.txt b/tests/functional/u/unnecessary/unnecessary_comprehension.txt
index 6093bdba8f..d316fcdc84 100644
--- a/tests/functional/u/unnecessary/unnecessary_comprehension.txt
+++ b/tests/functional/u/unnecessary/unnecessary_comprehension.txt
@@ -1,13 +1,13 @@
-unnecessary-comprehension:5:0:None:None::Unnecessary use of a comprehension, use list(iterable) instead.:UNDEFINED
-unnecessary-comprehension:8:0:None:None::Unnecessary use of a comprehension, use list(iterable) instead.:UNDEFINED
-unnecessary-comprehension:9:0:None:None::Unnecessary use of a comprehension, use list(iterable) instead.:UNDEFINED
-unnecessary-comprehension:17:0:None:None::Unnecessary use of a comprehension, use list(a_dict.items()) instead.:UNDEFINED
-unnecessary-comprehension:20:0:None:None::Unnecessary use of a comprehension, use set(iterable) instead.:UNDEFINED
-unnecessary-comprehension:23:0:None:None::Unnecessary use of a comprehension, use set(iterable) instead.:UNDEFINED
-unnecessary-comprehension:24:0:None:None::Unnecessary use of a comprehension, use set(iterable) instead.:UNDEFINED
-unnecessary-comprehension:32:0:None:None::Unnecessary use of a comprehension, use dict(iterable) instead.:UNDEFINED
-unnecessary-comprehension:34:0:None:None::Unnecessary use of a comprehension, use dict(iterable) instead.:UNDEFINED
-unnecessary-comprehension:46:0:None:None::Unnecessary use of a comprehension, use my_list instead.:UNDEFINED
-unnecessary-comprehension:47:0:None:None::Unnecessary use of a comprehension, use my_dict instead.:UNDEFINED
+unnecessary-comprehension:5:0:5:21::Unnecessary use of a comprehension, use list(iterable) instead.:UNDEFINED
+unnecessary-comprehension:8:0:8:31::Unnecessary use of a comprehension, use list(iterable) instead.:UNDEFINED
+unnecessary-comprehension:9:0:9:33::Unnecessary use of a comprehension, use list(iterable) instead.:UNDEFINED
+unnecessary-comprehension:17:7:17:42::Unnecessary use of a comprehension, use list(a_dict.items()) instead.:UNDEFINED
+unnecessary-comprehension:20:0:20:21::Unnecessary use of a comprehension, use set(iterable) instead.:UNDEFINED
+unnecessary-comprehension:23:0:23:31::Unnecessary use of a comprehension, use set(iterable) instead.:UNDEFINED
+unnecessary-comprehension:24:7:24:42::Unnecessary use of a comprehension, use set(iterable) instead.:UNDEFINED
+unnecessary-comprehension:32:0:32:27::Unnecessary use of a comprehension, use dict(iterable) instead.:UNDEFINED
+unnecessary-comprehension:34:0:34:29::Unnecessary use of a comprehension, use dict(iterable) instead.:UNDEFINED
+unnecessary-comprehension:46:0:46:26::Unnecessary use of a comprehension, use my_list instead.:UNDEFINED
+unnecessary-comprehension:47:8:47:42::Unnecessary use of a comprehension, use my_dict instead.:UNDEFINED
 consider-using-dict-items:48:0:None:None::Consider iterating with .items():UNDEFINED
-unnecessary-comprehension:49:0:None:None::Unnecessary use of a comprehension, use my_set instead.:UNDEFINED
+unnecessary-comprehension:49:0:49:25::Unnecessary use of a comprehension, use my_set instead.:UNDEFINED
diff --git a/tests/functional/u/unnecessary/unnecessary_dict_index_lookup.py b/tests/functional/u/unnecessary/unnecessary_dict_index_lookup.py
index 55dd5688c0..f594d9e0f8 100644
--- a/tests/functional/u/unnecessary/unnecessary_dict_index_lookup.py
+++ b/tests/functional/u/unnecessary/unnecessary_dict_index_lookup.py
@@ -11,20 +11,23 @@
     print(a_dict[k])  # Should not emit warning, v != a_dict[k]
 
 for k, v in b_dict.items():
+    print(k)
     k = "another key"
     print(b_dict[k])  # This is fine, key reassigned
 
 
 # Tests on comprehensions
-{v: 1 for k, v in a_dict.items() if a_dict[k]}  # [unnecessary-dict-index-lookup]
-{v: 1 for k, v in a_dict.items() if k}  # This is fine, no indexing
-{a_dict[k]: 1 for k, v in a_dict.items() if k}  # [unnecessary-dict-index-lookup]
-{a_dict[k]: 1 for k, v in a_dict.items() if a_dict[k]}  # [unnecessary-dict-index-lookup, unnecessary-dict-index-lookup]
+A = {v: 1 for k, v in a_dict.items() if a_dict[k]}  # [unnecessary-dict-index-lookup]
+B = {v: 1 for k, v in a_dict.items() if k}  # This is fine, no indexing
+C = {a_dict[k]: 1 for k, v in a_dict.items() if k}  # [unnecessary-dict-index-lookup]
+# +1: [unnecessary-dict-index-lookup, unnecessary-dict-index-lookup]
+D = {a_dict[k]: 1 for k, v in a_dict.items() if a_dict[k]}
 
-[v for k, v in a_dict.items() if a_dict[k]]  # [unnecessary-dict-index-lookup]
-[v for k, v in a_dict.items() if k]  # This is fine, no indexing
-[a_dict[k] for k, v in a_dict.items() if k]  # [unnecessary-dict-index-lookup]
-[a_dict[k] for k, v in a_dict.items() if a_dict[k]]  # [unnecessary-dict-index-lookup, unnecessary-dict-index-lookup]
+E = [v for k, v in a_dict.items() if a_dict[k]]  # [unnecessary-dict-index-lookup]
+F = [v for k, v in a_dict.items() if k]  # This is fine, no indexing
+G = [a_dict[k] for k, v in a_dict.items() if k]  # [unnecessary-dict-index-lookup]
+# +1: [unnecessary-dict-index-lookup, unnecessary-dict-index-lookup]
+H = [a_dict[k] for k, v in a_dict.items() if a_dict[k]]
 
 
 # Tests on dict attribute of a class
@@ -35,20 +38,22 @@ class Foo:
 for k, v in Foo.c_dict.items():
     print(b_dict[k])  # Should not emit warning, accessing other dictionary
     print(Foo.c_dict[k])  # [unnecessary-dict-index-lookup]
-    unnecessary = 0 # pylint: disable=invalid-name
+    unnecessary = 0  # pylint: disable=invalid-name
     unnecessary += Foo.c_dict[k]  # [unnecessary-dict-index-lookup]
     Foo.c_dict[k] += v  # key access necessary
 
 # Tests on comprehensions
-{v: 1 for k, v in Foo.c_dict.items() if Foo.c_dict[k]}  # [unnecessary-dict-index-lookup]
-{v: 1 for k, v in Foo.c_dict.items() if k}  # This is fine, no indexing
-{Foo.c_dict[k]: 1 for k, v in Foo.c_dict.items() if k}  # [unnecessary-dict-index-lookup]
-{Foo.c_dict[k]: 1 for k, v in Foo.c_dict.items() if Foo.c_dict[k]}  # [unnecessary-dict-index-lookup, unnecessary-dict-index-lookup]
-
-[v for k, v in Foo.c_dict.items() if Foo.c_dict[k]]  # [unnecessary-dict-index-lookup]
-[v for k, v in Foo.c_dict.items() if k]  # This is fine, no indexing
-[Foo.c_dict[k] for k, v in Foo.c_dict.items() if k]  # [unnecessary-dict-index-lookup]
-[Foo.c_dict[k] for k, v in Foo.c_dict.items() if Foo.c_dict[k]]  # [unnecessary-dict-index-lookup, unnecessary-dict-index-lookup]
+S = {v: 1 for k, v in Foo.c_dict.items() if Foo.c_dict[k]}  # [unnecessary-dict-index-lookup]
+J = {v: 1 for k, v in Foo.c_dict.items() if k}  # This is fine, no indexing
+K = {Foo.c_dict[k]: 1 for k, v in Foo.c_dict.items() if k}  # [unnecessary-dict-index-lookup]
+# +1: [unnecessary-dict-index-lookup, unnecessary-dict-index-lookup]
+L = {Foo.c_dict[k]: 1 for k, v in Foo.c_dict.items() if Foo.c_dict[k]}
+
+M = [v for k, v in Foo.c_dict.items() if Foo.c_dict[k]]  # [unnecessary-dict-index-lookup]
+N = [v for k, v in Foo.c_dict.items() if k]  # This is fine, no indexing
+T = [Foo.c_dict[k] for k, v in Foo.c_dict.items() if k]  # [unnecessary-dict-index-lookup]
+# +1: [unnecessary-dict-index-lookup, unnecessary-dict-index-lookup]
+P = [Foo.c_dict[k] for k, v in Foo.c_dict.items() if Foo.c_dict[k]]
 
 # Test assigning d.items() to a single variable
 d = {1: "a", 2: "b"}
@@ -56,8 +61,8 @@ class Foo:
     print(item[0])
     print(d[item[0]])  # [unnecessary-dict-index-lookup]
 
-[item[0] for item in d.items()]
-[d[item[0]] for item in d.items()]  # [unnecessary-dict-index-lookup]
+Q = [item[0] for item in d.items()]
+R = [d[item[0]] for item in d.items()]  # [unnecessary-dict-index-lookup]
 
 # Reassigning single var
 for item in d.items():
@@ -82,3 +87,28 @@ class Foo:
     if 'V' in d[k]:  # [unnecessary-dict-index-lookup]
         d[k] = "value"
         print(d[k])  # This is fine
+
+# Test false positive described in #4716
+# Should not be emitted for del
+# (https://github.com/PyCQA/pylint/issues/4716)
+d = {}
+for key, val in d.items():
+    del d[key]
+    break
+
+for item in d.items():
+    del d[item[0]]
+    break
+
+outer_dict = {"inner_dict": {}}
+for key, val in outer_dict.items():
+    for key_two, val_two in val.items():
+        del outer_dict[key][key_two]  # [unnecessary-dict-index-lookup]
+        break
+
+# Test partial unpacking of items
+# https://github.com/PyCQA/pylint/issues/5504
+
+d = {}
+for key, in d.items():
+    print(d[key])
diff --git a/tests/functional/u/unnecessary/unnecessary_dict_index_lookup.txt b/tests/functional/u/unnecessary/unnecessary_dict_index_lookup.txt
index ca43a16c04..6ca3008d0c 100644
--- a/tests/functional/u/unnecessary/unnecessary_dict_index_lookup.txt
+++ b/tests/functional/u/unnecessary/unnecessary_dict_index_lookup.txt
@@ -1,23 +1,24 @@
 unnecessary-dict-index-lookup:7:10:7:19::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:19:36:19:45::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:21:1:21:10::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:22:1:22:10::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:22:44:22:53::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:24:33:24:42::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:26:1:26:10::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:27:1:27:10::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:27:41:27:50::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:37:10:37:23::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:39:19:39:32::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:43:40:43:53::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:45:1:45:14::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:46:1:46:14::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:46:52:46:65::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:48:37:48:50::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:50:1:50:14::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:51:1:51:14::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:51:49:51:62::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
-unnecessary-dict-index-lookup:57:10:57:20::Unnecessary dictionary index lookup, use 'item[1]' instead:UNDEFINED
-unnecessary-dict-index-lookup:60:1:60:11::Unnecessary dictionary index lookup, use 'item[1]' instead:UNDEFINED
-unnecessary-dict-index-lookup:65:10:65:20::Unnecessary dictionary index lookup, use 'item[1]' instead:UNDEFINED
-unnecessary-dict-index-lookup:82:14:82:18::Unnecessary dictionary index lookup, use '_' instead:UNDEFINED
+unnecessary-dict-index-lookup:20:40:20:49::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:22:5:22:14::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:24:5:24:14::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:24:48:24:57::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:26:37:26:46::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:28:5:28:14::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:30:5:30:14::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:30:45:30:54::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:40:10:40:23::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:42:19:42:32::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:46:44:46:57::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:48:5:48:18::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:50:5:50:18::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:50:56:50:69::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:52:41:52:54::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:54:5:54:18::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:56:5:56:18::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:56:53:56:66::Unnecessary dictionary index lookup, use 'v' instead:UNDEFINED
+unnecessary-dict-index-lookup:62:10:62:20::Unnecessary dictionary index lookup, use 'item[1]' instead:UNDEFINED
+unnecessary-dict-index-lookup:65:5:65:15::Unnecessary dictionary index lookup, use 'item[1]' instead:UNDEFINED
+unnecessary-dict-index-lookup:70:10:70:20::Unnecessary dictionary index lookup, use 'item[1]' instead:UNDEFINED
+unnecessary-dict-index-lookup:87:14:87:18::Unnecessary dictionary index lookup, use '_' instead:UNDEFINED
+unnecessary-dict-index-lookup:106:12:106:27::Unnecessary dictionary index lookup, use 'val' instead:UNDEFINED
diff --git a/tests/functional/u/unnecessary/unnecessary_ellipsis.py b/tests/functional/u/unnecessary/unnecessary_ellipsis.py
new file mode 100644
index 0000000000..e34de754b0
--- /dev/null
+++ b/tests/functional/u/unnecessary/unnecessary_ellipsis.py
@@ -0,0 +1,131 @@
+"""Emit a warning when the ellipsis constant is used and can be avoided"""
+
+# pylint: disable=missing-docstring, too-few-public-methods, invalid-name, unused-argument
+
+from typing import List, overload, Union
+
+# Ellipsis and preceding statement
+try:
+    A = 2
+except ValueError:
+    A = 24
+    ...  # [unnecessary-ellipsis]
+
+def ellipsis_and_subsequent_statement():
+    ...  # [unnecessary-ellipsis]
+    return 0
+
+# The parent of ellipsis is an assignment
+B = ...
+C = [..., 1, 2, 3]
+
+# The parent of ellipsis is a call
+if "X" is type(...):
+    ...
+
+def docstring_only():
+    '''In Python, stubbed functions often have a body that contains just a
+    single `...` constant, indicating that the function doesn't do
+    anything. However, a stubbed function can also have just a
+    docstring, and function with a docstring and no body also does
+    nothing.
+    '''
+
+
+# This function has no docstring, so it needs a `...` constant.
+def ellipsis_only():
+    ...
+
+
+def docstring_and_ellipsis():
+    '''This function doesn't do anything, but it has a docstring, so its
+    `...` constant is useless clutter.
+
+    NEW CHECK: unnecessary-ellipsis
+
+    This would check for stubs with both docstrings and `...`
+    constants, suggesting the removal of the useless `...`
+    constants
+    '''
+    ... # [unnecessary-ellipsis]
+
+
+class DocstringOnly:
+    '''The same goes for class stubs: docstring, or `...`, but not both.
+    '''
+
+
+# No problem
+class EllipsisOnly:
+    ...
+
+
+class DocstringAndEllipsis:
+    '''Whoops! Mark this one as bad too.
+    '''
+    ... # [unnecessary-ellipsis]
+
+
+# Function overloading
+@overload
+def summarize(data: int) -> float: ...
+
+
+@overload
+def summarize(data: str) -> str: ...
+
+
+def summarize(data):
+    if isinstance(data, str):
+        ...
+    return float(data)
+
+
+
+# Method overloading
+class MyIntegerList(List[int]):
+    @overload
+    def __getitem__(self, index: int) -> int: ...
+
+    @overload
+    def __getitem__(self, index: slice) -> List[int]: ...
+
+    def __getitem__(self, index: Union[int, slice]) -> Union[int, List[int]]:
+        if isinstance(index, int):
+            ...
+        elif isinstance(index, slice):
+            ...
+        else:
+            raise TypeError(...)
+
+# Ellipsis is allowed as a default argument
+def func_with_ellipsis_default_arg(a = ...) -> None:
+    "Some docstring."
+
+# Ignore if the ellipsis is inside a container:
+my_list = [...]
+my_tuple = (...,)
+my_set = {...}
+
+# Ellipsis inside a container which is a value in a dictionary
+mydict1 = {'x': [...]}
+mydict2 = {'x': {...}}
+mydict3 = {'x': (...,)}
+
+# Ignore if the ellipsis is used with a lambda expression
+print("x", lambda: ...)
+
+
+def func1(val1, _):
+    if val1 is not ...:
+        pass
+
+
+def func2(val1, val2):
+    """Ignore if ellipsis is used on comparisons.
+    See https://github.com/PyCQA/pylint/issues/6071."""
+    if val1 is not ... and val2:
+        pass
+
+
+assert "x" != ...
diff --git a/tests/functional/u/unnecessary/unnecessary_ellipsis.txt b/tests/functional/u/unnecessary/unnecessary_ellipsis.txt
new file mode 100644
index 0000000000..7b7b905890
--- /dev/null
+++ b/tests/functional/u/unnecessary/unnecessary_ellipsis.txt
@@ -0,0 +1,4 @@
+unnecessary-ellipsis:12:4:12:7::Unnecessary ellipsis constant:UNDEFINED
+unnecessary-ellipsis:15:4:15:7:ellipsis_and_subsequent_statement:Unnecessary ellipsis constant:UNDEFINED
+unnecessary-ellipsis:50:4:50:7:docstring_and_ellipsis:Unnecessary ellipsis constant:UNDEFINED
+unnecessary-ellipsis:66:4:66:7:DocstringAndEllipsis:Unnecessary ellipsis constant:UNDEFINED
diff --git a/tests/functional/u/unpacking.py b/tests/functional/u/unpacking/unpacking.py
similarity index 100%
rename from tests/functional/u/unpacking.py
rename to tests/functional/u/unpacking/unpacking.py
diff --git a/tests/functional/u/unpacking_generalizations.py b/tests/functional/u/unpacking/unpacking_generalizations.py
similarity index 100%
rename from tests/functional/u/unpacking_generalizations.py
rename to tests/functional/u/unpacking/unpacking_generalizations.py
diff --git a/tests/functional/u/unpacking_generalizations.txt b/tests/functional/u/unpacking/unpacking_generalizations.txt
similarity index 100%
rename from tests/functional/u/unpacking_generalizations.txt
rename to tests/functional/u/unpacking/unpacking_generalizations.txt
diff --git a/tests/functional/u/unpacking_non_sequence.py b/tests/functional/u/unpacking/unpacking_non_sequence.py
similarity index 95%
rename from tests/functional/u/unpacking_non_sequence.py
rename to tests/functional/u/unpacking/unpacking_non_sequence.py
index b7ea2189c6..0299af762d 100644
--- a/tests/functional/u/unpacking_non_sequence.py
+++ b/tests/functional/u/unpacking/unpacking_non_sequence.py
@@ -3,7 +3,8 @@
 # pylint: disable=too-few-public-methods, invalid-name, attribute-defined-outside-init, unused-variable
 # pylint: disable=using-constant-test, no-init, missing-docstring, wrong-import-order,wrong-import-position,no-else-return, useless-object-inheritance
 from os import rename as nonseq_func
-from functional.u.unpacking import nonseq
+from functional.u.unpacking.unpacking import nonseq
+from typing import NamedTuple
 
 __revision__ = 0
 
@@ -137,3 +138,12 @@ def flow_control_unpacking(var=None):
         var0, var1 = var
         return var0, var1
     return None
+
+
+class MyClass(NamedTuple):
+    x: float
+    y: float
+
+    def sum(self):
+        x, y = self
+        return x + y
diff --git a/tests/functional/u/unpacking/unpacking_non_sequence.txt b/tests/functional/u/unpacking/unpacking_non_sequence.txt
new file mode 100644
index 0000000000..c3c65050cb
--- /dev/null
+++ b/tests/functional/u/unpacking/unpacking_non_sequence.txt
@@ -0,0 +1,10 @@
+unpacking-non-sequence:78:0:78:15::Attempting to unpack a non-sequence defined at line 75:UNDEFINED
+unpacking-non-sequence:79:0:79:17::Attempting to unpack a non-sequence:UNDEFINED
+unpacking-non-sequence:80:0:80:11::Attempting to unpack a non-sequence None:UNDEFINED
+unpacking-non-sequence:81:0:81:8::Attempting to unpack a non-sequence 1:UNDEFINED
+unpacking-non-sequence:82:0:82:13::Attempting to unpack a non-sequence defined at line 9 of functional.u.unpacking.unpacking:UNDEFINED
+unpacking-non-sequence:83:0:83:15::Attempting to unpack a non-sequence defined at line 11 of functional.u.unpacking.unpacking:UNDEFINED
+unpacking-non-sequence:84:0:84:18::Attempting to unpack a non-sequence:UNDEFINED
+unpacking-non-sequence:99:8:99:33:ClassUnpacking.test:Attempting to unpack a non-sequence defined at line 75:UNDEFINED
+unpacking-non-sequence:100:8:100:35:ClassUnpacking.test:Attempting to unpack a non-sequence:UNDEFINED
+unpacking-non-sequence:101:8:101:31:ClassUnpacking.test:Attempting to unpack a non-sequence:UNDEFINED
diff --git a/tests/functional/u/unpacking_non_sequence_py37.py b/tests/functional/u/unpacking/unpacking_non_sequence_py37.py
similarity index 100%
rename from tests/functional/u/unpacking_non_sequence_py37.py
rename to tests/functional/u/unpacking/unpacking_non_sequence_py37.py
diff --git a/tests/functional/u/unpacking_non_sequence_py37.rc b/tests/functional/u/unpacking/unpacking_non_sequence_py37.rc
similarity index 100%
rename from tests/functional/u/unpacking_non_sequence_py37.rc
rename to tests/functional/u/unpacking/unpacking_non_sequence_py37.rc
diff --git a/tests/functional/u/unpacking_non_sequence.txt b/tests/functional/u/unpacking_non_sequence.txt
deleted file mode 100644
index 7a8b8a85c4..0000000000
--- a/tests/functional/u/unpacking_non_sequence.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-unpacking-non-sequence:77:0:77:15::Attempting to unpack a non-sequence defined at line 74:UNDEFINED
-unpacking-non-sequence:78:0:78:17::Attempting to unpack a non-sequence:UNDEFINED
-unpacking-non-sequence:79:0:79:11::Attempting to unpack a non-sequence None:UNDEFINED
-unpacking-non-sequence:80:0:80:8::Attempting to unpack a non-sequence 1:UNDEFINED
-unpacking-non-sequence:81:0:81:13::Attempting to unpack a non-sequence defined at line 9 of functional.u.unpacking:UNDEFINED
-unpacking-non-sequence:82:0:82:15::Attempting to unpack a non-sequence defined at line 11 of functional.u.unpacking:UNDEFINED
-unpacking-non-sequence:83:0:83:18::Attempting to unpack a non-sequence:UNDEFINED
-unpacking-non-sequence:98:8:98:33:ClassUnpacking.test:Attempting to unpack a non-sequence defined at line 74:UNDEFINED
-unpacking-non-sequence:99:8:99:35:ClassUnpacking.test:Attempting to unpack a non-sequence:UNDEFINED
-unpacking-non-sequence:100:8:100:31:ClassUnpacking.test:Attempting to unpack a non-sequence:UNDEFINED
diff --git a/tests/functional/u/unspecified_encoding_py38.py b/tests/functional/u/unspecified_encoding_py38.py
index ce5f3e8167..20233f0734 100644
--- a/tests/functional/u/unspecified_encoding_py38.py
+++ b/tests/functional/u/unspecified_encoding_py38.py
@@ -143,3 +143,19 @@ class IOArgs:
 
 # Test for crash reported in https://github.com/PyCQA/pylint/issues/5321
 open(FILENAME, args_good_one.mode, encoding=args_good_one.encoding)
+
+# Positional arguments
+open(FILENAME, "w", -1, "utf-8")
+open(FILENAME, "w", -1)  # [unspecified-encoding]
+
+Path(FILENAME).open("w", -1, "utf-8")
+Path(FILENAME).open("w", -1)  # [unspecified-encoding]
+
+Path(FILENAME).read_text("utf-8")
+Path(FILENAME).read_text()  # [unspecified-encoding]
+
+Path(FILENAME).write_text("string", "utf-8")
+Path(FILENAME).write_text("string")  # [unspecified-encoding]
+
+# Test for crash reported in https://github.com/PyCQA/pylint/issues/5731
+open(FILENAME, mode=None)  # [bad-open-mode, unspecified-encoding]
diff --git a/tests/functional/u/unspecified_encoding_py38.txt b/tests/functional/u/unspecified_encoding_py38.txt
index 60a811ecae..b3371299f5 100644
--- a/tests/functional/u/unspecified_encoding_py38.txt
+++ b/tests/functional/u/unspecified_encoding_py38.txt
@@ -23,3 +23,9 @@ unspecified-encoding:81:0:81:21::Using open without explicitly specifying an enc
 unspecified-encoding:82:0:82:25::Using open without explicitly specifying an encoding:UNDEFINED
 unspecified-encoding:83:0:83:25::Using open without explicitly specifying an encoding:UNDEFINED
 unspecified-encoding:84:0:84:39::Using open without explicitly specifying an encoding:UNDEFINED
+unspecified-encoding:149:0:149:23::Using open without explicitly specifying an encoding:UNDEFINED
+unspecified-encoding:152:0:152:28::Using open without explicitly specifying an encoding:UNDEFINED
+unspecified-encoding:155:0:155:26::Using open without explicitly specifying an encoding:UNDEFINED
+unspecified-encoding:158:0:158:35::Using open without explicitly specifying an encoding:UNDEFINED
+bad-open-mode:161:0:161:25::"""None"" is not a valid mode for open.":UNDEFINED
+unspecified-encoding:161:0:161:25::Using open without explicitly specifying an encoding:UNDEFINED
diff --git a/tests/functional/u/unused/unused_argument.py b/tests/functional/u/unused/unused_argument.py
index a3fd4e6abc..af2ae8ae46 100644
--- a/tests/functional/u/unused/unused_argument.py
+++ b/tests/functional/u/unused/unused_argument.py
@@ -47,6 +47,12 @@ def metadata_from_dict(key):
     """
     return {key: str(value) for key, value in key.items()}
 
+
+def metadata_from_dict_2(key):
+    """Similar, but with more nesting"""
+    return {key: (a, b) for key, (a, b) in key.items()}
+
+
 # pylint: disable=too-few-public-methods,  misplaced-future,wrong-import-position
 from __future__ import print_function
 
@@ -87,3 +93,18 @@ class BBBB(object):
     def __init__(self, arg):  # [unused-argument]
         """Constructor with an extra parameter. Should raise a warning"""
         self.spam = 1
+
+
+# Regression test for https://github.com/PyCQA/pylint/issues/5771
+# involving keyword-only arguments
+class Ancestor:
+    def __init__(self):
+        self.thing = None
+
+    def set_thing(self, thing, *, other=None):  # [unused-argument]
+        self.thing = thing
+
+class Descendant(Ancestor):
+    def set_thing(self, thing, *, other=None):
+        """Subclass does not raise unused-argument"""
+        self.thing = thing
diff --git a/tests/functional/u/unused/unused_argument.txt b/tests/functional/u/unused/unused_argument.txt
index 9d7a54b604..92795058ef 100644
--- a/tests/functional/u/unused/unused_argument.txt
+++ b/tests/functional/u/unused/unused_argument.txt
@@ -1,8 +1,9 @@
 unused-argument:3:16:3:21:test_unused:Unused argument 'first':HIGH
 unused-argument:3:23:3:29:test_unused:Unused argument 'second':HIGH
 unused-argument:32:29:32:32:Sub.newmethod:Unused argument 'aay':INFERENCE
-unused-argument:54:13:54:16:function:Unused argument 'arg':HIGH
-unused-argument:61:21:61:24:AAAA.method:Unused argument 'arg':INFERENCE
-unused-argument:68:0:None:None:AAAA.selected:Unused argument 'args':INFERENCE
-unused-argument:68:0:None:None:AAAA.selected:Unused argument 'kwargs':INFERENCE
-unused-argument:87:23:87:26:BBBB.__init__:Unused argument 'arg':INFERENCE
+unused-argument:60:13:60:16:function:Unused argument 'arg':HIGH
+unused-argument:67:21:67:24:AAAA.method:Unused argument 'arg':INFERENCE
+unused-argument:74:0:None:None:AAAA.selected:Unused argument 'args':INFERENCE
+unused-argument:74:0:None:None:AAAA.selected:Unused argument 'kwargs':INFERENCE
+unused-argument:93:23:93:26:BBBB.__init__:Unused argument 'arg':INFERENCE
+unused-argument:104:34:104:39:Ancestor.set_thing:Unused argument 'other':INFERENCE
diff --git a/tests/functional/u/unused/unused_argument_py3.py b/tests/functional/u/unused/unused_argument_py3.py
index 4d0fd9adc0..2529e6caa2 100644
--- a/tests/functional/u/unused/unused_argument_py3.py
+++ b/tests/functional/u/unused/unused_argument_py3.py
@@ -7,3 +7,12 @@ def func(first, *, second): # [unused-argument, unused-argument]
 def only_raises(first, second=42): # [unused-argument]
     if first == 24:
         raise ValueError
+
+
+def increment_factory(initial):
+
+    def increment():
+        nonlocal initial
+        initial += 1
+
+    return increment
diff --git a/tests/functional/u/unused/unused_import_everything_disabled.py b/tests/functional/u/unused/unused_import_everything_disabled.py
index 7d6cce74c0..381cd012fd 100644
--- a/tests/functional/u/unused/unused_import_everything_disabled.py
+++ b/tests/functional/u/unused/unused_import_everything_disabled.py
@@ -1,8 +1,17 @@
 """Test that unused-import is not emitted here when everything else is disabled
 
 https://github.com/PyCQA/pylint/issues/3445
+https://github.com/PyCQA/pylint/issues/6089
 """
+from math import e, pi
 from os import environ
 
 for k, v in environ.items():
     print(k, v)
+
+
+class MyClass:
+    """For the bug reported in #6089 it is important to use the same names for the class attributes as in the imports."""
+
+    e = float(e)
+    pi = pi
diff --git a/tests/functional/u/unused/unused_name_from_wilcard_import.py b/tests/functional/u/unused/unused_name_from_wildcard_import.py
similarity index 100%
rename from tests/functional/u/unused/unused_name_from_wilcard_import.py
rename to tests/functional/u/unused/unused_name_from_wildcard_import.py
diff --git a/tests/functional/u/unused/unused_name_from_wilcard_import.txt b/tests/functional/u/unused/unused_name_from_wildcard_import.txt
similarity index 77%
rename from tests/functional/u/unused/unused_name_from_wilcard_import.txt
rename to tests/functional/u/unused/unused_name_from_wildcard_import.txt
index c939b8260c..0289a13fb1 100644
--- a/tests/functional/u/unused/unused_name_from_wilcard_import.txt
+++ b/tests/functional/u/unused/unused_name_from_wildcard_import.txt
@@ -1,4 +1,4 @@
-unused-wildcard-import:3:0:3:34::Unused import(s) func and only_raises from wildcard import of unused_argument_py3:UNDEFINED
+unused-wildcard-import:3:0:3:34::Unused import(s) func, only_raises and increment_factory from wildcard import of unused_argument_py3:UNDEFINED
 wildcard-import:3:0:3:34::Wildcard import unused_argument_py3:UNDEFINED
 unused-wildcard-import:4:0:4:38::Unused import(s) VAR from wildcard import of unused_global_variable1:UNDEFINED
 wildcard-import:4:0:4:38::Wildcard import unused_global_variable1:UNDEFINED
diff --git a/tests/functional/u/unused/unused_private_member.py b/tests/functional/u/unused/unused_private_member.py
index fc42ea8fb8..d69d7eb11a 100644
--- a/tests/functional/u/unused/unused_private_member.py
+++ b/tests/functional/u/unused/unused_private_member.py
@@ -1,4 +1,6 @@
 # pylint: disable=missing-docstring, invalid-name, too-few-public-methods, no-self-use, line-too-long, unused-argument, protected-access
+from functools import partialmethod
+
 
 class AnotherClass():
     def __test(self):  # [unused-private-member]
@@ -309,3 +311,36 @@ class Foo:
 
     def method(self):
         print(self.__class__.__ham)
+
+
+# https://github.com/PyCQA/pylint/issues/4756
+# Check for false positives emitted when private functions are not referenced in the class body
+# with standard calls but passed as arguments to other functions.
+class FalsePositive4756a:
+    def __bar(self, x):
+        print(x)
+    fizz = partialmethod(__bar, 'fizz')
+foo = FalsePositive4756a()
+foo.fizz()
+
+class FalsePositive4756b:
+    def __get_prop(self):
+        pass
+
+    def __set_prop(self, value):
+        pass
+
+    def __del_prop(self):
+        pass
+
+    prop = property(__get_prop, __set_prop, __del_prop)
+
+
+class TypeSelfCallInMethod:
+    """Regression test for issue 5569"""
+    @classmethod
+    def b(cls) -> None:
+        cls.__a = ''  # [unused-private-member]
+
+    def a(self):
+        return type(self).__a
diff --git a/tests/functional/u/unused/unused_private_member.txt b/tests/functional/u/unused/unused_private_member.txt
index 8d69dd02c3..e6b6ab83c3 100644
--- a/tests/functional/u/unused/unused_private_member.txt
+++ b/tests/functional/u/unused/unused_private_member.txt
@@ -1,19 +1,20 @@
-unused-private-member:4:4:5:12:AnotherClass.__test:Unused private member `AnotherClass.__test(self)`:UNDEFINED
-unused-private-member:8:4:8:15:HasUnusedInClass:Unused private member `HasUnusedInClass.__my_secret`:UNDEFINED
-unused-private-member:12:4:13:35:HasUnusedInClass.__private_class_method_unused:Unused private member `HasUnusedInClass.__private_class_method_unused(cls)`:UNDEFINED
-unused-private-member:20:4:21:12:HasUnusedInClass.__private_static_method_unused:Unused private member `HasUnusedInClass.__private_static_method_unused()`:UNDEFINED
-unused-private-member:28:8:28:30:HasUnusedInClass.__init__:Unused private member `HasUnusedInClass.__instance_secret`:UNDEFINED
-unused-private-member:34:4:38:13:HasUnusedInClass.__test:Unused private member `HasUnusedInClass.__test(self, x, y, z)`:UNDEFINED
-unused-private-member:55:4:56:31:HasUnusedInClass.__test_recursive:Unused private member `HasUnusedInClass.__test_recursive(self)`:UNDEFINED
-unused-private-member:133:8:133:21:FalsePositive4657.__init__:Unused private member `FalsePositive4657.__attr_c`:UNDEFINED
-undefined-variable:138:15:138:18:FalsePositive4657.attr_c:Undefined variable 'cls':UNDEFINED
-unused-private-member:157:8:157:26:FalsePositive4668.__new__:Unused private member `FalsePositive4668.__unused`:UNDEFINED
-unused-private-member:181:8:182:27:FalsePositive4673.do_thing.__true_positive:Unused private member `FalsePositive4673.do_thing.__true_positive(in_thing)`:UNDEFINED
-unused-private-member:201:8:202:16:FalsePositive4673.complicated_example.__inner_4:Unused private member `FalsePositive4673.complicated_example.__inner_4()`:UNDEFINED
-unused-private-member:212:8:212:23:Crash4755Context.__init__:Unused private member `Crash4755Context.__messages`:UNDEFINED
-unused-private-member:229:4:229:24:FalsePositive4681:Unused private member `FalsePositive4681.__should_cause_error`:UNDEFINED
-unused-private-member:239:12:239:50:FalsePositive4681.__init__:Unused private member `FalsePositive4681.__should_cause_error`:UNDEFINED
-unused-private-member:243:12:243:50:FalsePositive4681.__init__:Unused private member `FalsePositive4681.__should_cause_error`:UNDEFINED
-unused-private-member:274:4:275:26:FalsePositive4849.__unused_private_method:Unused private member `FalsePositive4849.__unused_private_method()`:UNDEFINED
-unused-private-member:291:4:294:44:Pony.__init_defaults:Unused private member `Pony.__init_defaults(self)`:UNDEFINED
-unused-private-member:296:4:298:20:Pony.__get_fur_color:Unused private member `Pony.__get_fur_color(self)`:UNDEFINED
+unused-private-member:6:4:6:14:AnotherClass.__test:Unused private member `AnotherClass.__test(self)`:UNDEFINED
+unused-private-member:10:4:10:15:HasUnusedInClass:Unused private member `HasUnusedInClass.__my_secret`:UNDEFINED
+unused-private-member:14:4:14:37:HasUnusedInClass.__private_class_method_unused:Unused private member `HasUnusedInClass.__private_class_method_unused(cls)`:UNDEFINED
+unused-private-member:22:4:22:38:HasUnusedInClass.__private_static_method_unused:Unused private member `HasUnusedInClass.__private_static_method_unused()`:UNDEFINED
+unused-private-member:30:8:30:30:HasUnusedInClass.__init__:Unused private member `HasUnusedInClass.__instance_secret`:UNDEFINED
+unused-private-member:36:4:36:14:HasUnusedInClass.__test:Unused private member `HasUnusedInClass.__test(self, x, y, z)`:UNDEFINED
+unused-private-member:57:4:57:24:HasUnusedInClass.__test_recursive:Unused private member `HasUnusedInClass.__test_recursive(self)`:UNDEFINED
+unused-private-member:135:8:135:21:FalsePositive4657.__init__:Unused private member `FalsePositive4657.__attr_c`:UNDEFINED
+undefined-variable:140:15:140:18:FalsePositive4657.attr_c:Undefined variable 'cls':UNDEFINED
+unused-private-member:159:8:159:26:FalsePositive4668.__new__:Unused private member `FalsePositive4668.__unused`:UNDEFINED
+unused-private-member:183:8:183:27:FalsePositive4673.do_thing.__true_positive:Unused private member `FalsePositive4673.do_thing.__true_positive(in_thing)`:UNDEFINED
+unused-private-member:203:8:203:21:FalsePositive4673.complicated_example.__inner_4:Unused private member `FalsePositive4673.complicated_example.__inner_4()`:UNDEFINED
+unused-private-member:214:8:214:23:Crash4755Context.__init__:Unused private member `Crash4755Context.__messages`:UNDEFINED
+unused-private-member:231:4:231:24:FalsePositive4681:Unused private member `FalsePositive4681.__should_cause_error`:UNDEFINED
+unused-private-member:241:12:241:50:FalsePositive4681.__init__:Unused private member `FalsePositive4681.__should_cause_error`:UNDEFINED
+unused-private-member:245:12:245:50:FalsePositive4681.__init__:Unused private member `FalsePositive4681.__should_cause_error`:UNDEFINED
+unused-private-member:276:4:276:31:FalsePositive4849.__unused_private_method:Unused private member `FalsePositive4849.__unused_private_method()`:UNDEFINED
+unused-private-member:293:4:293:23:Pony.__init_defaults:Unused private member `Pony.__init_defaults(self)`:UNDEFINED
+unused-private-member:298:4:298:23:Pony.__get_fur_color:Unused private member `Pony.__get_fur_color(self)`:UNDEFINED
+unused-private-member:343:8:343:15:TypeSelfCallInMethod.b:Unused private member `TypeSelfCallInMethod.__a`:UNDEFINED
diff --git a/tests/functional/u/unused/unused_variable.py b/tests/functional/u/unused/unused_variable.py
index d5afd8f2bb..d037a386ee 100644
--- a/tests/functional/u/unused/unused_variable.py
+++ b/tests/functional/u/unused/unused_variable.py
@@ -172,3 +172,10 @@ def main(lst):
     print(e)  # [undefined-loop-variable]
 
 main([])
+
+
+def func5():
+    """No unused-variable for a container if iterated in comprehension"""
+    x = []
+    # Test case requires homonym between "for x" and "in x"
+    assert [True for x in x]
diff --git a/tests/functional/u/unused/unused_variable_py38.txt b/tests/functional/u/unused/unused_variable_py38.txt
index 62a9e8b6ce..c870838e6e 100644
--- a/tests/functional/u/unused/unused_variable_py38.txt
+++ b/tests/functional/u/unused/unused_variable_py38.txt
@@ -1,6 +1,6 @@
-unused-variable:4:0:8:16:typed_assignment_in_function_default:Unused variable 'typed_assignment_in_function_default':UNDEFINED
+unused-variable:4:0:4:40:typed_assignment_in_function_default:Unused variable 'typed_assignment_in_function_default':UNDEFINED
 unused-variable:5:18:5:31::Unused variable 'typed_default':UNDEFINED
-unused-variable:11:0:15:16:assignment_in_function_default:Unused variable 'assignment_in_function_default':UNDEFINED
+unused-variable:11:0:11:34:assignment_in_function_default:Unused variable 'assignment_in_function_default':UNDEFINED
 unused-variable:12:11:12:18::Unused variable 'default':UNDEFINED
-unused-variable:18:0:23:16:assignment_used_in_function_scope:Unused variable 'assignment_used_in_function_scope':UNDEFINED
-unused-variable:26:0:30:16:assignment_used_in_global_scope:Unused variable 'assignment_used_in_global_scope':UNDEFINED
+unused-variable:18:0:18:37:assignment_used_in_function_scope:Unused variable 'assignment_used_in_function_scope':UNDEFINED
+unused-variable:26:0:26:35:assignment_used_in_global_scope:Unused variable 'assignment_used_in_global_scope':UNDEFINED
diff --git a/tests/functional/u/use/use_implicit_booleaness_not_comparison.py b/tests/functional/u/use/use_implicit_booleaness_not_comparison.py
index ce64fd1ed3..681ee0607a 100644
--- a/tests/functional/u/use/use_implicit_booleaness_not_comparison.py
+++ b/tests/functional/u/use/use_implicit_booleaness_not_comparison.py
@@ -194,3 +194,46 @@ def test_function():
 long_test = {}
 if long_test == {        }: # [use-implicit-booleaness-not-comparison]
     pass
+
+
+# Check for properties and uninferable class methods
+# See https://github.com/PyCQA/pylint/issues/5646
+from xyz import AnotherClassWithProperty
+
+
+class ParentWithProperty:
+
+    @classmethod
+    @property
+    def parent_function(cls):
+        return {}
+
+
+class MyClassWithProxy(ParentWithProperty):
+
+    attribute = True
+
+    @property
+    @classmethod
+    def my_property(cls):
+        return {}
+
+    @property
+    @classmethod
+    def my_difficult_property(cls):
+        if cls.attribute:
+            return {}
+        return MyClassWithProxy()
+
+
+
+def test_func():
+    """Some assertions against empty dicts."""
+    my_class = MyClassWithProxy()
+    assert my_class.parent_function == {}  # [use-implicit-booleaness-not-comparison]
+    assert my_class.my_property == {}  # [use-implicit-booleaness-not-comparison]
+
+    # If the return value is not always implicit boolean, don't raise
+    assert my_class.my_difficult_property == {}
+    # Uninferable does not raise
+    assert AnotherClassWithProperty().my_property == {}
diff --git a/tests/functional/u/use/use_implicit_booleaness_not_comparison.txt b/tests/functional/u/use/use_implicit_booleaness_not_comparison.txt
index ecd9189d65..d316d5acd3 100644
--- a/tests/functional/u/use/use_implicit_booleaness_not_comparison.txt
+++ b/tests/functional/u/use/use_implicit_booleaness_not_comparison.txt
@@ -28,3 +28,5 @@ use-implicit-booleaness-not-comparison:160:3:160:20::'numpy_array >= ()' can be
 use-implicit-booleaness-not-comparison:185:3:185:13::'data == {}' can be simplified to 'not data' as an empty sequence is falsey:UNDEFINED
 use-implicit-booleaness-not-comparison:187:3:187:13::'data != {}' can be simplified to 'data' as an empty sequence is falsey:UNDEFINED
 use-implicit-booleaness-not-comparison:195:3:195:26::'long_test == {}' can be simplified to 'not long_test' as an empty sequence is falsey:UNDEFINED
+use-implicit-booleaness-not-comparison:233:11:233:41:test_func:'my_class.parent_function == {}' can be simplified to 'not my_class.parent_function' as an empty sequence is falsey:UNDEFINED
+use-implicit-booleaness-not-comparison:234:11:234:37:test_func:'my_class.my_property == {}' can be simplified to 'not my_class.my_property' as an empty sequence is falsey:UNDEFINED
diff --git a/tests/functional/u/use/use_maxsplit_arg.py b/tests/functional/u/use/use_maxsplit_arg.py
index 396da3adc2..d0d43c2b98 100644
--- a/tests/functional/u/use/use_maxsplit_arg.py
+++ b/tests/functional/u/use/use_maxsplit_arg.py
@@ -90,3 +90,7 @@ class Bar():
 for j in range(5):
     print(source.split('.')[i])
     i = i + 1
+
+# Test for crash when sep is given by keyword
+# https://github.com/PyCQA/pylint/issues/5737
+get_last = SEQ.split(sep=None)[-1]  # [use-maxsplit-arg]
diff --git a/tests/functional/u/use/use_maxsplit_arg.txt b/tests/functional/u/use/use_maxsplit_arg.txt
index d9c108446d..a583dfccaf 100644
--- a/tests/functional/u/use/use_maxsplit_arg.txt
+++ b/tests/functional/u/use/use_maxsplit_arg.txt
@@ -19,3 +19,4 @@ use-maxsplit-arg:79:6:79:27::Use Bar.split.rsplit(',', maxsplit=1)[-1] instead:U
 use-maxsplit-arg:82:4:82:23::Use '1,2,3'.split('\n', maxsplit=1)[0] instead:UNDEFINED
 use-maxsplit-arg:83:4:83:26::Use '1,2,3'.rsplit('split', maxsplit=1)[-1] instead:UNDEFINED
 use-maxsplit-arg:84:4:84:28::Use '1,2,3'.split('rsplit', maxsplit=1)[0] instead:UNDEFINED
+use-maxsplit-arg:96:11:96:30::Use SEQ.rsplit(None, maxsplit=1)[-1] instead:UNDEFINED
diff --git a/tests/functional/u/use/use_symbolic_message_instead.txt b/tests/functional/u/use/use_symbolic_message_instead.txt
index bbc1f24bd4..5a01b7cdbe 100644
--- a/tests/functional/u/use/use_symbolic_message_instead.txt
+++ b/tests/functional/u/use/use_symbolic_message_instead.txt
@@ -3,12 +3,12 @@ use-symbolic-message-instead:1:0:None:None::"'C0111' is cryptic: use '# pylint:
 use-symbolic-message-instead:1:0:None:None::"'R0903' is cryptic: use '# pylint: disable=too-few-public-methods' instead":UNDEFINED
 use-symbolic-message-instead:2:0:None:None::"'c0111' is cryptic: use '# pylint: enable=missing-docstring' instead":UNDEFINED
 use-symbolic-message-instead:2:0:None:None::"'w0223' is cryptic: use '# pylint: enable=abstract-method' instead":UNDEFINED
-missing-function-docstring:4:0:5:22:my_function:Missing function or method docstring:HIGH
+missing-function-docstring:4:0:4:15:my_function:Missing function or method docstring:HIGH
 use-symbolic-message-instead:7:0:None:None::"'C0111' is cryptic: use '# pylint: disable=missing-docstring' instead":UNDEFINED
 use-symbolic-message-instead:8:0:None:None::"'R0903' is cryptic: use '# pylint: enable=too-few-public-methods' instead":UNDEFINED
 use-symbolic-message-instead:9:0:None:None::"'R0903' is cryptic: use '# pylint: disable=too-few-public-methods' instead":UNDEFINED
 use-symbolic-message-instead:12:0:None:None::"'C0102' is cryptic: use '# pylint: disable=blacklisted-name' instead":UNDEFINED
 use-symbolic-message-instead:16:0:None:None::"'C0102' is cryptic: use '# pylint: disable=blacklisted-name' instead":UNDEFINED
 use-symbolic-message-instead:16:0:None:None::"'R1711' is cryptic: use '# pylint: disable=useless-return' instead":UNDEFINED
-missing-function-docstring:20:0:21:8:test_enabled_by_id_msg:Missing function or method docstring:HIGH
+missing-function-docstring:20:0:20:26:test_enabled_by_id_msg:Missing function or method docstring:HIGH
 use-symbolic-message-instead:20:0:None:None::"'C0111' is cryptic: use '# pylint: enable=missing-docstring' instead":UNDEFINED
diff --git a/tests/functional/u/use/used_before_assignment_except_handler_for_try_with_return_py38.py b/tests/functional/u/use/used_before_assignment_except_handler_for_try_with_return_py38.py
new file mode 100644
index 0000000000..a43a89aa10
--- /dev/null
+++ b/tests/functional/u/use/used_before_assignment_except_handler_for_try_with_return_py38.py
@@ -0,0 +1,46 @@
+"""Tests for used-before-assignment with assignments in except handlers after
+try blocks with return statements.
+See: https://github.com/PyCQA/pylint/issues/5500.
+"""
+# pylint: disable=inconsistent-return-statements
+
+
+# Named expressions
+def func_ok_namedexpr_1(var):
+    """'msg' is defined in one handler with a named expression under an if."""
+    try:
+        return 1 / var.some_other_func()
+    except AttributeError:
+        if (msg := var.get_msg()):
+            pass
+    except ZeroDivisionError:
+        msg = "Division by 0"
+    print(msg)
+
+
+def func_ok_namedexpr_2(var):
+    """'msg' is defined in one handler with a named expression occurring
+    in a call used in an if test.
+    """
+    try:
+        return 1 / var.some_other_func()
+    except AttributeError:
+        if print(msg := var.get_msg()):
+            pass
+    except ZeroDivisionError:
+        msg = "Division by 0"
+    print(msg)
+
+
+def func_ok_namedexpr_3(var):
+    """'msg' is defined in one handler with a named expression occurring
+    as a keyword in a call used in an if test.
+    """
+    try:
+        return 1 / var.some_other_func()
+    except AttributeError:
+        if print("zero!", "here", sep=(msg := var.get_sep())):
+            pass
+    except ZeroDivisionError:
+        msg = "Division by 0"
+    print(msg)
diff --git a/tests/functional/u/use/used_before_assignment_except_handler_for_try_with_return_py38.rc b/tests/functional/u/use/used_before_assignment_except_handler_for_try_with_return_py38.rc
new file mode 100644
index 0000000000..85fc502b37
--- /dev/null
+++ b/tests/functional/u/use/used_before_assignment_except_handler_for_try_with_return_py38.rc
@@ -0,0 +1,2 @@
+[testoptions]
+min_pyver=3.8
diff --git a/tests/functional/u/use/used_before_assignment_py37.txt b/tests/functional/u/use/used_before_assignment_py37.txt
deleted file mode 100644
index f819720f38..0000000000
--- a/tests/functional/u/use/used_before_assignment_py37.txt
+++ /dev/null
@@ -1 +0,0 @@
-used-before-assignment:17:20:17:27:MyClass.incorrect_default_method:Using variable 'MyClass' before assignment:UNDEFINED
diff --git a/tests/functional/u/use/used_before_assignment_typing.txt b/tests/functional/u/use/used_before_assignment_typing.txt
deleted file mode 100644
index 7f73a9eb6e..0000000000
--- a/tests/functional/u/use/used_before_assignment_typing.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-used-before-assignment:12:21:12:28:MyClass.incorrect_typing_method:Using variable 'MyClass' before assignment:UNDEFINED
-used-before-assignment:17:26:17:33:MyClass.incorrect_nested_typing_method:Using variable 'MyClass' before assignment:UNDEFINED
-used-before-assignment:22:20:22:27:MyClass.incorrect_default_method:Using variable 'MyClass' before assignment:UNDEFINED
diff --git a/tests/functional/u/use/used_before_assignment.py b/tests/functional/u/used/used_before_assignment.py
similarity index 100%
rename from tests/functional/u/use/used_before_assignment.py
rename to tests/functional/u/used/used_before_assignment.py
diff --git a/tests/functional/u/use/used_before_assignment.txt b/tests/functional/u/used/used_before_assignment.txt
similarity index 76%
rename from tests/functional/u/use/used_before_assignment.txt
rename to tests/functional/u/used/used_before_assignment.txt
index d063aa000a..64fee9e556 100644
--- a/tests/functional/u/use/used_before_assignment.txt
+++ b/tests/functional/u/used/used_before_assignment.txt
@@ -1,2 +1,2 @@
-used-before-assignment:6:19:6:22::Using variable 'MSG' before assignment:UNDEFINED
-used-before-assignment:8:20:8:24::Using variable 'MSG2' before assignment:UNDEFINED
+used-before-assignment:6:19:6:22::Using variable 'MSG' before assignment:HIGH
+used-before-assignment:8:20:8:24::Using variable 'MSG2' before assignment:HIGH
diff --git a/tests/functional/u/use/used_before_assignment_488.py b/tests/functional/u/used/used_before_assignment_488.py
similarity index 100%
rename from tests/functional/u/use/used_before_assignment_488.py
rename to tests/functional/u/used/used_before_assignment_488.py
diff --git a/tests/functional/u/used/used_before_assignment_class_nested_under_function.py b/tests/functional/u/used/used_before_assignment_class_nested_under_function.py
new file mode 100644
index 0000000000..3627ae1e19
--- /dev/null
+++ b/tests/functional/u/used/used_before_assignment_class_nested_under_function.py
@@ -0,0 +1,13 @@
+"""https://github.com/PyCQA/pylint/issues/4590"""
+# pylint: disable=too-few-public-methods
+
+
+def conditional_class_factory():
+    """Define a nested class"""
+    class ConditionalClass(ModuleClass):
+        """Subclasses a name from the module scope"""
+    return ConditionalClass
+
+
+class ModuleClass:
+    """Module-level class"""
diff --git a/tests/functional/u/used/used_before_assignment_comprehension_homonyms.py b/tests/functional/u/used/used_before_assignment_comprehension_homonyms.py
new file mode 100644
index 0000000000..feae58dbe5
--- /dev/null
+++ b/tests/functional/u/used/used_before_assignment_comprehension_homonyms.py
@@ -0,0 +1,95 @@
+"""Homonym between filtered comprehension and assignment in except block."""
+
+def func():
+    """https://github.com/PyCQA/pylint/issues/5586"""
+    try:
+        print(value for value in range(1 / 0) if isinstance(value, int))
+    except ZeroDivisionError:
+        value = 1
+        print(value)
+
+
+def func2():
+    """Same, but with attribute access."""
+    try:
+        print(value for value in range(1 / 0) if isinstance(value.num, int))
+    except ZeroDivisionError:
+        value = 1
+        print(value)
+
+
+def func3():
+    """Same, but with no call."""
+    try:
+        print(value for value in range(1 / 0) if value)
+    except ZeroDivisionError:
+        value = 1
+        print(value)
+
+
+def func4():
+    """https://github.com/PyCQA/pylint/issues/6035"""
+    assets = [asset for asset in range(3) if asset.name == "filename"]
+
+    try:
+        raise ValueError
+    except ValueError:
+        asset = assets[0]
+        print(asset)
+
+
+def func5():
+    """Similar, but with subscript notation"""
+    results = {}
+    # pylint: disable-next=consider-using-dict-items
+    filtered =  [k for k in results if isinstance(results[k], dict)]
+
+    try:
+        1 / 0
+    except ZeroDivisionError:
+        k = None
+        print(k, filtered)
+
+
+def func6(data, keys):
+    """Similar, but with a subscript in a key-value pair rather than the test
+    See https://github.com/PyCQA/pylint/issues/6069"""
+    try:
+        results = {key: data[key] for key in keys}
+    except KeyError as exc:
+        key, *_ = exc.args
+        raise Exception(f"{key} not found") from exc
+
+    return results
+
+
+def func7():
+    """Similar, but with a comparison"""
+    bools = [str(i) == i for i in range(3)]
+
+    try:
+        1 / 0
+    except ZeroDivisionError:
+        i = None
+        print(i, bools)
+
+
+def func8():
+    """Similar, but with a container"""
+    pairs = [(i, i) for i in range(3)]
+
+    try:
+        1 / 0
+    except ZeroDivisionError:
+        i = None
+        print(i, pairs)
+
+
+# Module level cases
+
+module_ints = [j | j for j in range(3)]
+try:
+    1 / 0
+except ZeroDivisionError:
+    j = None
+    print(j, module_ints)
diff --git a/tests/functional/u/used/used_before_assignment_except_handler_for_try_with_return.py b/tests/functional/u/used/used_before_assignment_except_handler_for_try_with_return.py
new file mode 100644
index 0000000000..dc9661380d
--- /dev/null
+++ b/tests/functional/u/used/used_before_assignment_except_handler_for_try_with_return.py
@@ -0,0 +1,177 @@
+"""Tests for used-before-assignment with assignments in except handlers after
+try blocks with return statements.
+See: https://github.com/PyCQA/pylint/issues/5500.
+"""
+# pylint: disable=inconsistent-return-statements
+
+
+def function():
+    """Assume except blocks execute if the try block returns."""
+    try:
+        success_message = "success message"
+        return success_message
+    except ValueError:
+        failure_message = "failure message"
+    finally:
+        print(failure_message)  # [used-before-assignment]
+
+    return failure_message
+
+
+def func_ok(var):
+    """'msg' is defined in all ExceptHandlers."""
+    try:
+        return 1 / var.some_other_func()
+    except AttributeError:
+        msg = "Attribute not defined"
+    except ZeroDivisionError:
+        msg = "Division by 0"
+    print(msg)
+
+
+def func_ok2(var):
+    """'msg' is defined in all ExceptHandlers that don't raise an Exception."""
+    try:
+        return 1 / var.some_other_func()
+    except AttributeError as ex:
+        raise Exception from ex
+    except ZeroDivisionError:
+        msg = "Division by 0"
+    print(msg)
+
+
+def func_ok3(var):
+    """'msg' is defined in all ExceptHandlers that don't return."""
+    try:
+        return 1 / var.some_other_func()
+    except AttributeError:
+        return
+    except ZeroDivisionError:
+        msg = "Division by 0"
+    print(msg)
+
+
+def func_ok4(var):
+    """Define "msg" with a chained assignment."""
+    try:
+        return 1 / var.some_other_func()
+    except AttributeError:
+        msg2 = msg = "Division by 0"
+        print(msg2)
+    except ZeroDivisionError:
+        msg = "Division by 0"
+    print(msg)
+
+
+def func_ok5(var):
+    """Define 'msg' via unpacked iterable."""
+    try:
+        return 1 / var.some_other_func()
+    except AttributeError:
+        msg, msg2 = ["Division by 0", "Division by 0"]
+        print(msg2)
+    except ZeroDivisionError:
+        msg = "Division by 0"
+    print(msg)
+
+
+def func_ok6(var):
+    """Define 'msg' in one handler nested under if block."""
+    err_message = False
+    try:
+        return 1 / var.some_other_func()
+    except ZeroDivisionError:
+        if err_message:
+            msg = "Division by 0"
+        else:
+            msg = None
+    print(msg)
+
+
+def func_ok7(var):
+    """Define 'msg' in one handler nested under with statement."""
+    try:
+        return 1 / var.some_other_func()
+    except ZeroDivisionError:
+        with open(__file__, encoding='utf-8') as my_file:
+            msg = "Division by 0"
+            my_file.write(msg)
+    print(msg)
+
+
+def func_invalid1(var):
+    """'msg' is not defined in one handler."""
+    try:
+        return 1 / var.some_other_func()
+    except AttributeError:
+        pass
+    except ZeroDivisionError:
+        msg = "Division by 0"
+    print(msg)  # [used-before-assignment]
+
+
+def func_invalid2(var):
+    """'msg' is not defined in one handler."""
+    try:
+        return 1 / var.some_other_func()
+    except AttributeError:
+        msg: str
+    except ZeroDivisionError:
+        msg = "Division by 0"
+    print(msg)  # [used-before-assignment]
+
+
+def func_invalid3(var):
+    """'msg' is not defined in one handler, but is defined in another
+    nested under an if. Nesting under an if tests that the implementation
+    does not assume direct parentage between `msg=` and `except`, and
+    the prior except is necessary to raise the message.
+    """
+    err_message = False
+    try:
+        return 1 / var.some_other_func()
+    except AttributeError:
+        pass
+    except ZeroDivisionError:
+        if err_message:
+            msg = "Division by 0"
+        else:
+            msg = None
+    print(msg)  # [used-before-assignment]
+
+
+def func_invalid4(var):
+    """Define 'msg' in one handler nested under with statement."""
+    try:
+        return 1 / var.some_other_func()
+    except AttributeError:
+        pass
+    except ZeroDivisionError:
+        with open(__file__, encoding='utf-8') as my_file:
+            msg = "Division by 0"
+            my_file.write("****")
+    print(msg)  # [used-before-assignment]
+
+
+def func_invalid5(var):
+    """Define 'msg' in one handler only via chained assignment."""
+    try:
+        return 1 / var.some_other_func()
+    except AttributeError:
+        pass
+    except ZeroDivisionError:
+        msg2 = msg = "Division by 0"
+        print(msg2)
+    print(msg)  # [used-before-assignment]
+
+
+def func_invalid6(var):
+    """Define 'msg' in one handler only via unpacked iterable."""
+    try:
+        return 1 / var.some_other_func()
+    except AttributeError:
+        pass
+    except ZeroDivisionError:
+        msg, msg2 = ["Division by 0"] * 2
+        print(msg2)
+    print(msg)  # [used-before-assignment]
diff --git a/tests/functional/u/used/used_before_assignment_except_handler_for_try_with_return.txt b/tests/functional/u/used/used_before_assignment_except_handler_for_try_with_return.txt
new file mode 100644
index 0000000000..55761a411c
--- /dev/null
+++ b/tests/functional/u/used/used_before_assignment_except_handler_for_try_with_return.txt
@@ -0,0 +1,7 @@
+used-before-assignment:16:14:16:29:function:Using variable 'failure_message' before assignment:CONTROL_FLOW
+used-before-assignment:110:10:110:13:func_invalid1:Using variable 'msg' before assignment:CONTROL_FLOW
+used-before-assignment:121:10:121:13:func_invalid2:Using variable 'msg' before assignment:CONTROL_FLOW
+used-before-assignment:140:10:140:13:func_invalid3:Using variable 'msg' before assignment:CONTROL_FLOW
+used-before-assignment:153:10:153:13:func_invalid4:Using variable 'msg' before assignment:CONTROL_FLOW
+used-before-assignment:165:10:165:13:func_invalid5:Using variable 'msg' before assignment:CONTROL_FLOW
+used-before-assignment:177:10:177:13:func_invalid6:Using variable 'msg' before assignment:CONTROL_FLOW
diff --git a/tests/functional/u/use/used_before_assignment_issue1081.py b/tests/functional/u/used/used_before_assignment_issue1081.py
similarity index 100%
rename from tests/functional/u/use/used_before_assignment_issue1081.py
rename to tests/functional/u/used/used_before_assignment_issue1081.py
diff --git a/tests/functional/u/use/used_before_assignment_issue1081.txt b/tests/functional/u/used/used_before_assignment_issue1081.txt
similarity index 84%
rename from tests/functional/u/use/used_before_assignment_issue1081.txt
rename to tests/functional/u/used/used_before_assignment_issue1081.txt
index 0aa266877d..857c4826ba 100644
--- a/tests/functional/u/use/used_before_assignment_issue1081.txt
+++ b/tests/functional/u/used/used_before_assignment_issue1081.txt
@@ -1,7 +1,7 @@
-used-before-assignment:7:7:7:8:used_before_assignment_1:Using variable 'x' before assignment:UNDEFINED
+used-before-assignment:7:7:7:8:used_before_assignment_1:Using variable 'x' before assignment:HIGH
 redefined-outer-name:8:12:8:13:used_before_assignment_1:Redefining name 'x' from outer scope (line 3):UNDEFINED
-used-before-assignment:13:7:13:8:used_before_assignment_2:Using variable 'x' before assignment:UNDEFINED
+used-before-assignment:13:7:13:8:used_before_assignment_2:Using variable 'x' before assignment:HIGH
 redefined-outer-name:15:4:15:5:used_before_assignment_2:Redefining name 'x' from outer scope (line 3):UNDEFINED
-used-before-assignment:19:7:19:8:used_before_assignment_3:Using variable 'x' before assignment:UNDEFINED
+used-before-assignment:19:7:19:8:used_before_assignment_3:Using variable 'x' before assignment:HIGH
 redefined-outer-name:21:12:21:13:used_before_assignment_3:Redefining name 'x' from outer scope (line 3):UNDEFINED
 redefined-outer-name:30:4:30:5:not_used_before_assignment_2:Redefining name 'x' from outer scope (line 3):UNDEFINED
diff --git a/tests/functional/u/used/used_before_assignment_issue2615.py b/tests/functional/u/used/used_before_assignment_issue2615.py
new file mode 100644
index 0000000000..bce073bf3c
--- /dev/null
+++ b/tests/functional/u/used/used_before_assignment_issue2615.py
@@ -0,0 +1,60 @@
+"""https://github.com/PyCQA/pylint/issues/2615"""
+def main():
+    """When evaluating except blocks, assume try statements fail."""
+    try:
+        res = 1 / 0
+        res = 42
+        if main():
+            res = None
+        with open(__file__, encoding="utf-8") as opened_file:
+            res = opened_file.readlines()
+    except ZeroDivisionError:
+        print(res)  # [used-before-assignment]
+    print(res)
+
+
+def nested_except_blocks():
+    """Assignments in an except are tested against possibly failing
+    assignments in try blocks at two different nesting levels."""
+    try:
+        res = 1 / 0
+        res = 42
+        if main():
+            res = None
+        with open(__file__, encoding="utf-8") as opened_file:
+            res = opened_file.readlines()
+    except ZeroDivisionError:
+        try:
+            more_bad_division = 1 / 0
+        except ZeroDivisionError:
+            print(more_bad_division)  # [used-before-assignment]
+            print(res)  # [used-before-assignment]
+    print(res)
+
+
+def consecutive_except_blocks():
+    """An assignment assumed to execute in one TryExcept should continue to be
+    assumed to execute in a consecutive TryExcept.
+    """
+    try:
+        res = 100
+    except ZeroDivisionError:
+        pass
+    try:
+        pass
+    except ValueError:
+        print(res)
+
+
+def name_earlier_in_except_block():
+    """Permit the name that might not have been assigned during the try block
+    to be defined inside a conditional inside the except block.
+    """
+    try:
+        res = 1 / 0
+    except ZeroDivisionError:
+        if main():
+            res = 10
+        else:
+            res = 11
+        print(res)
diff --git a/tests/functional/u/used/used_before_assignment_issue2615.txt b/tests/functional/u/used/used_before_assignment_issue2615.txt
new file mode 100644
index 0000000000..567f562305
--- /dev/null
+++ b/tests/functional/u/used/used_before_assignment_issue2615.txt
@@ -0,0 +1,3 @@
+used-before-assignment:12:14:12:17:main:Using variable 'res' before assignment:CONTROL_FLOW
+used-before-assignment:30:18:30:35:nested_except_blocks:Using variable 'more_bad_division' before assignment:CONTROL_FLOW
+used-before-assignment:31:18:31:21:nested_except_blocks:Using variable 'res' before assignment:CONTROL_FLOW
diff --git a/tests/functional/u/used/used_before_assignment_issue4761.py b/tests/functional/u/used/used_before_assignment_issue4761.py
new file mode 100644
index 0000000000..6f8e048e4c
--- /dev/null
+++ b/tests/functional/u/used/used_before_assignment_issue4761.py
@@ -0,0 +1,206 @@
+"""used-before-assignment (E0601)"""
+def function():
+    """Consider that except blocks may not execute."""
+    try:
+        pass
+    except ValueError:
+        some_message = 'some message'
+
+    if not some_message:  # [used-before-assignment]
+        return 1
+
+    return some_message
+
+
+def uses_nonlocal():
+    """https://github.com/PyCQA/pylint/issues/5965"""
+    count = 0
+    def inner():
+        nonlocal count
+        try:
+            print(count)
+        except ValueError:
+            count +=1
+
+    return inner()
+
+
+def uses_unrelated_nonlocal():
+    """Unrelated nonlocals still let messages emit"""
+    count = 0
+    unrelated = 0
+    def inner():
+        nonlocal unrelated
+        try:
+            print(count)  # [used-before-assignment]
+        except ValueError:
+            count += 1
+
+    print(count)
+    return inner()
+
+
+# Cases related to a specific control flow where
+# the `else` of a loop can depend on a name only defined
+# in a single except handler because that except handler is the
+# only non-break exit branch.
+
+def valid_only_non_break_exit_from_loop_is_except_handler():
+    """https://github.com/PyCQA/pylint/issues/5683"""
+    for _ in range(3):
+        try:
+            function()  # not an exit branch because of `else` below
+        except ValueError as verr:
+            error = verr  # < exit branch where error is defined
+        else:
+            break  # < exit condition where error is *not* defined
+            # will skip else: raise error
+        print("retrying...")
+    else:
+        # This usage is valid because there is only one exit branch
+        raise error
+
+
+def invalid_no_outer_else():
+    """The reliance on the name is not guarded by else."""
+    for _ in range(3):
+        try:
+            function()
+        except ValueError as verr:
+            error = verr
+        else:
+            break
+        print("retrying...")
+    raise error  # [used-before-assignment]
+
+
+def invalid_no_outer_else_2():
+    """Same, but the raise is inside a loop."""
+    for _ in range(3):
+        try:
+            function()
+        except ValueError as verr:
+            error = verr
+        else:
+            break
+        raise error  # [used-before-assignment]
+
+
+def invalid_no_inner_else():
+    """No inner else statement."""
+    for _ in range(3):
+        try:
+            function()
+        except ValueError as verr:
+            error = verr
+        print("retrying...")
+        if function():
+            break
+    else:
+        raise error  # [used-before-assignment]
+
+
+def invalid_wrong_break_location():
+    """The break is in the wrong location."""
+    for _ in range(3):
+        try:
+            function()
+            break
+        except ValueError as verr:
+            error = verr
+            print("I give up")
+    else:
+        raise error  # [used-before-assignment]
+
+
+def invalid_no_break():
+    """No break."""
+    for _ in range(3):
+        try:
+            function()
+        except ValueError as verr:
+            error = verr
+        else:
+            pass
+    else:  # pylint: disable=useless-else-on-loop
+        raise error  # [used-before-assignment]
+
+
+def invalid_other_non_break_exit_from_loop_besides_except_handler():
+    """The continue creates another exit branch."""
+    while function():
+        if function():
+            continue
+        try:
+            pass
+        except ValueError as verr:
+            error = verr
+        else:
+            break
+    else:
+        raise error  # [used-before-assignment]
+
+
+def valid_continue_does_not_matter():
+    """This continue doesn't matter: still just one exit branch."""
+    while function():
+        try:
+            for _ in range(3):
+                if function():
+                    continue
+                print(1 / 0)
+        except ZeroDivisionError as zde:
+            error = zde
+        else:
+            break
+    else:
+        raise error
+
+
+def invalid_conditional_continue_after_break():
+    """The continue is another exit branch"""
+    while function():
+        try:
+            if function():
+                break
+            if not function():
+                continue
+        except ValueError as verr:
+            error = verr
+        else:
+            break
+    else:
+        raise error  # [used-before-assignment]
+
+
+def invalid_unrelated_loops():
+    """The loop else in question is not related to the try/except/else."""
+    for _ in range(3):
+        try:
+            function()
+        except ValueError as verr:
+            error = verr
+        else:
+            break
+    while function():
+        print('The time is:')
+        break
+    else:
+        raise error  # [used-before-assignment]
+
+
+def valid_nested_loops():
+    """The name `error` is still available in a nested else."""
+    for _ in range(3):
+        try:
+            function()
+        except ValueError as verr:
+            error = verr
+        else:
+            break
+    else:
+        while function():
+            print('The time is:')
+            break
+        else:
+            raise error
diff --git a/tests/functional/u/used/used_before_assignment_issue4761.txt b/tests/functional/u/used/used_before_assignment_issue4761.txt
new file mode 100644
index 0000000000..833e0bf185
--- /dev/null
+++ b/tests/functional/u/used/used_before_assignment_issue4761.txt
@@ -0,0 +1,10 @@
+used-before-assignment:9:11:9:23:function:Using variable 'some_message' before assignment:CONTROL_FLOW
+used-before-assignment:35:18:35:23:uses_unrelated_nonlocal.inner:Using variable 'count' before assignment:CONTROL_FLOW
+used-before-assignment:74:10:74:15:invalid_no_outer_else:Using variable 'error' before assignment:CONTROL_FLOW
+used-before-assignment:86:14:86:19:invalid_no_outer_else_2:Using variable 'error' before assignment:CONTROL_FLOW
+used-before-assignment:100:14:100:19:invalid_no_inner_else:Using variable 'error' before assignment:CONTROL_FLOW
+used-before-assignment:113:14:113:19:invalid_wrong_break_location:Using variable 'error' before assignment:CONTROL_FLOW
+used-before-assignment:126:14:126:19:invalid_no_break:Using variable 'error' before assignment:CONTROL_FLOW
+used-before-assignment:141:14:141:19:invalid_other_non_break_exit_from_loop_besides_except_handler:Using variable 'error' before assignment:CONTROL_FLOW
+used-before-assignment:173:14:173:19:invalid_conditional_continue_after_break:Using variable 'error' before assignment:CONTROL_FLOW
+used-before-assignment:189:14:189:19:invalid_unrelated_loops:Using variable 'error' before assignment:CONTROL_FLOW
diff --git a/tests/functional/u/use/used_before_assignment_issue626.py b/tests/functional/u/used/used_before_assignment_issue626.py
similarity index 86%
rename from tests/functional/u/use/used_before_assignment_issue626.py
rename to tests/functional/u/used/used_before_assignment_issue626.py
index c98632b7f7..cb9fc100e6 100644
--- a/tests/functional/u/use/used_before_assignment_issue626.py
+++ b/tests/functional/u/used/used_before_assignment_issue626.py
@@ -42,3 +42,10 @@ def main4():
         pass
 
     print(e)  # [used-before-assignment]
+
+
+def main5():
+    try:
+        print([e for e in range(3) if e])
+    except ValueError as e:
+        print(e)
diff --git a/tests/functional/u/use/used_before_assignment_issue626.txt b/tests/functional/u/used/used_before_assignment_issue626.txt
similarity index 87%
rename from tests/functional/u/use/used_before_assignment_issue626.txt
rename to tests/functional/u/used/used_before_assignment_issue626.txt
index 43b86e2642..1ee575ba3e 100644
--- a/tests/functional/u/use/used_before_assignment_issue626.txt
+++ b/tests/functional/u/used/used_before_assignment_issue626.txt
@@ -1,5 +1,5 @@
 unused-variable:5:4:6:12:main1:Unused variable 'e':UNDEFINED
-used-before-assignment:8:10:8:11:main1:Using variable 'e' before assignment:UNDEFINED
+used-before-assignment:8:10:8:11:main1:Using variable 'e' before assignment:HIGH
 unused-variable:21:4:22:12:main3:Unused variable 'e':UNDEFINED
 unused-variable:31:4:32:12:main4:Unused variable 'e':UNDEFINED
-used-before-assignment:44:10:44:11:main4:Using variable 'e' before assignment:UNDEFINED
+used-before-assignment:44:10:44:11:main4:Using variable 'e' before assignment:HIGH
diff --git a/tests/functional/u/used/used_before_assignment_issue85.py b/tests/functional/u/used/used_before_assignment_issue85.py
new file mode 100644
index 0000000000..367af9dfa0
--- /dev/null
+++ b/tests/functional/u/used/used_before_assignment_issue85.py
@@ -0,0 +1,126 @@
+"""https://github.com/PyCQA/pylint/issues/85"""
+def main():
+    """When evaluating finally blocks, assume try statements fail."""
+    try:
+        res = 1 / 0
+        res = 42
+    finally:
+        print(res)  # [used-before-assignment]
+    print(res)
+
+
+def try_except_finally():
+    """When evaluating finally blocks, assume try statements fail."""
+    try:
+        res = 1 / 0
+        res = 42
+    except ZeroDivisionError:
+        print()
+    finally:
+        print(res)  # [used-before-assignment]
+    print(res)
+
+
+def try_except_finally_assignment_in_final_block():
+    """Assignment of the name in the final block does not warn."""
+    try:
+        res = 1 / 0
+        res = 42
+    except ZeroDivisionError:
+        print()
+    finally:
+        res = 999
+        print(res)
+    print(res)
+
+
+def try_except_finally_nested_try_finally_in_try():
+    """Don't confuse assignments in different finally statements where
+    one is nested inside a try.
+    """
+    try:
+        try:
+            res = 1 / 0
+        finally:
+            print(res)  # [used-before-assignment]
+        print(1 / 0)
+    except ZeroDivisionError:
+        print()
+    finally:
+        res = 999  # this assignment could be confused for that above
+        print(res)
+    print(res)
+
+
+def try_except_finally_nested_in_finally():
+    """Until Pylint comes to a consensus on requiring all except handlers to
+    define a name, raise, or return (https://github.com/PyCQA/pylint/issues/5524),
+    Pylint assumes statements in try blocks succeed when accessed *after*
+    except or finally blocks and fail when accessed *in* except or finally
+    blocks.)
+    """
+    try:
+        outer_times = 1
+    finally:
+        try:
+            inner_times = 1
+        except TypeError:
+            pass
+        finally:
+            print(outer_times)  # [used-before-assignment]
+        print(inner_times)  # see docstring: might emit in a future version
+
+
+def try_except_finally_nested_in_finally_2():
+    """Neither name is accessed after a finally block."""
+    try:
+        outer_times = 1
+    finally:
+        try:
+            inner_times = 1
+        except TypeError:
+            pass
+        finally:
+            print(inner_times)  # [used-before-assignment]
+        print(outer_times)  # [used-before-assignment]
+
+
+def try_except_finally_nested_in_finally_3():
+    """One name is never accessed after a finally block, but just emit
+    once per name.
+    """
+    try:
+        outer_times = 1
+    finally:
+        try:
+            inner_times = 1
+        except TypeError:
+            pass
+        finally:
+            print(inner_times)  # [used-before-assignment]
+            print(outer_times)  # [used-before-assignment]
+        print(inner_times)
+        # used-before-assignment is only raised once per name
+        print(outer_times)
+
+
+def try_except_finally_nested_in_finally_4():
+    """Triple nesting: don't assume direct parentages of outer try/finally
+    and inner try/finally.
+    """
+    try:
+        outer_times = 1
+    finally:
+        try:
+            pass
+        finally:
+            try:
+                inner_times = 1
+            except TypeError:
+                pass
+            finally:
+                print(inner_times)  # [used-before-assignment]
+                print(outer_times)  # [used-before-assignment]
+            print(inner_times)
+            # used-before-assignment is only raised once per name
+            print(outer_times)
diff --git a/tests/functional/u/used/used_before_assignment_issue85.txt b/tests/functional/u/used/used_before_assignment_issue85.txt
new file mode 100644
index 0000000000..9f405c2c5c
--- /dev/null
+++ b/tests/functional/u/used/used_before_assignment_issue85.txt
@@ -0,0 +1,10 @@
+used-before-assignment:8:14:8:17:main:Using variable 'res' before assignment:CONTROL_FLOW
+used-before-assignment:20:14:20:17:try_except_finally:Using variable 'res' before assignment:CONTROL_FLOW
+used-before-assignment:45:18:45:21:try_except_finally_nested_try_finally_in_try:Using variable 'res' before assignment:HIGH
+used-before-assignment:70:18:70:29:try_except_finally_nested_in_finally:Using variable 'outer_times' before assignment:CONTROL_FLOW
+used-before-assignment:84:18:84:29:try_except_finally_nested_in_finally_2:Using variable 'inner_times' before assignment:CONTROL_FLOW
+used-before-assignment:85:14:85:25:try_except_finally_nested_in_finally_2:Using variable 'outer_times' before assignment:CONTROL_FLOW
+used-before-assignment:100:18:100:29:try_except_finally_nested_in_finally_3:Using variable 'inner_times' before assignment:CONTROL_FLOW
+used-before-assignment:101:18:101:29:try_except_finally_nested_in_finally_3:Using variable 'outer_times' before assignment:CONTROL_FLOW
+used-before-assignment:122:22:122:33:try_except_finally_nested_in_finally_4:Using variable 'inner_times' before assignment:CONTROL_FLOW
+used-before-assignment:123:22:123:33:try_except_finally_nested_in_finally_4:Using variable 'outer_times' before assignment:CONTROL_FLOW
diff --git a/tests/functional/u/use/used_before_assignment_issue853.py b/tests/functional/u/used/used_before_assignment_issue853.py
similarity index 100%
rename from tests/functional/u/use/used_before_assignment_issue853.py
rename to tests/functional/u/used/used_before_assignment_issue853.py
diff --git a/tests/functional/u/use/used_before_assignment_nonlocal.py b/tests/functional/u/used/used_before_assignment_nonlocal.py
similarity index 63%
rename from tests/functional/u/use/used_before_assignment_nonlocal.py
rename to tests/functional/u/used/used_before_assignment_nonlocal.py
index 5cbdd510c2..aa0b654b71 100644
--- a/tests/functional/u/use/used_before_assignment_nonlocal.py
+++ b/tests/functional/u/used/used_before_assignment_nonlocal.py
@@ -58,3 +58,34 @@ def on_click(event):
     on_click(True)
 
 nonlocal_in_ifexp()
+
+
+def type_annotation_only_gets_value_via_nonlocal():
+    """https://github.com/PyCQA/pylint/issues/5394"""
+    some_num: int
+    def inner():
+        nonlocal some_num
+        some_num = 5
+    inner()
+    print(some_num)
+
+
+def type_annotation_only_gets_value_via_nonlocal_nested():
+    """Similar, with nesting"""
+    some_num: int
+    def inner():
+        def inner2():
+            nonlocal some_num
+            some_num = 5
+        inner2()
+    inner()
+    print(some_num)
+
+
+def type_annotation_never_gets_value_despite_nonlocal():
+    """Type annotation lacks a value despite nonlocal declaration"""
+    some_num: int
+    def inner():
+        nonlocal some_num
+    inner()
+    print(some_num)  # [used-before-assignment]
diff --git a/tests/functional/u/use/used_before_assignment_nonlocal.txt b/tests/functional/u/used/used_before_assignment_nonlocal.txt
similarity index 54%
rename from tests/functional/u/use/used_before_assignment_nonlocal.txt
rename to tests/functional/u/used/used_before_assignment_nonlocal.txt
index 95bc19b6cf..f3e873315d 100644
--- a/tests/functional/u/use/used_before_assignment_nonlocal.txt
+++ b/tests/functional/u/used/used_before_assignment_nonlocal.txt
@@ -1,6 +1,7 @@
-used-before-assignment:18:14:18:17:test_fail.wrap:Using variable 'cnt' before assignment:UNDEFINED
-used-before-assignment:27:14:27:17:test_fail2.wrap:Using variable 'cnt' before assignment:UNDEFINED
-used-before-assignment:30:20:30:30:test_fail3:Using variable 'test_fail4' before assignment:UNDEFINED
-used-before-assignment:34:22:34:32:test_fail4:Using variable 'test_fail5' before assignment:UNDEFINED
-used-before-assignment:34:44:34:53:test_fail4:Using variable 'undefined' before assignment:UNDEFINED
-used-before-assignment:40:18:40:28:test_fail5:Using variable 'undefined1' before assignment:UNDEFINED
+used-before-assignment:18:14:18:17:test_fail.wrap:Using variable 'cnt' before assignment:HIGH
+used-before-assignment:27:14:27:17:test_fail2.wrap:Using variable 'cnt' before assignment:HIGH
+used-before-assignment:30:20:30:30:test_fail3:Using variable 'test_fail4' before assignment:HIGH
+used-before-assignment:34:22:34:32:test_fail4:Using variable 'test_fail5' before assignment:HIGH
+used-before-assignment:34:44:34:53:test_fail4:Using variable 'undefined' before assignment:HIGH
+used-before-assignment:40:18:40:28:test_fail5:Using variable 'undefined1' before assignment:HIGH
+used-before-assignment:91:10:91:18:type_annotation_never_gets_value_despite_nonlocal:Using variable 'some_num' before assignment:HIGH
diff --git a/tests/functional/u/use/used_before_assignment_py37.py b/tests/functional/u/used/used_before_assignment_py37.py
similarity index 71%
rename from tests/functional/u/use/used_before_assignment_py37.py
rename to tests/functional/u/used/used_before_assignment_py37.py
index e17c345a90..c64bf7cf55 100644
--- a/tests/functional/u/use/used_before_assignment_py37.py
+++ b/tests/functional/u/used/used_before_assignment_py37.py
@@ -1,6 +1,7 @@
 """Tests for used-before-assignment with functions added in python 3.7"""
 # pylint: disable=missing-function-docstring
 from __future__ import annotations
+from collections import namedtuple
 from typing import List
 
 
@@ -14,7 +15,7 @@ def second_correct_typing_method(self, other: List[MyClass]) -> bool:
         return self == other[0]
 
     def incorrect_default_method(
-        self, other=MyClass() # [used-before-assignment]
+        self, other=MyClass() # [undefined-variable]
     ) -> bool:
         return self == other
 
@@ -26,3 +27,9 @@ def inner_method(self, other: MyClass) -> bool:
             return self == other
 
         return inner_method(self, MyClass())
+
+
+class NamedTupleSubclass(namedtuple("NamedTupleSubclass", [])):
+    """Taken from https://github.com/PyCQA/pylint/issues/5982"""
+    def method(self) -> NamedTupleSubclass:
+        """Variables checker crashed when astroid did not supply a lineno"""
diff --git a/tests/functional/u/use/used_before_assignment_py37.rc b/tests/functional/u/used/used_before_assignment_py37.rc
similarity index 100%
rename from tests/functional/u/use/used_before_assignment_py37.rc
rename to tests/functional/u/used/used_before_assignment_py37.rc
diff --git a/tests/functional/u/used/used_before_assignment_py37.txt b/tests/functional/u/used/used_before_assignment_py37.txt
new file mode 100644
index 0000000000..fa0a0b77a0
--- /dev/null
+++ b/tests/functional/u/used/used_before_assignment_py37.txt
@@ -0,0 +1 @@
+undefined-variable:18:20:18:27:MyClass.incorrect_default_method:Undefined variable 'MyClass':UNDEFINED
diff --git a/tests/functional/u/used/used_before_assignment_type_annotations.py b/tests/functional/u/used/used_before_assignment_type_annotations.py
new file mode 100644
index 0000000000..1a03050c34
--- /dev/null
+++ b/tests/functional/u/used/used_before_assignment_type_annotations.py
@@ -0,0 +1,90 @@
+"""Tests for annotation of variables and potential use before assignment"""
+# pylint: disable=too-few-public-methods, global-variable-not-assigned
+from collections import namedtuple
+from typing import List
+
+def value_and_type_assignment():
+    """The variable assigned a value and type"""
+    variable: int = 2
+    print(variable)
+
+
+def only_type_assignment():
+    """The variable never gets assigned a value"""
+    variable: int
+    print(variable)  # [used-before-assignment]
+
+
+def both_type_and_value_assignment():
+    """The variable first gets a type and subsequently a value"""
+    variable: int
+    variable = 1
+    print(variable)
+
+
+def value_assignment_after_access():
+    """The variable gets a value after it has been accessed"""
+    variable: int
+    print(variable)  # [used-before-assignment]
+    variable = 1
+
+
+def value_assignment_from_iterator():
+    """The variables gets a value from an iterator"""
+    variable: int
+    for variable in (1, 2):
+        print(variable)
+
+
+def assignment_in_comprehension():
+    """A previously typed variables gets used in a comprehension. Don't crash!"""
+    some_list: List[int]
+    some_list = [1, 2, 3]
+    some_list = [i * 2 for i in some_list]
+
+
+def decorator_returning_function():
+    """A decorator that returns a wrapper function with decoupled typing"""
+    def wrapper_with_decoupled_typing():
+        print(var)
+
+    var: int
+    var = 2
+    return wrapper_with_decoupled_typing
+
+
+def decorator_returning_incorrect_function():
+    """A decorator that returns a wrapper function with decoupled typing"""
+    def wrapper_with_type_and_no_value():
+        # This emits NameError rather than UnboundLocalError, so
+        # undefined-variable is okay, even though the traceback refers
+        # to "free variable 'var' referenced before assignment"
+        print(var) # [undefined-variable]
+
+    var: int
+    return wrapper_with_type_and_no_value
+
+
+def typing_and_value_assignment_with_tuple_assignment():
+    """The typed variables get assigned with a tuple assignment"""
+    var_one: int
+    var_two: int
+    var_one, var_two = 1, 1
+    print(var_one)
+    print(var_two)
+
+
+def nested_class_as_return_annotation():
+    """A namedtuple as a class attribute is used as a return annotation
+
+    Taken from https://github.com/PyCQA/pylint/issues/5568"""
+    class MyObject:
+        """namedtuple as class attribute"""
+        Coords = namedtuple('Point', ['x', 'y'])
+
+        def my_method(self) -> Coords:
+            """Return annotation is valid"""
+            # pylint: disable=unnecessary-pass
+            pass
+
+    print(MyObject)
diff --git a/tests/functional/u/used/used_before_assignment_type_annotations.txt b/tests/functional/u/used/used_before_assignment_type_annotations.txt
new file mode 100644
index 0000000000..81e1646da8
--- /dev/null
+++ b/tests/functional/u/used/used_before_assignment_type_annotations.txt
@@ -0,0 +1,3 @@
+used-before-assignment:15:10:15:18:only_type_assignment:Using variable 'variable' before assignment:HIGH
+used-before-assignment:28:10:28:18:value_assignment_after_access:Using variable 'variable' before assignment:HIGH
+undefined-variable:62:14:62:17:decorator_returning_incorrect_function.wrapper_with_type_and_no_value:Undefined variable 'var':HIGH
diff --git a/tests/functional/u/use/used_before_assignment_typing.py b/tests/functional/u/used/used_before_assignment_typing.py
similarity index 76%
rename from tests/functional/u/use/used_before_assignment_typing.py
rename to tests/functional/u/used/used_before_assignment_typing.py
index a9961c8906..9be01d7706 100644
--- a/tests/functional/u/use/used_before_assignment_typing.py
+++ b/tests/functional/u/used/used_before_assignment_typing.py
@@ -9,17 +9,17 @@ class MyClass:
     """Type annotation or default values for first level methods can't refer to their own class"""
 
     def incorrect_typing_method(
-        self, other: MyClass  # [used-before-assignment]
+        self, other: MyClass  # [undefined-variable]
     ) -> bool:
         return self == other
 
     def incorrect_nested_typing_method(
-        self, other: List[MyClass]  # [used-before-assignment]
+        self, other: List[MyClass]  # [undefined-variable]
     ) -> bool:
         return self == other[0]
 
     def incorrect_default_method(
-        self, other=MyClass()  # [used-before-assignment]
+        self, other=MyClass()  # [undefined-variable]
     ) -> bool:
         return self == other
 
@@ -61,3 +61,16 @@ def inner_method(self, other: MyOtherClass) -> bool:
     def self_referential_optional_within_method(self) -> None:
         variable: Optional[MyOtherClass] = self
         print(variable)
+
+
+class MyThirdClass:
+    """Class to test self referential variable typing within conditionals.
+    This regressed, reported in: https://github.com/PyCQA/pylint/issues/5499
+    """
+
+    def function(self, var: int) -> None:
+        if var < 0.5:
+            _x: MyThirdClass = self
+
+    def other_function(self) -> None:
+        _x: MyThirdClass = self
diff --git a/tests/functional/u/used/used_before_assignment_typing.txt b/tests/functional/u/used/used_before_assignment_typing.txt
new file mode 100644
index 0000000000..ae05b23f38
--- /dev/null
+++ b/tests/functional/u/used/used_before_assignment_typing.txt
@@ -0,0 +1,3 @@
+undefined-variable:12:21:12:28:MyClass.incorrect_typing_method:Undefined variable 'MyClass':UNDEFINED
+undefined-variable:17:26:17:33:MyClass.incorrect_nested_typing_method:Undefined variable 'MyClass':UNDEFINED
+undefined-variable:22:20:22:27:MyClass.incorrect_default_method:Undefined variable 'MyClass':UNDEFINED
diff --git a/tests/functional/u/use/used_prior_global_declaration.py b/tests/functional/u/used/used_prior_global_declaration.py
similarity index 100%
rename from tests/functional/u/use/used_prior_global_declaration.py
rename to tests/functional/u/used/used_prior_global_declaration.py
diff --git a/tests/functional/u/use/used_prior_global_declaration.txt b/tests/functional/u/used/used_prior_global_declaration.txt
similarity index 100%
rename from tests/functional/u/use/used_prior_global_declaration.txt
rename to tests/functional/u/used/used_prior_global_declaration.txt
diff --git a/tests/functional/u/useless/useless_else_on_loop.py b/tests/functional/u/useless/useless_else_on_loop.py
index 0bd3dff67b..c7d9016638 100644
--- a/tests/functional/u/useless/useless_else_on_loop.py
+++ b/tests/functional/u/useless/useless_else_on_loop.py
@@ -12,7 +12,7 @@ def test_return_for():
     return None
 
 def test_return_while():
-    """else + return is not accetable."""
+    """else + return is not acceptable."""
     while True:
         return 1
     else:  # [useless-else-on-loop]
diff --git a/tests/functional/u/useless/useless_else_on_loop.txt b/tests/functional/u/useless/useless_else_on_loop.txt
index ac8117ac72..938f24cc51 100644
--- a/tests/functional/u/useless/useless_else_on_loop.txt
+++ b/tests/functional/u/useless/useless_else_on_loop.txt
@@ -1,6 +1,6 @@
-useless-else-on-loop:10:4:11:31:test_return_for:Else clause on loop without a break statement:UNDEFINED
-useless-else-on-loop:18:4:19:31:test_return_while:Else clause on loop without a break statement:UNDEFINED
-useless-else-on-loop:28:0:29:21::Else clause on loop without a break statement:UNDEFINED
-useless-else-on-loop:35:0:36:21::Else clause on loop without a break statement:UNDEFINED
-useless-else-on-loop:40:0:43:13::Else clause on loop without a break statement:UNDEFINED
-useless-else-on-loop:87:4:88:19:test_break_in_orelse_deep2:Else clause on loop without a break statement:UNDEFINED
+useless-else-on-loop:10:4:11:31:test_return_for:Else clause on loop without a break statement, remove the else and de-indent all the code inside it:UNDEFINED
+useless-else-on-loop:18:4:19:31:test_return_while:Else clause on loop without a break statement, remove the else and de-indent all the code inside it:UNDEFINED
+useless-else-on-loop:28:0:29:21::Else clause on loop without a break statement, remove the else and de-indent all the code inside it:UNDEFINED
+useless-else-on-loop:35:0:36:21::Else clause on loop without a break statement, remove the else and de-indent all the code inside it:UNDEFINED
+useless-else-on-loop:40:0:43:13::Else clause on loop without a break statement, remove the else and de-indent all the code inside it:UNDEFINED
+useless-else-on-loop:87:4:88:19:test_break_in_orelse_deep2:Else clause on loop without a break statement, remove the else and de-indent all the code inside it:UNDEFINED
diff --git a/tests/functional/u/useless/useless_object_inheritance.txt b/tests/functional/u/useless/useless_object_inheritance.txt
index fe3bd2e4a8..67f48417f9 100644
--- a/tests/functional/u/useless/useless_object_inheritance.txt
+++ b/tests/functional/u/useless/useless_object_inheritance.txt
@@ -1,4 +1,4 @@
-useless-object-inheritance:8:0:9:8:A:Class 'A' inherits from object, can be safely removed from bases in python3:UNDEFINED
-useless-object-inheritance:14:0:15:8:C:Class 'C' inherits from object, can be safely removed from bases in python3:UNDEFINED
-useless-object-inheritance:17:0:18:8:D:Class 'D' inherits from object, can be safely removed from bases in python3:UNDEFINED
-useless-object-inheritance:20:0:21:8:E:Class 'E' inherits from object, can be safely removed from bases in python3:UNDEFINED
+useless-object-inheritance:8:0:8:7:A:Class 'A' inherits from object, can be safely removed from bases in python3:UNDEFINED
+useless-object-inheritance:14:0:14:7:C:Class 'C' inherits from object, can be safely removed from bases in python3:UNDEFINED
+useless-object-inheritance:17:0:17:7:D:Class 'D' inherits from object, can be safely removed from bases in python3:UNDEFINED
+useless-object-inheritance:20:0:20:7:E:Class 'E' inherits from object, can be safely removed from bases in python3:UNDEFINED
diff --git a/tests/functional/u/useless/useless_return.txt b/tests/functional/u/useless/useless_return.txt
index b64b76be4d..035e951ab2 100644
--- a/tests/functional/u/useless/useless_return.txt
+++ b/tests/functional/u/useless/useless_return.txt
@@ -1,2 +1,2 @@
-useless-return:4:0:6:10:myfunc:Useless return at end of function or method:UNDEFINED
-useless-return:9:4:11:19:SomeClass.mymethod:Useless return at end of function or method:UNDEFINED
+useless-return:4:0:4:10:myfunc:Useless return at end of function or method:UNDEFINED
+useless-return:9:4:9:16:SomeClass.mymethod:Useless return at end of function or method:UNDEFINED
diff --git a/tests/functional/u/useless/useless_super_delegation.py b/tests/functional/u/useless/useless_super_delegation.py
index 2e03840402..cc36a0c783 100644
--- a/tests/functional/u/useless/useless_super_delegation.py
+++ b/tests/functional/u/useless/useless_super_delegation.py
@@ -205,7 +205,7 @@ def with_default_arg_quad(self, first, default_arg="has_been_changed"):
         super(NotUselessSuper, self).with_default_arg_quad(first, default_arg + "_and_modified")
 
     def with_default_unhandled(self, first, default_arg=lambda: True):
-        # Not useless because the default value type is not explictely handled (Lambda), so assume they are different
+        # Not useless because the default value type is not explicitly handled (Lambda), so assume they are different
         super(NotUselessSuper, self).with_default_unhandled(first, default_arg)
 
 
diff --git a/tests/functional/u/useless/useless_super_delegation.txt b/tests/functional/u/useless/useless_super_delegation.txt
index 43f52674a9..b69febe691 100644
--- a/tests/functional/u/useless/useless_super_delegation.txt
+++ b/tests/functional/u/useless/useless_super_delegation.txt
@@ -1,19 +1,19 @@
-useless-super-delegation:214:4:215:60:UselessSuper.equivalent_params:Useless super delegation in method 'equivalent_params':UNDEFINED
-useless-super-delegation:217:4:218:67:UselessSuper.equivalent_params_1:Useless super delegation in method 'equivalent_params_1':UNDEFINED
-useless-super-delegation:220:4:221:67:UselessSuper.equivalent_params_2:Useless super delegation in method 'equivalent_params_2':UNDEFINED
-useless-super-delegation:223:4:224:77:UselessSuper.equivalent_params_3:Useless super delegation in method 'equivalent_params_3':UNDEFINED
-useless-super-delegation:226:4:227:60:UselessSuper.equivalent_params_4:Useless super delegation in method 'equivalent_params_4':UNDEFINED
-useless-super-delegation:229:4:230:67:UselessSuper.equivalent_params_5:Useless super delegation in method 'equivalent_params_5':UNDEFINED
-useless-super-delegation:232:4:233:84:UselessSuper.equivalent_params_6:Useless super delegation in method 'equivalent_params_6':UNDEFINED
-useless-super-delegation:235:4:237:82:UselessSuper.with_default_argument:Useless super delegation in method 'with_default_argument':UNDEFINED
-useless-super-delegation:239:4:240:80:UselessSuper.without_default_argument:Useless super delegation in method 'without_default_argument':UNDEFINED
-useless-super-delegation:242:4:244:80:UselessSuper.with_default_argument_none:Useless super delegation in method 'with_default_argument_none':UNDEFINED
-useless-super-delegation:246:4:247:79:UselessSuper.with_default_argument_int:Useless super delegation in method 'with_default_argument_int':UNDEFINED
-useless-super-delegation:249:4:250:81:UselessSuper.with_default_argument_tuple:Useless super delegation in method 'with_default_argument_tuple':UNDEFINED
-useless-super-delegation:252:4:253:80:UselessSuper.with_default_argument_dict:Useless super delegation in method 'with_default_argument_dict':UNDEFINED
-useless-super-delegation:255:4:256:79:UselessSuper.with_default_argument_var:Useless super delegation in method 'with_default_argument_var':UNDEFINED
-useless-super-delegation:258:4:259:44:UselessSuper.__init__:Useless super delegation in method '__init__':UNDEFINED
-useless-super-delegation:261:4:262:70:UselessSuper.with_default_arg:Useless super delegation in method 'with_default_arg':UNDEFINED
-useless-super-delegation:264:4:265:74:UselessSuper.with_default_arg_bis:Useless super delegation in method 'with_default_arg_bis':UNDEFINED
-useless-super-delegation:267:4:268:74:UselessSuper.with_default_arg_ter:Useless super delegation in method 'with_default_arg_ter':UNDEFINED
-useless-super-delegation:270:4:271:75:UselessSuper.with_default_arg_quad:Useless super delegation in method 'with_default_arg_quad':UNDEFINED
+useless-super-delegation:214:4:214:25:UselessSuper.equivalent_params:Useless super delegation in method 'equivalent_params':UNDEFINED
+useless-super-delegation:217:4:217:27:UselessSuper.equivalent_params_1:Useless super delegation in method 'equivalent_params_1':UNDEFINED
+useless-super-delegation:220:4:220:27:UselessSuper.equivalent_params_2:Useless super delegation in method 'equivalent_params_2':UNDEFINED
+useless-super-delegation:223:4:223:27:UselessSuper.equivalent_params_3:Useless super delegation in method 'equivalent_params_3':UNDEFINED
+useless-super-delegation:226:4:226:27:UselessSuper.equivalent_params_4:Useless super delegation in method 'equivalent_params_4':UNDEFINED
+useless-super-delegation:229:4:229:27:UselessSuper.equivalent_params_5:Useless super delegation in method 'equivalent_params_5':UNDEFINED
+useless-super-delegation:232:4:232:27:UselessSuper.equivalent_params_6:Useless super delegation in method 'equivalent_params_6':UNDEFINED
+useless-super-delegation:235:4:235:29:UselessSuper.with_default_argument:Useless super delegation in method 'with_default_argument':UNDEFINED
+useless-super-delegation:239:4:239:32:UselessSuper.without_default_argument:Useless super delegation in method 'without_default_argument':UNDEFINED
+useless-super-delegation:242:4:242:34:UselessSuper.with_default_argument_none:Useless super delegation in method 'with_default_argument_none':UNDEFINED
+useless-super-delegation:246:4:246:33:UselessSuper.with_default_argument_int:Useless super delegation in method 'with_default_argument_int':UNDEFINED
+useless-super-delegation:249:4:249:35:UselessSuper.with_default_argument_tuple:Useless super delegation in method 'with_default_argument_tuple':UNDEFINED
+useless-super-delegation:252:4:252:34:UselessSuper.with_default_argument_dict:Useless super delegation in method 'with_default_argument_dict':UNDEFINED
+useless-super-delegation:255:4:255:33:UselessSuper.with_default_argument_var:Useless super delegation in method 'with_default_argument_var':UNDEFINED
+useless-super-delegation:258:4:258:16:UselessSuper.__init__:Useless super delegation in method '__init__':UNDEFINED
+useless-super-delegation:261:4:261:24:UselessSuper.with_default_arg:Useless super delegation in method 'with_default_arg':UNDEFINED
+useless-super-delegation:264:4:264:28:UselessSuper.with_default_arg_bis:Useless super delegation in method 'with_default_arg_bis':UNDEFINED
+useless-super-delegation:267:4:267:28:UselessSuper.with_default_arg_ter:Useless super delegation in method 'with_default_arg_ter':UNDEFINED
+useless-super-delegation:270:4:270:29:UselessSuper.with_default_arg_quad:Useless super delegation in method 'with_default_arg_quad':UNDEFINED
diff --git a/tests/functional/u/useless/useless_super_delegation_py3.txt b/tests/functional/u/useless/useless_super_delegation_py3.txt
index bad62c1bda..2497504a06 100644
--- a/tests/functional/u/useless/useless_super_delegation_py3.txt
+++ b/tests/functional/u/useless/useless_super_delegation_py3.txt
@@ -1,2 +1,2 @@
-useless-super-delegation:21:4:22:36:UselessSuper.useless:Useless super delegation in method 'useless':UNDEFINED
-useless-super-delegation:34:4:35:31:Ham.__init__:Useless super delegation in method '__init__':UNDEFINED
+useless-super-delegation:21:4:21:15:UselessSuper.useless:Useless super delegation in method 'useless':UNDEFINED
+useless-super-delegation:34:4:34:16:Ham.__init__:Useless super delegation in method '__init__':UNDEFINED
diff --git a/tests/functional/u/useless/useless_super_delegation_py35.txt b/tests/functional/u/useless/useless_super_delegation_py35.txt
index fdcf74142e..abcf6c5fb4 100644
--- a/tests/functional/u/useless/useless_super_delegation_py35.txt
+++ b/tests/functional/u/useless/useless_super_delegation_py35.txt
@@ -1 +1 @@
-useless-super-delegation:11:4:12:62:UselessSuper.useless:Useless super delegation in method 'useless':UNDEFINED
+useless-super-delegation:11:4:11:15:UselessSuper.useless:Useless super delegation in method 'useless':UNDEFINED
diff --git a/tests/functional/u/useless/useless_super_delegation_py38.txt b/tests/functional/u/useless/useless_super_delegation_py38.txt
index da08eb3a75..1c4631c938 100644
--- a/tests/functional/u/useless/useless_super_delegation_py38.txt
+++ b/tests/functional/u/useless/useless_super_delegation_py38.txt
@@ -1 +1 @@
-useless-super-delegation:16:4:17:39:Ham.__init__:Useless super delegation in method '__init__':UNDEFINED
+useless-super-delegation:16:4:16:16:Ham.__init__:Useless super delegation in method '__init__':UNDEFINED
diff --git a/tests/functional/u/use/using_constant_test.py b/tests/functional/u/using_constant_test.py
similarity index 100%
rename from tests/functional/u/use/using_constant_test.py
rename to tests/functional/u/using_constant_test.py
diff --git a/tests/functional/u/use/using_constant_test.txt b/tests/functional/u/using_constant_test.txt
similarity index 100%
rename from tests/functional/u/use/using_constant_test.txt
rename to tests/functional/u/using_constant_test.txt
diff --git a/tests/functional/w/with_used_before_assign.txt b/tests/functional/w/with_used_before_assign.txt
index 4ceca20ba4..0462099886 100644
--- a/tests/functional/w/with_used_before_assign.txt
+++ b/tests/functional/w/with_used_before_assign.txt
@@ -1,2 +1,2 @@
 undefined-variable:10:39:10:42:do_nothing:Undefined variable 'ctx':UNDEFINED
-used-before-assignment:11:8:11:15:do_nothing:Using variable 'context' before assignment:UNDEFINED
+used-before-assignment:11:8:11:15:do_nothing:Using variable 'context' before assignment:HIGH
diff --git a/tests/input/similar_lines_a.py b/tests/input/similar_lines_a.py
index 65a72a79d5..bbd13b5f37 100644
--- a/tests/input/similar_lines_a.py
+++ b/tests/input/similar_lines_a.py
@@ -1,7 +1,6 @@
 """ A file designed to have lines of similarity when compared to similar_lines_b
 
 We use lorm-ipsum to generate 'random' code. """
-# Copyright (c) 2020 Frank Harrison <frank@doublethefish.com>
 
 
 def adipiscing(elit):
diff --git a/tests/input/similar_lines_b.py b/tests/input/similar_lines_b.py
index 21634883d8..fbca78fb9b 100644
--- a/tests/input/similar_lines_b.py
+++ b/tests/input/similar_lines_b.py
@@ -2,7 +2,6 @@
 similarity when compared to its sister file
 
 As with the sister file, we use lorm-ipsum to generate 'random' code. """
-# Copyright (c) 2020 Frank Harrison <frank@doublethefish.com>
 
 
 class Nulla:
diff --git a/tests/lint/__init__.py b/tests/lint/__init__.py
index e69de29bb2..e8a8ff79fd 100644
--- a/tests/lint/__init__.py
+++ b/tests/lint/__init__.py
@@ -0,0 +1,3 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
diff --git a/tests/lint/test_pylinter.py b/tests/lint/test_pylinter.py
index 9d6695a250..57ad0f7b8e 100644
--- a/tests/lint/test_pylinter.py
+++ b/tests/lint/test_pylinter.py
@@ -1,3 +1,7 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 from typing import Any, NoReturn
 from unittest.mock import patch
 
diff --git a/tests/lint/test_utils.py b/tests/lint/test_utils.py
index f7294f353c..891ee0020b 100644
--- a/tests/lint/test_utils.py
+++ b/tests/lint/test_utils.py
@@ -1,5 +1,13 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+import unittest.mock
 from pathlib import Path, PosixPath
 
+import pytest
+
+from pylint.lint import Run
 from pylint.lint.utils import get_fatal_error_message, prepare_crash_report
 
 
@@ -15,7 +23,7 @@ def test_prepare_crash_report(tmp_path: PosixPath) -> None:
         template_path = prepare_crash_report(
             ex, str(python_file), str(tmp_path / "pylint-crash-%Y.txt")
         )
-    assert str(tmp_path) in str(template_path)
+    assert str(tmp_path) in str(template_path)  # pylint: disable=used-before-assignment
     with open(template_path, encoding="utf8") as f:
         template_content = f.read()
     assert python_content in template_content
@@ -31,3 +39,16 @@ def test_get_fatal_error_message() -> None:
     assert python_path in msg
     assert crash_path in msg
     assert "open an issue" in msg
+
+
+def test_issue_template_on_fatal_errors(capsys: pytest.CaptureFixture) -> None:
+    """Test that we also create an issue template if the offending exception isn't from astroid."""
+    with pytest.raises(SystemExit):
+        with unittest.mock.patch(
+            "astroid.MANAGER.ast_from_file", side_effect=RecursionError()
+        ):
+            Run([__file__])
+    captured = capsys.readouterr()
+    assert "Fatal error while checking" in captured.out
+    assert "Please open an issue" in captured.out
+    assert "Traceback" in captured.err
diff --git a/tests/lint/unittest_expand_modules.py b/tests/lint/unittest_expand_modules.py
index 4d679ad641..75d344707c 100644
--- a/tests/lint/unittest_expand_modules.py
+++ b/tests/lint/unittest_expand_modules.py
@@ -1,6 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import re
 from pathlib import Path
@@ -78,10 +78,10 @@ def test__is_in_ignore_list_re_match() -> None:
 
 
 class TestExpandModules(CheckerTestCase):
-    """Test the expand_modules function while allowing options to be set"""
+    """Test the expand_modules function while allowing options to be set."""
 
     class Checker(BaseChecker):
-        """This dummy checker is needed to allow options to be set"""
+        """This dummy checker is needed to allow options to be set."""
 
         name = "checker"
         msgs: Dict[str, Tuple[str, ...]] = {}
@@ -107,13 +107,13 @@ class Checker(BaseChecker):
     )
     @set_config(ignore_paths="")
     def test_expand_modules(self, files_or_modules, expected):
-        """Test expand_modules with the default value of ignore-paths"""
+        """Test expand_modules with the default value of ignore-paths."""
         ignore_list, ignore_list_re = [], []
         modules, errors = expand_modules(
             files_or_modules,
             ignore_list,
             ignore_list_re,
-            get_global_option(self, "ignore-paths"),
+            get_global_option(self.checker, "ignore-paths"),
         )
         modules.sort(key=lambda d: d["name"])
         assert modules == expected
@@ -133,7 +133,7 @@ def test_expand_modules(self, files_or_modules, expected):
     )
     @set_config(ignore_paths=".*/lint/.*")
     def test_expand_modules_with_ignore(self, files_or_modules, expected):
-        """Test expand_modules with a non-default value of ignore-paths"""
+        """Test expand_modules with a non-default value of ignore-paths."""
         ignore_list, ignore_list_re = [], []
         modules, errors = expand_modules(
             files_or_modules,
diff --git a/tests/lint/unittest_lint.py b/tests/lint/unittest_lint.py
index f504efcf63..91df7dc1f6 100644
--- a/tests/lint/unittest_lint.py
+++ b/tests/lint/unittest_lint.py
@@ -1,41 +1,7 @@
-# Copyright (c) 2006-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2011-2014 Google, Inc.
-# Copyright (c) 2012 Kevin Jing Qiu <kevin.jing.qiu@gmail.com>
-# Copyright (c) 2012 Anthony VEREZ <anthony.verez.external@cassidian.com>
-# Copyright (c) 2012 FELD Boris <lothiraldan@gmail.com>
-# Copyright (c) 2013-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Florian Bruhin <me@the-compiler.org>
-# Copyright (c) 2015 Noam Yorav-Raphael <noamraph@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016-2017 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2016 Glenn Matthews <glenn@e-dad.net>
-# Copyright (c) 2016 Glenn Matthews <glmatthe@cisco.com>
-# Copyright (c) 2017-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2017, 2021 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2017 Craig Citro <craigcitro@gmail.com>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2018, 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2018 Matus Valo <matusvalo@users.noreply.github.com>
-# Copyright (c) 2018 Scott Worley <scottworley@scottworley.com>
-# Copyright (c) 2018 Randall Leeds <randall@bleeds.info>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Reverb C <reverbc@users.noreply.github.com>
-# Copyright (c) 2019 Janne Rönkkö <jannero@users.noreply.github.com>
-# Copyright (c) 2019 Trevor Bekolay <tbekolay@gmail.com>
-# Copyright (c) 2019 Andres Perez Hortal <andresperezcba@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 Martin Vielsmaier <martin@vielsmaier.net>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Damien Baty <damien.baty@polyconseil.fr>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Michal Vasilek <michal@vasilek.cz>
-# Copyright (c) 2021 Eisuke Kawashima <e-kwsm@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 # pylint: disable=redefined-outer-name
 
 import os
@@ -249,9 +215,9 @@ def reporter():
 
 
 @pytest.fixture
-def init_linter(linter: PyLinter) -> PyLinter:
+def initialized_linter(linter: PyLinter) -> PyLinter:
     linter.open()
-    linter.set_current_module("toto")
+    linter.set_current_module("toto", "mydir/toto")
     linter.file_state = FileState("toto")
     return linter
 
@@ -273,8 +239,8 @@ def visit_class(self, _):
     linter.check(["abc"])
 
 
-def test_enable_message(init_linter: PyLinter) -> None:
-    linter = init_linter
+def test_enable_message(initialized_linter: PyLinter) -> None:
+    linter = initialized_linter
     assert linter.is_message_enabled("W0101")
     assert linter.is_message_enabled("W0102")
     linter.disable("W0101", scope="package")
@@ -290,8 +256,8 @@ def test_enable_message(init_linter: PyLinter) -> None:
     assert linter.is_message_enabled("W0102", 1)
 
 
-def test_enable_message_category(init_linter: PyLinter) -> None:
-    linter = init_linter
+def test_enable_message_category(initialized_linter: PyLinter) -> None:
+    linter = initialized_linter
     assert linter.is_message_enabled("W0101")
     assert linter.is_message_enabled("C0202")
     linter.disable("W", scope="package")
@@ -309,11 +275,11 @@ def test_enable_message_category(init_linter: PyLinter) -> None:
     assert linter.is_message_enabled("C0202", line=1)
 
 
-def test_message_state_scope(init_linter: PyLinter) -> None:
+def test_message_state_scope(initialized_linter: PyLinter) -> None:
     class FakeConfig:
         confidence = ["HIGH"]
 
-    linter = init_linter
+    linter = initialized_linter
     linter.disable("C0202")
     assert MSG_STATE_SCOPE_CONFIG == linter._get_message_state_scope("C0202")
     linter.disable("W0101", scope="module", line=3)
@@ -327,8 +293,8 @@ class FakeConfig:
     )
 
 
-def test_enable_message_block(init_linter: PyLinter) -> None:
-    linter = init_linter
+def test_enable_message_block(initialized_linter: PyLinter) -> None:
+    linter = initialized_linter
     linter.open()
     filepath = join(REGRTEST_DATA_DIR, "func_block_disable_msg.py")
     linter.set_current_module("func_block_disable_msg")
@@ -385,12 +351,12 @@ def test_enable_message_block(init_linter: PyLinter) -> None:
     assert fs._suppression_mapping["E1101", 110] == 109
 
 
-def test_enable_by_symbol(init_linter: PyLinter) -> None:
-    """messages can be controlled by symbolic names.
+def test_enable_by_symbol(initialized_linter: PyLinter) -> None:
+    """Messages can be controlled by symbolic names.
 
     The state is consistent across symbols and numbers.
     """
-    linter = init_linter
+    linter = initialized_linter
     assert linter.is_message_enabled("W0101")
     assert linter.is_message_enabled("unreachable")
     assert linter.is_message_enabled("W0102")
@@ -434,7 +400,8 @@ def test_set_unsupported_reporter(linter: PyLinter) -> None:
         linter.set_option("output-format", "missing.module.Class")
 
 
-def test_set_option_1(linter: PyLinter) -> None:
+def test_set_option_1(initialized_linter: PyLinter) -> None:
+    linter = initialized_linter
     linter.set_option("disable", "C0111,W0234")
     assert not linter.is_message_enabled("C0111")
     assert not linter.is_message_enabled("W0234")
@@ -443,7 +410,8 @@ def test_set_option_1(linter: PyLinter) -> None:
     assert not linter.is_message_enabled("non-iterator-returned")
 
 
-def test_set_option_2(linter: PyLinter) -> None:
+def test_set_option_2(initialized_linter: PyLinter) -> None:
+    linter = initialized_linter
     linter.set_option("disable", ("C0111", "W0234"))
     assert not linter.is_message_enabled("C0111")
     assert not linter.is_message_enabled("W0234")
@@ -459,7 +427,8 @@ def test_enable_checkers(linter: PyLinter) -> None:
     assert "design" in [c.name for c in linter.prepare_checkers()]
 
 
-def test_errors_only(linter: PyLinter) -> None:
+def test_errors_only(initialized_linter: PyLinter) -> None:
+    linter = initialized_linter
     linter.error_mode()
     checkers = linter.prepare_checkers()
     checker_names = {c.name for c in checkers}
@@ -467,14 +436,15 @@ def test_errors_only(linter: PyLinter) -> None:
     assert set() == should_not & checker_names
 
 
-def test_disable_similar(linter: PyLinter) -> None:
+def test_disable_similar(initialized_linter: PyLinter) -> None:
+    linter = initialized_linter
     linter.set_option("disable", "RP0801")
     linter.set_option("disable", "R0801")
     assert not ("similarities" in [c.name for c in linter.prepare_checkers()])
 
 
 def test_disable_alot(linter: PyLinter) -> None:
-    """check that we disabled a lot of checkers"""
+    """Check that we disabled a lot of checkers."""
     linter.set_option("reports", False)
     linter.set_option("disable", "R,C,W")
     checker_names = [c.name for c in linter.prepare_checkers()]
@@ -652,8 +622,10 @@ def test_full_documentation(linter: PyLinter) -> None:
         assert re.search(regexp, output)
 
 
-def test_list_msgs_enabled(init_linter: PyLinter, capsys: CaptureFixture) -> None:
-    linter = init_linter
+def test_list_msgs_enabled(
+    initialized_linter: PyLinter, capsys: CaptureFixture
+) -> None:
+    linter = initialized_linter
     linter.enable("W0101", scope="package")
     linter.disable("W0102", scope="package")
     linter.list_messages_enabled()
@@ -865,12 +837,12 @@ def test_multiprocessing(jobs: int) -> None:
     assert len(messages) == len(set(messages))
 
 
-def test_filename_with__init__(init_linter: PyLinter) -> None:
+def test_filename_with__init__(initialized_linter: PyLinter) -> None:
     # This tracks a regression where a file whose name ends in __init__.py,
     # such as flycheck__init__.py, would accidentally lead to linting the
     # entire containing directory.
     reporter = testutils.GenericTestReporter()
-    linter = init_linter
+    linter = initialized_linter
     linter.open()
     linter.set_reporter(reporter)
     filepath = join(INPUT_DIR, "not__init__.py")
@@ -879,15 +851,15 @@ def test_filename_with__init__(init_linter: PyLinter) -> None:
     assert len(messages) == 0
 
 
-def test_by_module_statement_value(init_linter: PyLinter) -> None:
+def test_by_module_statement_value(initialized_linter: PyLinter) -> None:
     """Test "statement" for each module analyzed of computed correctly."""
-    linter = init_linter
+    linter = initialized_linter
     linter.check([os.path.join(os.path.dirname(__file__), "data")])
 
     by_module_stats = linter.stats.by_module
     for module, module_stats in by_module_stats.items():
 
-        linter2 = init_linter
+        linter2 = initialized_linter
         if module == "data":
             linter2.check([os.path.join(os.path.dirname(__file__), "data/__init__.py")])
         else:
diff --git a/tests/message/__init__.py b/tests/message/__init__.py
index e69de29bb2..e8a8ff79fd 100644
--- a/tests/message/__init__.py
+++ b/tests/message/__init__.py
@@ -0,0 +1,3 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
diff --git a/tests/message/conftest.py b/tests/message/conftest.py
index e30dbb5355..7a9a399cfa 100644
--- a/tests/message/conftest.py
+++ b/tests/message/conftest.py
@@ -1,5 +1,7 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 # pylint: disable=redefined-outer-name
 
 
diff --git a/tests/message/test_no_removed_msgid_or_symbol_used.py b/tests/message/test_no_removed_msgid_or_symbol_used.py
new file mode 100644
index 0000000000..e00450b9a7
--- /dev/null
+++ b/tests/message/test_no_removed_msgid_or_symbol_used.py
@@ -0,0 +1,18 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+from pylint.constants import DELETED_MESSAGES
+from pylint.lint import PyLinter
+
+
+def test_no_removed_msgid_or_symbol_used(linter: PyLinter) -> None:
+    """Tests that we're not using deleted msgid or symbol.
+
+    This could cause occasional bugs, but more importantly confusion and inconsistencies
+    when searching for old msgids online. See https://github.com/PyCQA/pylint/issues/5729
+    """
+    for msgid, symbol, old_names in DELETED_MESSAGES:
+        linter.msgs_store.message_id_store.register_message_definition(
+            msgid, symbol, old_names
+        )
diff --git a/tests/message/unittest_message.py b/tests/message/unittest_message.py
index 64cadf91a8..ef560a6499 100644
--- a/tests/message/unittest_message.py
+++ b/tests/message/unittest_message.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 from typing import ValuesView
 
@@ -11,13 +12,13 @@
 
 def test_new_message(message_definitions: ValuesView[MessageDefinition]) -> None:
     def build_message(
-        message_definition: MessageDefinition, location_value: MessageLocationTuple
+        message_definition_: MessageDefinition, location_value: MessageLocationTuple
     ) -> Message:
         return Message(
-            symbol=message_definition.symbol,
-            msg_id=message_definition.msgid,
+            symbol=message_definition_.symbol,
+            msg_id=message_definition_.msgid,
             location=location_value,
-            msg=message_definition.msg,
+            msg=message_definition_.msg,
             confidence=HIGH,
         )
 
diff --git a/tests/message/unittest_message_definition.py b/tests/message/unittest_message_definition.py
index 2015c21549..c81763ff3d 100644
--- a/tests/message/unittest_message_definition.py
+++ b/tests/message/unittest_message_definition.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import sys
 from unittest import mock
diff --git a/tests/message/unittest_message_definition_store.py b/tests/message/unittest_message_definition_store.py
index e13163080a..a7d8352c64 100644
--- a/tests/message/unittest_message_definition_store.py
+++ b/tests/message/unittest_message_definition_store.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 from contextlib import redirect_stdout
 from io import StringIO
diff --git a/tests/message/unittest_message_id_store.py b/tests/message/unittest_message_id_store.py
index 340b23d326..150ec8d698 100644
--- a/tests/message/unittest_message_id_store.py
+++ b/tests/message/unittest_message_id_store.py
@@ -1,14 +1,19 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
+from pathlib import Path
 from typing import Dict, ValuesView
 
 import pytest
 
+from pylint import lint
 from pylint.exceptions import InvalidMessageError, UnknownMessageError
 from pylint.message.message_definition import MessageDefinition
 from pylint.message.message_id_store import MessageIdStore
 
+EMPTY_FILE = str(Path(__file__).parent.parent.resolve() / "regrtest_data" / "empty.py")
+
 
 def test_len_str(msgid_store: MessageIdStore, msgids: Dict[str, str]) -> None:
     assert len(msgid_store) == len(msgids)
@@ -90,3 +95,47 @@ def test_duplicate_msgid(msgid_store: MessageIdStore) -> None:
         "Message symbol 'warning-symbol' cannot be used for 'W1234' and 'W1235'"
         in str(error.value)
     )
+
+
+def test_exclusivity_of_msgids() -> None:
+    """Test to see if all checkers have an exclusive message id prefix."""
+    err_msg = (
+        "{} has the same prefix ('{}') as the '{}' checker. Please make sure the prefix "
+        "is unique for each checker. You can use 'script/get_unused_message_id_category.py' "
+        "to get an unique id."
+    )
+
+    runner = lint.Run(
+        ["--enable-all-extensions", EMPTY_FILE],
+        exit=False,
+    )
+
+    # Some pairs are hard-coded as they are pre-existing and non-exclusive
+    # and we don't want to rename them for backwards compatibility
+    checker_id_pairs = {
+        "00": ("master", "miscellaneous"),
+        "01": (
+            "basic",
+            "refactoring",
+            "consider_ternary_expression",
+            "while_used",
+            "docstyle",
+            "deprecated_builtins",
+        ),
+        "02": ("classes", "refactoring", "multiple_types"),
+        "03": ("classes", "format"),
+        "04": ("imports", "spelling"),
+        "05": ("consider-using-any-or-all", "miscellaneous"),
+        "07": ("exceptions", "broad_try_clause", "overlap-except"),
+        "12": ("design", "logging"),
+        "17": ("async", "refactoring"),
+        "20": ("compare-to-zero", "refactoring"),
+    }
+
+    for msgid, definition in runner.linter.msgs_store._messages_definitions.items():
+        if msgid[1:3] in checker_id_pairs:
+            assert (
+                definition.checker_name in checker_id_pairs[msgid[1:3]]
+            ), err_msg.format(msgid, msgid[1:3], checker_id_pairs[msgid[1:3]][0])
+        else:
+            checker_id_pairs[msgid[1:3]] = (definition.checker_name,)
diff --git a/tests/primer/packages_to_lint_batch_one.json b/tests/primer/packages_to_lint_batch_one.json
index 95768b82e7..1c90556766 100644
--- a/tests/primer/packages_to_lint_batch_one.json
+++ b/tests/primer/packages_to_lint_batch_one.json
@@ -1,7 +1,7 @@
 {
   "black": {
     "branch": "main",
-    "directories": ["src/black/", "src/blackd/", "src/black_primer/", "src/blib2to3/"],
+    "directories": ["src/black/", "src/blackd/", "src/blib2to3/"],
     "url": "https://github.com/psf/black.git"
   },
   "django": {
diff --git a/tests/primer/packages_to_lint_batch_two.json b/tests/primer/packages_to_lint_batch_two.json
index 636d155ff9..929d6e560b 100644
--- a/tests/primer/packages_to_lint_batch_two.json
+++ b/tests/primer/packages_to_lint_batch_two.json
@@ -1,6 +1,6 @@
 {
   "pandas": {
-    "branch": "master",
+    "branch": "main",
     "directories": ["pandas"],
     "pylint_additional_args": ["--ignore-patterns=\"test_"],
     "url": "https://github.com/pandas-dev/pandas.git"
diff --git a/tests/primer/test_primer_external.py b/tests/primer/test_primer_external.py
index 12206b0fc4..4a43259621 100644
--- a/tests/primer/test_primer_external.py
+++ b/tests/primer/test_primer_external.py
@@ -1,5 +1,7 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 import json
 import logging
 import subprocess
@@ -30,7 +32,7 @@ def get_packages_to_lint_from_json(
 PACKAGES_TO_LINT_BATCH_ONE = get_packages_to_lint_from_json(
     PACKAGE_TO_LINT_JSON_BATCH_ONE
 )
-"""Dictionary of external packages used during the primer test in batch one"""
+"""Dictionary of external packages used during the primer test in batch one."""
 
 PACKAGE_TO_LINT_JSON_BATCH_TWO = (
     Path(__file__).parent / "packages_to_lint_batch_two.json"
@@ -38,7 +40,7 @@ def get_packages_to_lint_from_json(
 PACKAGES_TO_LINT_BATCH_TWO = get_packages_to_lint_from_json(
     PACKAGE_TO_LINT_JSON_BATCH_TWO
 )
-"""Dictionary of external packages used during the primer test in batch two"""
+"""Dictionary of external packages used during the primer test in batch two."""
 
 
 class TestPrimer:
@@ -68,7 +70,7 @@ def test_primer_external_packages_no_crash_batch_two(
 
     @staticmethod
     def _primer_test(package: PackageToLint, caplog: LogCaptureFixture) -> None:
-        """Runs pylint over external packages to check for crashes and fatal messages
+        """Runs pylint over external packages to check for crashes and fatal messages.
 
         We only check for crashes (bit-encoded exit code 32) and fatal messages
         (bit-encoded exit code 1). We assume that these external repositories do not
diff --git a/tests/primer/test_primer_stdlib.py b/tests/primer/test_primer_stdlib.py
index f403cbbf55..59599ae00a 100644
--- a/tests/primer/test_primer_stdlib.py
+++ b/tests/primer/test_primer_stdlib.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import contextlib
 import io
@@ -46,7 +47,7 @@ def _patch_stdout(out):
 def test_primer_stdlib_no_crash(
     test_module_location: str, test_module_name: str, capsys: CaptureFixture
 ) -> None:
-    """Test that pylint does not produces any crashes or fatal errors on stdlib modules"""
+    """Test that pylint does not produce any crashes or fatal errors on stdlib modules."""
     __tracebackhide__ = True  # pylint: disable=unused-variable
     os.chdir(test_module_location)
     with _patch_stdout(io.StringIO()):
diff --git a/tests/profile/test_profile_against_externals.py b/tests/profile/test_profile_against_externals.py
index 128a34738f..81819476eb 100644
--- a/tests/profile/test_profile_against_externals.py
+++ b/tests/profile/test_profile_against_externals.py
@@ -1,11 +1,8 @@
-""" Profiles basic -jX functionality """
-# Copyright (c) 2020-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020 Frank Harrison <frank@doublethefish.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
+"""Profiles basic -jX functionality."""
 
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 # pylint: disable=missing-function-docstring
 
@@ -42,7 +39,7 @@ def _get_py_files(scanpath):
     "name,git_repo", [("numpy", "https://github.com/numpy/numpy.git")]
 )
 def test_run(tmp_path, name, git_repo):
-    """Runs pylint against external sources"""
+    """Runs pylint against external sources."""
     checkoutdir = tmp_path / name
     checkoutdir.mkdir()
     os.system(f"git clone --depth=1 {git_repo} {checkoutdir}")
diff --git a/tests/pyreverse/conftest.py b/tests/pyreverse/conftest.py
index 9536fbcb0a..52b9198836 100644
--- a/tests/pyreverse/conftest.py
+++ b/tests/pyreverse/conftest.py
@@ -1,3 +1,7 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 from typing import Callable, Optional
 
 import pytest
@@ -43,10 +47,26 @@ def colorized_puml_config() -> PyreverseConfig:
     )
 
 
+@pytest.fixture()
+def mmd_config() -> PyreverseConfig:
+    return PyreverseConfig(
+        output_format="mmd",
+        colorized=False,
+    )
+
+
+@pytest.fixture()
+def html_config() -> PyreverseConfig:
+    return PyreverseConfig(
+        output_format="html",
+        colorized=False,
+    )
+
+
 @pytest.fixture(scope="session")
 def get_project() -> Callable:
     def _get_project(module: str, name: Optional[str] = "No Name") -> Project:
-        """return an astroid project representation"""
+        """Return an astroid project representation."""
 
         def _astroid_wrapper(func: Callable, modname: str) -> Module:
             return func(modname)
diff --git a/tests/pyreverse/data/classes_No_Name.dot b/tests/pyreverse/data/classes_No_Name.dot
index b2c5551088..1f3f705e78 100644
--- a/tests/pyreverse/data/classes_No_Name.dot
+++ b/tests/pyreverse/data/classes_No_Name.dot
@@ -8,7 +8,7 @@ charset="utf-8"
 "data.suppliermodule_test.DoSomething" [color="black", fontcolor="black", label="{DoSomething|my_int : Optional[int]\lmy_int_2 : Optional[int]\lmy_string : str\l|do_it(new_int: int): int\l}", shape="record", style="solid"];
 "data.suppliermodule_test.Interface" [color="black", fontcolor="black", label="{Interface|\l|get_value()\lset_value(value)\l}", shape="record", style="solid"];
 "data.property_pattern.PropertyPatterns" [color="black", fontcolor="black", label="{PropertyPatterns|prop1\lprop2\l|}", shape="record", style="solid"];
-"data.clientmodule_test.Specialization" [color="black", fontcolor="black", label="{Specialization|TYPE : str\lrelation\lrelation2\ltop : str\l|}", shape="record", style="solid"];
+"data.clientmodule_test.Specialization" [color="black", fontcolor="black", label="{Specialization|TYPE : str\lrelation\lrelation2\ltop : str\l|from_value(value: int)\lincrement_value(): None\ltransform_value(value: int): int\l}", shape="record", style="solid"];
 "data.clientmodule_test.Specialization" -> "data.clientmodule_test.Ancestor" [arrowhead="empty", arrowtail="none"];
 "data.clientmodule_test.Ancestor" -> "data.suppliermodule_test.Interface" [arrowhead="empty", arrowtail="node", style="dashed"];
 "data.suppliermodule_test.DoNothing" -> "data.clientmodule_test.Ancestor" [arrowhead="diamond", arrowtail="none", fontcolor="green", label="cls_member", style="solid"];
diff --git a/tests/pyreverse/data/classes_No_Name.html b/tests/pyreverse/data/classes_No_Name.html
new file mode 100644
index 0000000000..b4ada04b85
--- /dev/null
+++ b/tests/pyreverse/data/classes_No_Name.html
@@ -0,0 +1,50 @@
+<html>
+  <body>
+    <script src="https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js"></script>
+      <div class="mermaid">
+
+        classDiagram
+          class Ancestor {
+            attr : str
+            cls_member
+            get_value()
+            set_value(value)
+          }
+          class CustomException {
+          }
+          class DoNothing {
+          }
+          class DoNothing2 {
+          }
+          class DoSomething {
+            my_int : Optional[int]
+            my_int_2 : Optional[int]
+            my_string : str
+            do_it(new_int: int) -> int
+          }
+          class Interface {
+            get_value()
+            set_value(value)
+          }
+          class PropertyPatterns {
+            prop1
+            prop2
+          }
+          class Specialization {
+            TYPE : str
+            relation
+            relation2
+            top : str
+            from_value(value: int)
+            increment_value() -> None
+            transform_value(value: int) -> int
+          }
+          Specialization --|> Ancestor
+          Ancestor ..|> Interface
+          DoNothing --* Ancestor : cls_member
+          DoNothing --* Specialization : relation
+          DoNothing2 --* Specialization : relation2
+
+       </div>
+  </body>
+</html>
diff --git a/tests/pyreverse/data/classes_No_Name.mmd b/tests/pyreverse/data/classes_No_Name.mmd
new file mode 100644
index 0000000000..efdaacae19
--- /dev/null
+++ b/tests/pyreverse/data/classes_No_Name.mmd
@@ -0,0 +1,41 @@
+classDiagram
+  class Ancestor {
+    attr : str
+    cls_member
+    get_value()
+    set_value(value)
+  }
+  class CustomException {
+  }
+  class DoNothing {
+  }
+  class DoNothing2 {
+  }
+  class DoSomething {
+    my_int : Optional[int]
+    my_int_2 : Optional[int]
+    my_string : str
+    do_it(new_int: int) -> int
+  }
+  class Interface {
+    get_value()
+    set_value(value)
+  }
+  class PropertyPatterns {
+    prop1
+    prop2
+  }
+  class Specialization {
+    TYPE : str
+    relation
+    relation2
+    top : str
+    from_value(value: int)
+    increment_value() -> None
+    transform_value(value: int) -> int
+  }
+  Specialization --|> Ancestor
+  Ancestor ..|> Interface
+  DoNothing --* Ancestor : cls_member
+  DoNothing --* Specialization : relation
+  DoNothing2 --* Specialization : relation2
diff --git a/tests/pyreverse/data/classes_No_Name.puml b/tests/pyreverse/data/classes_No_Name.puml
index 1d9e5f37da..37767b321c 100644
--- a/tests/pyreverse/data/classes_No_Name.puml
+++ b/tests/pyreverse/data/classes_No_Name.puml
@@ -31,6 +31,9 @@ class "Specialization" as data.clientmodule_test.Specialization {
   relation
   relation2
   top : str
+  from_value(value: int)
+  increment_value() -> None
+  transform_value(value: int) -> int
 }
 data.clientmodule_test.Specialization --|> data.clientmodule_test.Ancestor
 data.clientmodule_test.Ancestor ..|> data.suppliermodule_test.Interface
diff --git a/tests/pyreverse/data/classes_No_Name.vcg b/tests/pyreverse/data/classes_No_Name.vcg
index bc542b64b1..4c792db698 100644
--- a/tests/pyreverse/data/classes_No_Name.vcg
+++ b/tests/pyreverse/data/classes_No_Name.vcg
@@ -25,7 +25,7 @@ graph:{
   node: {title:"data.property_pattern.PropertyPatterns"  label:"\fbPropertyPatterns\fn\n\f__________________\n\f08prop1\n\f08prop2\n\f__________________"
   shape:box
 }
-  node: {title:"data.clientmodule_test.Specialization"  label:"\fbSpecialization\fn\n\f________________\n\f08TYPE : str\n\f08relation\n\f08relation2\n\f08top : str\n\f________________"
+  node: {title:"data.clientmodule_test.Specialization"  label:"\fbSpecialization\fn\n\f_________________\n\f08TYPE : str\n\f08relation\n\f08relation2\n\f08top : str\n\f_________________\n\f10from_value()\n\f10increment_value()\n\f10transform_value()"
   shape:box
 }
   edge: {sourcename:"data.clientmodule_test.Specialization" targetname:"data.clientmodule_test.Ancestor"  arrowstyle:solid
diff --git a/tests/pyreverse/data/classes_colorized.dot b/tests/pyreverse/data/classes_colorized.dot
index 0ed3285666..72f30658db 100644
--- a/tests/pyreverse/data/classes_colorized.dot
+++ b/tests/pyreverse/data/classes_colorized.dot
@@ -8,7 +8,7 @@ charset="utf-8"
 "data.suppliermodule_test.DoSomething" [color="aliceblue", fontcolor="black", label="{DoSomething|my_int : Optional[int]\lmy_int_2 : Optional[int]\lmy_string : str\l|do_it(new_int: int): int\l}", shape="record", style="filled"];
 "data.suppliermodule_test.Interface" [color="aliceblue", fontcolor="black", label="{Interface|\l|get_value()\lset_value(value)\l}", shape="record", style="filled"];
 "data.property_pattern.PropertyPatterns" [color="aliceblue", fontcolor="black", label="{PropertyPatterns|prop1\lprop2\l|}", shape="record", style="filled"];
-"data.clientmodule_test.Specialization" [color="aliceblue", fontcolor="black", label="{Specialization|TYPE : str\lrelation\lrelation2\ltop : str\l|}", shape="record", style="filled"];
+"data.clientmodule_test.Specialization" [color="aliceblue", fontcolor="black", label="{Specialization|TYPE : str\lrelation\lrelation2\ltop : str\l|from_value(value: int)\lincrement_value(): None\ltransform_value(value: int): int\l}", shape="record", style="filled"];
 "data.clientmodule_test.Specialization" -> "data.clientmodule_test.Ancestor" [arrowhead="empty", arrowtail="none"];
 "data.clientmodule_test.Ancestor" -> "data.suppliermodule_test.Interface" [arrowhead="empty", arrowtail="node", style="dashed"];
 "data.suppliermodule_test.DoNothing" -> "data.clientmodule_test.Ancestor" [arrowhead="diamond", arrowtail="none", fontcolor="green", label="cls_member", style="solid"];
diff --git a/tests/pyreverse/data/classes_colorized.puml b/tests/pyreverse/data/classes_colorized.puml
index 611a669dbf..1226f7b4e6 100644
--- a/tests/pyreverse/data/classes_colorized.puml
+++ b/tests/pyreverse/data/classes_colorized.puml
@@ -31,6 +31,9 @@ class "Specialization" as data.clientmodule_test.Specialization #aliceblue {
   relation
   relation2
   top : str
+  from_value(value: int)
+  increment_value() -> None
+  transform_value(value: int) -> int
 }
 data.clientmodule_test.Specialization --|> data.clientmodule_test.Ancestor
 data.clientmodule_test.Ancestor ..|> data.suppliermodule_test.Interface
diff --git a/tests/pyreverse/data/packages_No_Name.html b/tests/pyreverse/data/packages_No_Name.html
new file mode 100644
index 0000000000..128f8d1a43
--- /dev/null
+++ b/tests/pyreverse/data/packages_No_Name.html
@@ -0,0 +1,19 @@
+<html>
+  <body>
+    <script src="https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js"></script>
+      <div class="mermaid">
+
+        classDiagram
+          class data {
+          }
+          class clientmodule_test {
+          }
+          class property_pattern {
+          }
+          class suppliermodule_test {
+          }
+          clientmodule_test --> suppliermodule_test
+
+       </div>
+  </body>
+</html>
diff --git a/tests/pyreverse/data/packages_No_Name.mmd b/tests/pyreverse/data/packages_No_Name.mmd
new file mode 100644
index 0000000000..e8b02d0704
--- /dev/null
+++ b/tests/pyreverse/data/packages_No_Name.mmd
@@ -0,0 +1,10 @@
+classDiagram
+  class data {
+  }
+  class clientmodule_test {
+  }
+  class property_pattern {
+  }
+  class suppliermodule_test {
+  }
+  clientmodule_test --> suppliermodule_test
diff --git a/tests/pyreverse/test_diadefs.py b/tests/pyreverse/test_diadefs.py
index 0885598e1d..ecb601b0c6 100644
--- a/tests/pyreverse/test_diadefs.py
+++ b/tests/pyreverse/test_diadefs.py
@@ -1,27 +1,8 @@
-# Copyright (c) 2008-2010, 2013 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2014 Google, Inc.
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Damien Baty <damien.baty@polyconseil.fr>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Takahide Nojima <nozzy123nozzy@gmail.com>
-# Copyright (c) 2021 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-# Copyright (c) 2021 Mark Byrne <31762852+mbyrnepr2@users.noreply.github.com>
-# Copyright (c) 2021 bot <bot@noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""Unit test for the extensions.diadefslib modules"""
+"""Unit test for the extensions.diadefslib modules."""
 # pylint: disable=redefined-outer-name
 import sys
 from pathlib import Path
@@ -42,14 +23,14 @@
 
 
 def _process_classes(classes: List[DiagramEntity]) -> List[Tuple[bool, str]]:
-    """extract class names of a list"""
+    """Extract class names of a list."""
     return sorted((isinstance(c.node, nodes.ClassDef), c.title) for c in classes)
 
 
 def _process_relations(
     relations: Dict[str, List[Relationship]]
 ) -> List[Tuple[str, str, str]]:
-    """extract relation indices from a relation list"""
+    """Extract relation indices from a relation list."""
     result = []
     for rel_type, rels in relations.items():
         for rel in rels:
@@ -71,7 +52,7 @@ def PROJECT(get_project):
 def test_option_values(
     default_config: PyreverseConfig, HANDLER: DiadefsHandler, PROJECT: Project
 ) -> None:
-    """test for ancestor, associated and module options"""
+    """Test for ancestor, associated and module options."""
     df_h = DiaDefGenerator(Linker(PROJECT), HANDLER)
     cl_config = default_config
     cl_config.classes = ["Specialization"]
@@ -102,7 +83,7 @@ def test_option_values(
 
 
 def test_default_values() -> None:
-    """test default values for package or class diagrams"""
+    """Test default values for package or class diagrams."""
     # TODO : should test difference between default values for package or class diagrams pylint: disable=fixme
 
 
@@ -118,7 +99,7 @@ class TestDefaultDiadefGenerator:
     def test_exctract_relations(
         self, HANDLER: DiadefsHandler, PROJECT: Project
     ) -> None:
-        """test extract_relations between classes"""
+        """Test extract_relations between classes."""
         cd = DefaultDiadefGenerator(Linker(PROJECT), HANDLER).visit(PROJECT)[1]
         cd.extract_relationships()
         relations = _process_relations(cd.relationships)
@@ -127,10 +108,11 @@ def test_exctract_relations(
     def test_functional_relation_extraction(
         self, default_config: PyreverseConfig, get_project: Callable
     ) -> None:
-        """functional test of relations extraction;
-        different classes possibly in different modules"""
+        """Functional test of relations extraction;
+        different classes possibly in different modules
+        """
         # XXX should be catching pyreverse environment problem but doesn't
-        # pyreverse doesn't extracts the relations but this test ok
+        # pyreverse doesn't extract the relations but this test ok
         project = get_project("data")
         handler = DiadefsHandler(default_config)
         diadefs = handler.get_diadefs(project, Linker(project, tag=True))
diff --git a/tests/pyreverse/test_diagrams.py b/tests/pyreverse/test_diagrams.py
index db8a4e645b..f10af571db 100644
--- a/tests/pyreverse/test_diagrams.py
+++ b/tests/pyreverse/test_diagrams.py
@@ -1,11 +1,8 @@
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Takahide Nojima <nozzy123nozzy@gmail.com>
-#
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""Unit test for the diagrams modules"""
+"""Unit test for the diagrams modules."""
 from typing import Callable
 
 from pylint.pyreverse.diadefslib import DefaultDiadefGenerator, DiadefsHandler
diff --git a/tests/pyreverse/test_inspector.py b/tests/pyreverse/test_inspector.py
index dec38f541c..8f053c1486 100644
--- a/tests/pyreverse/test_inspector.py
+++ b/tests/pyreverse/test_inspector.py
@@ -1,21 +1,8 @@
-# Copyright (c) 2015-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Damien Baty <damien.baty@polyconseil.fr>
-# Copyright (c) 2021 Takahide Nojima <nozzy123nozzy@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-# Copyright (c) 2021 Mark Byrne <31762852+mbyrnepr2@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""
- for the visitors.diadefs module
-"""
+"""For the visitors.diadefs module."""
 # pylint: disable=redefined-outer-name
 
 import os
diff --git a/tests/pyreverse/test_main.py b/tests/pyreverse/test_main.py
index 792bcbb8b9..eda6e99743 100644
--- a/tests/pyreverse/test_main.py
+++ b/tests/pyreverse/test_main.py
@@ -1,16 +1,44 @@
-"""Unittest for the main module"""
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Unittest for the main module."""
 import os
 import sys
 from typing import Iterator
+from unittest import mock
 
 import pytest
 
 from pylint.lint import fix_import_path
+from pylint.pyreverse import main
 
 TEST_DATA_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "data"))
 PROJECT_ROOT_DIR = os.path.abspath(os.path.join(TEST_DATA_DIR, ".."))
 
 
+@pytest.fixture(name="mock_subprocess")
+def mock_utils_subprocess():
+    with mock.patch("pylint.pyreverse.utils.subprocess") as mock_subprocess:
+        yield mock_subprocess
+
+
+@pytest.fixture
+def mock_graphviz(mock_subprocess):
+    mock_subprocess.run.return_value = mock.Mock(
+        stderr=(
+            'Format: "XYZ" not recognized. Use one of: '
+            "bmp canon cgimage cmap cmapx cmapx_np dot dot_json eps exr fig gd "
+            "gd2 gif gv icns ico imap imap_np ismap jp2 jpe jpeg jpg json json0 "
+            "mp pct pdf pic pict plain plain-ext png pov ps ps2 psd sgi svg svgz "
+            "tga tif tiff tk vdx vml vmlz vrml wbmp webp xdot xdot1.2 xdot1.4 xdot_json"
+        )
+    )
+    with mock.patch("pylint.pyreverse.utils.shutil") as mock_shutil:
+        mock_shutil.which.return_value = "/usr/bin/dot"
+        yield
+
+
 @pytest.fixture(params=[PROJECT_ROOT_DIR, TEST_DATA_DIR])
 def setup_path(request) -> Iterator:
     current_sys_path = list(sys.path)
@@ -29,3 +57,64 @@ def test_project_root_in_sys_path():
     """
     with fix_import_path([TEST_DATA_DIR]):
         assert sys.path == [PROJECT_ROOT_DIR]
+
+
+@mock.patch("pylint.pyreverse.main.Linker", new=mock.MagicMock())
+@mock.patch("pylint.pyreverse.main.DiadefsHandler", new=mock.MagicMock())
+@mock.patch("pylint.pyreverse.main.writer")
+@pytest.mark.usefixtures("mock_graphviz")
+def test_graphviz_supported_image_format(mock_writer, capsys):
+    """Test that Graphviz is used if the image format is supported."""
+    with pytest.raises(SystemExit) as wrapped_sysexit:
+        # we have to catch the SystemExit so the test execution does not stop
+        main.Run(["-o", "png", TEST_DATA_DIR])
+    # Check that the right info message is shown to the user
+    assert (
+        "Format png is not supported natively. Pyreverse will try to generate it using Graphviz..."
+        in capsys.readouterr().out
+    )
+    # Check that pyreverse actually made the call to create the diagram and we exit cleanly
+    mock_writer.DiagramWriter().write.assert_called_once()
+    assert wrapped_sysexit.value.code == 0
+
+
+@mock.patch("pylint.pyreverse.main.Linker", new=mock.MagicMock())
+@mock.patch("pylint.pyreverse.main.DiadefsHandler", new=mock.MagicMock())
+@mock.patch("pylint.pyreverse.main.writer")
+@pytest.mark.usefixtures("mock_graphviz")
+def test_graphviz_cant_determine_supported_formats(
+    mock_writer, mock_subprocess, capsys
+):
+    """Test that Graphviz is used if the image format is supported."""
+    mock_subprocess.run.return_value.stderr = "..."
+    with pytest.raises(SystemExit) as wrapped_sysexit:
+        # we have to catch the SystemExit so the test execution does not stop
+        main.Run(["-o", "png", TEST_DATA_DIR])
+    # Check that the right info message is shown to the user
+    assert (
+        "Unable to determine Graphviz supported output formats."
+        in capsys.readouterr().out
+    )
+    # Check that pyreverse actually made the call to create the diagram and we exit cleanly
+    mock_writer.DiagramWriter().write.assert_called_once()
+    assert wrapped_sysexit.value.code == 0
+
+
+@mock.patch("pylint.pyreverse.main.Linker", new=mock.MagicMock())
+@mock.patch("pylint.pyreverse.main.DiadefsHandler", new=mock.MagicMock())
+@mock.patch("pylint.pyreverse.main.writer", new=mock.MagicMock())
+@pytest.mark.usefixtures("mock_graphviz")
+def test_graphviz_unsupported_image_format(capsys):
+    """Test that Graphviz is used if the image format is supported."""
+    with pytest.raises(SystemExit) as wrapped_sysexit:
+        # we have to catch the SystemExit so the test execution does not stop
+        main.Run(["-o", "somethingElse", TEST_DATA_DIR])
+    # Check that the right info messages are shown to the user
+    stdout = capsys.readouterr().out
+    assert (
+        "Format somethingElse is not supported natively. Pyreverse will try to generate it using Graphviz..."
+        in stdout
+    )
+    assert "Format somethingElse is not supported by Graphviz. It supports:" in stdout
+    # Check that we exited with the expected error code
+    assert wrapped_sysexit.value.code == 32
diff --git a/tests/pyreverse/test_printer.py b/tests/pyreverse/test_printer.py
index 6d240c8362..9128fc6ddf 100644
--- a/tests/pyreverse/test_printer.py
+++ b/tests/pyreverse/test_printer.py
@@ -1,13 +1,11 @@
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 from typing import Type
 
 import pytest
+from astroid import nodes
 
 from pylint.pyreverse.dot_printer import DotPrinter
 from pylint.pyreverse.plantuml_printer import PlantUmlPrinter
@@ -46,6 +44,15 @@ def test_unsupported_layout(layout: Layout, printer_class: Type[Printer]):
         printer_class(title="unittest", layout=layout)
 
 
+def test_method_arguments_none():
+    func = nodes.FunctionDef()
+    args = nodes.Arguments()
+    args.args = None
+    func.postinit(args, body=None)
+    parsed_args = Printer._get_method_arguments(func)
+    assert parsed_args == []
+
+
 class TestPlantUmlPrinter:
     printer = PlantUmlPrinter(title="unittest", layout=Layout.TOP_TO_BOTTOM)
 
diff --git a/tests/pyreverse/test_printer_factory.py b/tests/pyreverse/test_printer_factory.py
index f2ad7106aa..97ee1179c8 100644
--- a/tests/pyreverse/test_printer_factory.py
+++ b/tests/pyreverse/test_printer_factory.py
@@ -1,11 +1,8 @@
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""
-Unit tests for pylint.pyreverse.printer_factory
-"""
+"""Unit tests for pylint.pyreverse.printer_factory."""
 
 import pytest
 
diff --git a/tests/pyreverse/test_utils.py b/tests/pyreverse/test_utils.py
index c631917d9e..da75fa9310 100644
--- a/tests/pyreverse/test_utils.py
+++ b/tests/pyreverse/test_utils.py
@@ -1,14 +1,8 @@
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Mark Byrne <31762852+mbyrnepr2@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-# For details: https://github.com/PyCQA/pylint/blob/master/LICENSE
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""Tests for pylint.pyreverse.utils"""
+"""Tests for pylint.pyreverse.utils."""
 
 from typing import Any
 from unittest.mock import patch
@@ -17,7 +11,12 @@
 import pytest
 from astroid import nodes
 
-from pylint.pyreverse.utils import get_annotation, get_visibility, infer_node
+from pylint.pyreverse.utils import (
+    get_annotation,
+    get_annotation_label,
+    get_visibility,
+    infer_node,
+)
 
 
 @pytest.mark.parametrize(
@@ -48,7 +47,7 @@ def test_get_visibility(names, expected):
     ],
 )
 def test_get_annotation_annassign(assign, label):
-    """AnnAssign"""
+    """AnnAssign."""
     node = astroid.extract_node(assign)
     got = get_annotation(node.value).name
     assert isinstance(node, nodes.AnnAssign)
@@ -67,8 +66,8 @@ def test_get_annotation_annassign(assign, label):
     ],
 )
 def test_get_annotation_assignattr(init_method, label):
-    """AssignAttr"""
-    assign = fr"""
+    """AssignAttr."""
+    assign = rf"""
         class A:
             {init_method}
     """
@@ -81,6 +80,23 @@ class A:
             assert got == label, f"got {got} instead of {label} for value {node}"
 
 
+@pytest.mark.parametrize(
+    "node_text, expected_label",
+    [
+        ("def f() -> None: pass", "None"),
+        ("def f() -> int: pass", "int"),
+        ("def f(a) -> Optional[int]: return 1 if a else None", "Optional[int]"),
+        ("def f() -> 'MyType': pass", "'MyType'"),
+    ],
+)
+def test_get_annotation_label_of_return_type(
+    node_text: str, expected_label: str
+) -> None:
+    func = astroid.extract_node(node_text)
+    assert isinstance(func, nodes.FunctionDef)
+    assert get_annotation_label(func.returns) == expected_label
+
+
 @patch("pylint.pyreverse.utils.get_annotation")
 @patch("astroid.node_classes.NodeNG.infer", side_effect=astroid.InferenceError)
 def test_infer_node_1(mock_infer: Any, mock_get_annotation: Any) -> None:
@@ -109,7 +125,8 @@ def test_infer_node_2(mock_infer: Any, mock_get_annotation: Any) -> None:
 
 def test_infer_node_3() -> None:
     """Return a set containing a nodes.ClassDef object when the attribute
-    has a type annotation"""
+    has a type annotation
+    """
     node = astroid.extract_node(
         """
         class Component:
diff --git a/tests/pyreverse/test_writer.py b/tests/pyreverse/test_writer.py
index 142ba04a00..d3b2d8f448 100644
--- a/tests/pyreverse/test_writer.py
+++ b/tests/pyreverse/test_writer.py
@@ -1,25 +1,8 @@
-# Copyright (c) 2008, 2010, 2013 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2014-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Google, Inc.
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2018 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Mark Byrne <31762852+mbyrnepr2@users.noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""
-Unit test for ``DiagramWriter``
-"""
+"""Unit test for ``DiagramWriter``."""
 
 
 import codecs
@@ -58,10 +41,12 @@
 VCG_FILES = ["packages_No_Name.vcg", "classes_No_Name.vcg"]
 PUML_FILES = ["packages_No_Name.puml", "classes_No_Name.puml"]
 COLORIZED_PUML_FILES = ["packages_colorized.puml", "classes_colorized.puml"]
+MMD_FILES = ["packages_No_Name.mmd", "classes_No_Name.mmd"]
+HTML_FILES = ["packages_No_Name.html", "classes_No_Name.html"]
 
 
 class Config:
-    """config object for tests"""
+    """Config object for tests."""
 
     def __init__(self):
         for attr, value in _DEFAULTS.items():
@@ -121,6 +106,22 @@ def setup_colorized_puml(
     yield from _setup(project, colorized_puml_config, writer)
 
 
+@pytest.fixture()
+def setup_mmd(mmd_config: PyreverseConfig, get_project: Callable) -> Iterator:
+    writer = DiagramWriter(mmd_config)
+
+    project = get_project(TEST_DATA_DIR)
+    yield from _setup(project, mmd_config, writer)
+
+
+@pytest.fixture()
+def setup_html(html_config: PyreverseConfig, get_project: Callable) -> Iterator:
+    writer = DiagramWriter(html_config)
+
+    project = get_project(TEST_DATA_DIR)
+    yield from _setup(project, html_config, writer)
+
+
 def _setup(
     project: Project, config: PyreverseConfig, writer: DiagramWriter
 ) -> Iterator:
@@ -132,7 +133,13 @@ def _setup(
     writer.write(dd)
     yield
     for fname in (
-        DOT_FILES + COLORIZED_DOT_FILES + VCG_FILES + PUML_FILES + COLORIZED_PUML_FILES
+        DOT_FILES
+        + COLORIZED_DOT_FILES
+        + VCG_FILES
+        + PUML_FILES
+        + COLORIZED_PUML_FILES
+        + MMD_FILES
+        + HTML_FILES
     ):
         try:
             os.remove(fname)
@@ -164,6 +171,18 @@ def test_puml_files(generated_file: str) -> None:
     _assert_files_are_equal(generated_file)
 
 
+@pytest.mark.usefixtures("setup_mmd")
+@pytest.mark.parametrize("generated_file", MMD_FILES)
+def test_mmd_files(generated_file: str) -> None:
+    _assert_files_are_equal(generated_file)
+
+
+@pytest.mark.usefixtures("setup_html")
+@pytest.mark.parametrize("generated_file", HTML_FILES)
+def test_html_files(generated_file: str) -> None:
+    _assert_files_are_equal(generated_file)
+
+
 @pytest.mark.usefixtures("setup_colorized_puml")
 @pytest.mark.parametrize("generated_file", COLORIZED_PUML_FILES)
 def test_colorized_puml_files(generated_file: str) -> None:
diff --git a/tests/regrtest_data/directory/package/__init__.py b/tests/regrtest_data/directory/package/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regrtest_data/directory/package/module.py b/tests/regrtest_data/directory/package/module.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regrtest_data/directory/package/subpackage/__init__.py b/tests/regrtest_data/directory/package/subpackage/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regrtest_data/directory/package/subpackage/module.py b/tests/regrtest_data/directory/package/subpackage/module.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regrtest_data/directory/subdirectory/module.py b/tests/regrtest_data/directory/subdirectory/module.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regrtest_data/directory/subdirectory/subsubdirectory/module.py b/tests/regrtest_data/directory/subdirectory/subsubdirectory/module.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regrtest_data/dummy_plugin/dummy_plugin.py b/tests/regrtest_data/dummy_plugin/dummy_plugin.py
index dd0554f7e7..22b0ea391e 100644
--- a/tests/regrtest_data/dummy_plugin/dummy_plugin.py
+++ b/tests/regrtest_data/dummy_plugin/dummy_plugin.py
@@ -26,6 +26,6 @@ class DummyPlugin2(BaseChecker):
     )
 
 
-def register(linter: PyLinter) -> None:
+def register(linter: "PyLinter") -> None:
     linter.register_checker(DummyPlugin1(linter))
     linter.register_checker(DummyPlugin2(linter))
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_all/__init__.py b/tests/regrtest_data/duplicate_code/raw_strings_all/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regrtest_data/duplicate_data_raw_strings/first.py b/tests/regrtest_data/duplicate_code/raw_strings_all/first.py
similarity index 100%
rename from tests/regrtest_data/duplicate_data_raw_strings/first.py
rename to tests/regrtest_data/duplicate_code/raw_strings_all/first.py
diff --git a/tests/regrtest_data/duplicate_data_raw_strings/second.py b/tests/regrtest_data/duplicate_code/raw_strings_all/second.py
similarity index 100%
rename from tests/regrtest_data/duplicate_data_raw_strings/second.py
rename to tests/regrtest_data/duplicate_code/raw_strings_all/second.py
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_all/third.py b/tests/regrtest_data/duplicate_code/raw_strings_all/third.py
new file mode 100644
index 0000000000..687c5922ed
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_all/third.py
@@ -0,0 +1,11 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_file/__init__.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_file/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_file/first.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_file/first.py
new file mode 100644
index 0000000000..fc7f0af615
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_file/first.py
@@ -0,0 +1,12 @@
+# pylint: disable=duplicate-code
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_file/second.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_file/second.py
new file mode 100644
index 0000000000..687c5922ed
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_file/second.py
@@ -0,0 +1,11 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_file/third.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_file/third.py
new file mode 100644
index 0000000000..687c5922ed
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_file/third.py
@@ -0,0 +1,11 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_file_double/__init__.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_file_double/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_file_double/first.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_file_double/first.py
new file mode 100644
index 0000000000..fc7f0af615
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_file_double/first.py
@@ -0,0 +1,12 @@
+# pylint: disable=duplicate-code
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_file_double/second.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_file_double/second.py
new file mode 100644
index 0000000000..fc7f0af615
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_file_double/second.py
@@ -0,0 +1,12 @@
+# pylint: disable=duplicate-code
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_file_double/third.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_file_double/third.py
new file mode 100644
index 0000000000..687c5922ed
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_file_double/third.py
@@ -0,0 +1,11 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_line_begin/__init__.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_begin/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_line_begin/first.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_begin/first.py
new file mode 100644
index 0000000000..3f6182d23a
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_begin/first.py
@@ -0,0 +1,11 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1  # pylint: disable=duplicate-code
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_line_begin/second.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_begin/second.py
new file mode 100644
index 0000000000..687c5922ed
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_begin/second.py
@@ -0,0 +1,11 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_line_disable_all/__init__.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_disable_all/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_line_disable_all/first.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_disable_all/first.py
new file mode 100644
index 0000000000..030b519e22
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_disable_all/first.py
@@ -0,0 +1,11 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1  # pylint: disable=duplicate-code
+    yyyy = 2  # pylint: disable=duplicate-code
+    zzzz = 3  # pylint: disable=duplicate-code
+    wwww = 4  # pylint: disable=duplicate-code
+    vvvv = xxxx + yyyy + zzzz + wwww  # pylint: disable=duplicate-code
+    return vvvv  # pylint: disable=duplicate-code
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_line_disable_all/second.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_disable_all/second.py
new file mode 100644
index 0000000000..687c5922ed
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_disable_all/second.py
@@ -0,0 +1,11 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_line_end/__init__.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_end/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_line_end/first.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_end/first.py
new file mode 100644
index 0000000000..97728fff4a
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_end/first.py
@@ -0,0 +1,11 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv  # pylint: disable=duplicate-code
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_line_end/second.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_end/second.py
new file mode 100644
index 0000000000..687c5922ed
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_end/second.py
@@ -0,0 +1,11 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_line_middle/__init__.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_middle/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_line_middle/first.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_middle/first.py
new file mode 100644
index 0000000000..828b94c459
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_middle/first.py
@@ -0,0 +1,11 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3  # pylint: disable=duplicate-code
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_line_middle/second.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_middle/second.py
new file mode 100644
index 0000000000..687c5922ed
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_line_middle/second.py
@@ -0,0 +1,11 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_scope/__init__.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_scope/first.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope/first.py
new file mode 100644
index 0000000000..97e987edb3
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope/first.py
@@ -0,0 +1,12 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    # pylint: disable=duplicate-code
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_scope/second.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope/second.py
new file mode 100644
index 0000000000..687c5922ed
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope/second.py
@@ -0,0 +1,11 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_scope/third.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope/third.py
new file mode 100644
index 0000000000..687c5922ed
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope/third.py
@@ -0,0 +1,11 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_double/__init__.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_double/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_double/first.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_double/first.py
new file mode 100644
index 0000000000..97e987edb3
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_double/first.py
@@ -0,0 +1,12 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    # pylint: disable=duplicate-code
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_double/second.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_double/second.py
new file mode 100644
index 0000000000..97e987edb3
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_double/second.py
@@ -0,0 +1,12 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    # pylint: disable=duplicate-code
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_double/third.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_double/third.py
new file mode 100644
index 0000000000..687c5922ed
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_double/third.py
@@ -0,0 +1,11 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_second_function/__init__.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_second_function/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_second_function/first.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_second_function/first.py
new file mode 100644
index 0000000000..ae2b088b56
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_second_function/first.py
@@ -0,0 +1,21 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    # pylint: disable=duplicate-code
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
+
+
+def look_busy_two():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_second_function/second.py b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_second_function/second.py
new file mode 100644
index 0000000000..c3693ef374
--- /dev/null
+++ b/tests/regrtest_data/duplicate_code/raw_strings_disable_scope_second_function/second.py
@@ -0,0 +1,20 @@
+r"""A raw docstring.
+"""
+
+
+def look_busy():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
+
+
+def look_busy_two():
+    xxxx = 1
+    yyyy = 2
+    zzzz = 3
+    wwww = 4
+    vvvv = xxxx + yyyy + zzzz + wwww
+    return vvvv
diff --git a/tests/regrtest_data/issue_5724.py b/tests/regrtest_data/issue_5724.py
new file mode 100644
index 0000000000..dad184c432
--- /dev/null
+++ b/tests/regrtest_data/issue_5724.py
@@ -0,0 +1 @@
+a = "a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #a #"
diff --git a/tests/regrtest_data/max_inferable_limit_for_classes/main.py b/tests/regrtest_data/max_inferable_limit_for_classes/main.py
new file mode 100644
index 0000000000..2588d916fe
--- /dev/null
+++ b/tests/regrtest_data/max_inferable_limit_for_classes/main.py
@@ -0,0 +1,38 @@
+"""This example is based on sqlalchemy.
+
+See https://github.com/PyCQA/pylint/issues/5679
+"""
+from other_funcs import FromClause
+
+from .nodes import roles
+
+
+class HasMemoized(object):
+    ...
+
+
+class Generative(HasMemoized):
+    ...
+
+
+class ColumnElement(
+    roles.ColumnArgumentOrKeyRole,
+    roles.BinaryElementRole,
+    roles.OrderByRole,
+    roles.ColumnsClauseRole,
+    roles.LimitOffsetRole,
+    roles.DMLColumnRole,
+    roles.DDLConstraintColumnRole,
+    roles.StatementRole,
+    Generative,
+):
+    ...
+
+
+class FunctionElement(ColumnElement, FromClause):
+    ...
+
+
+class months_between(FunctionElement):
+    def __init__(self):
+        super().__init__()
diff --git a/tests/regrtest_data/max_inferable_limit_for_classes/nodes/roles.py b/tests/regrtest_data/max_inferable_limit_for_classes/nodes/roles.py
new file mode 100644
index 0000000000..2f58f1b508
--- /dev/null
+++ b/tests/regrtest_data/max_inferable_limit_for_classes/nodes/roles.py
@@ -0,0 +1,82 @@
+class SQLRole(object):
+    ...
+
+
+class UsesInspection(object):
+    ...
+
+
+class AllowsLambdaRole(object):
+    ...
+
+
+class ColumnArgumentRole(SQLRole):
+    ...
+
+
+class ColumnArgumentOrKeyRole(ColumnArgumentRole):
+    ...
+
+
+class ColumnListRole(SQLRole):
+    ...
+
+
+class ColumnsClauseRole(AllowsLambdaRole, UsesInspection, ColumnListRole):
+    ...
+
+
+class LimitOffsetRole(SQLRole):
+    ...
+
+
+class ByOfRole(ColumnListRole):
+    ...
+
+
+class OrderByRole(AllowsLambdaRole, ByOfRole):
+    ...
+
+
+class StructuralRole(SQLRole):
+    ...
+
+
+class ExpressionElementRole(SQLRole):
+    ...
+
+
+class BinaryElementRole(ExpressionElementRole):
+    ...
+
+
+class JoinTargetRole(AllowsLambdaRole, UsesInspection, StructuralRole):
+    ...
+
+
+class FromClauseRole(ColumnsClauseRole, JoinTargetRole):
+    ...
+
+
+class StrictFromClauseRole(FromClauseRole):
+    ...
+
+
+class AnonymizedFromClauseRole(StrictFromClauseRole):
+    ...
+
+
+class ReturnsRowsRole(SQLRole):
+    ...
+
+
+class StatementRole(SQLRole):
+    ...
+
+
+class DMLColumnRole(SQLRole):
+    ...
+
+
+class DDLConstraintColumnRole(SQLRole):
+    ...
diff --git a/tests/regrtest_data/max_inferable_limit_for_classes/other_funcs.py b/tests/regrtest_data/max_inferable_limit_for_classes/other_funcs.py
new file mode 100644
index 0000000000..f737fbf5a8
--- /dev/null
+++ b/tests/regrtest_data/max_inferable_limit_for_classes/other_funcs.py
@@ -0,0 +1,31 @@
+from operator import attrgetter
+
+from .nodes import roles
+
+
+class HasCacheKey(object):
+    ...
+
+
+class HasMemoized(object):
+    ...
+
+
+class MemoizedHasCacheKey(HasCacheKey, HasMemoized):
+    ...
+
+
+class ClauseElement(MemoizedHasCacheKey):
+    ...
+
+
+class ReturnsRows(roles.ReturnsRowsRole, ClauseElement):
+    ...
+
+
+class Selectable(ReturnsRows):
+    ...
+
+
+class FromClause(roles.AnonymizedFromClauseRole, Selectable):
+    c = property(attrgetter("columns"))
diff --git a/tests/regrtest_data/unicode/invisible_function.txt b/tests/regrtest_data/unicode/invisible_function.txt
new file mode 100644
index 0000000000..ebec0247ec
--- /dev/null
+++ b/tests/regrtest_data/unicode/invisible_function.txt
@@ -0,0 +1,15 @@
+#!/usr/bin/env python3
+
+def is_admin():
+    return True
+
+def is_​admin():
+    return False
+
+def main():
+    if is_​admin():
+        print("You are an admin.")
+
+
+if __name__ == '__main__':
+    main()
diff --git a/tests/regrtest_data/unicode/pep_bidirectional_utf_16_bom.txt b/tests/regrtest_data/unicode/pep_bidirectional_utf_16_bom.txt
new file mode 100644
index 0000000000..67cce9b527
Binary files /dev/null and b/tests/regrtest_data/unicode/pep_bidirectional_utf_16_bom.txt differ
diff --git a/tests/regrtest_data/unicode/pep_bidirectional_utf_16_le_no_bom.txt b/tests/regrtest_data/unicode/pep_bidirectional_utf_16_le_no_bom.txt
new file mode 100644
index 0000000000..70610fcbb1
Binary files /dev/null and b/tests/regrtest_data/unicode/pep_bidirectional_utf_16_le_no_bom.txt differ
diff --git a/tests/regrtest_data/unicode/pep_bidirectional_utf_32_bom.txt b/tests/regrtest_data/unicode/pep_bidirectional_utf_32_bom.txt
new file mode 100644
index 0000000000..afa27e9ef1
Binary files /dev/null and b/tests/regrtest_data/unicode/pep_bidirectional_utf_32_bom.txt differ
diff --git a/tests/regrtest_data/unicode/pep_bidirectional_utf_32_le_no_bom.txt b/tests/regrtest_data/unicode/pep_bidirectional_utf_32_le_no_bom.txt
new file mode 100644
index 0000000000..dab9046fa4
Binary files /dev/null and b/tests/regrtest_data/unicode/pep_bidirectional_utf_32_le_no_bom.txt differ
diff --git a/tests/regrtest_data/very_long_line.py b/tests/regrtest_data/very_long_line.py
new file mode 100644
index 0000000000..82988e8707
--- /dev/null
+++ b/tests/regrtest_data/very_long_line.py
@@ -0,0 +1,2 @@
+# A list of 1000 tuples
+very_long_list = [[None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None], [None, None]]
diff --git a/tests/test_check_parallel.py b/tests/test_check_parallel.py
index df493ccb28..d41ed13f4d 100644
--- a/tests/test_check_parallel.py
+++ b/tests/test_check_parallel.py
@@ -1,25 +1,24 @@
-"""Puts the check_parallel system under test"""
-# Copyright (c) 2020-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2020 Frank Harrison <frank@doublethefish.com>
-# Copyright (c) 2021 Jaehoon Hwang <jaehoonhwang@users.noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Julien Palard <julien@palard.fr>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Puts the check_parallel system under test."""
 
 # pylint: disable=protected-access,missing-function-docstring,no-self-use
 
+import argparse
+import multiprocessing
 import os
 from typing import List
 
+import dill
 import pytest
 from astroid import nodes
 
 import pylint.interfaces
 import pylint.lint.parallel
 from pylint.checkers.base_checker import BaseChecker
+from pylint.checkers.mapreduce_checker import MapReduceMixin
 from pylint.lint import PyLinter
 from pylint.lint.parallel import _worker_check_single_file as worker_check_single_file
 from pylint.lint.parallel import _worker_initialize as worker_initialize
@@ -30,7 +29,7 @@
 
 
 def _gen_file_data(idx: int = 0) -> FileItem:
-    """Generates a file to use as a stream"""
+    """Generates a file to use as a stream."""
     filepath = os.path.abspath(
         os.path.join(os.path.dirname(__file__), "input", "similar1")
     )
@@ -47,7 +46,7 @@ def _gen_file_datas(count: int = 1) -> List[FileItem]:
 
 
 class SequentialTestChecker(BaseChecker):
-    """A checker that does not need to consolidate data across run invocations"""
+    """A checker that does not need to consolidate data across run invocations."""
 
     __implements__ = (pylint.interfaces.IRawChecker,)
 
@@ -67,13 +66,13 @@ def __init__(self, linter: PyLinter) -> None:
         self.linter = linter
 
     def process_module(self, _node: nodes.Module) -> None:
-        """Called once per stream/file/astroid object"""
+        """Called once per stream/file/astroid object."""
         # record the number of invocations with the data object
         record = self.test_data + str(len(self.data))
         self.data.append(record)
 
 
-class ParallelTestChecker(BaseChecker):
+class ParallelTestChecker(BaseChecker, MapReduceMixin):
     """A checker that does need to consolidate data.
 
     To simulate the need to consolidate data, this checker only
@@ -81,7 +80,7 @@ class ParallelTestChecker(BaseChecker):
 
     On non-parallel builds: it works on all the files in a single run.
 
-    On parallel builds: lint.parallel calls ``open`` once per file.
+    On parallel builds: ``lint.parallel`` calls ``open`` once per file.
 
     So if files are treated by separate processes, no messages will be
     raised from the individual process, all messages will be raised
@@ -106,7 +105,7 @@ def __init__(self, linter: PyLinter) -> None:
         self.linter = linter
 
     def open(self) -> None:
-        """init the checkers: reset statistics information"""
+        """Init the checkers: reset statistics information."""
         self.linter.stats.reset_node_count()
         self.data = []
 
@@ -128,42 +127,42 @@ def reduce_map_data(self, linter: PyLinter, data: List[List[str]]) -> None:
         recombined.close()
 
     def process_module(self, _node: nodes.Module) -> None:
-        """Called once per stream/file/astroid object"""
+        """Called once per stream/file/astroid object."""
         # record the number of invocations with the data object
         record = self.test_data + str(len(self.data))
         self.data.append(record)
 
 
 class ExtraSequentialTestChecker(SequentialTestChecker):
-    """A checker that does not need to consolidate data across run invocations"""
+    """A checker that does not need to consolidate data across run invocations."""
 
     name = "extra-sequential-checker"
     test_data = "extra-sequential"
 
 
 class ExtraParallelTestChecker(ParallelTestChecker):
-    """A checker that does need to consolidate data across run invocations"""
+    """A checker that does need to consolidate data across run invocations."""
 
     name = "extra-parallel-checker"
     test_data = "extra-parallel"
 
 
 class ThirdSequentialTestChecker(SequentialTestChecker):
-    """A checker that does not need to consolidate data across run invocations"""
+    """A checker that does not need to consolidate data across run invocations."""
 
     name = "third-sequential-checker"
     test_data = "third-sequential"
 
 
 class ThirdParallelTestChecker(ParallelTestChecker):
-    """A checker that does need to consolidate data across run invocations"""
+    """A checker that does need to consolidate data across run invocations."""
 
     name = "third-parallel-checker"
     test_data = "third-parallel"
 
 
 class TestCheckParallelFramework:
-    """Tests the check_parallel() function's framework"""
+    """Tests the check_parallel() function's framework."""
 
     def setup_class(self):
         self._prev_global_linter = pylint.lint.parallel._worker_linter
@@ -173,8 +172,22 @@ def teardown_class(self):
 
     def test_worker_initialize(self) -> None:
         linter = PyLinter(reporter=Reporter())
-        worker_initialize(linter=linter)
-        assert pylint.lint.parallel._worker_linter == linter
+        worker_initialize(linter=dill.dumps(linter))
+        assert isinstance(pylint.lint.parallel._worker_linter, type(linter))
+
+    def test_worker_initialize_pickling(self) -> None:
+        """Test that we can pickle objects that standard pickling in multiprocessing can't.
+
+        See:
+        https://stackoverflow.com/questions/8804830/python-multiprocessing-picklingerror-cant-pickle-type-function
+        https://github.com/PyCQA/pylint/pull/5584
+        """
+        linter = PyLinter(reporter=Reporter())
+        linter.attribute = argparse.ArgumentParser()  # type: ignore[attr-defined]
+        with multiprocessing.Pool(
+            2, initializer=worker_initialize, initargs=[dill.dumps(linter)]
+        ) as pool:
+            pool.imap_unordered(print, [1, 2])
 
     def test_worker_check_single_file_uninitialised(self) -> None:
         pylint.lint.parallel._worker_linter = None
@@ -185,7 +198,7 @@ def test_worker_check_single_file_uninitialised(self) -> None:
 
     def test_worker_check_single_file_no_checkers(self) -> None:
         linter = PyLinter(reporter=Reporter())
-        worker_initialize(linter=linter)
+        worker_initialize(linter=dill.dumps(linter))
 
         (
             _,  # proc-id
@@ -222,9 +235,9 @@ def test_worker_check_single_file_no_checkers(self) -> None:
         assert stats.warning == 0
 
     def test_worker_check_sequential_checker(self) -> None:
-        """Same as test_worker_check_single_file_no_checkers with SequentialTestChecker"""
+        """Same as test_worker_check_single_file_no_checkers with SequentialTestChecker."""
         linter = PyLinter(reporter=Reporter())
-        worker_initialize(linter=linter)
+        worker_initialize(linter=dill.dumps(linter))
 
         # Add the only checker we care about in this test
         linter.register_checker(SequentialTestChecker(linter))
@@ -267,19 +280,18 @@ def test_worker_check_sequential_checker(self) -> None:
 
 
 class TestCheckParallel:
-    """Tests the check_parallel() function"""
+    """Tests the check_parallel() function."""
 
     def test_sequential_checkers_work(self) -> None:
-        """Tests original basic types of checker works as expected in -jN
+        """Tests original basic types of checker works as expected in -jN.
 
         This means that a sequential checker should return the same data for a given
-        file-stream irrespective of whether its run in -j1 or -jN
+        file-stream irrespective of whether it's run in -j1 or -jN
         """
         linter = PyLinter(reporter=Reporter())
 
         # Add a sequential checker to ensure it records data against some streams
         linter.register_checker(SequentialTestChecker(linter))
-        linter.enable("R9999")
 
         # Create a dummy file, the actual contents of which will be ignored by the
         # register test checkers, but it will trigger at least a single-job to be run.
@@ -288,7 +300,10 @@ def test_sequential_checkers_work(self) -> None:
         # Invoke the lint process in a multiprocess way, although we only specify one
         # job.
         check_parallel(
-            linter, jobs=1, files=iter(single_file_container), arguments=None
+            linter,
+            jobs=1,
+            files=iter(single_file_container),
+            arguments=["--enable", "R9999"],
         )
         assert len(linter.get_checkers()) == 2, (
             "We should only have the 'master' and 'sequential-checker' "
@@ -339,9 +354,10 @@ def test_sequential_checkers_work(self) -> None:
         assert linter.stats.warning == 0
 
     def test_invoke_single_job(self) -> None:
-        """Tests basic checkers functionality using just a single workderdo
+        """Tests basic checkers functionality using just a single workderdo.
 
-        This is *not* the same -j1 and does not happen under normal operation"""
+        This is *not* the same -j1 and does not happen under normal operation
+        """
         linter = PyLinter(reporter=Reporter())
 
         linter.register_checker(SequentialTestChecker(linter))
@@ -392,26 +408,21 @@ def test_invoke_single_job(self) -> None:
             (3, 1, 1),
             (3, 1, 2),
             (3, 1, 3),
-            (3, 5, 1),
-            (3, 5, 2),
-            (3, 5, 3),
             (10, 2, 1),
             (10, 2, 2),
             (10, 2, 3),
-            (2, 10, 1),
-            (2, 10, 2),
-            (2, 10, 3),
         ],
     )
     def test_compare_workers_to_single_proc(self, num_files, num_jobs, num_checkers):
-        """Compares the 3 key parameters for check_parallel() produces the same results
+        """Compares the 3 key parameters for check_parallel() produces the same results.
 
         The intent here is to ensure that the check_parallel() operates on each file,
         without ordering issues, irrespective of the number of workers used and the
         number of checkers applied.
 
         This test becomes more important if we want to change how we parametrise the
-        checkers, for example if we aim to batch the files across jobs."""
+        checkers, for example if we aim to batch the files across jobs.
+        """
 
         # define the stats we expect to get back from the runs, these should only vary
         # with the number of files.
@@ -442,7 +453,7 @@ def test_compare_workers_to_single_proc(self, num_files, num_jobs, num_checkers)
 
         file_infos = _gen_file_datas(num_files)
 
-        # Loop for single-proc and mult-proc so we can ensure the same linter-config
+        # Loop for single-proc and mult-proc, so we can ensure the same linter-config
         for do_single_proc in range(2):
             linter = PyLinter(reporter=Reporter())
 
@@ -491,19 +502,13 @@ def test_compare_workers_to_single_proc(self, num_files, num_jobs, num_checkers)
             (3, 1, 1),
             (3, 1, 2),
             (3, 1, 3),
-            (3, 5, 1),
-            (3, 5, 2),
-            (3, 5, 3),
             (10, 2, 1),
             (10, 2, 2),
             (10, 2, 3),
-            (2, 10, 1),
-            (2, 10, 2),
-            (2, 10, 3),
         ],
     )
     def test_map_reduce(self, num_files, num_jobs, num_checkers):
-        """Compares the 3 key parameters for check_parallel() produces the same results
+        """Compares the 3 key parameters for check_parallel() produces the same results.
 
         The intent here is to validate the reduce step: no stats should be lost.
 
@@ -514,7 +519,7 @@ def test_map_reduce(self, num_files, num_jobs, num_checkers):
         # with the number of files.
         file_infos = _gen_file_datas(num_files)
 
-        # Loop for single-proc and mult-proc so we can ensure the same linter-config
+        # Loop for single-proc and mult-proc, so we can ensure the same linter-config
         for do_single_proc in range(2):
             linter = PyLinter(reporter=Reporter())
 
diff --git a/tests/test_epylint.py b/tests/test_epylint.py
index 4f2d2aad01..e1b090395a 100644
--- a/tests/test_epylint.py
+++ b/tests/test_epylint.py
@@ -1,4 +1,8 @@
-"""Test for issue https://github.com/PyCQA/pylint/issues/4286"""
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Test for issue https://github.com/PyCQA/pylint/issues/4286."""
 # pylint: disable=redefined-outer-name
 from pathlib import PosixPath
 
diff --git a/tests/test_func.py b/tests/test_func.py
index 575773bb9d..2de78c5d0f 100644
--- a/tests/test_func.py
+++ b/tests/test_func.py
@@ -1,24 +1,8 @@
-# Copyright (c) 2006-2010, 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2012 FELD Boris <lothiraldan@gmail.com>
-# Copyright (c) 2013-2014 Google, Inc.
-# Copyright (c) 2014-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Michal Nowikowski <godfryd@gmail.com>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2017 Michka Popoff <michkapopoff@gmail.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""functional/non regression tests for pylint"""
+"""Functional/non regression tests for pylint."""
 
 import re
 import sys
@@ -38,8 +22,9 @@
 
 
 def exception_str(self, ex) -> str:  # pylint: disable=unused-argument
-    """function used to replace default __str__ method of exception instances
-    This function is not typed because it is legacy code"""
+    """Function used to replace default __str__ method of exception instances
+    This function is not typed because it is legacy code
+    """
     return f"in {ex.file}\n:: {', '.join(ex.args)}"
 
 
diff --git a/tests/test_functional.py b/tests/test_functional.py
index 6f0eceb23f..b328af5fcc 100644
--- a/tests/test_functional.py
+++ b/tests/test_functional.py
@@ -1,30 +1,10 @@
-# Copyright (c) 2014-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Google, Inc.
-# Copyright (c) 2014 Michal Nowikowski <godfryd@gmail.com>
-# Copyright (c) 2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2018 Lucas Cimon <lucas.cimon@gmail.com>
-# Copyright (c) 2018 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Mr. Senko <atodorov@mrsenko.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Damien Baty <damien.baty@polyconseil.fr>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2020 bernie gray <bfgray3@users.noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Functional full-module tests for PyLint."""
-import csv
-import os
 import sys
+from pathlib import Path
 from typing import Union
 
 import pytest
@@ -33,59 +13,26 @@
 
 from pylint import testutils
 from pylint.testutils import UPDATE_FILE, UPDATE_OPTION
-from pylint.testutils.functional_test_file import FunctionalTestFile
+from pylint.testutils.functional import (
+    FunctionalTestFile,
+    LintModuleOutputUpdate,
+    get_functional_test_files_from_directory,
+)
 from pylint.utils import HAS_ISORT_5
 
 # TODOs
 #  - implement exhaustivity tests
 
-# 'Wet finger' number of files that are reasonable to display by an IDE
-# 'Wet finger' as in 'in my settings there are precisely this many'.
-REASONABLY_DISPLAYABLE_VERTICALLY = 48
-
-
-class LintModuleOutputUpdate(testutils.LintModuleTest):
-    """If message files should be updated instead of checked."""
-
-    class TestDialect(csv.excel):
-        delimiter = ":"
-        lineterminator = "\n"
-
-    csv.register_dialect("test", TestDialect)
 
-    def _check_output_text(self, _, expected_output, actual_output):
-        if not expected_output and not actual_output:
-            if os.path.exists(self._test_file.expected_output):
-                os.remove(self._test_file.expected_output)
-            return
-        with open(self._test_file.expected_output, "w", encoding="utf-8") as f:
-            writer = csv.writer(f, dialect="test")
-            for line in actual_output:
-                writer.writerow(line.to_csv())
+FUNCTIONAL_DIR = Path(__file__).parent.resolve() / "functional"
 
 
-def get_tests():
-    input_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "functional")
-    suite = []
-    for dirpath, _, filenames in os.walk(input_dir):
-        if dirpath.endswith("__pycache__"):
-            continue
-
-        assert (
-            len(filenames) <= REASONABLY_DISPLAYABLE_VERTICALLY
-        ), f"{dirpath} contain too much functional tests files."
-
-        for filename in filenames:
-            if filename != "__init__.py" and filename.endswith(".py"):
-                # isort 5 has slightly different rules as isort 4. Testing
-                # both would be hard: test with isort 5 only.
-                if filename == "wrong_import_order.py" and not HAS_ISORT_5:
-                    continue
-                suite.append(testutils.FunctionalTestFile(dirpath, filename))
-    return suite
-
-
-TESTS = get_tests()
+# isort 5 has slightly different rules as isort 4. Testing both would be hard: test with isort 5 only.
+TESTS = [
+    t
+    for t in get_functional_test_files_from_directory(FUNCTIONAL_DIR)
+    if not (t.base == "wrong_import_order" and not HAS_ISORT_5)
+]
 TESTS_NAMES = [t.base for t in TESTS]
 TEST_WITH_EXPECTED_DEPRECATION = [
     "future_unicode_literals",
@@ -108,8 +55,8 @@ def test_functional(
     lint_test.runTest()
     warning = None
     try:
-        # Catch <unknown>:x: DeprecationWarning: invalid escape sequence
-        # so it's not shown during tests
+        # Catch <unknown>:x: DeprecationWarning: invalid escape sequence,
+        # so, it's not shown during tests
         warning = recwarn.pop()
     except AssertionError:
         pass
diff --git a/tests/test_functional_directories.py b/tests/test_functional_directories.py
new file mode 100644
index 0000000000..f757723322
--- /dev/null
+++ b/tests/test_functional_directories.py
@@ -0,0 +1,16 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Test that the directory structure of the functional tests is correct."""
+from pathlib import Path
+
+from pylint.testutils.functional.find_functional_tests import (
+    get_functional_test_files_from_directory,
+)
+
+
+def test_directories() -> None:
+    """Test that the directory structure of the functional tests is correct."""
+    functional_dir = Path(__file__).parent / "functional"
+    get_functional_test_files_from_directory(functional_dir)
diff --git a/tests/test_import_graph.py b/tests/test_import_graph.py
index 6035601bf5..9ea57e2cef 100644
--- a/tests/test_import_graph.py
+++ b/tests/test_import_graph.py
@@ -1,21 +1,7 @@
-# Copyright (c) 2006-2008, 2010, 2013 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2012 FELD Boris <lothiraldan@gmail.com>
-# Copyright (c) 2014-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Google, Inc.
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2018 Reverb C <reverbc@users.noreply.github.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Damien Baty <damien.baty@polyconseil.fr>
-# Copyright (c) 2020 Frank Harrison <frank@doublethefish.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Andrew Howe <howeaj@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 # pylint: disable=redefined-outer-name
 
 import os
@@ -47,7 +33,7 @@ def dest(request: SubRequest) -> Iterator[Union[Iterator, Iterator[str]]]:
 
 @pytest.mark.parametrize("dest", POSSIBLE_DOT_FILENAMES, indirect=True)
 def test_dependencies_graph(dest: str) -> None:
-    """DOC files are correctly generated, and the graphname is the basename"""
+    """DOC files are correctly generated, and the graphname is the basename."""
     imports._dependencies_graph(dest, {"labas": {"hoho", "yep"}, "hoho": {"yep"}})
     with open(dest, encoding="utf-8") as stream:
         assert (
@@ -73,7 +59,7 @@ def test_dependencies_graph(dest: str) -> None:
     any(shutil.which(x) for x in ("dot", "gv")), reason="dot or gv is installed"
 )
 def test_missing_graphviz(filename: str) -> None:
-    """Raises if graphviz is not installed, and defaults to png if no extension given"""
+    """Raises if graphviz is not installed, and defaults to png if no extension given."""
     with pytest.raises(RuntimeError, match=r"Cannot generate `graph\.png`.*"):
         imports._dependencies_graph(filename, {"a": {"b", "c"}, "b": {"c"}})
 
diff --git a/tests/test_numversion.py b/tests/test_numversion.py
index 46f154da73..1bfb451da7 100644
--- a/tests/test_numversion.py
+++ b/tests/test_numversion.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import pytest
 
diff --git a/tests/test_pragma_parser.py b/tests/test_pragma_parser.py
index 7bf00c7a34..d8dd508b08 100644
--- a/tests/test_pragma_parser.py
+++ b/tests/test_pragma_parser.py
@@ -1,3 +1,7 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 import pytest
 
 from pylint.utils.pragma_parser import (
diff --git a/tests/test_pylint_runners.py b/tests/test_pylint_runners.py
index 6c44308922..303b433d35 100644
--- a/tests/test_pylint_runners.py
+++ b/tests/test_pylint_runners.py
@@ -1,3 +1,7 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 # pylint: disable=missing-module-docstring, missing-function-docstring
 import os
 import sys
@@ -21,3 +25,16 @@ def test_runner(runner: Callable, tmpdir: LocalPath) -> None:
             with pytest.raises(SystemExit) as err:
                 runner()
             assert err.value.code == 0
+
+
+@pytest.mark.parametrize(
+    "runner", [run_epylint, run_pylint, run_pyreverse, run_symilar]
+)
+def test_runner_with_arguments(runner: Callable, tmpdir: LocalPath) -> None:
+    """Check the runners with arguments as parameter instead of sys.argv."""
+    filepath = os.path.abspath(__file__)
+    testargs = [filepath]
+    with tmpdir.as_cwd():
+        with pytest.raises(SystemExit) as err:
+            runner(testargs)
+        assert err.value.code == 0
diff --git a/tests/test_regr.py b/tests/test_regr.py
index 0936e0d066..76bcafd68d 100644
--- a/tests/test_regr.py
+++ b/tests/test_regr.py
@@ -1,31 +1,14 @@
-# Copyright (c) 2006-2011, 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2012 FELD Boris <lothiraldan@gmail.com>
-# Copyright (c) 2014 Google, Inc.
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016-2017 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2018 Reverb C <reverbc@users.noreply.github.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2020 Damien Baty <damien.baty@polyconseil.fr>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Andrew Haigh <hello@nelf.in>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-"""non regression tests for pylint, which requires a too specific configuration
+"""Non regression tests for pylint, which requires a too specific configuration
 to be incorporated in the automatic functional test framework
 """
 # pylint: disable=redefined-outer-name
 
 import os
-import signal
 import sys
-from contextlib import contextmanager
 from os.path import abspath, dirname, join
 from typing import Callable, Iterator, List, cast
 
@@ -51,8 +34,8 @@ def disable():
 
 @pytest.fixture
 def finalize_linter(linter: PyLinter) -> Iterator[PyLinter]:
-    """call reporter.finalize() to cleanup
-    pending messages if a test finished badly
+    """Call reporter.finalize() to clean up pending messages if a test
+    finished badly.
     """
     yield linter
     linter.reporter = cast(  # Due to fixture
@@ -154,27 +137,7 @@ def test_pylint_config_attr() -> None:
     assert inferred[0].name == "Values"
 
 
-@contextmanager
-def timeout(timeout_s: float):
-    def _handle(_signum, _frame):
-        pytest.fail("timed out")
-
-    signal.signal(signal.SIGALRM, _handle)
-    signal.setitimer(signal.ITIMER_REAL, timeout_s)
-    yield
-    signal.setitimer(signal.ITIMER_REAL, 0)
-    signal.signal(signal.SIGALRM, signal.SIG_DFL)
-
-
-@pytest.mark.skipif(not hasattr(signal, "setitimer"), reason="Assumes POSIX signals")
-@pytest.mark.parametrize(
-    "file_names,timeout_s",
-    [
-        ([join(REGR_DATA, "hang", "pkg4972.string")], 30.0),
-    ],
-)
-def test_hang(
-    finalize_linter: PyLinter, file_names: List[str], timeout_s: float
-) -> None:
-    with timeout(timeout_s):
-        finalize_linter.check(file_names)
+@pytest.mark.timeout(30)
+@pytest.mark.parametrize("file_names", ([join(REGR_DATA, "hang", "pkg4972.string")],))
+def test_hang(finalize_linter: PyLinter, file_names: List[str]) -> None:
+    finalize_linter.check(file_names)
diff --git a/tests/test_self.py b/tests/test_self.py
index 41bf423ecf..36084b717a 100644
--- a/tests/test_self.py
+++ b/tests/test_self.py
@@ -1,39 +1,6 @@
-# Copyright (c) 2006-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2014-2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Vlad Temian <vladtemian@gmail.com>
-# Copyright (c) 2014 Google, Inc.
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2016 Moises Lopez <moylop260@vauxoo.com>
-# Copyright (c) 2017, 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2017, 2021 Ville Skyttä <ville.skytta@iki.fi>
-# Copyright (c) 2017, 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2017, 2019 Thomas Hisch <t.hisch@gmail.com>
-# Copyright (c) 2017 Daniel Miller <millerdev@gmail.com>
-# Copyright (c) 2017 Bryce Guinta <bryce.paul.guinta@gmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2018 Jason Owen <jason.a.owen@gmail.com>
-# Copyright (c) 2018 Jace Browning <jacebrowning@gmail.com>
-# Copyright (c) 2018 Reverb C <reverbc@users.noreply.github.com>
-# Copyright (c) 2019 Hugues <hugues.bruant@affirm.com>
-# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 Frank Harrison <frank@doublethefish.com>
-# Copyright (c) 2020 Matěj Grabovský <mgrabovs@redhat.com>
-# Copyright (c) 2020 Pieter Engelbrecht <pengelbrecht@rems2.com>
-# Copyright (c) 2020 Clément Pit-Claudel <cpitclaudel@users.noreply.github.com>
-# Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Mark Bell <mark00bell@googlemail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Dr. Nick <das-intensity@users.noreply.github.com>
-# Copyright (c) 2021 Andreas Finkler <andi.finkler@gmail.com>
-# Copyright (c) 2021 chohner <mail@chohner.com>
-# Copyright (c) 2021 Louis Sautier <sautier.louis@gmail.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 # pylint: disable=too-many-public-methods
 
@@ -100,6 +67,24 @@ def _configure_lc_ctype(lc_ctype: str) -> Iterator:
             os.environ[lc_ctype_env] = original_lctype
 
 
+@contextlib.contextmanager
+def _test_sys_path() -> Generator[None, None, None]:
+    original_path = sys.path
+    try:
+        yield
+    finally:
+        sys.path = original_path
+
+
+@contextlib.contextmanager
+def _test_cwd() -> Generator[None, None, None]:
+    original_dir = os.getcwd()
+    try:
+        yield
+    finally:
+        os.chdir(original_dir)
+
+
 class MultiReporter(BaseReporter):
     def __init__(self, reporters: List[BaseReporter]) -> None:
         # pylint: disable=super-init-not-called
@@ -183,8 +168,7 @@ def _test_output(self, args: List[str], expected_output: str) -> None:
     def _test_output_file(
         self, args: List[str], filename: LocalPath, expected_output: str
     ) -> None:
-        """
-        Run Pylint with the ``output`` option set (must be included in
+        """Run Pylint with the ``output`` option set (must be included in
         the ``args`` passed to this method!) and check the file content afterwards.
         """
         out = StringIO()
@@ -247,7 +231,7 @@ def test_generate_config_disable_symbolic_names(self) -> None:
         output = out.getvalue()
         # Get rid of the pesky messages that pylint emits if the
         # configuration file is not found.
-        pattern = fr"\[{MAIN_CHECKER_NAME.upper()}"
+        pattern = rf"\[{MAIN_CHECKER_NAME.upper()}"
         master = re.search(pattern, output)
         assert master is not None, f"{pattern} not found in {output}"
         out = StringIO(output[master.start() :])
@@ -275,7 +259,7 @@ def test_error_missing_arguments(self) -> None:
         self._runtest([], code=32)
 
     def test_no_out_encoding(self) -> None:
-        """test redirection of stdout with non ascii characters"""
+        """Test redirection of stdout with non ascii characters."""
         # This test reproduces bug #48066 ; it happens when stdout is redirected
         # through '>' : the sys.stdout.encoding becomes then None, and if the
         # output contains non ascii, pylint will crash
@@ -718,11 +702,15 @@ def test_fail_under(self) -> None:
             ],
             code=0,
         )
+        # Need the old evaluation formula to test a negative score
+        # failing below a negative --fail-under threshold
         self._runtest(
             [
                 "--fail-under",
                 "-9",
                 "--enable=all",
+                "--evaluation",
+                "0 if fatal else 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)",
                 join(HERE, "regrtest_data", "fail_under_minus10.py"),
             ],
             code=22,
@@ -732,6 +720,8 @@ def test_fail_under(self) -> None:
                 "--fail-under",
                 "-5",
                 "--enable=all",
+                "--evaluation",
+                "0 if fatal else 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)",
                 join(HERE, "regrtest_data", "fail_under_minus10.py"),
             ],
             code=22,
@@ -777,6 +767,9 @@ def test_fail_on(self, fu_score, fo_msgs, fname, out):
                 f"--fail-on={fo_msgs}",
                 "--enable=all",
                 join(HERE, "regrtest_data", fname),
+                # Use the old form of the evaluation that can go negative
+                "--evaluation",
+                "0 if fatal else 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)",
             ],
             code=out,
         )
@@ -802,14 +795,6 @@ def test_fail_on_edge_case(self, opts, out):
 
     @staticmethod
     def test_modify_sys_path() -> None:
-        @contextlib.contextmanager
-        def test_sys_path() -> Generator[None, None, None]:
-            original_path = sys.path
-            try:
-                yield
-            finally:
-                sys.path = original_path
-
         @contextlib.contextmanager
         def test_environ_pythonpath(
             new_pythonpath: Optional[str],
@@ -829,7 +814,7 @@ def test_environ_pythonpath(
                     # Only delete PYTHONPATH if new_pythonpath wasn't None
                     del os.environ["PYTHONPATH"]
 
-        with test_sys_path(), patch("os.getcwd") as mock_getcwd:
+        with _test_sys_path(), patch("os.getcwd") as mock_getcwd:
             cwd = "/tmp/pytest-of-root/pytest-0/test_do_not_import_files_from_0"
             mock_getcwd.return_value = cwd
             default_paths = [
@@ -1103,14 +1088,6 @@ def test_jobs_score(self) -> None:
         expected = "Your code has been rated at 7.50/10"
         self._test_output([path, "--jobs=2", "-ry"], expected_output=expected)
 
-    def test_duplicate_code_raw_strings(self) -> None:
-        path = join(HERE, "regrtest_data", "duplicate_data_raw_strings")
-        expected_output = "Similar lines in 2 files"
-        self._test_output(
-            [path, "--disable=all", "--enable=duplicate-code"],
-            expected_output=expected_output,
-        )
-
     def test_regression_parallel_mode_without_filepath(self) -> None:
         # Test that parallel mode properly passes filepath
         # https://github.com/PyCQA/pylint/issues/3564
@@ -1154,6 +1131,12 @@ def test_fail_on_exit_code(self, args, expected):
         # and errors that are generated they don't affect the exit code.
         self._runtest([path, "--fail-under=-10"] + args, code=expected)
 
+    def test_one_module_fatal_error(self):
+        """Fatal errors in one of several modules linted still exits non-zero."""
+        valid_path = join(HERE, "conftest.py")
+        invalid_path = join(HERE, "garbagePath.py")
+        self._runtest([valid_path, invalid_path], code=1)
+
     @pytest.mark.parametrize(
         "args, expected",
         [
@@ -1189,7 +1172,7 @@ def test_fail_on_info_only_exit_code(self, args, expected):
             ),
             (
                 "colorized",
-                "tests/regrtest_data/unused_variable.py:4:4: W0612: Unused variable 'variable' (unused-variable)",
+                "tests/regrtest_data/unused_variable.py:4:4: W0612: \x1B[35mUnused variable 'variable'\x1B[0m (\x1B[35munused-variable\x1B[0m)",
             ),
             ("json", '"message": "Unused variable \'variable\'",'),
         ],
@@ -1240,17 +1223,11 @@ def test_output_file_specified_in_rcfile(self, tmpdir: LocalPath) -> None:
 
     @staticmethod
     def test_enable_all_extensions() -> None:
-        """Test to see if --enable-all-extensions does indeed load all extensions"""
+        """Test to see if --enable-all-extensions does indeed load all extensions."""
         # Record all extensions
         plugins = []
         for filename in os.listdir(os.path.dirname(extensions.__file__)):
-            # pylint: disable=fixme
-            # TODO: Remove the check for deprecated check_docs after the extension has been removed
-            if (
-                filename.endswith(".py")
-                and not filename.startswith("_")
-                and not filename.startswith("check_docs")
-            ):
+            if filename.endswith(".py") and not filename.startswith("_"):
                 plugins.append(f"pylint.extensions.{filename[:-3]}")
 
         # Check if they are loaded
@@ -1260,6 +1237,13 @@ def test_enable_all_extensions() -> None:
         )
         assert sorted(plugins) == sorted(runner.linter._dynamic_plugins)
 
+    @staticmethod
+    def test_load_text_repoter_if_not_provided() -> None:
+        """Test if PyLinter.reporter is a TextReporter if no reporter is provided."""
+        linter = PyLinter()
+
+        assert isinstance(linter.reporter, TextReporter)
+
     @staticmethod
     def test_regex_paths_csv_validator() -> None:
         """Test to see if _regexp_paths_csv_validator works.
@@ -1269,3 +1253,68 @@ def test_regex_paths_csv_validator() -> None:
         with pytest.raises(SystemExit) as ex:
             Run(["--ignore-paths", "test", join(HERE, "regrtest_data", "empty.py")])
         assert ex.value.code == 0
+
+    @staticmethod
+    def test_max_inferred_for_complicated_class_hierarchy() -> None:
+        """Regression test for a crash reported in https://github.com/PyCQA/pylint/issues/5679.
+
+        The class hierarchy of 'sqlalchemy' is so intricate that it becomes uninferable with
+        the standard max_inferred of 100. We used to crash when this happened.
+        """
+        with pytest.raises(SystemExit) as ex:
+            Run(
+                [
+                    join(
+                        HERE,
+                        "regrtest_data",
+                        "max_inferable_limit_for_classes",
+                        "main.py",
+                    ),
+                ]
+            )
+        # Error code should not include bit-value 1 for crash
+        assert not ex.value.code % 2
+
+    def test_regression_recursive(self):
+        self._test_output(
+            [join(HERE, "regrtest_data", "directory", "subdirectory"), "--recursive=n"],
+            expected_output="No such file or directory",
+        )
+
+    def test_recursive(self):
+        self._runtest(
+            [join(HERE, "regrtest_data", "directory", "subdirectory"), "--recursive=y"],
+            code=0,
+        )
+
+    def test_recursive_current_dir(self):
+        with _test_sys_path():
+            # pytest is including directory HERE/regrtest_data to sys.path which causes
+            # astroid to believe that directory is a package.
+            sys.path = [
+                path
+                for path in sys.path
+                if not os.path.basename(path) == "regrtest_data"
+            ]
+            with _test_cwd():
+                os.chdir(join(HERE, "regrtest_data", "directory"))
+                self._runtest(
+                    [".", "--recursive=y"],
+                    code=0,
+                )
+
+    def test_regression_recursive_current_dir(self):
+        with _test_sys_path():
+            # pytest is including directory HERE/regrtest_data to sys.path which causes
+            # astroid to believe that directory is a package.
+            sys.path = [
+                path
+                for path in sys.path
+                if not os.path.basename(path) == "regrtest_data"
+            ]
+            with _test_cwd():
+                os.chdir(join(HERE, "regrtest_data", "directory"))
+                self._test_output(
+                    ["."],
+                    expected_output="No such file or directory",
+                )
diff --git a/tests/test_similar.py b/tests/test_similar.py
new file mode 100644
index 0000000000..f595102bca
--- /dev/null
+++ b/tests/test_similar.py
@@ -0,0 +1,141 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+import contextlib
+import os
+import re
+import sys
+import warnings
+from io import StringIO
+from os.path import abspath, dirname, join
+from typing import Iterator, List, TextIO
+
+import pytest
+
+from pylint.lint import Run
+
+HERE = abspath(dirname(__file__))
+DATA = join(HERE, "regrtest_data", "duplicate_code")
+CLEAN_PATH = re.escape(dirname(dirname(__file__)) + os.path.sep)
+
+
+@contextlib.contextmanager
+def _patch_streams(out: TextIO) -> Iterator:
+    sys.stderr = sys.stdout = out
+    try:
+        yield
+    finally:
+        sys.stderr = sys.__stderr__
+        sys.stdout = sys.__stdout__
+
+
+class TestSimilarCodeChecker:
+    def _runtest(self, args: List[str], code: int) -> None:
+        """Runs the tests and sees if output code is as expected."""
+        out = StringIO()
+        pylint_code = self._run_pylint(args, out=out)
+        output = out.getvalue()
+        msg = f"expected output status {code}, got {pylint_code}"
+        if output is not None:
+            msg = f"{msg}. Below pylint output: \n{output}"
+        assert pylint_code == code, msg
+
+    @staticmethod
+    def _run_pylint(args: List[str], out: TextIO) -> int:
+        """Runs pylint with a patched output."""
+        args = args + ["--persistent=no"]
+        with _patch_streams(out):
+            with pytest.raises(SystemExit) as cm:
+                with warnings.catch_warnings():
+                    warnings.simplefilter("ignore")
+                    Run(args)
+            return cm.value.code
+
+    @staticmethod
+    def _clean_paths(output: str) -> str:
+        """Normalize path to the tests directory."""
+        output = re.sub(CLEAN_PATH, "", output, flags=re.MULTILINE)
+        return output.replace("\\", "/")
+
+    def _test_output(self, args: List[str], expected_output: str) -> None:
+        """Tests if the output of a pylint run is as expected."""
+        out = StringIO()
+        self._run_pylint(args, out=out)
+        actual_output = self._clean_paths(out.getvalue())
+        expected_output = self._clean_paths(expected_output)
+        assert expected_output.strip() in actual_output.strip()
+
+    def test_duplicate_code_raw_strings_all(self) -> None:
+        """Test similar lines in 3 similar files."""
+        path = join(DATA, "raw_strings_all")
+        expected_output = "Similar lines in 2 files"
+        self._test_output(
+            [path, "--disable=all", "--enable=duplicate-code"],
+            expected_output=expected_output,
+        )
+
+    def test_duplicate_code_raw_strings_disable_file(self) -> None:
+        """Tests disabling duplicate-code at the file level in a single file."""
+        path = join(DATA, "raw_strings_disable_file")
+        expected_output = "Similar lines in 2 files"
+        self._test_output(
+            [path, "--disable=all", "--enable=duplicate-code"],
+            expected_output=expected_output,
+        )
+
+    def test_duplicate_code_raw_strings_disable_file_double(self) -> None:
+        """Tests disabling duplicate-code at the file level in two files."""
+        path = join(DATA, "raw_strings_disable_file_double")
+        self._runtest([path, "--disable=all", "--enable=duplicate-code"], code=0)
+
+    def test_duplicate_code_raw_strings_disable_line_two(self) -> None:
+        """Tests disabling duplicate-code at a line at the begin of a piece of similar code."""
+        path = join(DATA, "raw_strings_disable_line_begin")
+        expected_output = "Similar lines in 2 files"
+        self._test_output(
+            [path, "--disable=all", "--enable=duplicate-code"],
+            expected_output=expected_output,
+        )
+
+    def test_duplicate_code_raw_strings_disable_line_disable_all(self) -> None:
+        """Tests disabling duplicate-code with all similar lines disabled per line."""
+        path = join(DATA, "raw_strings_disable_line_disable_all")
+        self._runtest([path, "--disable=all", "--enable=duplicate-code"], code=0)
+
+    def test_duplicate_code_raw_strings_disable_line_midle(self) -> None:
+        """Tests disabling duplicate-code at a line in the middle of a piece of similar code."""
+        path = join(DATA, "raw_strings_disable_line_middle")
+        self._runtest([path, "--disable=all", "--enable=duplicate-code"], code=0)
+
+    def test_duplicate_code_raw_strings_disable_line_end(self) -> None:
+        """Tests disabling duplicate-code at a line at the end of a piece of similar code."""
+        path = join(DATA, "raw_strings_disable_line_end")
+        expected_output = "Similar lines in 2 files"
+        self._test_output(
+            [path, "--disable=all", "--enable=duplicate-code"],
+            expected_output=expected_output,
+        )
+
+    def test_duplicate_code_raw_strings_disable_scope(self) -> None:
+        """Tests disabling duplicate-code at an inner scope level."""
+        path = join(DATA, "raw_strings_disable_scope")
+        expected_output = "Similar lines in 2 files"
+        self._test_output(
+            [path, "--disable=all", "--enable=duplicate-code"],
+            expected_output=expected_output,
+        )
+
+    def test_duplicate_code_raw_strings_disable_scope_double(self) -> None:
+        """Tests disabling duplicate-code at an inner scope level in two files."""
+        path = join(DATA, "raw_strings_disable_scope_double")
+        self._runtest([path, "--disable=all", "--enable=duplicate-code"], code=0)
+
+    def test_duplicate_code_raw_strings_disable_scope_function(self) -> None:
+        """Tests disabling duplicate-code at an inner scope level with another scope with similarity."""
+        path = join(DATA, "raw_strings_disable_scope_second_function")
+        expected_output = "Similar lines in 2 files"
+        self._test_output(
+            [path, "--disable=all", "--enable=duplicate-code"],
+            expected_output=expected_output,
+        )
diff --git a/tests/testutils/data/init_hook.py b/tests/testutils/data/init_hook.py
new file mode 100644
index 0000000000..f16492d3aa
--- /dev/null
+++ b/tests/testutils/data/init_hook.py
@@ -0,0 +1,3 @@
+"""This file should never be tested as the init-hook in the configuration
+file prevents the test runner from getting here.
+"""
diff --git a/tests/testutils/data/init_hook.rc b/tests/testutils/data/init_hook.rc
new file mode 100644
index 0000000000..b0efa254be
--- /dev/null
+++ b/tests/testutils/data/init_hook.rc
@@ -0,0 +1,3 @@
+[MASTER]
+
+init-hook=raise RuntimeError
diff --git a/tests/testutils/data/u/use/use_len.py b/tests/testutils/data/u/use/use_len.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/testutils/data/u/use/using_dir.py b/tests/testutils/data/u/use/using_dir.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/testutils/data/u/use_dir.py b/tests/testutils/data/u/use_dir.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/testutils/data/u/using/using_len.py b/tests/testutils/data/u/using/using_len.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/testutils/dummy_checker.py b/tests/testutils/dummy_checker.py
index e69de29bb2..e8a8ff79fd 100644
--- a/tests/testutils/dummy_checker.py
+++ b/tests/testutils/dummy_checker.py
@@ -0,0 +1,3 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
diff --git a/tests/testutils/test_configuration_test.py b/tests/testutils/test_configuration_test.py
index 195c4415c5..2efa65df37 100644
--- a/tests/testutils/test_configuration_test.py
+++ b/tests/testutils/test_configuration_test.py
@@ -1,3 +1,7 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 import logging
 from pathlib import Path
 
diff --git a/tests/testutils/test_decorator.py b/tests/testutils/test_decorator.py
new file mode 100644
index 0000000000..42b88ab5c9
--- /dev/null
+++ b/tests/testutils/test_decorator.py
@@ -0,0 +1,15 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+import pytest
+
+from pylint.testutils.decorator import set_config_directly
+
+
+def test_deprecation_of_set_config_directly() -> None:
+    """Test that the deprecation of set_config_directly works as expected."""
+
+    with pytest.warns(DeprecationWarning) as records:
+        set_config_directly()
+        assert len(records) == 1
diff --git a/tests/testutils/test_functional_testutils.py b/tests/testutils/test_functional_testutils.py
new file mode 100644
index 0000000000..f37ffb1ca1
--- /dev/null
+++ b/tests/testutils/test_functional_testutils.py
@@ -0,0 +1,31 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+"""Tests for the functional test framework."""
+
+from pathlib import Path
+
+import pytest
+
+from pylint import testutils
+from pylint.testutils.functional import (
+    FunctionalTestFile,
+    get_functional_test_files_from_directory,
+)
+
+HERE = Path(__file__).parent
+DATA_DIRECTORY = HERE / "data"
+
+
+def test_parsing_of_pylintrc_init_hook() -> None:
+    """Test that we correctly parse an init-hook in a settings file."""
+    with pytest.raises(RuntimeError):
+        test_file = FunctionalTestFile(str(DATA_DIRECTORY), "init_hook.py")
+        testutils.LintModuleTest(test_file)
+
+
+def test_get_functional_test_files_from_directory() -> None:
+    """Test that we correctly check the functional test directory structures."""
+    with pytest.raises(AssertionError, match="using_dir.py should not go in"):
+        get_functional_test_files_from_directory(DATA_DIRECTORY)
diff --git a/tests/testutils/test_lint_module_output_update.py b/tests/testutils/test_lint_module_output_update.py
new file mode 100644
index 0000000000..6d46f84b47
--- /dev/null
+++ b/tests/testutils/test_lint_module_output_update.py
@@ -0,0 +1,76 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
+# pylint: disable=redefined-outer-name
+from pathlib import Path
+from typing import Callable, Tuple
+
+import pytest
+
+from pylint.constants import PY38_PLUS
+from pylint.testutils import FunctionalTestFile
+from pylint.testutils.functional import LintModuleOutputUpdate
+
+
+@pytest.fixture()
+def lint_module_fixture(
+    tmp_path: Path,
+) -> Callable[[str], Tuple[Path, Path, LintModuleOutputUpdate]]:
+    def inner(base: str) -> Tuple[Path, Path, LintModuleOutputUpdate]:
+        filename = tmp_path / f"{base}.py"
+        expected_output_file = tmp_path / f"{base}.txt"
+        lmou = LintModuleOutputUpdate(
+            test_file=FunctionalTestFile(str(tmp_path), str(filename))
+        )
+        return filename, expected_output_file, lmou
+
+    return inner
+
+
+@pytest.mark.skipif(PY38_PLUS, reason="Requires python 3.7 or lower")
+def test_not_py38(tmp_path: Path) -> None:
+    with pytest.raises(RuntimeError, match="new AST parser"):
+        LintModuleOutputUpdate(
+            test_file=FunctionalTestFile(str(tmp_path), str(tmp_path / "filename.py"))
+        )
+
+
+@pytest.mark.skipif(not PY38_PLUS, reason="Requires python 3.8 or superior")
+def test_lint_module_output_update_fail_before(
+    lint_module_fixture: Callable[[str], Tuple[Path, Path, LintModuleOutputUpdate]]
+) -> None:
+    """There is a fail before the output need to be updated."""
+    filename, expected_output_file, lmou = lint_module_fixture("foo")
+    filename.write_text("", encoding="utf8")
+    assert not expected_output_file.exists()
+    with pytest.raises(AssertionError, match="1: disallowed-name"):
+        lmou.runTest()
+    assert not expected_output_file.exists()
+
+
+@pytest.mark.skipif(not PY38_PLUS, reason="Requires python 3.8 or superior")
+def test_lint_module_output_update_effective(
+    lint_module_fixture: Callable[[str], Tuple[Path, Path, LintModuleOutputUpdate]]
+) -> None:
+    """The file is updated following a successful tests with wrong output."""
+    filename, expected_output_file, lmou = lint_module_fixture("foo")
+    filename.write_text("# [disallowed-name]\n", encoding="utf8")
+    lmou.runTest()
+    assert (expected_output_file).exists()
+    assert (
+        expected_output_file.read_text(encoding="utf8")
+        == 'disallowed-name:1:0:None:None::"Disallowed name ""foo""":UNDEFINED\n'
+    )
+
+
+@pytest.mark.skipif(not PY38_PLUS, reason="Requires python 3.8 or superior")
+def test_lint_module_output_update_remove_useless_txt(
+    lint_module_fixture: Callable[[str], Tuple[Path, Path, LintModuleOutputUpdate]]
+) -> None:
+    """The file is updated following a successful tests with wrong output."""
+    filename, expected_output_file, lmou = lint_module_fixture("fine_name")
+    expected_output_file.write_text("", encoding="utf8")
+    filename.write_text("", encoding="utf8")
+    lmou.runTest()
+    assert not (expected_output_file).exists()
diff --git a/tests/testutils/test_output_line.py b/tests/testutils/test_output_line.py
index eafb3eb533..6e6335ecc5 100644
--- a/tests/testutils/test_output_line.py
+++ b/tests/testutils/test_output_line.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 # pylint: disable=redefined-outer-name
 
@@ -123,16 +124,27 @@ def test_output_line_to_csv(confidence: Confidence, message: Callable) -> None:
 
 def test_output_line_from_csv_error() -> None:
     """Test that errors are correctly raised for incorrect OutputLine's."""
+    # Test a csv-string which does not have a number for line and column
     with pytest.raises(
         MalformedOutputLineException,
         match="msg-symbolic-name:42:27:MyClass.my_function:The message",
     ):
         OutputLine.from_csv("'missing-docstring', 'line', 'column', 'obj', 'msg'", True)
+    # Test a tuple which does not have a number for line and column
     with pytest.raises(
         MalformedOutputLineException, match="symbol='missing-docstring' ?"
     ):
         csv = ("missing-docstring", "line", "column", "obj", "msg")
         OutputLine.from_csv(csv, True)
+    # Test a csv-string that is too long
+    with pytest.raises(
+        MalformedOutputLineException,
+        match="msg-symbolic-name:42:27:MyClass.my_function:The message",
+    ):
+        OutputLine.from_csv(
+            "'missing-docstring', 1, 2, 'obj', 'msg', 'func', 'message', 'conf', 'too_long'",
+            True,
+        )
 
 
 @pytest.mark.parametrize(
diff --git a/tests/testutils/test_package_to_lint.py b/tests/testutils/test_package_to_lint.py
index bf90db3e74..c3d2a4ab4d 100644
--- a/tests/testutils/test_package_to_lint.py
+++ b/tests/testutils/test_package_to_lint.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 from pylint.testutils.primer import PRIMER_DIRECTORY_PATH, PackageToLint
 
diff --git a/tests/unittest_reporters_json.py b/tests/unittest_reporters_json.py
index a1b76fe104..421506fe50 100644
--- a/tests/unittest_reporters_json.py
+++ b/tests/unittest_reporters_json.py
@@ -1,17 +1,6 @@
-# Copyright (c) 2014 Vlad Temian <vladtemian@gmail.com>
-# Copyright (c) 2015-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2017 guillaume2 <guillaume.peillex@gmail.col>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Test for the JSON reporter."""
 
@@ -28,7 +17,7 @@
 
 
 def test_simple_json_output_no_score() -> None:
-    """Test JSON reporter with no score"""
+    """Test JSON reporter with no score."""
     message = {
         "msg": "line-too-long",
         "line": 1,
@@ -57,7 +46,7 @@ def test_simple_json_output_no_score() -> None:
 
 
 def test_simple_json_output_no_score_with_end_line() -> None:
-    """Test JSON reporter with no score with end_line and end_column"""
+    """Test JSON reporter with no score with end_line and end_column."""
     message = {
         "msg": "line-too-long",
         "line": 1,
diff --git a/tests/unittest_reporting.py b/tests/unittest_reporting.py
index 08bd2a3457..6db3f5a962 100644
--- a/tests/unittest_reporting.py
+++ b/tests/unittest_reporting.py
@@ -1,20 +1,7 @@
-# Copyright (c) 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2014-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2014 Calin Don <calin.don@gmail.com>
-# Copyright (c) 2014 Google, Inc.
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016-2017 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2018 Sushobhit <31987769+sushobhit27@users.noreply.github.com>
-# Copyright (c) 2019-2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 ruro <ruro.ruro@ya.ru>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
+
 # pylint: disable=redefined-outer-name
 import sys
 import warnings
@@ -58,7 +45,7 @@ def test_template_option(linter):
 
 
 def test_template_option_default(linter) -> None:
-    """Test the default msg-template setting"""
+    """Test the default msg-template setting."""
     output = StringIO()
     linter.reporter.out = output
     linter.open()
@@ -72,7 +59,7 @@ def test_template_option_default(linter) -> None:
 
 
 def test_template_option_end_line(linter) -> None:
-    """Test the msg-template option with end_line and end_column"""
+    """Test the msg-template option with end_line and end_column."""
     output = StringIO()
     linter.reporter.out = output
     linter.set_option(
@@ -91,10 +78,11 @@ def test_template_option_end_line(linter) -> None:
     assert out_lines[2] == "my_mod:2:0:2:4: C0301: Line too long (3/4) (line-too-long)"
 
 
-def test_template_option_non_exisiting(linter) -> None:
-    """Test the msg-template option with a non exisiting options.
+def test_template_option_non_existing(linter) -> None:
+    """Test the msg-template option with non-existent options.
     This makes sure that this option remains backwards compatible as new
-    parameters do not break on previous versions"""
+    parameters do not break on previous versions
+    """
     output = StringIO()
     linter.reporter.out = output
     linter.set_option(
@@ -124,7 +112,7 @@ def test_template_option_non_exisiting(linter) -> None:
 
 
 def test_deprecation_set_output(recwarn):
-    """TODO remove in 3.0"""
+    """TODO remove in 3.0."""
     reporter = BaseReporter()
     # noinspection PyDeprecation
     reporter.set_output(sys.stdout)
@@ -190,11 +178,11 @@ def test_multi_format_output(tmp_path):
 
     with redirect_stdout(text):
         linter = PyLinter()
+        linter.load_default_plugins()
         linter.set_option("persistent", False)
         linter.set_option("output-format", formats)
         linter.set_option("reports", True)
         linter.set_option("score", True)
-        linter.load_default_plugins()
 
         assert linter.reporter.linter is linter
         with pytest.raises(NotImplementedError):
@@ -332,8 +320,8 @@ def test_multi_format_output(tmp_path):
         "\n"
         "\n"
         "\n"
-        "-------------------------------------\n"
-        "Your code has been rated at -10.00/10\n"
+        "-----------------------------------\n"
+        "Your code has been rated at 0.00/10\n"
         "\n"
         "direct output\n"
     )
diff --git a/tests/utils/__init__.py b/tests/utils/__init__.py
index e69de29bb2..e8a8ff79fd 100644
--- a/tests/utils/__init__.py
+++ b/tests/utils/__init__.py
@@ -0,0 +1,3 @@
+# Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+# For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
diff --git a/tests/utils/unittest_ast_walker.py b/tests/utils/unittest_ast_walker.py
index 9d350830a1..ec271bee78 100644
--- a/tests/utils/unittest_ast_walker.py
+++ b/tests/utils/unittest_ast_walker.py
@@ -1,5 +1,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import warnings
 from typing import Dict, Set
diff --git a/tests/utils/unittest_utils.py b/tests/utils/unittest_utils.py
index 6514de872c..c802c40e2d 100644
--- a/tests/utils/unittest_utils.py
+++ b/tests/utils/unittest_utils.py
@@ -1,23 +1,6 @@
-# Copyright (c) 2013-2014 Google, Inc.
-# Copyright (c) 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-# Copyright (c) 2014 Arun Persaud <arun@nubati.net>
-# Copyright (c) 2015-2018, 2020 Claudiu Popa <pcmanticore@gmail.com>
-# Copyright (c) 2015 Aru Sahni <arusahni@gmail.com>
-# Copyright (c) 2015 Ionel Cristian Maries <contact@ionelmc.ro>
-# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
-# Copyright (c) 2016 Glenn Matthews <glenn@e-dad.net>
-# Copyright (c) 2017-2019, 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
-# Copyright (c) 2017-2018, 2020 Anthony Sottile <asottile@umich.edu>
-# Copyright (c) 2017 ttenhoeve-aa <ttenhoeve@appannie.com>
-# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
-# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
-# Copyright (c) 2020 Peter Kolbus <peter.kolbus@gmail.com>
-# Copyright (c) 2020 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
-# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
-
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
+# Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 import io
 
@@ -25,7 +8,7 @@
 
 
 def test_decoding_stream_unknown_encoding() -> None:
-    """decoding_stream should fall back to *some* decoding when given an
+    """Decoding_stream should fall back to *some* decoding when given an
     unknown encoding.
     """
     binary_io = io.BytesIO(b"foo\nbar")