python · mistermocha · May 24, 2017
diff --git a/test-data/unit/check-enum.test b/test-data/unit/check-enum.test
@@ -204,6 +204,17 @@ x = x | C.b
 [out]
 main:6: error: Incompatible types in assignment (expression has type "int", variable has type "C")
 
+[case testEnumFlagMultiples]
+from enum import Flag, auto
+class Color(Flag):
+    RED = auto()
+    BLUE = auto()
+    GREEN = auto()
+    WHITE = RED | BLUE | GREEN
+x = Color.RED & Color.BLUE
+x = Color.RED or Color.GREEN
+x = Color.RED & Color.WHITE
+
 [case testAnonymousEnum]
 from enum import Enum
 class A:

diff --git a/test-data/unit/fixtures/bool.pyi b/test-data/unit/fixtures/bool.pyi
@@ -10,3 +10,4 @@ class bool: pass
 class int: pass
 class str: pass
 class unicode: pass
+class ellipsis: pass
diff --git a/test-data/unit/fixtures/staticmethod.pyi b/test-data/unit/fixtures/staticmethod.pyi
@@ -17,3 +17,4 @@ class int:
 class str: pass
 class unicode: pass
 class bytes: pass
+class ellipsis: pass
diff --git a/test-data/unit/lib-stub/enum.pyi b/test-data/unit/lib-stub/enum.pyi
@@ -22,7 +22,12 @@ def unique(enumeration: _T) -> _T: pass
 
 class Flag(Enum):
     def __or__(self: _T, other: Union[int, _T]) -> _T: pass
+    def __and__(self: _T, other: Union[int, _T]) -> _T: pass
 
 
 class IntFlag(int, Flag):
     def __and__(self: _T, other: Union[int, _T]) -> _T: pass
+
+class auto(IntFlag):
+    value = ...
+    def __init__(self) -> None: pass
diff --git a/typeshed b/typeshed