Merge "Add pep 584 to python immutabledict fallback" into main

2 files changed, 18 insertions, 3 deletions

diff --git a/lib/sqlalchemy/cyextension/immutabledict.pyx b/lib/sqlalchemy/cyextension/immutabledict.pyx
index 6ab255311..100287b38 100644
--- a/lib/sqlalchemy/cyextension/immutabledict.pyx
+++ b/lib/sqlalchemy/cyextension/immutabledict.pyx
@@ -32,6 +32,7 @@ class ImmutableDictBase(dict):
     __delitem__ = __setitem__ = __setattr__ = _immutable
     clear = pop = popitem = setdefault = update = _immutable
 
+
 cdef class immutabledict(dict):
     def __repr__(self):
         return f"immutabledict({dict.__repr__(self)})"
@@ -118,7 +119,9 @@ cdef class immutabledict(dict):
         _immutable_fn(self)
 
     def __or__(self, other):
-        return immutabledict(super().__or__(other))
+        return immutabledict(dict.__or__(self, other))
 
     def __ror__(self, other):
-        return immutabledict(super().__ror__(other))
+        # NOTE: this is used only in cython 3.x;
+        # version 0.x will call __or__ with args inversed
+        return immutabledict(dict.__ror__(self, other))
diff --git a/lib/sqlalchemy/util/_py_collections.py b/lib/sqlalchemy/util/_py_collections.py
index 488229abb..cd46893a4 100644
--- a/lib/sqlalchemy/util/_py_collections.py
+++ b/lib/sqlalchemy/util/_py_collections.py
@@ -27,6 +27,7 @@ from typing import TypeVar
 from typing import Union
 
 _T = TypeVar("_T", bound=Any)
+_S = TypeVar("_S", bound=Any)
 _KT = TypeVar("_KT", bound=Any)
 _VT = TypeVar("_VT", bound=Any)
 
@@ -129,8 +130,19 @@ class immutabledict(ImmutableDictBase[_KT, _VT]):
     def __repr__(self) -> str:
         return "immutabledict(%s)" % dict.__repr__(self)
 
+    # PEP 584
+    def __ior__(self, __value: Any) -> NoReturn:  # type: ignore
+        self._readonly()
 
-_S = TypeVar("_S", bound=Any)
+    def __or__(  # type: ignore[override]
+        self, __value: Mapping[_KT, _VT]
+    ) -> immutabledict[_KT, _VT]:
+        return immutabledict(super().__or__(__value))
+
+    def __ror__(  # type: ignore[override]
+        self, __value: Mapping[_KT, _VT]
+    ) -> immutabledict[_KT, _VT]:
+        return immutabledict(super().__ror__(__value))
 
 
 class OrderedSet(Set[_T]):