Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

typing.py: merge 3.5->3.6 (Tuple/ellipsis/equality).

This commit is contained in:
Guido van Rossum 2016-04-18 07:39:54 -07:00
parent 27e1240af5 5abcbb3ee5
commit 49ed08fd0b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/test/test_typing.py
View File

@ -359,6 +359,12 @@ class TupleTests(TestCase):
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

3
Lib/typing.py
View File

@ -705,7 +705,8 @@ class TupleMeta(TypingMeta):
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__)