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

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

src/_pytest/_io/saferepr.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import pprint
 import reprlib
-from types import MethodType
 
 
 def _try_repr_or_str(obj: object) -> str:

src/_pytest/assertion/rewrite.py

@@ -420,7 +420,7 @@ def _saferepr(obj: object) -> str:
     if isinstance(obj, types.MethodType):
         # for bound methods, skip redundant <bound method ...> information
         return obj.__name__
-    
+
     maxsize = _get_maxsize_for_saferepr(util._config)
     return saferepr(obj, maxsize=maxsize).replace("\n", "\\n")
 
@@ -1018,9 +1018,7 @@ class AssertionRewriter(ast.NodeVisitor):
                     ]
                 ):
                     pytest_temp = self.variable()
-                    self.variables_overwrite[self.scope][
+                    self.variables_overwrite[self.scope][v.left.target.id] = v.left  # type:ignore[assignment]
-                        v.left.target.id
-                    ] = v.left  # type:ignore[assignment]
                     v.left.target.id = pytest_temp
             self.push_format_context()
             res, expl = self.visit(v)
@@ -1064,9 +1062,7 @@ class AssertionRewriter(ast.NodeVisitor):
             if isinstance(arg, ast.Name) and arg.id in self.variables_overwrite.get(
                 self.scope, {}
             ):
-                arg = self.variables_overwrite[self.scope][
+                arg = self.variables_overwrite[self.scope][arg.id]  # type:ignore[assignment]
-                    arg.id
-                ]  # type:ignore[assignment]
             res, expl = self.visit(arg)
             arg_expls.append(expl)
             new_args.append(res)
@@ -1074,9 +1070,7 @@ class AssertionRewriter(ast.NodeVisitor):
             if isinstance(
                 keyword.value, ast.Name
             ) and keyword.value.id in self.variables_overwrite.get(self.scope, {}):
-                keyword.value = self.variables_overwrite[self.scope][
+                keyword.value = self.variables_overwrite[self.scope][keyword.value.id]  # type:ignore[assignment]
-                    keyword.value.id
-                ]  # type:ignore[assignment]
             res, expl = self.visit(keyword.value)
             new_kwargs.append(ast.keyword(keyword.arg, res))
             if keyword.arg:
@@ -1113,13 +1107,9 @@ class AssertionRewriter(ast.NodeVisitor):
         if isinstance(
             comp.left, ast.Name
         ) and comp.left.id in self.variables_overwrite.get(self.scope, {}):
-            comp.left = self.variables_overwrite[self.scope][
+            comp.left = self.variables_overwrite[self.scope][comp.left.id]  # type:ignore[assignment]
-                comp.left.id
-            ]  # type:ignore[assignment]
         if isinstance(comp.left, ast.NamedExpr):
-            self.variables_overwrite[self.scope][
+            self.variables_overwrite[self.scope][comp.left.target.id] = comp.left  # type:ignore[assignment]
-                comp.left.target.id
-            ] = comp.left  # type:ignore[assignment]
         left_res, left_expl = self.visit(comp.left)
         if isinstance(comp.left, (ast.Compare, ast.BoolOp)):
             left_expl = f"({left_expl})"
@@ -1137,9 +1127,7 @@ class AssertionRewriter(ast.NodeVisitor):
                 and next_operand.target.id == left_res.id
             ):
                 next_operand.target.id = self.variable()
-                self.variables_overwrite[self.scope][
+                self.variables_overwrite[self.scope][left_res.id] = next_operand  # type:ignore[assignment]
-                    left_res.id
-                ] = next_operand  # type:ignore[assignment]
             next_res, next_expl = self.visit(next_operand)
             if isinstance(next_operand, (ast.Compare, ast.BoolOp)):
                 next_expl = f"({next_expl})"

testing/io/test_saferepr.py

@@ -1,8 +1,6 @@
 # mypy: allow-untyped-defs
 from __future__ import annotations
 
-import re
-
 from _pytest._io.saferepr import DEFAULT_REPR_MAX_SIZE
 from _pytest._io.saferepr import saferepr
 from _pytest._io.saferepr import saferepr_unlimited

testing/test_assertrewrite.py

@@ -10,6 +10,7 @@ import marshal
 import os
 from pathlib import Path
 import py_compile
+import re
 import stat
 import sys
 import textwrap
@@ -18,13 +19,13 @@ from typing import Generator
 from typing import Mapping
 from unittest import mock
 import zipfile
-import re
 
 import _pytest._code
 from _pytest._io.saferepr import DEFAULT_REPR_MAX_SIZE
 from _pytest.assertion import util
 from _pytest.assertion.rewrite import _get_assertion_exprs
 from _pytest.assertion.rewrite import _get_maxsize_for_saferepr
+from _pytest.assertion.rewrite import _saferepr
 from _pytest.assertion.rewrite import AssertionRewritingHook
 from _pytest.assertion.rewrite import get_cache_dir
 from _pytest.assertion.rewrite import PYC_TAIL
@@ -34,7 +35,6 @@ from _pytest.config import Config
 from _pytest.config import ExitCode
 from _pytest.pathlib import make_numbered_dir
 from _pytest.pytester import Pytester
-from _pytest.assertion.rewrite import _saferepr
 import pytest