Update additional astroid imports (#10594)

Author: cdce8p

pylint/checkers/async_checker.py

@@ -10,6 +10,8 @@
 from typing import TYPE_CHECKING
 
 import astroid
+import astroid.bases
+import astroid.exceptions
 from astroid import nodes
 
 from pylint import checkers

pylint/checkers/base/basic_checker.py

@@ -12,7 +12,7 @@
 from typing import TYPE_CHECKING, Literal, cast
 
 import astroid
-from astroid import nodes, objects, util
+from astroid import bases, nodes, objects, util
 
 from pylint import utils as lint_utils
 from pylint.checkers import BaseChecker, utils
@@ -311,7 +311,7 @@ def _check_using_constant_test(
             nodes.Lambda,
             nodes.FunctionDef,
             nodes.ClassDef,
-            astroid.bases.Generator,
+            bases.Generator,
             astroid.UnboundMethod,
             astroid.BoundMethod,
             nodes.Module,

pylint/checkers/base/name_checker/checker.py

@@ -17,8 +17,7 @@
 from typing import TYPE_CHECKING
 
 import astroid
-import astroid.bases
-from astroid import nodes
+from astroid import bases, nodes, util
 from astroid.typing import InferenceResult
 
 from pylint import constants, interfaces
@@ -489,7 +488,7 @@ def visit_assignname(  # pylint: disable=too-many-branches,too-many-statements
                 elif isinstance(inferred_assign_type, nodes.ClassDef):
                     self._check_name("class", node.name, node)
 
-                elif inferred_assign_type in (None, astroid.util.Uninferable):
+                elif inferred_assign_type in (None, util.Uninferable):
                     return
 
                 # Don't emit if the name redefines an import in an ImportError except handler
@@ -513,7 +512,7 @@ def visit_assignname(  # pylint: disable=too-many-branches,too-many-statements
                     node_type = "variable"
                     if (
                         (iattrs := tuple(node.frame().igetattr(node.name)))
-                        and astroid.util.Uninferable not in iattrs
+                        and util.Uninferable not in iattrs
                         and len(iattrs) == 2
                         and astroid.are_exclusive(*iattrs)
                     ):
@@ -663,7 +662,7 @@ def _assigns_typevar(node: nodes.NodeNG | None) -> str | None:
     def _assigns_typealias(node: nodes.NodeNG | None) -> bool:
         """Check if a node is assigning a TypeAlias."""
         inferred = utils.safe_infer(node)
-        if isinstance(inferred, (nodes.ClassDef, astroid.bases.UnionType)):
+        if isinstance(inferred, (nodes.ClassDef, bases.UnionType)):
             qname = inferred.qname()
             if qname == "typing.TypeAlias":
                 return True

pylint/checkers/classes/class_checker.py

@@ -14,9 +14,8 @@
 from typing import TYPE_CHECKING, Any, NamedTuple, TypeAlias
 
 import astroid
-import astroid.objects
-from astroid import bases, nodes, util
-from astroid.nodes import LocalsDictNodeNG
+import astroid.exceptions
+from astroid import bases, nodes, objects, util
 from astroid.typing import SuccessfulInferenceResult
 
 from pylint.checkers import BaseChecker, utils
@@ -177,7 +176,7 @@ def _is_trivial_super_delegation(function: nodes.FunctionDef) -> bool:
 
     # Anything other than a super call is non-trivial.
     super_call = safe_infer(expr)
-    if not isinstance(super_call, astroid.objects.Super):
+    if not isinstance(super_call, objects.Super):
         return False
 
     # The name should be the same.
@@ -415,7 +414,7 @@ def _has_data_descriptor(cls: nodes.ClassDef, attr: str) -> bool:
 
 
 def _called_in_methods(
-    func: LocalsDictNodeNG,
+    func: nodes.LocalsDictNodeNG,
     klass: nodes.ClassDef,
     methods: Sequence[str],
 ) -> bool:
@@ -1981,7 +1980,7 @@ def _is_type_self_call(self, expr: nodes.NodeNG) -> bool:
         return False
 
     @staticmethod
-    def _is_classmethod(func: LocalsDictNodeNG) -> bool:
+    def _is_classmethod(func: nodes.LocalsDictNodeNG) -> bool:
         """Check if the given *func* node is a class method."""
         return isinstance(func, nodes.FunctionDef) and (
             func.type == "classmethod" or func.name == "__class_getitem__"
@@ -2238,7 +2237,7 @@ def _check_init(self, node: nodes.FunctionDef, klass_node: nodes.ClassDef) -> No
                             _proxied=nodes.ClassDef(name="super") as p
                         ) if is_builtin_object(p):
                             return
-                        case astroid.objects.Super():
+                        case objects.Super():
                             return
                     try:
                         method = not_called_yet.pop(klass)

pylint/checkers/imports.py

@@ -16,6 +16,7 @@
 from typing import TYPE_CHECKING, Any
 
 import astroid
+import astroid.modutils
 from astroid import nodes
 from astroid.nodes._base_nodes import ImportNode
 
@@ -1081,7 +1082,7 @@ def _check_preferred_module(self, node: ImportNode, mod_path: str) -> None:
         """Check if the module has a preferred replacement."""
         mod_compare = [mod_path]
         # build a comparison list of possible names using importfrom
-        if isinstance(node, astroid.nodes.node_classes.ImportFrom):
+        if isinstance(node, nodes.ImportFrom):
             mod_compare = [f"{node.modname}.{name[0]}" for name in node.names]
 
         # find whether there are matches with the import vs preferred_modules keys

pylint/checkers/nested_min_max.py

@@ -23,7 +23,7 @@
     objects.DictValues,
     objects.DictKeys,
     objects.DictItems,
-    nodes.node_classes.Dict,
+    nodes.Dict,
 )
 
 

pylint/checkers/refactoring/refactoring_checker.py

@@ -14,8 +14,7 @@
 from typing import TYPE_CHECKING, Any, NamedTuple, TypeAlias, cast
 
 import astroid
-import astroid.objects
-from astroid import bases, nodes
+from astroid import bases, nodes, objects
 from astroid.util import UninferableBase
 
 from pylint import checkers
@@ -1858,7 +1857,7 @@ def _check_unnecessary_comprehension(self, node: nodes.Comprehension) -> None:
             args: tuple[str] | None = None
             inferred = utils.safe_infer(node.iter)
             match (node.parent, inferred):
-                case [nodes.DictComp(), astroid.objects.DictItems()]:
+                case [nodes.DictComp(), objects.DictItems()]:
                     args = (f"dict({node.iter.func.expr.as_string()})",)
                 case [nodes.ListComp(), nodes.List()]:
                     args = (f"list({node.iter.as_string()})",)

pylint/checkers/strings.py

@@ -15,7 +15,7 @@
 from typing import TYPE_CHECKING, Literal
 
 import astroid
-from astroid import bases, nodes, util
+from astroid import arguments, bases, nodes, util
 from astroid.typing import SuccessfulInferenceResult
 
 from pylint.checkers import BaseChecker, BaseRawFileChecker, BaseTokenChecker, utils
@@ -473,7 +473,7 @@ def _check_new_format(self, node: nodes.Call, func: bases.BoundMethod) -> None:
         if not (isinstance(strnode, nodes.Const) and isinstance(strnode.value, str)):
             return
         try:
-            call_site = astroid.arguments.CallSite.from_call(node)
+            call_site = arguments.CallSite.from_call(node)
         except astroid.InferenceError:
             return
 

pylint/checkers/typecheck.py

@@ -18,9 +18,12 @@
 from typing import TYPE_CHECKING, Any, Literal, TypeAlias
 
 import astroid
+import astroid.context
 import astroid.exceptions
 import astroid.helpers
-from astroid import arguments, bases, nodes, util
+import astroid.interpreter
+import astroid.modutils
+from astroid import arguments, bases, nodes, objects, util
 from astroid.nodes import _base_nodes
 from astroid.typing import InferenceResult, SuccessfulInferenceResult
 
@@ -476,7 +479,7 @@ def _emit_no_member(
         # at some point during the runtime of the program.
         if utils.is_attribute_typed_annotation(owner, node.attrname):
             return False
-    if isinstance(owner, astroid.objects.Super):
+    if isinstance(owner, objects.Super):
         # Verify if we are dealing with an invalid Super object.
         # If it is invalid, then there's no point in checking that
         # it has the required attribute. Also, don't fail if the
@@ -605,9 +608,9 @@ def _determine_callable(
     callable_obj: nodes.NodeNG,
 ) -> tuple[CallableObjects, int, str]:
     # TODO: The typing of the second return variable is actually Literal[0,1]
-    # We need typing on astroid.NodeNG.implicit_parameters for this
+    # We need typing on nodes.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
+    # We need typing on nodes.NodeNG.type for this
 
     # Ordering is important, since BoundMethod is a subclass of UnboundMethod,
     # and Function inherits Lambda.
@@ -1478,7 +1481,7 @@ def visit_call(self, node: nodes.Call) -> None:
 
         # Build the set of keyword arguments, checking for duplicate keywords,
         # and count the positional arguments.
-        call_site = astroid.arguments.CallSite.from_call(node)
+        call_site = arguments.CallSite.from_call(node)
 
         # Warn about duplicated keyword arguments, such as `f=24, **{'f': 24}`
         for keyword in call_site.duplicated_keywords:
@@ -1853,7 +1856,7 @@ def _check_invalid_slice_index(self, node: nodes.Slice) -> None:
                 nodes.List,
                 nodes.Dict,
                 nodes.Tuple,
-                astroid.objects.FrozenSet,
+                objects.FrozenSet,
                 nodes.Set,
             )
             if not (
@@ -1883,15 +1886,15 @@ def visit_with(self, node: nodes.With) -> None:
             match inferred := safe_infer(ctx_mgr, context=context):
                 case _ if not inferred:
                     continue
-                case astroid.bases.Generator():
+                case bases.Generator():
                     # Check if we are dealing with a function decorated
                     # with contextlib.contextmanager.
                     if decorated_with(
                         inferred.parent, self.linter.config.contextmanager_decorators
                     ):
                         continue
                     # Check if it's an AsyncGenerator decorated with asynccontextmanager
-                    if isinstance(inferred, astroid.bases.AsyncGenerator):
+                    if isinstance(inferred, bases.AsyncGenerator):
                         async_decorators = ["contextlib.asynccontextmanager"]
                         if decorated_with(inferred.parent, async_decorators):
                             self.add_message(

pylint/checkers/utils.py

@@ -18,8 +18,10 @@
 from re import Match
 from typing import TYPE_CHECKING, TypeVar
 
-import astroid.objects
-from astroid import TooManyLevelsError, nodes, util
+import astroid
+import astroid.exceptions
+import astroid.helpers
+from astroid import TooManyLevelsError, bases, nodes, objects, util
 from astroid.context import InferenceContext
 from astroid.exceptions import AstroidError
 from astroid.nodes._base_nodes import ImportNode, Statement
@@ -852,7 +854,7 @@ def _is_property_decorator(decorator: nodes.Name) -> bool:
                 inferred = safe_infer(returns[0].value)
                 if (
                     inferred
-                    and isinstance(inferred, astroid.objects.Property)
+                    and isinstance(inferred, objects.Property)
                     and isinstance(inferred.function, nodes.FunctionDef)
                 ):
                     return decorated_with_property(inferred.function)
@@ -1006,7 +1008,7 @@ def find_except_wrapper_node_in_scope(
     """Return the ExceptHandler in which the node is, without going out of scope."""
     for current in node.node_ancestors():
         match current:
-            case astroid.scoped_nodes.LocalsDictNodeNG():
+            case nodes.LocalsDictNodeNG():
                 # If we're inside a function/class definition, we don't want to keep checking
                 # higher ancestors for `except` clauses, because if these exist, it means our
                 # function/class was defined in an `except` clause, rather than the current code
@@ -1287,9 +1289,7 @@ def _supports_protocol(
         case nodes.ComprehensionScope():
             return True
 
-        case astroid.bases.Proxy(
-            _proxied=astroid.BaseInstance() as p
-        ) if has_known_bases(p):
+        case bases.Proxy(_proxied=astroid.BaseInstance() as p) if has_known_bases(p):
             return protocol_callback(p)
 
     return False