Use bool() in tests when we want an unspecified bool in a conditional

Author: rwbarton

test-data/unit/check-fastparse.test

@@ -36,7 +36,7 @@ class C:
 [case testFastParseConditionalProperty]
 # flags: fast-parser
 class C:
-  if 1:
+  if bool():
     @property
     def x(self) -> str: pass
     @x.setter

test-data/unit/check-functions.test

@@ -1534,12 +1534,13 @@ g()
 [builtins fixtures/list.py]
 
 [case testFunctionDefinitionWithWhileStatement]
-while 1:
+while bool():
     def f(): pass
 else:
     def g(): pass
 f()
 g()
+[builtins fixtures/bool.py]
 
 [case testBareCallable]
 from typing import Callable, Any

test-data/unit/check-isinstance.test

@@ -12,7 +12,7 @@ x = None # type: List[Any]
 def foo() -> List[int]: pass
 def bar() -> List[str]: pass
 
-if 1:
+if bool():
     x = foo()
 else:
     x = bar()
@@ -143,11 +143,11 @@ def bar() -> None:
     x = foo()
     if isinstance(x, int):
         return
-    while 1:
+    while bool():
         x + 'a'
-        while 1:
+        while bool():
             x = foo()
-            if 1:
+            if bool():
                 return
             x = 'a'
     x + 'a'
@@ -163,24 +163,24 @@ def bar() -> None:
     x = foo()
     if isinstance(x, int):
         return
-    while 1:
+    while bool():
         x + 'a'
-        while 1:
+        while bool():
             x = foo()
-            if 1:
+            if bool():
                 return
             x = 'a'
     x + 'a'
 
     x = foo()
     if isinstance(x, int):
         return
-    while 1:
+    while bool():
         x + 'a'
-        while 1:
+        while bool():
             x + 'a'         # E: Unsupported operand types for + (likely involving Union)
             x = foo()
-            if 1:
+            if bool():
                 continue
             x = 'a'
         x = 'a'
@@ -269,7 +269,7 @@ class A: pass
 class B(A): z = 1
 
 x = A()
-while 1:
+while bool():
     try:
         x.z # E: "A" has no attribute "z"
         x = A()
@@ -473,7 +473,7 @@ class House:
 h = House()
 h.pet = Dog()
 
-while 1:
+while bool():
     if isinstance(h.pet, Dog):
         if isinstance(h.pet.paws, str):
             x = h.pet.paws + 'a'
@@ -560,7 +560,7 @@ if isinstance(h.pet, Dog):
     if isinstance(h.pet.paws, str):
         for i in [1]:
             h.pet.paws + 'a'
-            if 1:
+            if bool():
                 break
             h.pet.paws = 1
             h.pet.paws + 1
@@ -612,7 +612,7 @@ from typing import Union, List
 
 x = None # type: Union[int, str, List[int]]
 
-while 1:
+while bool():
     if isinstance(x, int):
         x + 1
     elif isinstance(x, str):
@@ -628,7 +628,7 @@ from typing import Union, List
 
 x = None # type: Union[int, str, List[int]]
 
-while 1:
+while bool():
     if isinstance(x, int):
         x + 1
         break
@@ -644,7 +644,7 @@ x + [1]               # E: Unsupported operand types for + (likely involving Uni
 [case testIsInstanceThreeUnion3]
 from typing import Union, List
 
-while 1:
+while bool():
     x = None # type: Union[int, str, List[int]]
     x = 1
     if isinstance(x, int):
@@ -724,7 +724,7 @@ x + 1      # E: Unsupported operand types for + ("str" and "int")
 x = 1
 x + 1
 
-while 1:
+while bool():
       x + 1    # E: Unsupported operand types for + (likely involving Union)
       x = 'a'
 [builtins fixtures/isinstancelist.py]
@@ -757,7 +757,7 @@ def foo() -> Union[int, str]: pass
 x = foo()
 x = 1
 
-while 1:
+while bool():
     x + 1
     x = 'a'
     break
@@ -782,19 +782,19 @@ def foo() -> Union[int, str]: pass
 x = foo()
 x = 1
 
-while 1:
+while bool():
     x + 1
-    if 1:
+    if bool():
         x = 'a'
         break
 else:
     x + 1
     x = 'a'
 x + 'a'
 x = 1
-while 1:
+while bool():
     x + 1 # E: Unsupported operand types for + (likely involving Union)
-    if 1:
+    if bool():
         x = 'a'
         continue
 else:
@@ -812,7 +812,7 @@ x = 1
 
 for y in [1]:
     x + 1
-    if 1:
+    if bool():
         x = 'a'
         break
 else:
@@ -822,7 +822,7 @@ x + 'a'
 x = 1
 for y in [1]:
     x + 1 # E: Unsupported operand types for + (likely involving Union)
-    if 1:
+    if bool():
         x = 'a'
         continue
 else:
@@ -848,8 +848,8 @@ else:
     x + 1
 x + 1 # E: Unsupported operand types for + (likely involving Union)
 x = 1
-while 1:
-    while 1:
+while bool():
+    while bool():
         break
     else:
         x = 'a'
@@ -883,21 +883,21 @@ def bar() -> None:
     if isinstance(x, str):
        x + 'a'
     else:
-       while 1:
+       while bool():
           if isinstance(x, int):
              x + 1
           else:
              x.a
           break
-       while 1:
+       while bool():
           if isinstance(x, int):
              x + 1
           else:
              x.a
           continue
 
        #for i in [1]:
-       while 1:
+       while bool():
           if isinstance(x, int):
              x + 1
           else:
@@ -967,15 +967,15 @@ x + 'a'   # E: Unsupported operand types for + ("int" and "str")
 [case testUnreachableCode]
 x = 1 # type: int
 
-while 1:
+while bool():
     x = 'a'           # E: Incompatible types in assignment (expression has type "str", variable has type "int")
     break
     x = 'a'           # Note: no error because unreachable code
 [builtins fixtures/isinstancelist.py]
 
 [case testUnreachableCode2]
 x = 1
-while 1:
+while bool():
     try:
         pass
     except:

test-data/unit/check-unreachable-code.test

@@ -104,10 +104,11 @@ def f(): pass
 PY3 = f()
 if PY3:
     pass
-elif 1:
+elif bool():
     import nonexistent
     1 + ''
 else:
     import bad_name
     1 + ''
+[builtins fixtures/bool.py]
 [out]

test-data/unit/check-weak-typing.test

@@ -165,7 +165,7 @@ x + 'a'
 [case testWeakConditionalChanges]
 # mypy: weak
 def f():
-    if 1:
+    if bool():
         x = 1
         x + 1
         x + 'a' # E: Unsupported operand types for + ("int" and "str")
@@ -177,11 +177,11 @@ def f():
     x + 'a'
 def g():
     x = 1
-    if 1:
+    if bool():
         x = 1
     else:
         x = 'a'
-    if 1:
+    if bool():
         return
     x + 'a'
 [builtins fixtures/ops.py]
@@ -213,17 +213,18 @@ f(*args, y=2)
 
 # I couldn't come up with a simple example, but this showed a bug in
 # binders.
-if 1:
-    if 1:
+if bool():
+    if bool():
         pass
-if 1:
+if bool():
     z = ''
     pat = 1
     pat() # E: "int" not callable
 pat()
 pat = ''
 pat()  # E: "str" not callable
-while 1:
+while bool():
     pass
 pat() # E: "str" not callable
+[builtins fixtures/bool.py]
 [out]

test-data/unit/fixtures/exception.py

@@ -7,5 +7,6 @@ class tuple: pass
 class function: pass
 class int: pass
 class str: pass
+class bool: pass
 
 class BaseException: pass

test-data/unit/fixtures/list.py

@@ -25,3 +25,4 @@ class tuple: pass
 class function: pass
 class int: pass
 class str: pass
+class bool: pass

test-data/unit/fixtures/property.py

@@ -14,3 +14,4 @@ class int: pass
 class str: pass
 class bytes: pass
 class tuple: pass
+class bool: pass