Merge branch 'main' into pipe-output

Author: Pierre-Sassoulas

.github/workflows/ci.yaml

@@ -39,11 +39,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Check out code from GitHub
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
       - name: Set up Python
         id: python
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Create Python virtual environment with virtualenv==15.1.0

.github/workflows/release-tests.yml

@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code from Github
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Install requirements

.github/workflows/release.yml

@@ -3,7 +3,7 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.2.0
     hooks:
       - id: trailing-whitespace
         exclude: .github/|tests/testdata
@@ -28,7 +28,7 @@ repos:
         exclude: tests/testdata|setup.py
         types: [python]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.1
+    rev: v2.32.0
     hooks:
       - id: pyupgrade
         exclude: tests/testdata
@@ -90,7 +90,7 @@ repos:
           ]
         exclude: tests/testdata| # exclude everything, we're not ready
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.6.1
+    rev: v2.6.2
     hooks:
       - id: prettier
         args: [--prose-wrap=always, --print-width=88]

.pre-commit-config.yaml

@@ -38,13 +38,14 @@ Contributors
 - Julien Jehannet <[email protected]>
 - Calen Pennington <[email protected]>
 - Phil Schaf <[email protected]>
+- Hugo van Kemenade <[email protected]>
 - Alex Hall <[email protected]>
 - Tushar Sadhwani <[email protected]>
 - Tim Martin <[email protected]>
 - Raphael Gaschignard <[email protected]>
 - Radosław Ganczarek <[email protected]>
+- Paligot Gérard <[email protected]>
 - Ioana Tagirta <[email protected]>
-- Hugo <[email protected]>
 - Derek Gustafson <[email protected]>
 - David Shea <[email protected]>
 - Daniel Harding <[email protected]>
@@ -55,7 +56,6 @@ Contributors
 - Marien Zwart <[email protected]>
 - FELD Boris <[email protected]>
 - Enji Cooper <[email protected]>
-- AndroWiiid <[email protected]>
 - doranid <[email protected]>
 - brendanator <[email protected]>
 - Tomas Gavenciak <[email protected]>
@@ -105,7 +105,6 @@ Contributors
 - Philipp Hörist <[email protected]>
 - Peter de Blanc <[email protected]>
 - Peter Talley <[email protected]>
-- Paligot Gérard <[email protected]>
 - Ovidiu Sabou <[email protected]>
 - Nicolas Noirbent <[email protected]>
 - Neil Girdhar <[email protected]>
@@ -127,7 +126,6 @@ Contributors
 - Jakub Wilk <[email protected]>
 - Iva Miholic <[email protected]>
 - Ionel Maries Cristian <[email protected]>
-- Hugo van Kemenade <[email protected]>
 - HoverHell <[email protected]>
 - HQupgradeHQ <[email protected]>
 - Grygorii Iermolenko <[email protected]>

CONTRIBUTORS.txt

@@ -11,11 +11,49 @@ Release date: TBA
 
   Closes PyCQA/pylint#3518
 
+* Fix ``re`` brain on Python ``3.11``. The flags now come from ``re._compile``.
 
-What's New in astroid 2.11.3?
+* Build ``nodes.Module`` for frozen modules which have location information in their
+  ``ModuleSpec``.
+
+  Closes #1512
+
+* Rename ``ModuleSpec`` -> ``module_type`` constructor parameter to match attribute
+  name and improve typing. Use ``type`` instead.
+
+
+What's New in astroid 2.11.4?
 =============================
 Release date: TBA
 
+* Fix ``col_offset`` attribute for nodes involving ``with`` on ``PyPy``.
+
+* Fixed a crash involving two starred expressions: one inside a comprehension,
+  both inside a call.
+
+  Refs PyCQA/pylint#6372
+
+* Made ``FunctionDef.implicit_parameters`` return 1 for methods by making
+  ``FunctionDef.is_bound`` return ``True``, as it does for class methods.
+
+  Closes PyCQA/pylint#6464
+
+* Fixed a crash when ``_filter_stmts`` encounters an ``EmptyNode``.
+
+  Closes PyCQA/pylint#6438
+
+
+What's New in astroid 2.11.3?
+=============================
+Release date: 2022-04-19
+
+* Fixed an error in the Qt brain when building ``instance_attrs``.
+
+  Closes PyCQA/pylint#6221
+
+* Fixed a crash in the ``gi`` brain.
+
+  Closes PyCQA/pylint#6371
 
 
 What's New in astroid 2.11.2?

ChangeLog

@@ -5,9 +5,8 @@
 import ast
 import sys
 import types
-from collections import namedtuple
 from functools import partial
-from typing import Dict, Optional
+from typing import Dict, List, NamedTuple, Optional, Type
 
 from astroid.const import PY38_PLUS, Context
 
@@ -20,23 +19,21 @@
     except ImportError:
         _ast_py3 = None
 
-FunctionType = namedtuple("FunctionType", ["argtypes", "returns"])
 
+class FunctionType(NamedTuple):
+    argtypes: List[ast.expr]
+    returns: ast.expr
 
-class ParserModule(
-    namedtuple(
-        "ParserModule",
-        [
-            "module",
-            "unary_op_classes",
-            "cmp_op_classes",
-            "bool_op_classes",
-            "bin_op_classes",
-            "context_classes",
-        ],
-    )
-):
-    def parse(self, string: str, type_comments=True):
+
+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]
+
+    def parse(self, string: str, type_comments: bool = True) -> ast.Module:
         if self.module is _ast_py3:
             if PY38_PLUS:
                 parse_func = partial(self.module.parse, type_comments=type_comments)
@@ -58,7 +55,7 @@ def parse_function_type_comment(type_comment: str) -> Optional[FunctionType]:
     return FunctionType(argtypes=func_type.argtypes, returns=func_type.returns)
 
 
-def get_parser_module(type_comments=True) -> ParserModule:
+def get_parser_module(type_comments: bool = True) -> ParserModule:
     parser_module = ast
     if type_comments and _ast_py3:
         parser_module = _ast_py3
@@ -79,11 +76,15 @@ def get_parser_module(type_comments=True) -> ParserModule:
     )
 
 
-def _unary_operators_from_module(module):
+def _unary_operators_from_module(
+    module: types.ModuleType,
+) -> Dict[Type[ast.unaryop], str]:
     return {module.UAdd: "+", module.USub: "-", module.Not: "not", module.Invert: "~"}
 
 
-def _binary_operators_from_module(module):
+def _binary_operators_from_module(
+    module: types.ModuleType,
+) -> Dict[Type[ast.operator], str]:
     binary_operators = {
         module.Add: "+",
         module.BitAnd: "&",
@@ -102,11 +103,15 @@ def _binary_operators_from_module(module):
     return binary_operators
 
 
-def _bool_operators_from_module(module):
+def _bool_operators_from_module(
+    module: types.ModuleType,
+) -> Dict[Type[ast.boolop], str]:
     return {module.And: "and", module.Or: "or"}
 
 
-def _compare_operators_from_module(module):
+def _compare_operators_from_module(
+    module: types.ModuleType,
+) -> Dict[Type[ast.cmpop], str]:
     return {
         module.Eq: "==",
         module.Gt: ">",
@@ -121,7 +126,9 @@ def _compare_operators_from_module(module):
     }
 
 
-def _contexts_from_module(module) -> Dict[ast.expr_context, Context]:
+def _contexts_from_module(
+    module: types.ModuleType,
+) -> Dict[Type[ast.expr_context], Context]:
     return {
         module.Load: Context.Load,
         module.Store: Context.Store,

astroid/_ast.py

@@ -74,7 +74,9 @@ def _gi_build_stub(parent):
 
         try:
             obj = getattr(parent, name)
-        except AttributeError:
+        except Exception:  # pylint: disable=broad-except
+            # gi.module.IntrospectionModule.__getattr__() can raise all kinds of things
+            # like ValueError, TypeError, NotImplementedError, RepositoryError, etc
             continue
 
         if inspect.isclass(obj):

astroid/brain/brain_gi.py

@@ -21,7 +21,7 @@ def _looks_like_signal(node, signal_name="pyqtSignal"):
     return False
 
 
-def transform_pyqt_signal(node):
+def transform_pyqt_signal(node: nodes.FunctionDef) -> None:
     module = parse(
         """
     class pyqtSignal(object):
@@ -33,13 +33,13 @@ def emit(self, *args):
             pass
     """
     )
-    signal_cls = module["pyqtSignal"]
-    node.instance_attrs["emit"] = signal_cls["emit"]
-    node.instance_attrs["disconnect"] = signal_cls["disconnect"]
-    node.instance_attrs["connect"] = signal_cls["connect"]
+    signal_cls: nodes.ClassDef = module["pyqtSignal"]
+    node.instance_attrs["emit"] = [signal_cls["emit"]]
+    node.instance_attrs["disconnect"] = [signal_cls["disconnect"]]
+    node.instance_attrs["connect"] = [signal_cls["connect"]]
 
 
-def transform_pyside_signal(node):
+def transform_pyside_signal(node: nodes.FunctionDef) -> None:
     module = parse(
         """
     class NotPySideSignal(object):
@@ -51,10 +51,10 @@ def emit(self, *args):
             pass
     """
     )
-    signal_cls = module["NotPySideSignal"]
-    node.instance_attrs["connect"] = signal_cls["connect"]
-    node.instance_attrs["disconnect"] = signal_cls["disconnect"]
-    node.instance_attrs["emit"] = signal_cls["emit"]
+    signal_cls: nodes.ClassDef = module["NotPySideSignal"]
+    node.instance_attrs["connect"] = [signal_cls["connect"]]
+    node.instance_attrs["disconnect"] = [signal_cls["disconnect"]]
+    node.instance_attrs["emit"] = [signal_cls["emit"]]
 
 
 def pyqt4_qtcore_transform():

astroid/brain/brain_qt.py

@@ -7,33 +7,39 @@
 from astroid import context, inference_tip, nodes
 from astroid.brain.helpers import register_module_extender
 from astroid.builder import _extract_single_node, parse
-from astroid.const import PY37_PLUS, PY39_PLUS
+from astroid.const import PY37_PLUS, PY39_PLUS, PY311_PLUS
 from astroid.manager import AstroidManager
 
 
-def _re_transform():
-    # Since Python 3.6 there is the RegexFlag enum
-    # where every entry will be exposed via updating globals()
+def _re_transform() -> nodes.Module:
+    # The RegexFlag enum exposes all its entries by updating globals()
+    # In 3.6-3.10 all flags come from sre_compile
+    # On 3.11+ all flags come from re._compiler
+    if PY311_PLUS:
+        import_compiler = "import re._compiler as _compiler"
+    else:
+        import_compiler = "import sre_compile as _compiler"
     return parse(
-        """
-    import sre_compile
-    ASCII = sre_compile.SRE_FLAG_ASCII
-    IGNORECASE = sre_compile.SRE_FLAG_IGNORECASE
-    LOCALE = sre_compile.SRE_FLAG_LOCALE
-    UNICODE = sre_compile.SRE_FLAG_UNICODE
-    MULTILINE = sre_compile.SRE_FLAG_MULTILINE
-    DOTALL = sre_compile.SRE_FLAG_DOTALL
-    VERBOSE = sre_compile.SRE_FLAG_VERBOSE
+        f"""
+    {import_compiler}
+    NOFLAG = 0
+    ASCII = _compiler.SRE_FLAG_ASCII
+    IGNORECASE = _compiler.SRE_FLAG_IGNORECASE
+    LOCALE = _compiler.SRE_FLAG_LOCALE
+    UNICODE = _compiler.SRE_FLAG_UNICODE
+    MULTILINE = _compiler.SRE_FLAG_MULTILINE
+    DOTALL = _compiler.SRE_FLAG_DOTALL
+    VERBOSE = _compiler.SRE_FLAG_VERBOSE
+    TEMPLATE = _compiler.SRE_FLAG_TEMPLATE
+    DEBUG = _compiler.SRE_FLAG_DEBUG
     A = ASCII
     I = IGNORECASE
     L = LOCALE
     U = UNICODE
     M = MULTILINE
     S = DOTALL
     X = VERBOSE
-    TEMPLATE = sre_compile.SRE_FLAG_TEMPLATE
     T = TEMPLATE
-    DEBUG = sre_compile.SRE_FLAG_DEBUG
     """
     )
 

astroid/brain/brain_re.py

@@ -11,6 +11,7 @@
 PY38_PLUS = sys.version_info >= (3, 8)
 PY39_PLUS = sys.version_info >= (3, 9)
 PY310_PLUS = sys.version_info >= (3, 10)
+PY311_PLUS = sys.version_info >= (3, 11)
 BUILTINS = "builtins"  # TODO Remove in 2.8
 
 WIN32 = sys.platform == "win32"