Revert most of the changes to test fixtures

python · hauntsaninja · Sep 3, 2021 · May 29, 2021 · Jun 18, 2021 · Jun 25, 2021
commit 7166b54a7ac6e8c73a7c0bd1869d15c577e913d4
diff --git a/test-data/unit/check-dynamic-typing.test b/test-data/unit/check-dynamic-typing.test
@@ -212,9 +212,8 @@ class C: pass
 [file builtins.py]
 class object:
   def __init__(self): pass
-class int:
-    def __bool__(self) -> bool: pass
-class bool(int): pass
+class bool: pass
+class int: pass
 class type: pass
 class function: pass
 class str: pass

diff --git a/test-data/unit/check-enum.test b/test-data/unit/check-enum.test
@@ -894,13 +894,13 @@ else:
 
 [case testEnumReachabilityWithNone]
 # flags: --strict-optional
-from enum import Flag
+from enum import Enum
 from typing import Optional
 
-class Foo(Flag):
+class Foo(Enum):
     A = 1
     B = 2
-    C = 4
+    C = 3
 
 x: Optional[Foo]
 if x:

diff --git a/test-data/unit/check-expressions.test b/test-data/unit/check-expressions.test
@@ -323,8 +323,7 @@ if int():
     b = b or a  # E: Incompatible types in assignment (expression has type "Union[bool, A]", variable has type "bool")
 if int():
     b = a or b  # E: Incompatible types in assignment (expression has type "Union[A, bool]", variable has type "bool")
-class A:
-    def __bool__(self) -> bool: pass
+class A: pass
 
 [builtins fixtures/bool.pyi]
    
@@ -376,8 +375,7 @@ if int():
     d = c or d # E: Incompatible types in assignment (expression has type "C", variable has type "D")
 if int():
     d = d or c # E: Incompatible types in assignment (expression has type "C", variable has type "D")
-class C:
-    def __bool__(self) -> bool: pass
+class C: pass
 class D(C): pass
 [builtins fixtures/bool.pyi]
 

diff --git a/test-data/unit/check-inference-context.test b/test-data/unit/check-inference-context.test
@@ -749,10 +749,8 @@ if int():
 if int():
     b = b or c # E: Incompatible types in assignment (expression has type "Union[List[B], List[C]]", variable has type "List[B]")
 
-class A:
-    def __bool__(self) -> bool: ...
-class B:
-    def __bool__(self) -> bool: ...
+class A: pass
+class B: pass
 class C(B): pass
 [builtins fixtures/list.pyi]
 

diff --git a/test-data/unit/check-typevar-values.test b/test-data/unit/check-typevar-values.test
@@ -86,9 +86,8 @@ class B:
     def g(self) -> B: return B()
 AB = TypeVar('AB', A, B)
 def f(x: AB) -> AB:
-    indeterminate: bool
     y = x
-    if indeterminate:
+    if y:
         return y.f()
     else:
         return y.g() # E: Incompatible return value type (got "B", expected "A")

diff --git a/test-data/unit/fixtures/bool.pyi b/test-data/unit/fixtures/bool.pyi
@@ -10,11 +10,9 @@ class object:
 class type: pass
 class tuple(Generic[T]): pass
 class function: pass
-class int:
-    def __bool__(self) -> 'bool': pass
+class int: pass
 class bool(int): pass
 class float: pass
-class str:
-    def __len__(self) -> int: pass
+class str: pass
 class unicode: pass
 class ellipsis: pass
diff --git a/test-data/unit/fixtures/dict.pyi b/test-data/unit/fixtures/dict.pyi
@@ -33,7 +33,6 @@ class dict(Mapping[KT, VT]):
 
 class int: # for convenience
     def __add__(self, x: int) -> int: pass
-    def __bool__(self) -> bool: pass
 
 class str: pass # for keyword argument key type
 class unicode: pass # needed for py2 docstrings

diff --git a/test-data/unit/fixtures/isinstancelist.pyi b/test-data/unit/fixtures/isinstancelist.pyi
@@ -18,13 +18,11 @@ def issubclass(x: object, t: Union[type, Tuple]) -> bool: pass
 
 class int:
     def __add__(self, x: int) -> int: pass
-    def __bool__(self) -> bool: pass
 class float: pass
 class bool(int): pass
 class str:
     def __add__(self, x: str) -> str: pass
     def __getitem__(self, x: int) -> str: pass
-    def __len__(self) -> int: pass
 
 T = TypeVar('T')
 KT = TypeVar('KT')

diff --git a/test-data/unit/fixtures/ops.pyi b/test-data/unit/fixtures/ops.pyi
@@ -24,13 +24,12 @@ class tuple(Sequence[Tco]):
 
 class function: pass
 
-class bool(int): pass
+class bool: pass
 
 class str:
     def __init__(self, x: 'int') -> None: pass
     def __add__(self, x: 'str') -> 'str': pass
     def __eq__(self, x: object) -> bool: pass
-    def __len__(self) -> int: pass
     def startswith(self, x: 'str') -> bool: pass
     def strip(self) -> 'str': pass
 
@@ -56,7 +55,6 @@ class int:
     def __le__(self, x: 'int') -> bool: pass
     def __gt__(self, x: 'int') -> bool: pass
     def __ge__(self, x: 'int') -> bool: pass
-    def __bool__(self) -> bool: pass
 
 class float:
     def __add__(self, x: 'float') -> 'float': pass

diff --git a/test-data/unit/fixtures/primitives.pyi b/test-data/unit/fixtures/primitives.pyi
@@ -17,7 +17,6 @@ class int:
     def __init__(self, x: object = ..., base: int = ...) -> None: pass
     def __add__(self, i: int) -> int: pass
     def __rmul__(self, x: int) -> int: pass
-    def __bool__(self) -> bool: pass
 class float:
     def __float__(self) -> float: pass
 class complex: pass

diff --git a/test-data/unit/lib-stub/builtins.pyi b/test-data/unit/lib-stub/builtins.pyi
@@ -11,14 +11,11 @@ class type:
 # These are provided here for convenience.
 class int:
     def __add__(self, other: int) -> int: pass
-    def __bool__(self) -> bool: pass
 class bool(int): pass
 class float: pass
 
-class str:
-    def __len__(self) -> int: pass
-class bytes:
-    def __len__(self) -> int: pass
+class str: pass
+class bytes: pass
 
 class function: pass
 class ellipsis: pass

diff --git a/test-data/unit/lib-stub/enum.pyi b/test-data/unit/lib-stub/enum.pyi
@@ -35,7 +35,6 @@ def unique(enumeration: _T) -> _T: pass
 
 class Flag(Enum):
     def __or__(self: _T, other: Union[int, _T]) -> _T: pass
-    def __bool__(self) -> bool: ...
 
 
 class IntFlag(int, Flag):

diff --git a/test-data/unit/lib-stub/typing.pyi b/test-data/unit/lib-stub/typing.pyi
@@ -42,7 +42,6 @@ class Generator(Iterator[T], Generic[T, U, V]):
 
 class Sequence(Iterable[T_co]):
     def __getitem__(self, n: Any) -> T_co: pass
-    def __len__(self) -> int: pass
 
 class Mapping(Generic[T, T_co]): pass