From e259267e52fb14571ae3845d3d93985ad96425b9 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Sat, 8 Oct 2016 20:27:22 -0700 Subject: Merge further typing.py changes from upstream. --- Lib/typing.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Lib/typing.py') diff --git a/Lib/typing.py b/Lib/typing.py index 05b65b70c6..557fa589ea 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -993,7 +993,10 @@ class GenericMeta(TypingMeta, abc.ABCMeta): # This allows unparameterized generic collections to be used # with issubclass() and isinstance() in the same way as their # collections.abc counterparts (e.g., isinstance([], Iterable)). - self.__subclasshook__ = _make_subclasshook(self) + if ('__subclasshook__' not in namespace and extra # allow overriding + or hasattr(self.__subclasshook__, '__name__') and + self.__subclasshook__.__name__ == '__extrahook__'): + self.__subclasshook__ = _make_subclasshook(self) if isinstance(extra, abc.ABCMeta): self._abc_registry = extra._abc_registry return self -- cgit v1.2.1