From 9dbd9b198a4fe4fd96682d74a8730e4e18e775ad Mon Sep 17 00:00:00 2001 From: Jelle Zijlstra Date: Mon, 14 May 2018 17:09:40 -0400 Subject: [PATCH 1/2] fix error message in pythoneval test Needed after python/typeshed#2128; this will fail tests until the typeshed change is merged. --- test-data/unit/pythoneval.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-data/unit/pythoneval.test b/test-data/unit/pythoneval.test index afc1885c2f19..a7b8773f63c5 100644 --- 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 From 55dbb9f71596e00943ed0e921b152a460ba3b4c6 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Mon, 11 Jun 2018 15:23:02 -0700 Subject: [PATCH 2/2] Also merge typeshed. --- typeshed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/typeshed b/typeshed index af3b015aa864..c4bf27b83564 160000 --- a/typeshed +++ b/typeshed @@ -1 +1 @@ -Subproject commit af3b015aa86429624167397743c09da349c3dda4 +Subproject commit c4bf27b835646b47f6b49c7de013ed0207c84de2