Merge branch 'main' of https://github.com/PyCQA/astroid into orelse-lineno

Author: DanielNoord

.github/workflows/ci.yaml

@@ -33,7 +33,7 @@ jobs:
           'requirements_test_brain.txt', 'requirements_test_pre_commit.txt') }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           path: venv
           key: >-
@@ -56,7 +56,7 @@ jobs:
             hashFiles('.pre-commit-config.yaml') }}"
       - name: Restore pre-commit environment
         id: cache-precommit
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           key: >-
@@ -79,7 +79,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         python-version: [3.7, 3.8, 3.9, "3.10"]
     outputs:
@@ -104,7 +104,7 @@ jobs:
           'requirements_test_brain.txt') }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           path: venv
           key: >-
@@ -125,7 +125,7 @@ jobs:
           . venv/bin/activate
           pytest --cov --cov-report= tests/
       - name: Upload coverage artifact
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: coverage-${{ matrix.python-version }}
           path: .coverage
@@ -153,7 +153,7 @@ jobs:
           'requirements_test_brain.txt') }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           path: venv
           key: >-
@@ -174,7 +174,7 @@ jobs:
           . venv/bin/activate
           pytest --cov --cov-report= tests/
       - name: Upload coverage artifact
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: coverage-${{ matrix.python-version }}
           path: .coverage
@@ -200,7 +200,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           path: venv
           key:
@@ -231,9 +231,9 @@ jobs:
     timeout-minutes: 20
     needs: tests-linux
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.7, 3.8, 3.9, "3.10", "3.11-dev"]
     steps:
       - name: Set temp directory
         run: echo "TEMP=$env:USERPROFILE\AppData\Local\Temp" >> $env:GITHUB_ENV
@@ -254,7 +254,7 @@ jobs:
           'requirements_test_brain.txt') }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           path: venv
           key: >-
@@ -282,7 +282,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["pypy-3.7", "pypy-3.8"]
+        python-version: ["pypy-3.7", "pypy-3.8", "pypy-3.9"]
     steps:
       - name: Check out code from GitHub
         uses: actions/[email protected]
@@ -298,7 +298,7 @@ jobs:
             hashFiles('setup.cfg', 'requirements_test_min.txt') }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           path: venv
           key: >-

.pre-commit-config.yaml

@@ -39,7 +39,7 @@ repos:
       - id: isort
         exclude: tests/testdata
   - repo: https://github.com/Pierre-Sassoulas/black-disable-checker/
-    rev: 1.0.1
+    rev: v1.1.0
     hooks:
       - id: black-disable-checker
         exclude: tests/unittest_nodes_lineno.py
@@ -71,7 +71,7 @@ repos:
           ]
         exclude: tests/testdata|conf.py
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.950
+    rev: v0.960
     hooks:
       - id: mypy
         name: mypy

ChangeLog

@@ -8,8 +8,7 @@ Release date: TBA
 
 * ``astroid`` now requires Python 3.7.2 to run.
 
-* Made ``block_range`` of ``nodes.If``, ``nodes.For``, ``nodes.While``,
-  and ``nodes.TryExcept`` respect ``else`` and ``finally``.
+* Fix detection of builtins on ``PyPy`` 3.9.
 
 * Fix ``re`` brain on Python ``3.11``. The flags now come from ``re._compile``.
 
@@ -18,20 +17,46 @@ Release date: TBA
 
   Closes #1512
 
+* Capture and log messages emitted by C extensions when importing them.
+  This prevents contaminating programmatic output, e.g. pylint's JSON reporter.
+
+  Closes PyCQA/pylint#3518
+
+* Remove dependency on ``pkg_resources`` from ``setuptools``.
+
+  Closes #1103
+
 * Allowed ``AstroidManager.clear_cache`` to reload necessary brain plugins.
 
+* Fixed incorrect inferences after rebuilding the builtins module, e.g. by calling
+  ``AstroidManager.clear_cache``.
+
+  Closes #1559
+
+* On Python versions >= 3.9, ``astroid`` now understands subscripting
+  builtin classes such as ``enumerate`` or ``staticmethod``.
+
 * Rename ``ModuleSpec`` -> ``module_type`` constructor parameter to match attribute
   name and improve typing. Use ``type`` instead.
 
+* Fixed pylint ``not-callable`` false positive with nested-tuple assignment in a for-loop.
+
+  Refs PyCQA/pylint#5113
+
 * Infer the return value of the ``.copy()`` method on ``dict``, ``list``, ``set``,
   and ``frozenset``.
 
   Closes #1403
 
+* Fix test for Python ``3.11``. In some instances ``err.__traceback__`` will
+  be uninferable now.
+
 What's New in astroid 2.11.6?
 =============================
 Release date: TBA
 
+* The Qt brain now correctly treats calling ``.disconnect()`` (with no
+  arguments) on a slot as valid.
 
 What's New in astroid 2.11.5?
 =============================

astroid/_ast.py

@@ -2,17 +2,19 @@
 # For details: https://github.com/PyCQA/astroid/blob/main/LICENSE
 # Copyright (c) https://github.com/PyCQA/astroid/blob/main/CONTRIBUTORS.txt
 
+from __future__ import annotations
+
 import ast
 import sys
 import types
 from functools import partial
-from typing import Dict, List, NamedTuple, Optional, Type
+from typing import NamedTuple
 
 from astroid.const import PY38_PLUS, Context
 
 if sys.version_info >= (3, 8):
     # On Python 3.8, typed_ast was merged back into `ast`
-    _ast_py3: Optional[types.ModuleType] = ast
+    _ast_py3: types.ModuleType | None = ast
 else:
     try:
         import typed_ast.ast3 as _ast_py3
@@ -21,17 +23,17 @@
 
 
 class FunctionType(NamedTuple):
-    argtypes: List[ast.expr]
+    argtypes: list[ast.expr]
     returns: ast.expr
 
 
 class ParserModule(NamedTuple):
     module: types.ModuleType
-    unary_op_classes: Dict[Type[ast.unaryop], str]
-    cmp_op_classes: Dict[Type[ast.cmpop], str]
-    bool_op_classes: Dict[Type[ast.boolop], str]
-    bin_op_classes: Dict[Type[ast.operator], str]
-    context_classes: Dict[Type[ast.expr_context], Context]
+    unary_op_classes: dict[type[ast.unaryop], str]
+    cmp_op_classes: dict[type[ast.cmpop], str]
+    bool_op_classes: dict[type[ast.boolop], str]
+    bin_op_classes: dict[type[ast.operator], str]
+    context_classes: dict[type[ast.expr_context], Context]
 
     def parse(self, string: str, type_comments: bool = True) -> ast.Module:
         if self.module is _ast_py3:
@@ -46,7 +48,7 @@ def parse(self, string: str, type_comments: bool = True) -> ast.Module:
         return parse_func(string)
 
 
-def parse_function_type_comment(type_comment: str) -> Optional[FunctionType]:
+def parse_function_type_comment(type_comment: str) -> FunctionType | None:
     """Given a correct type comment, obtain a FunctionType object"""
     if _ast_py3 is None:
         return None
@@ -78,13 +80,13 @@ def get_parser_module(type_comments: bool = True) -> ParserModule:
 
 def _unary_operators_from_module(
     module: types.ModuleType,
-) -> Dict[Type[ast.unaryop], str]:
+) -> dict[type[ast.unaryop], str]:
     return {module.UAdd: "+", module.USub: "-", module.Not: "not", module.Invert: "~"}
 
 
 def _binary_operators_from_module(
     module: types.ModuleType,
-) -> Dict[Type[ast.operator], str]:
+) -> dict[type[ast.operator], str]:
     binary_operators = {
         module.Add: "+",
         module.BitAnd: "&",
@@ -105,13 +107,13 @@ def _binary_operators_from_module(
 
 def _bool_operators_from_module(
     module: types.ModuleType,
-) -> Dict[Type[ast.boolop], str]:
+) -> dict[type[ast.boolop], str]:
     return {module.And: "and", module.Or: "or"}
 
 
 def _compare_operators_from_module(
     module: types.ModuleType,
-) -> Dict[Type[ast.cmpop], str]:
+) -> dict[type[ast.cmpop], str]:
     return {
         module.Eq: "==",
         module.Gt: ">",
@@ -128,7 +130,7 @@ def _compare_operators_from_module(
 
 def _contexts_from_module(
     module: types.ModuleType,
-) -> Dict[Type[ast.expr_context], Context]:
+) -> dict[type[ast.expr_context], Context]:
     return {
         module.Load: Context.Load,
         module.Store: Context.Store,

astroid/arguments.py

@@ -2,7 +2,7 @@
 # For details: https://github.com/PyCQA/astroid/blob/main/LICENSE
 # Copyright (c) https://github.com/PyCQA/astroid/blob/main/CONTRIBUTORS.txt
 
-from typing import Optional, Set
+from __future__ import annotations
 
 from astroid import nodes
 from astroid.bases import Instance
@@ -36,7 +36,7 @@ def __init__(
         self.argument_context_map = argument_context_map
         args = callcontext.args
         keywords = callcontext.keywords
-        self.duplicated_keywords: Set[str] = set()
+        self.duplicated_keywords: set[str] = set()
         self._unpacked_args = self._unpack_args(args, context=context)
         self._unpacked_kwargs = self._unpack_keywords(keywords, context=context)
 
@@ -50,7 +50,7 @@ def __init__(
         }
 
     @classmethod
-    def from_call(cls, call_node, context: Optional[InferenceContext] = None):
+    def from_call(cls, call_node, context: InferenceContext | None = None):
         """Get a CallSite object from the given Call node.
 
         context will be used to force a single inference path.
@@ -160,7 +160,7 @@ def infer_argument(self, funcnode, name, context):
         """
         if name in self.duplicated_keywords:
             raise InferenceError(
-                "The arguments passed to {func!r} " " have duplicate keywords.",
+                "The arguments passed to {func!r} have duplicate keywords.",
                 call_site=self,
                 func=funcnode,
                 arg=name,

astroid/brain/brain_builtin_inference.py

@@ -4,9 +4,11 @@
 
 """Astroid hooks for various builtins."""
 
+from __future__ import annotations
+
 import itertools
+from collections.abc import Iterator
 from functools import partial
-from typing import Iterator, Optional
 
 from astroid import arguments, helpers, inference_tip, nodes, objects, util
 from astroid.builder import AstroidBuilder
@@ -534,7 +536,7 @@ def infer_callable(node, context=None):
 
 
 def infer_property(
-    node: nodes.Call, context: Optional[InferenceContext] = None
+    node: nodes.Call, context: InferenceContext | None = None
 ) -> objects.Property:
     """Understand `property` class
 
@@ -894,7 +896,7 @@ def _build_dict_with_elements(elements):
 
 
 def _infer_copy_method(
-    node: nodes.Call, context: Optional[InferenceContext] = None
+    node: nodes.Call, context: InferenceContext | None = None
 ) -> Iterator[nodes.NodeNG]:
     assert isinstance(node.func, nodes.Attribute)
     inferred_orig, inferred_copy = itertools.tee(node.func.expr.infer(context=context))