[Python-checkins] cpython (merge 3.5 -> default): typing.py: merge 3.5->3.6 (Tuple/ellipsis/equality).

Mon Apr 18 10:40:12 EDT 2016

https://hg.python.org/cpython/rev/98cda226d208
changeset: 101051:98cda226d208
parent: 101049:43567d214534
parent: 101050:9e9f01260b27
user: Guido van Rossum <guido at dropbox.com>
date: Mon Apr 18 07:39:54 2016 -0700
summary:
 typing.py: merge 3.5->3.6 (Tuple/ellipsis/equality).
files:
 Lib/test/test_typing.py | 6 ++++++
 Lib/typing.py | 3 ++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -359,6 +359,12 @@
 self.assertTrue(issubclass(tuple, Tuple))
 self.assertFalse(issubclass(Tuple, tuple)) # Can't have it both ways.
 
+ def test_equality(self):
+ assert Tuple[int] == Tuple[int]
+ assert Tuple[int, ...] == Tuple[int, ...]
+ assert Tuple[int] != Tuple[int, int]
+ assert Tuple[int] != Tuple[int, ...]
+
 def test_tuple_subclass(self):
 class MyTuple(tuple):
 pass
diff --git a/Lib/typing.py b/Lib/typing.py
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -705,7 +705,8 @@
 def __eq__(self, other):
 if not isinstance(other, TupleMeta):
 return NotImplemented
- return self.__tuple_params__ == other.__tuple_params__
+ return (self.__tuple_params__ == other.__tuple_params__ and
+ self.__tuple_use_ellipsis__ == other.__tuple_use_ellipsis__)
 
 def __hash__(self):
 return hash(self.__tuple_params__)
-- 
Repository URL: https://hg.python.org/cpython
