Skip to content

Commit 8adafdb

Browse files
committed
Remove extra newlines.
1 parent 8e20acc commit 8adafdb

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

test-data/unit/check-classes.test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4020,7 +4020,6 @@ class C(B):
40204020
[out]
40214021
main:6: error: Incompatible types in assignment (expression has type "str", base class "A" defined the type as "int")
40224022

4023-
40244023
[case testClassIgnoreType_RedefinedAttributeTypeIgnoredInChildren]
40254024
class A:
40264025
x = 0

test-data/unit/check-multiple-inheritance.test

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,6 @@ class Combo(Base2, Base1): ...
462462
main:10: error: Definition of "NestedVar" in base class "Base2" is incompatible with definition in base class "Base1"
463463

464464
[case testMultipleInheritance_NestedVariableOverriddenWithCompatibleType]
465-
466465
from typing import TypeVar, Generic
467466
T = TypeVar('T', covariant=True)
468467
class GenericBase(Generic[T]):
@@ -476,7 +475,6 @@ class A(Base1, Base2):
476475
[out]
477476

478477
[case testMultipleInheritance_NestedVariableOverriddenWithIncompatibleType1]
479-
480478
from typing import TypeVar, Generic
481479
T = TypeVar('T', covariant=True)
482480
class GenericBase(Generic[T]):
@@ -488,10 +486,9 @@ class Base2:
488486
class A(Base1, Base2):
489487
Nested: GenericBase['Base1']
490488
[out]
491-
main:11: error: Incompatible types in assignment (expression has type "GenericBase[Base1]", base class "Base2" defined the type as "GenericBase[Base2]")
489+
main:10: error: Incompatible types in assignment (expression has type "GenericBase[Base1]", base class "Base2" defined the type as "GenericBase[Base2]")
492490

493491
[case testMultipleInheritance_NestedVariableOverriddenWithIncompatibleType2]
494-
495492
from typing import TypeVar, Generic
496493
T = TypeVar('T', covariant=True)
497494
class GenericBase(Generic[T]):
@@ -503,11 +500,9 @@ class Base2:
503500
class A(Base1, Base2):
504501
Nested: GenericBase['Base2']
505502
[out]
506-
main:11: error: Incompatible types in assignment (expression has type "GenericBase[Base2]", base class "Base1" defined the type as "GenericBase[Base1]")
507-
503+
main:10: error: Incompatible types in assignment (expression has type "GenericBase[Base2]", base class "Base1" defined the type as "GenericBase[Base1]")
508504

509505
[case testMultipleInheritance_NestedVariableOverriddenWithCompatibleType]
510-
511506
from typing import TypeVar, Generic
512507
T = TypeVar('T', covariant=True)
513508
class GenericBase(Generic[T]):
@@ -520,8 +515,6 @@ class A(Base1, Base2):
520515
Nested: GenericBase['Base1']
521516
[out]
522517

523-
524-
525518
[case testMultipleInheritance_MethodDefinitionsCompatibleWithOverride]
526519
from typing import TypeVar, Union
527520
_T = TypeVar('_T')

0 commit comments

Comments
 (0)