Improve speed of Generic.__new__. Both PY2 and PY3. Fixes #196.

python · gvanrossum · Apr 4, 2016 · Mar 24, 2016 · Mar 24, 2016 · Mar 24, 2016
commit e0d1c5dc659db9734c10a1b3c678df9df75fcda0
diff --git a/python2/typing.py b/python2/typing.py
@@ -891,6 +891,20 @@ def _geqv(a, b):
     return _gorg(a) is _gorg(b)
 
 
+def _next_in_mro(cls):
+    """Helper for Generic.__new__.
+
+    Returns the class after the last occurrence of Generic or
+    Generic[...] in cls.__mro__.
+    """
+    next_in_mro = object
+    # Look for the last occurrence of Generic or Generic[...].
+    for i, c in enumerate(cls.__mro__[:-1]):
+        if isinstance(c, GenericMeta) and _gorg(c) is Generic:
+            next_in_mro = cls.__mro__[i+1]
+    return next_in_mro
+
+
 class GenericMeta(TypingMeta, abc.ABCMeta):
     """Metaclass for generic types."""
 
@@ -919,9 +933,6 @@ def __new__(cls, name, bases, namespace,
             # and reject multiple Generic[...].
             gvars = None
             for base in bases:
-                if base is object:
-                    # Avoid checking for Generic in its own definition.
-                    continue
                 if base is Generic:
                     raise TypeError("Cannot inherit from plain Generic")
                 if (isinstance(base, GenericMeta) and
@@ -950,6 +961,8 @@ def __new__(cls, name, bases, namespace,
             self.__extra__ = extra
         # Else __extra__ is inherited, eventually from the
         # (meta-)class default above.
+        # Speed hack (https://github.com/python/typing/issues/196).
+        self.__next_in_mro__ = _next_in_mro(self)
         return self
 
     def _get_type_vars(self, tvars):
@@ -1077,6 +1090,10 @@ def __subclasscheck__(self, cls):
         return issubclass(cls, self.__extra__)
 
 
+# Prevent checks for Generic to crash when defining Generic.
+Generic = None
+
+
 class Generic(object):
     """Abstract base class for generic types.
 
@@ -1102,16 +1119,13 @@ def lookup_name(mapping: Mapping[KT, VT], key: KT, default: VT) -> VT:
     __slots__ = ()
 
     def __new__(cls, *args, **kwds):
-        next_in_mro = object
-        # Look for the last occurrence of Generic or Generic[...].
-        for i, c in enumerate(cls.__mro__[:-1]):
-            if isinstance(c, GenericMeta) and _gorg(c) is Generic:
-                next_in_mro = cls.__mro__[i+1]
-        origin = _gorg(cls)
-        obj = next_in_mro.__new__(origin)
-        if origin is not cls:
+        if cls.__origin__ is None:
+            return cls.__next_in_mro__.__new__(cls)
+        else:
+            origin = _gorg(cls)
+            obj = cls.__next_in_mro__.__new__(origin)
             obj.__init__(*args, **kwds)
-        return obj
+            return obj
 
 
 def cast(typ, val):
@@ -1305,6 +1319,7 @@ def _get_protocol_attrs(self):
                             attr != '__args__' and
                             attr != '__slots__' and
                             attr != '_get_protocol_attrs' and
+                            attr != '__next_in_mro__' and
                             attr != '__parameters__' and
                             attr != '__origin__' and
                             attr != '__module__'):

diff --git a/src/typing.py b/src/typing.py
@@ -873,6 +873,20 @@ def _geqv(a, b):
     return _gorg(a) is _gorg(b)
 
 
+def _next_in_mro(cls):
+    """Helper for Generic.__new__.
+
+    Returns the class after the last occurrence of Generic or
+    Generic[...] in cls.__mro__.
+    """
+    next_in_mro = object
+    # Look for the last occurrence of Generic or Generic[...].
+    for i, c in enumerate(cls.__mro__[:-1]):
+        if isinstance(c, GenericMeta) and _gorg(c) is Generic:
+            next_in_mro = cls.__mro__[i+1]
+    return next_in_mro
+
+
 class GenericMeta(TypingMeta, abc.ABCMeta):
     """Metaclass for generic types."""
 
@@ -929,6 +943,8 @@ def __new__(cls, name, bases, namespace,
             self.__extra__ = extra
         # Else __extra__ is inherited, eventually from the
         # (meta-)class default above.
+        # Speed hack (https://github.com/python/typing/issues/196).
+        self.__next_in_mro__ = _next_in_mro(self)
         return self
 
     def _get_type_vars(self, tvars):
@@ -1056,6 +1072,10 @@ def __subclasscheck__(self, cls):
         return issubclass(cls, self.__extra__)
 
 
+# Prevent checks for Generic to crash when defining Generic.
+Generic = None
+
+
 class Generic(metaclass=GenericMeta):
     """Abstract base class for generic types.
 
@@ -1080,16 +1100,13 @@ def lookup_name(mapping: Mapping[KT, VT], key: KT, default: VT) -> VT:
     __slots__ = ()
 
     def __new__(cls, *args, **kwds):
-        next_in_mro = object
-        # Look for the last occurrence of Generic or Generic[...].
-        for i, c in enumerate(cls.__mro__[:-1]):
-            if isinstance(c, GenericMeta) and _gorg(c) is Generic:
-                next_in_mro = cls.__mro__[i+1]
-        origin = _gorg(cls)
-        obj = next_in_mro.__new__(origin)
-        if origin is not cls:
+        if cls.__origin__ is None:
+            return cls.__next_in_mro__.__new__(cls)
+        else:
+            origin = _gorg(cls)
+            obj = cls.__next_in_mro__.__new__(origin)
             obj.__init__(*args, **kwds)
-        return obj
+            return obj
 
 
 def cast(typ, val):
@@ -1283,6 +1300,7 @@ def _get_protocol_attrs(self):
                             attr != '__args__' and
                             attr != '__slots__' and
                             attr != '_get_protocol_attrs' and
+                            attr != '__next_in_mro__' and
                             attr != '__parameters__' and
                             attr != '__origin__' and
                             attr != '__module__'):