fix typing tests, add hash and eq methods

python · gvanrossum · Dec 13, 2020 · Oct 31, 2020 · Oct 31, 2020 · Oct 31, 2020
commit 588d421984b46da1a07ffb14729d0ce65cc45769
diff --git a/Lib/_collections_abc.py b/Lib/_collections_abc.py
@@ -421,11 +421,11 @@ def __new__(cls, *args, **kwargs):
             raise TypeError("Callable must be used as "
                             "Callable[[arg, ...], result].")
         _typ, _args = args
-        if not isinstance(_args, tuple) or len(_args) != 2:
+        if not isinstance(_args, (tuple, type(...))) or len(_args) != 2:
             raise TypeError("Callable must be used as "
                             "Callable[[arg, ...], result].")
         t_args, t_result = _args
-        if not isinstance(t_args, list):
+        if not isinstance(t_args, (list, type(...))):
             raise TypeError("Callable must be used as "
                             "Callable[[arg, ...], result].")
 
@@ -440,12 +440,27 @@ def __new__(cls, *args, **kwargs):
     def __init__(self, *args, **kwargs):
         pass
 
+    def __eq__(self, other):
+        if not isinstance(other, GenericAlias):
+            return NotImplemented
+        return (self.__origin__ == other.__origin__
+                and self.__args__ == other.__args__)
+
+    def __hash__(self):
+        return super().__hash__()
+
     def __repr__(self):
         t_args = self.__args__[:-1]
         t_result = self.__args__[-1]
-        return f"{_type_repr(self.__origin__)}" \
-               f"[[{', '.join(_type_repr(a) for a in t_args)}], " \
-               f"{_type_repr(t_result)}]"
+
+        orig = _type_repr(self.__origin__)
+        args = f"{', '.join(_type_repr(a) for a in t_args)}"
+        result = _type_repr(t_result)
+
+        if not isinstance(t_args[0], type(...)):
+            args = f"[{args}]"
+
+        return f"{orig}[{args}, {result}]"
 
 
 def _type_repr(obj):

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
@@ -1818,7 +1818,7 @@ def __call__(self):
         ## with self.assertRaises(TypeError):
         ##     T2[int, str]
 
-        self.assertEqual(repr(C1[int]).split('.')[-1], 'C1[int]')
+        self.assertEqual(repr(C1[[int], int]).split('.')[-1], 'C1[[int], int]')
         self.assertEqual(C2.__parameters__, ())
         self.assertIsInstance(C2(), collections.abc.Callable)
         self.assertIsSubclass(C2, collections.abc.Callable)
@@ -1858,8 +1858,8 @@ class MyTup(Tuple[T, T]): ...
         self.assertEqual(MyTup[int]().__orig_class__, MyTup[int])
         class MyCall(Callable[..., T]):
             def __call__(self): return None
-        self.assertIs(MyCall[T]().__class__, MyCall)
-        self.assertEqual(MyCall[T]().__orig_class__, MyCall[T])
+        self.assertIs(MyCall[[T], T]().__class__, MyCall)
+        self.assertEqual(MyCall[[T], T]().__orig_class__, MyCall[[T], T])
         class MyDict(typing.Dict[T, T]): ...
         self.assertIs(MyDict[int]().__class__, MyDict)
         self.assertEqual(MyDict[int]().__orig_class__, MyDict[int])