Reduce Sentinel as singletons

HexDecimal · HexDecimal · commit 2c509de74717 · 2025-07-01T16:45:52.000-07:00
Use pickles method of handing singleton objects.
This is simpler and more predictable than a custom unpickle function.

Anonymous sentinels can no longer be pickled and will
raise PicklingError instead of TypeError.
diff --git a/src/test_typing_extensions.py b/src/test_typing_extensions.py
@@ -9324,10 +9324,19 @@ def test_sentinel_import(self):
         self.assertIs(Sentinel._import_sentinel("nonexistent", ""), None)
         self.assertIs(Sentinel._import_sentinel("nonexistent", "nonexistent.nonexistent.nonexistent"), None)
 
-    def test_sentinel_picklable(self):
+    def test_sentinel_picklable_qualified(self):
         for proto in range(pickle.HIGHEST_PROTOCOL + 1):
             self.assertIs(self.SENTINEL, pickle.loads(pickle.dumps(self.SENTINEL, protocol=proto)))
 
+    def test_sentinel_picklable_anonymous(self):
+        anonymous_sentinel = Sentinel("anonymous_sentinel")  # Anonymous sentinel can not be pickled
+        for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+            with self.assertRaisesRegex(
+                pickle.PicklingError,
+                r"attribute lookup anonymous_sentinel on test_typing_extensions failed|not found as test_typing_extensions.anonymous_sentinel"
+            ):
+                self.assertIs(anonymous_sentinel, pickle.loads(pickle.dumps(anonymous_sentinel, protocol=proto)))
+
 
 
 if __name__ == '__main__':
diff --git a/src/typing_extensions.py b/src/typing_extensions.py
@@ -4158,16 +4158,6 @@ def evaluate_forward_ref(
 
 _sentinel_registry = {}
 
-def _unpickle_sentinel(
-    name: str,
-    module_name: str,
-    config: typing.Dict[str, typing.Any],
-    /,
-):
-    """Stable Sentinel unpickling function, get Sentinel at 'module_name.name'."""
-    # Explicit repr=name because a saved module_name is known to be valid
-    return Sentinel(name, module_name, repr=config.get("repr", name))
-
 class Sentinel:
     """A sentinel object.
 
@@ -4229,7 +4219,7 @@ def __new__(
         # Create initial or anonymous sentinel
         sentinel = super().__new__(cls)
         sentinel._name = name
-        sentinel._module_name = module_name
+        sentinel.__module__ = module_name  # Assign which module defined this instance
         sentinel._repr = repr if repr is not None else name
         return _sentinel_registry.setdefault(registry_key, sentinel)
 
@@ -4262,18 +4252,9 @@ def __or__(self, other):
         def __ror__(self, other):
             return typing.Union[other, self]
 
-    def __reduce__(self):
-        """Record where this sentinel is defined and its current parameters."""
-        config = {"repr": self._repr}
-        # Reduce callable must be at the top-level to be stable whenever Sentinel changes
-        return (
-            _unpickle_sentinel,
-            (
-                self._name,
-                self._module_name,
-                config,
-            ),
-        )
+    def __reduce__(self) -> str:
+        """Reduce this sentinel to a singleton."""
+        return self._name  # Module is set from __module__ attribute
 
 
 # Aliases for items that are in typing in all supported versions.
