bpo-35252: Remove FIXME from test_functools (GH-10551)

This commit is contained in:
Lysandros Nikolaou 2019-05-20 00:11:21 +02:00 committed by Łukasz Langa
parent 287b84de93
commit d673810b9d
3 changed files with 11 additions and 9 deletions

View File

@ -861,9 +861,11 @@ def singledispatch(func):
# only import typing if annotation parsing is necessary
from typing import get_type_hints
argname, cls = next(iter(get_type_hints(func).items()))
assert isinstance(cls, type), (
f"Invalid annotation for {argname!r}. {cls!r} is not a class."
)
if not isinstance(cls, type):
raise TypeError(
f"Invalid annotation for {argname!r}. "
f"{cls!r} is not a class."
)
registry[cls] = func
if cache_token is None and hasattr(cls, '__abstractmethods__'):
cache_token = get_cache_token()

View File

@ -2355,9 +2355,6 @@ class TestSingleDispatch(unittest.TestCase):
))
self.assertTrue(str(exc.exception).endswith(msg_suffix))
# FIXME: The following will only work after PEP 560 is implemented.
return
with self.assertRaises(TypeError) as exc:
@i.register
def _(arg: typing.Iterable[str]):
@ -2366,10 +2363,12 @@ class TestSingleDispatch(unittest.TestCase):
# types from `typing`. Instead, annotate with regular types
# or ABCs.
return "I annotated with a generic collection"
self.assertTrue(str(exc.exception).startswith(msg_prefix +
"<function TestSingleDispatch.test_invalid_registrations.<locals>._"
self.assertTrue(str(exc.exception).startswith(
"Invalid annotation for 'arg'."
))
self.assertTrue(str(exc.exception).endswith(
'typing.Iterable[str] is not a class.'
))
self.assertTrue(str(exc.exception).endswith(msg_suffix))
def test_invalid_positional_argument(self):
@functools.singledispatch

View File

@ -0,0 +1 @@
Throw a TypeError instead of an AssertionError when using an invalid type annotation with singledispatch.