Add '_py_abc' to the frame stack

fanninpm · fanninpm · commit 3fe2af9d284b · 2021-05-18T20:26:32.000-04:00
This restores an alteration made by @coolreader18 a while back.
diff --git a/Lib/typing.py b/Lib/typing.py
@@ -287,6 +287,7 @@ def __init_subclass__(self, /, *args, **kwds):
         if '_root' not in kwds:
             raise TypeError("Cannot subclass special typing classes")
 
+
 class _Immutable:
     """Mixin to indicate that object should not be copied."""
 
@@ -370,8 +371,7 @@ def __getitem__(self, parameters):
         raise TypeError(f"{self} is not subscriptable")
 
 
-Any = _SpecialForm('Any', doc=
-    """Special type indicating an unconstrained type.
+Any = _SpecialForm('Any', doc="""Special type indicating an unconstrained type.
 
     - Any is compatible with every type.
     - Any assumed to have all methods.
@@ -382,8 +382,7 @@ def __getitem__(self, parameters):
     or class checks.
     """)
 
-NoReturn = _SpecialForm('NoReturn', doc=
-    """Special type indicating functions that never return.
+NoReturn = _SpecialForm('NoReturn', doc="""Special type indicating functions that never return.
     Example::
 
       from typing import NoReturn
@@ -395,8 +394,7 @@ def stop() -> NoReturn:
     will fail in static type checkers.
     """)
 
-ClassVar = _SpecialForm('ClassVar', doc=
-    """Special type construct to mark class variables.
+ClassVar = _SpecialForm('ClassVar', doc="""Special type construct to mark class variables.
 
     An annotation wrapped in ClassVar indicates that a given
     attribute is intended to be used as a class variable and
@@ -412,8 +410,7 @@ class Starship:
     be used with isinstance() or issubclass().
     """)
 
-Final = _SpecialForm('Final', doc=
-    """Special typing construct to indicate final names to type checkers.
+Final = _SpecialForm('Final', doc="""Special typing construct to indicate final names to type checkers.
 
     A final name cannot be re-assigned or overridden in a subclass.
     For example:
@@ -430,8 +427,7 @@ class FastConnector(Connection):
     There is no runtime checking of these properties.
     """)
 
-Union = _SpecialForm('Union', doc=
-    """Union type; Union[X, Y] means either X or Y.
+Union = _SpecialForm('Union', doc="""Union type; Union[X, Y] means either X or Y.
 
     To define a union, use e.g. Union[int, str].  Details:
     - The arguments must be types and there must be at least one.
@@ -457,14 +453,12 @@ class FastConnector(Connection):
     - You can use Optional[X] as a shorthand for Union[X, None].
     """)
 
-Optional = _SpecialForm('Optional', doc=
-    """Optional type.
+Optional = _SpecialForm('Optional', doc="""Optional type.
 
     Optional[X] is equivalent to Union[X, None].
     """)
 
-Literal = _SpecialForm('Literal', doc=
-    """Special typing form to define literal types (a.k.a. value types).
+Literal = _SpecialForm('Literal', doc="""Special typing form to define literal types (a.k.a. value types).
 
     This form can be used to indicate to type checkers that the corresponding
     variable or function parameter has a value equivalent to the provided
@@ -601,7 +595,8 @@ def __init__(self, name, *constraints, bound=None,
         else:
             self.__bound__ = None
         try:
-            def_mod = sys._getframe(1).f_globals.get('__name__', '__main__')  # for pickling
+            def_mod = sys._getframe(1).f_globals.get(
+                '__name__', '__main__')  # for pickling
         except (AttributeError, ValueError):
             def_mod = None
         if def_mod != 'typing':
@@ -643,6 +638,7 @@ def __reduce__(self):
                     'type': 'Type',
                     'Set': 'AbstractSet'}
 
+
 def _is_dunder(attr):
     return attr.startswith('__') and attr.endswith('__')
 
@@ -656,6 +652,7 @@ class _GenericAlias(_Final, _root=True):
     have 'name' always set. If 'inst' is False, then the alias can't be instantiated,
     this is used by e.g. typing.List and typing.Dict.
     """
+
     def __init__(self, origin, params, *, inst=True, special=False, name=None):
         self._inst = inst
         self._special = special
@@ -786,7 +783,7 @@ def __reduce__(self):
         else:
             origin = self.__origin__
         if (origin is Callable and
-            not (len(self.__args__) == 2 and self.__args__[0] is Ellipsis)):
+                not (len(self.__args__) == 2 and self.__args__[0] is Ellipsis)):
             args = list(self.__args__[:-1]), self.__args__[-1]
         else:
             args = tuple(self.__args__)
@@ -799,6 +796,7 @@ class _VariadicGenericAlias(_GenericAlias, _root=True):
     """Same as _GenericAlias above but for variadic aliases. Currently,
     this is used only by special internal aliases: Tuple and Callable.
     """
+
     def __getitem__(self, params):
         if self._name != 'Callable' or not self._special:
             return self.__getitem_inner__(params)
@@ -989,7 +987,9 @@ def _allow_reckless_class_cheks():
     issubclass() on the whole MRO of a user class, which may contain protocols.
     """
     try:
-        return sys._getframe(3).f_globals['__name__'] in ['abc', 'functools']
+        # XXX RUSTPYTHON: added _py_abc; I think CPython was fine because abc called
+        # directly into the _abc builtin module, which wasn't in the frame stack
+        return sys._getframe(3).f_globals['__name__'] in ['abc', 'functools', '_py_abc']
     except (AttributeError, ValueError):  # For platforms without _getframe().
         return True
 
@@ -1435,6 +1435,7 @@ class Other(Leaf):  # Error reported by type checker
 def _alias(origin, params, inst=True):
     return _GenericAlias(origin, params, special=True, inst=inst)
 
+
 Hashable = _alias(collections.abc.Hashable, ())  # Not generic.
 Awaitable = _alias(collections.abc.Awaitable, T_co)
 Coroutine = _alias(collections.abc.Coroutine, (T_co, T_contra, V_co))
@@ -1672,7 +1673,7 @@ def __new__(*args, **kwargs):
             raise TypeError('NamedTuple.__new__(): not enough arguments')
         cls, *args = args  # allow the "cls" keyword be passed
         if args:
-            typename, *args = args # allow the "typename" keyword be passed
+            typename, *args = args  # allow the "typename" keyword be passed
         elif 'typename' in kwargs:
             typename = kwargs.pop('typename')
             import warnings
@@ -1683,7 +1684,7 @@ def __new__(*args, **kwargs):
                             "argument: 'typename'")
         if args:
             try:
-                fields, = args # allow the "fields" keyword be passed
+                fields, = args  # allow the "fields" keyword be passed
             except ValueError:
                 raise TypeError(f'NamedTuple.__new__() takes from 2 to 3 '
                                 f'positional arguments but {len(args) + 2} '
@@ -1999,6 +2000,7 @@ class io:
 Pattern = _alias(stdlib_re.Pattern, AnyStr)
 Match = _alias(stdlib_re.Match, AnyStr)
 
+
 class re:
     """Wrapper namespace for re type aliases."""
 
