Combine #5046 with typeshed sync (#5202)

gvanrossum · emmatyping · commit 6a956d798c7f · 2018-06-11T15:36:34.000-07:00
diff --git a/test-data/unit/pythoneval.test b/test-data/unit/pythoneval.test
@@ -1257,8 +1257,8 @@ class A:
 class B:
     __slots__ = (1, 2)
 [out]
-_testInvalidSlots.py:2: error: Incompatible types in assignment (expression has type "int", base class "object" defined the type as "Union[str, Iterable[str], None]")
-_testInvalidSlots.py:4: error: Incompatible types in assignment (expression has type "Tuple[int, int]", base class "object" defined the type as "Union[str, Iterable[str], None]")
+_testInvalidSlots.py:2: error: Incompatible types in assignment (expression has type "int", base class "object" defined the type as "Union[str, Iterable[str]]")
+_testInvalidSlots.py:4: error: Incompatible types in assignment (expression has type "Tuple[int, int]", base class "object" defined the type as "Union[str, Iterable[str]]")
 
 [case testDictWithStarStarSpecialCase]
 from typing import Dict
diff --git a/typeshed b/typeshed
@@ -1 +1 @@
-Subproject commit af3b015aa86429624167397743c09da349c3dda4
+Subproject commit c4bf27b835646b47f6b49c7de013ed0207c84de2
