Don't reimplement runtime_checkable on py38+

JelleZijlstra · Jun 9, 2023 · May 25, 2023 · May 25, 2023 · May 25, 2023 · May 26, 2023
commit 435c37a87e43f84a6a40fe2a3a46066993ddff02
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@
 - Fix regression in version 4.6.1 where comparing a generic class against a
   runtime-checkable protocol using `isinstance()` would cause `AttributeError`
   to be raised if using Python 3.7.
+- Due to changes in the implementation of `typing_extensions.Protocol`,
+  `typing.runtime_checkable` can now be used on `typing_extensions.Protocol`
+  (previously, users had to use `typing_extensions.runtime_checkable` if they
+  were using `typing_extensions.Protocol`).
 
 # Release 4.6.1 (May 23, 2023)
 

diff --git a/src/test_typing_extensions.py b/src/test_typing_extensions.py
@@ -1767,6 +1767,22 @@ def __init__(self):
         self.assertIsInstance(Bar(), Foo)
         self.assertNotIsInstance(object(), Foo)
 
+    @skipUnless(
+        hasattr(typing, "runtime_checkable"),
+        "Test is only relevant if typing.runtime_checkable exists"
+    )
+    def test_typing_dot_runtimecheckable_on_Protocol(self):
+        @typing.runtime_checkable
+        class Foo(Protocol):
+            x: int
+
+        class Bar:
+            def __init__(self):
+                self.x = 42
+
+        self.assertIsInstance(Bar(), Foo)
+        self.assertNotIsInstance(object(), Foo)
+
     def test_no_instantiation(self):
         class P(Protocol): pass
         with self.assertRaises(TypeError):
@@ -4187,7 +4203,7 @@ def test_typing_extensions_defers_when_possible(self):
             exclude |= {'final', 'Any', 'NewType'}
         if sys.version_info < (3, 12):
             exclude |= {
-                'Protocol', 'runtime_checkable', 'SupportsAbs', 'SupportsBytes',
+                'Protocol', 'SupportsAbs', 'SupportsBytes',
                 'SupportsComplex', 'SupportsFloat', 'SupportsIndex', 'SupportsInt',
                 'SupportsRound', 'TypedDict', 'is_typeddict', 'NamedTuple', 'Unpack',
             }

diff --git a/src/typing_extensions.py b/src/typing_extensions.py
@@ -545,7 +545,6 @@ def _caller(depth=2):
 # so we backport the 3.12 version of Protocol to Python <=3.11
 if sys.version_info >= (3, 12):
     Protocol = typing.Protocol
-    runtime_checkable = typing.runtime_checkable
 else:
     def _allow_reckless_class_checks(depth=4):
         """Allow instance and class checks for special stdlib modules.
@@ -799,6 +798,10 @@ def __init_subclass__(cls, *args, **kwargs):
                 if cls.__init__ is Protocol.__init__:
                     cls.__init__ = _no_init
 
+
+if sys.version_info >= (3, 8):
+    runtime_checkable = typing.runtime_checkable
+else:
     def runtime_checkable(cls):
         """Mark a protocol class as a runtime protocol, so that it
         can be used with isinstance() and issubclass(). Raise TypeError