From 9df373a509693981e5a8d8b862e16e3429d7fc18 Mon Sep 17 00:00:00 2001
From: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com>
Date: Tue, 9 Feb 2021 09:58:50 +0800
Subject: [PATCH 1/3] bpo-41824: Add versionadded for typing.ForwardRef docs
 (#24224)

---
 Doc/library/typing.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index af2cafb8b9969c..688564f1d24f51 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -1714,6 +1714,8 @@ Introspection helpers
    ``list[ForwardRef("SomeClass")]``.  This class should not be instantiated by
    a user, but may be used by introspection tools.
 
+   .. versionadded:: 3.7.4
+
 Constant
 --------
 

From a1bee7e9356dbdead476694bb8aff6a551bb9e56 Mon Sep 17 00:00:00 2001
From: Yurii Karabas <1998uriyyo@gmail.com>
Date: Wed, 12 May 2021 18:47:49 +0300
Subject: [PATCH 2/3] bpo-38908: Fix issue when non runtime_protocol failed to
 raise TypeError (#26067)

---
 Lib/test/test_typing.py                          |  8 ++++++++
 Lib/typing.py                                    | 16 ++++++++++++----
 .../2021-05-12-16-43-21.bpo-38908.nM2_rO.rst     |  5 +++++
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2021-05-12-16-43-21.bpo-38908.nM2_rO.rst

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 4bdb2a0fad6c76..d91363eb379605 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -1422,6 +1422,14 @@ class CustomProtocol(TestCase, Protocol):
         class CustomContextManager(typing.ContextManager, Protocol):
             pass
 
+    def test_non_runtime_protocol_isinstance_check(self):
+        class P(Protocol):
+            x: int
+
+        with self.assertRaisesRegex(TypeError, "@runtime_checkable"):
+            isinstance(1, P)
+
+
 class GenericTests(BaseTestCase):
 
     def test_basics(self):
diff --git a/Lib/typing.py b/Lib/typing.py
index 123fbc2c450107..c3844cf3083e1e 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -1079,14 +1079,14 @@ def _no_init(self, *args, **kwargs):
         raise TypeError('Protocols cannot be instantiated')
 
 
-def _allow_reckless_class_cheks():
+def _allow_reckless_class_checks(depth=3):
     """Allow instance and class checks for special stdlib modules.
 
     The abc and functools modules indiscriminately call isinstance() and
     issubclass() on the whole MRO of a user class, which may contain protocols.
     """
     try:
-        return sys._getframe(3).f_globals['__name__'] in ['abc', 'functools']
+        return sys._getframe(depth).f_globals['__name__'] in ['abc', 'functools']
     except (AttributeError, ValueError):  # For platforms without _getframe().
         return True
 
@@ -1106,6 +1106,14 @@ class _ProtocolMeta(ABCMeta):
     def __instancecheck__(cls, instance):
         # We need this method for situations where attributes are
         # assigned in __init__.
+        if (
+            getattr(cls, '_is_protocol', False) and
+            not getattr(cls, '_is_runtime_protocol', False) and
+            not _allow_reckless_class_checks(depth=2)
+        ):
+            raise TypeError("Instance and class checks can only be used with"
+                            " @runtime_checkable protocols")
+
         if ((not getattr(cls, '_is_protocol', False) or
                 _is_callable_members_only(cls)) and
                 issubclass(instance.__class__, cls)):
@@ -1168,12 +1176,12 @@ def _proto_hook(other):
 
             # First, perform various sanity checks.
             if not getattr(cls, '_is_runtime_protocol', False):
-                if _allow_reckless_class_cheks():
+                if _allow_reckless_class_checks():
                     return NotImplemented
                 raise TypeError("Instance and class checks can only be used with"
                                 " @runtime_checkable protocols")
             if not _is_callable_members_only(cls):
-                if _allow_reckless_class_cheks():
+                if _allow_reckless_class_checks():
                     return NotImplemented
                 raise TypeError("Protocols with non-method members"
                                 " don't support issubclass()")
diff --git a/Misc/NEWS.d/next/Library/2021-05-12-16-43-21.bpo-38908.nM2_rO.rst b/Misc/NEWS.d/next/Library/2021-05-12-16-43-21.bpo-38908.nM2_rO.rst
new file mode 100644
index 00000000000000..b72936c205f67c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-05-12-16-43-21.bpo-38908.nM2_rO.rst
@@ -0,0 +1,5 @@
+Fix issue where :mod:`typing` protocols without the  ``@runtime_checkable``
+decorator did not raise a ``TypeError`` when used with ``issubclass`` and
+``isinstance``.  Now, subclassses of ``typing.Protocol`` will raise a
+``TypeError`` when used with with those checks.
+Patch provided by Yurii Karabas.

From f1b15824be8f4627603a6e1eed7edc3ef1eae88a Mon Sep 17 00:00:00 2001
From: Fidget-Spinner <28750310+Fidget-Spinner@users.noreply.github.com>
Date: Thu, 13 May 2021 00:02:51 +0800
Subject: [PATCH 3/3] beep boop

---
 Doc/library/typing.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index f692602cccca6a..06a8b813c2b44b 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -1714,6 +1714,11 @@ Introspection helpers
    ``List[ForwardRef("SomeClass")]``.  This class should not be instantiated by
    a user, but may be used by introspection tools.
 
+   .. note::
+      :pep:`585` generic types such as ``list["SomeClass"]`` will not be
+      implicitly transformed into ``list[ForwardRef("SomeClass")]`` and thus
+      will not automatically resolve to ``list[SomeClass]``.
+
    .. versionadded:: 3.7.4
 
 Constant