[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

mypy/checker.py

@@ -43,7 +43,6 @@
 from mypy.mro import MroError, calculate_mro
 from mypy.nodes import (
     ARG_NAMED,
-    SYMBOL_FUNCBASE_TYPES,
     ARG_POS,
     ARG_STAR,
     CONTRAVARIANT,
@@ -57,6 +56,7 @@
     LITERAL_TYPE,
     MDEF,
     NOT_ABSTRACT,
+    SYMBOL_FUNCBASE_TYPES,
     AssertStmt,
     AssignmentExpr,
     AssignmentStmt,
@@ -4341,7 +4341,9 @@ def simple_rvalue(self, rvalue: Expression) -> bool:
         if isinstance(rvalue, (IntExpr, StrExpr, BytesExpr, FloatExpr, RefExpr)):
             return True
         if isinstance(rvalue, CallExpr):
-            if isinstance(rvalue.callee, RefExpr) and isinstance(rvalue.callee.node, SYMBOL_FUNCBASE_TYPES):
+            if isinstance(rvalue.callee, RefExpr) and isinstance(
+                rvalue.callee.node, SYMBOL_FUNCBASE_TYPES
+            ):
                 typ = rvalue.callee.node.type
                 if isinstance(typ, CallableType):
                     return not typ.variables

mypy/constraints.py

@@ -240,10 +240,7 @@ def infer_constraints_for_callable(
                     )
                     c = infer_constraints(callee.arg_types[i], actual_type, SUPERTYPE_OF)
                     constraints.extend(c)
-    if (
-        param_spec
-        and not any(c.type_var == param_spec.id for c in constraints)
-    ):
+    if param_spec and not any(c.type_var == param_spec.id for c in constraints):
         # Use ParamSpec constraint from arguments only if there are no other constraints,
         # since as explained above it is quite ad-hoc.
         constraints.append(

mypy/errors.py

@@ -11,7 +11,6 @@
 from mypy import errorcodes as codes
 from mypy.error_formatter import ErrorFormatter
 from mypy.errorcodes import IMPORT, IMPORT_NOT_FOUND, IMPORT_UNTYPED, ErrorCode, mypy_error_codes
-from mypy.message_registry import ErrorMessage
 from mypy.options import Options
 from mypy.scope import Scope
 from mypy.util import DEFAULT_SOURCE_OFFSET, is_typeshed_file

mypy/nodes.py

@@ -2548,9 +2548,10 @@ def name(self) -> str:
     def fullname(self) -> str:
         return self._fullname
 
+
 # All types that are both SymbolNodes and Expressions.
 # Use when common children of them are needed.
-SYMBOL_NODE_EXPRESSION_TYPES: Final = (TypeVarLikeExpr, )
+SYMBOL_NODE_EXPRESSION_TYPES: Final = (TypeVarLikeExpr,)
 
 
 class TypeVarExpr(TypeVarLikeExpr):

mypy/plugins/functools.py

@@ -8,7 +8,16 @@
 import mypy.plugin
 import mypy.semanal
 from mypy.argmap import map_actuals_to_formals
-from mypy.nodes import SYMBOL_FUNCBASE_TYPES, ARG_POS, ARG_STAR2, ArgKind, Argument, CallExpr, FuncItem, NameExpr, Var
+from mypy.nodes import (
+    ARG_POS,
+    ARG_STAR2,
+    SYMBOL_FUNCBASE_TYPES,
+    ArgKind,
+    Argument,
+    CallExpr,
+    NameExpr,
+    Var,
+)
 from mypy.plugins.common import add_method_to_class
 from mypy.typeops import get_all_type_vars
 from mypy.types import (

mypy/semanal.py

@@ -71,7 +71,6 @@
 from mypy.mro import MroError, calculate_mro
 from mypy.nodes import (
     ARG_NAMED,
-    SYMBOL_FUNCBASE_TYPES,
     ARG_POS,
     ARG_STAR2,
     CONTRAVARIANT,
@@ -87,6 +86,7 @@
     REVEAL_LOCALS,
     REVEAL_TYPE,
     RUNTIME_PROTOCOL_DECOS,
+    SYMBOL_FUNCBASE_TYPES,
     TYPE_VAR_KIND,
     TYPE_VAR_TUPLE_KIND,
     VARIANCE_NOT_READY,

mypy/server/astdiff.py

@@ -58,10 +58,9 @@ class level -- these are handled at attribute level (say, 'mod.Cls.method'
 
 from mypy.expandtype import expand_type
 from mypy.nodes import (
-    UNBOUND_IMPORTED,
     SYMBOL_FUNCBASE_TYPES,
+    UNBOUND_IMPORTED,
     Decorator,
-    FuncBase,
     FuncDef,
     FuncItem,
     MypyFile,

mypy/test/testmerge.py

@@ -13,7 +13,6 @@
     UNBOUND_IMPORTED,
     Expression,
     MypyFile,
-    Node,
     SymbolTable,
     SymbolTableNode,
     TypeInfo,