Change tests where the lines might differ or errors could be optional

Author: davidhalter

conformance/tests/annotations_generators.py

@@ -84,12 +84,12 @@ def generator7() -> Iterator[dict[str, int]]:
 
 
 def generator8() -> int:  # E: incompatible return type
-    yield None  # E
+    yield None  # E? error was already raised above
     return 0
 
 
 async def generator9() -> int:  # E: incompatible return type
-    yield None  # E
+    yield None  # E? error was already raised above
 
 
 class IntIterator(Protocol):

conformance/tests/classes_classvar.py

@@ -63,7 +63,7 @@ class ClassA(Generic[T, P]):
     good4: ClassVar = 3.1
     # > If the `ClassVar` qualifier is used without any assigned value, the type
     # > should be inferred as `Any`:
-    good5: ClassVar  #E? Type checkers may error on uninitialized ClassVar
+    good5: ClassVar  # E?: Type checkers may error on uninitialized ClassVar
     good6: Annotated[ClassVar[list[int]], ""] = []
 
     def method1(self, a: ClassVar[int]):  # E: ClassVar not allowed here

conformance/tests/overloads_definitions.py

@@ -119,7 +119,7 @@ def final_method(self, x: int | str) -> int | str: ...
     # The @final decorator should not be on one of the overloads:
 
     @overload  # E[invalid_final] @final should be on implementation only
-    @final
+    @final  # E[invalid_final]
     def invalid_final(self, x: int) -> int:  # E[invalid_final]
         ...
 

conformance/tests/overloads_definitions_stub.pyi

@@ -69,7 +69,7 @@ class Base:
     def invalid_final(self, x: int) -> int:  # E[invalid_final]
         ...
     @overload  # E[invalid_final]
-    @final
+    @final  # E[invalid_final]
     def invalid_final(self, x: str) -> str:  # E[invalid_final]
         ...
     @overload
@@ -82,7 +82,7 @@ class Base:
     def invalid_final_2(self, x: int) -> int:  # E[invalid_final_2]
         ...
     @overload  # E[invalid_final_2]
-    @final
+    @final  # E[invalid_final_2]
     def invalid_final_2(self, x: str) -> str: ...  # E[invalid_final_2]
 
     # These methods are just here for the @override test below. We use an
@@ -143,7 +143,7 @@ class Child(Base):  # E[override-final]
     @overload  # E[override_impl]: @override should appear only on first overload
     def to_override(self, x: int) -> int: ...
     @overload
-    @override
+    @override  # E[override_impl]: @override should appear only on first overload
     def to_override(  # E[override_impl]: @override should appear only on first overload
         self, x: str
     ) -> str:  # E[override_impl]: @override should appear only on first overload

conformance/tests/qualifiers_annotated.py

@@ -116,6 +116,6 @@ class ClassC(TypedDict):
 TA1: TypeAlias = Annotated[int | str, ""]
 TA2 = Annotated[Literal[1, 2], ""]
 
-T = TypeVar("T")
+T = TypeVar("T")  # E?: T is already defined
 
 TA3 = Annotated[T, ""]

conformance/tests/typeddicts_alt_syntax.py

@@ -42,4 +42,4 @@
 
 movie2: Movie2
 movie2 = {"name": "Blade Runner", "year": 1982}  # E?: May generate errors if keyword-argument syntax is unsupported
-movie2 = {"name": "Blade Runner", "year": ""}  # E: Incorrect type for year
+movie2 = {"name": "Blade Runner", "year": ""}  # E?: Incorrect type for year