Jun 18, 2022 · Jun 12, 2022 · Jun 15, 2022
diff --git a/Lib/dataclasses.py b/Lib/dataclasses.py
        self.type = type

    def __repr__(self):
        if isinstance(self.type, type) and not isinstance(self.type, GenericAlias):
        if isinstance(self.type, type):
            type_name = self.type.__name__
        else:
            # typing objects, e.g. List[int]
 def is_dataclass(obj):
    """Returns True if obj is a dataclass or an instance of a
    dataclass."""
    cls = obj if isinstance(obj, type)and not isinstance(obj, GenericAlias)else type(obj)
    cls = obj if isinstance(obj, type) else type(obj)
    return hasattr(cls, _FIELDS)


diff --git a/Lib/functools.py b/Lib/functools.py
        return get_origin(cls) in {Union, types.UnionType}

    def _is_valid_dispatch_type(cls):
        if isinstance(cls, type) and not isinstance(cls, GenericAlias):
        if isinstance(cls, type):
            return True
        from typing import get_args
        return (_is_union_type(cls) and
                all(isinstance(arg, type) and not isinstance(arg, GenericAlias)
                    for arg in get_args(cls)))
                all(isinstance(arg, type) for arg in get_args(cls)))

    def register(cls, func=None):
        """generic_func.register(cls, func) -> func
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
 import sysconfig
 import time
 import tokenize
 import types
 import urllib.parse
 import warnings
 from collections import deque
            normdirs.append(normdir)
    return dirs

 def _isclass(object):
    return inspect.isclass(object) and not isinstance(object, types.GenericAlias)

 def _findclass(func):
    cls = sys.modules.get(func.__module__)
    if cls is None:
        return None
    for name in func.__qualname__.split('.')[:-1]:
        cls = getattr(cls, name)
    if not_isclass(cls):
    if notinspect.isclass(cls):
        return None
    return cls

 def _finddoc(obj):
    if inspect.ismethod(obj):
        name = obj.__func__.__name__
        self = obj.__self__
        if (_isclass(self) and
        if (inspect.isclass(self) and
            getattr(getattr(self, name, None), '__func__') is obj.__func__):
            # classmethod
            cls = self
    elif inspect.isbuiltin(obj):
        name = obj.__name__
        self = obj.__self__
        if (_isclass(self) and
        if (inspect.isclass(self) and
            self.__qualname__ + '.' + name == obj.__qualname__):
            # classmethod
            cls = self

 def isdata(object):
    """Check if an object is of a type that probably means it's data."""
    return not (inspect.ismodule(object) or_isclass(object) or
    return not (inspect.ismodule(object) orinspect.isclass(object) or
                inspect.isroutine(object) or inspect.isframe(object) or
                inspect.istraceback(object) or inspect.iscode(object))

        # by lacking a __name__ attribute) and an instance.
        try:
            if inspect.ismodule(object): return self.docmodule(*args)
            if_isclass(object): return self.docclass(*args)
            ifinspect.isclass(object): return self.docclass(*args)
            if inspect.isroutine(object): return self.docroutine(*args)
        except AttributeError:
            pass
        modules = inspect.getmembers(object, inspect.ismodule)

        classes, cdict = [], {}
        for key, value in inspect.getmembers(object,_isclass):
        for key, value in inspect.getmembers(object,inspect.isclass):
            # if __all__ exists, believe it.  Otherwise use old heuristic.
            if (all is not None or
                (inspect.getmodule(value) or object) is object):
            result = result + self.section('DESCRIPTION', desc)

        classes = []
        for key, value in inspect.getmembers(object,_isclass):
        for key, value in inspect.getmembers(object,inspect.isclass):
            # if __all__ exists, believe it.  Otherwise use old heuristic.
            if (all is not None
                or (inspect.getmodule(value) or object) is object):
        return 'member descriptor %s.%s.%s' % (
            thing.__objclass__.__module__, thing.__objclass__.__name__,
            thing.__name__)
    if_isclass(thing):
    ifinspect.isclass(thing):
        return 'class ' + thing.__name__
    if inspect.isfunction(thing):
        return 'function ' + thing.__name__
        desc += ' in module ' + module.__name__

    if not (inspect.ismodule(object) or
 _isclass(object) or
 inspect.isclass(object) or
              inspect.isroutine(object) or
              inspect.isdatadescriptor(object) or
              _getdoc(object)):
diff --git a/Lib/types.py b/Lib/types.py
 updated=False
 shift=0
 fori,baseinenumerate(bases):
 ifisinstance(base,type)andnotisinstance(base,GenericAlias):
 ifisinstance(base,type):
 continue
 ifnothasattr(base,"__mro_entries__"):
 continue
diff --git a/Lib/typing.py b/Lib/typing.py
 var_tuple_index=None
 fillarg=None
 fork,arginenumerate(args):
 ifnot(isinstance(arg,type)andnotisinstance(arg,GenericAlias)):
 ifnotisinstance(arg,type):
 subargs=getattr(arg,'__typing_unpacked_tuple_args__',None)
 ifsubargsandlen(subargs)==2andsubargs[-1]is ...:
 ifvar_tuple_indexisnotNone:
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-12-19-31-56.gh-issue-89828.bq02M7.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-12-19-31-56.gh-issue-89828.bq02M7.rst
 :class:`types.GenericAlias` no longer relays the ``__class__`` attribute.
 For example, ``isinstance(list[int], type)`` no longer returns ``True``.
diff --git a/Objects/genericaliasobject.c b/Objects/genericaliasobject.c
 }

 static const char* const attr_exceptions[] = {
    "__class__",
    "__origin__",
    "__args__",
    "__unpacked__",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -230,7 +230,7 @@ def __init__(self, type):
		self.type = type

		def __repr__(self):
		if isinstance(self.type, type) and not isinstance(self.type, GenericAlias):
		if isinstance(self.type, type):
		type_name = self.type.__name__
		else:
		# typing objects, e.g. List[int]
Expand DownExpand Up		@@ -1248,7 +1248,7 @@ def _is_dataclass_instance(obj):
		def is_dataclass(obj):
		"""Returns True if obj is a dataclass or an instance of a
		dataclass."""
		cls = obj if isinstance(obj, type)and not isinstance(obj, GenericAlias)else type(obj)
		cls = obj if isinstance(obj, type) else type(obj)
		return hasattr(cls, _FIELDS)


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -843,12 +843,11 @@ def _is_union_type(cls):
		return get_origin(cls) in {Union, types.UnionType}

		def _is_valid_dispatch_type(cls):
		if isinstance(cls, type) and not isinstance(cls, GenericAlias):
		if isinstance(cls, type):
		return True
		from typing import get_args
		return (_is_union_type(cls) and
		all(isinstance(arg, type) and not isinstance(arg, GenericAlias)
		for arg in get_args(cls)))
		all(isinstance(arg, type) for arg in get_args(cls)))

		def register(cls, func=None):
		"""generic_func.register(cls, func) -> func
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -70,7 +70,6 @@ class or function within a module or module in a package. If the
		import sysconfig
		import time
		import tokenize
		import types
		import urllib.parse
		import warnings
		from collections import deque
Expand All		@@ -92,24 +91,21 @@ def pathdirs():
		normdirs.append(normdir)
		return dirs

		def _isclass(object):
		return inspect.isclass(object) and not isinstance(object, types.GenericAlias)

		def _findclass(func):
		cls = sys.modules.get(func.__module__)
		if cls is None:
		return None
		for name in func.__qualname__.split('.')[:-1]:
		cls = getattr(cls, name)
		if not_isclass(cls):
		if notinspect.isclass(cls):
		return None
		return cls

		def _finddoc(obj):
		if inspect.ismethod(obj):
		name = obj.__func__.__name__
		self = obj.__self__
		if (_isclass(self) and
		if (inspect.isclass(self) and
		getattr(getattr(self, name, None), '__func__') is obj.__func__):
		# classmethod
		cls = self
Expand All		@@ -123,7 +119,7 @@ def _finddoc(obj):
		elif inspect.isbuiltin(obj):
		name = obj.__name__
		self = obj.__self__
		if (_isclass(self) and
		if (inspect.isclass(self) and
		self.__qualname__ + '.' + name == obj.__qualname__):
		# classmethod
		cls = self
Expand DownExpand Up		@@ -210,7 +206,7 @@ def classname(object, modname):

		def isdata(object):
		"""Check if an object is of a type that probably means it's data."""
		return not (inspect.ismodule(object) or_isclass(object) or
		return not (inspect.ismodule(object) orinspect.isclass(object) or
		inspect.isroutine(object) or inspect.isframe(object) or
		inspect.istraceback(object) or inspect.iscode(object))

Expand DownExpand Up		@@ -481,7 +477,7 @@ def document(self, object, name=None, *args):
		# by lacking a __name__ attribute) and an instance.
		try:
		if inspect.ismodule(object): return self.docmodule(*args)
		if_isclass(object): return self.docclass(*args)
		ifinspect.isclass(object): return self.docclass(*args)
		if inspect.isroutine(object): return self.docroutine(*args)
		except AttributeError:
		pass
Expand DownExpand Up		@@ -783,7 +779,7 @@ def docmodule(self, object, name=None, mod=None, *ignored):
		modules = inspect.getmembers(object, inspect.ismodule)

		classes, cdict = [], {}
		for key, value in inspect.getmembers(object,_isclass):
		for key, value in inspect.getmembers(object,inspect.isclass):
		# if __all__ exists, believe it. Otherwise use old heuristic.
		if (all is not None or
		(inspect.getmodule(value) or object) is object):
Expand DownExpand Up		@@ -1223,7 +1219,7 @@ def docmodule(self, object, name=None, mod=None):
		result = result + self.section('DESCRIPTION', desc)

		classes = []
		for key, value in inspect.getmembers(object,_isclass):
		for key, value in inspect.getmembers(object,inspect.isclass):
		# if __all__ exists, believe it. Otherwise use old heuristic.
		if (all is not None
		or (inspect.getmodule(value) or object) is object):
Expand DownExpand Up		@@ -1707,7 +1703,7 @@ def describe(thing):
		return 'member descriptor %s.%s.%s' % (
		thing.__objclass__.__module__, thing.__objclass__.__name__,
		thing.__name__)
		if_isclass(thing):
		ifinspect.isclass(thing):
		return 'class ' + thing.__name__
		if inspect.isfunction(thing):
		return 'function ' + thing.__name__
Expand DownExpand Up		@@ -1768,7 +1764,7 @@ def render_doc(thing, title='Python Library Documentation: %s', forceload=0,
		desc += ' in module ' + module.__name__

		if not (inspect.ismodule(object) or
		_isclass(object) or
		inspect.isclass(object) or
		inspect.isroutine(object) or
		inspect.isdatadescriptor(object) or
		_getdoc(object)):
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -80,7 +80,7 @@ def resolve_bases(bases):
		updated=False
		shift=0
		fori,baseinenumerate(bases):
		ifisinstance(base,type)andnotisinstance(base,GenericAlias):
		ifisinstance(base,type):
		continue
		ifnothasattr(base,"__mro_entries__"):
		continue
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1079,7 +1079,7 @@ def __typing_prepare_subst__(self, alias, args):
		var_tuple_index=None
		fillarg=None
		fork,arginenumerate(args):
		ifnot(isinstance(arg,type)andnotisinstance(arg,GenericAlias)):
		ifnotisinstance(arg,type):
		subargs=getattr(arg,'__typing_unpacked_tuple_args__',None)
		ifsubargsandlen(subargs)==2andsubargs[-1]is ...:
		ifvar_tuple_indexisnotNone:
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		:class:`types.GenericAlias` no longer relays the ``__class__`` attribute.
		For example, ``isinstance(list[int], type)`` no longer returns ``True``.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -583,6 +583,7 @@ ga_vectorcall(PyObject self, PyObject const *args,
		}

		static const char* const attr_exceptions[] = {
		"__class__",
		"__origin__",
		"__args__",
		"__unpacked__",
Expand Down