Merge branch 'main' into only-one-cmd

src/app_model/registries/_menus_reg.py

@@ -1,6 +1,17 @@
 from __future__ import annotations
 
-from typing import Callable, Dict, Final, Iterator, List, Optional, Sequence, Set, Tuple
+from typing import (
+    Any,
+    Callable,
+    Dict,
+    Final,
+    Iterator,
+    List,
+    Optional,
+    Sequence,
+    Set,
+    Tuple,
+)
 
 from psygnal import Signal
 
@@ -39,7 +50,11 @@ def append_menu_items(
             menu_list = self._menu_items.setdefault(menu_id, [])
             menu_list.append(item)
             changed_ids.add(menu_id)
-            disposers.append(lambda: menu_list.remove(item))
+
+            def _remove(lst: list = menu_list, _item: Any = item) -> None:
+                lst.remove(_item)
+
+            disposers.append(_remove)
 
         def _dispose() -> None:
             for disposer in disposers:

src/app_model/registries/_register.py

@@ -223,11 +223,13 @@ def _register_action_obj(
     # keybinding
     for keyb in action.keybindings or ():
         if action.enablement is not None:
-            _keyb = keyb.copy()
-            if _keyb.when is None:
-                _keyb.when = action.enablement
-            else:
-                _keyb.when = action.enablement | _keyb.when
+            kwargs = keyb.dict()
+            kwargs["when"] = (
+                action.enablement
+                if keyb.when is None
+                else action.enablement | keyb.when
+            )
+            _keyb = type(keyb)(**kwargs)
         else:
             _keyb = keyb
         if _d := app.keybindings.register_keybinding_rule(action.id, _keyb):

src/app_model/types/_base.py

@@ -6,3 +6,4 @@ class _StrictModel(BaseModel):
 
     class Config:
         extra = Extra.forbid
+        frozen = True