Merge branch 'master' into unexpected-unused-type-ignore

python · ilevkivskyi · Jun 21, 2025 · Mar 4, 2023 · Mar 12, 2023 · Mar 12, 2023
commit 6c378b12e4991c4407fd0cb8c08bd6809dfb74c7
diff --git a/mypy/errors.py b/mypy/errors.py
@@ -786,7 +786,6 @@ def generate_unused_ignore_errors(self, file: str) -> None:
                 code=codes.UNUSED_IGNORE,
                 blocker=False,
                 only_once=False,
-                allow_dups=False,
                 origin=(self.file, [line]),
                 target=self.target_module,
             )
@@ -840,7 +839,6 @@ def generate_ignore_without_code_errors(
                 code=codes.IGNORE_WITHOUT_CODE,
                 blocker=False,
                 only_once=False,
-                allow_dups=False,
                 origin=(self.file, [line]),
                 target=self.target_module,
             )

diff --git a/test-data/unit/daemon.test b/test-data/unit/daemon.test
@@ -784,3 +784,21 @@ import a_module_which_does_not_exist
 class A:
     def __init__(self) -> None:
         self.__attrs_init__()  # type: ignore[attr-defined]
+
+[case testDaemonImportAncestors]
+$ dmypy run test.py
+Daemon started
+test.py:2: error: Unsupported operand types for + ("int" and "str")  [operator]
+Found 1 error in 1 file (checked 1 source file)
+== Return code: 1
+$ dmypy run test.py
+test.py:2: error: Unsupported operand types for + ("int" and "str")  [operator]
+Found 1 error in 1 file (checked 1 source file)
+== Return code: 1
+$ dmypy run test.py
+test.py:2: error: Unsupported operand types for + ("int" and "str")  [operator]
+Found 1 error in 1 file (checked 1 source file)
+== Return code: 1
+[file test.py]
+from xml.etree.ElementTree import Element
+1 + 'a'