From 3b557991d4a7626cf12baf2277bc87acbc439744 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 21 Oct 2016 17:30:29 -0700 Subject: Two minor typing.py fixes (upstream #305) --- Lib/typing.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'Lib/typing.py') diff --git a/Lib/typing.py b/Lib/typing.py index 5761693401..261da5d5e2 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -894,7 +894,7 @@ def _replace_arg(arg, tvars, args): return arg._subs_repr(tvars, args) if isinstance(arg, TypeVar): for i, tvar in enumerate(tvars): - if arg.__name__ == tvar.__name__: + if arg == tvar: return args[i] return _type_repr(arg) @@ -1322,10 +1322,6 @@ if sys.version_info[:2] >= (3, 3): hints = obj.__annotations__ except AttributeError: return {} - # we keep only those annotations that can be accessed on module - members = obj.__dict__ - hints = {name: value for name, value in hints.items() - if name in members} for name, value in hints.items(): if value is None: value = type(None) -- cgit v1.2.1