Merge pull request #1187 from davep/docstring-tidy

Author: davep

src/textual/binding.py

@@ -21,17 +21,17 @@ class NoBinding(Exception):
 @dataclass(frozen=True)
 class Binding:
     key: str
-    """Key to bind. This can also be a comma-separated list of keys to map multiple keys to a single action."""
+    """str: Key to bind. This can also be a comma-separated list of keys to map multiple keys to a single action."""
     action: str
-    """Action to bind to."""
+    """str: Action to bind to."""
     description: str
-    """Description of action."""
+    """str: Description of action."""
     show: bool = True
-    """Show the action in Footer, or False to hide."""
+    """bool: Show the action in Footer, or False to hide."""
     key_display: str | None = None
-    """How the key should be shown in footer."""
+    """str | None: How the key should be shown in footer."""
     universal: bool = False
-    """Allow forwarding from app to focused widget."""
+    """bool: Allow forwarding from app to focused widget."""
 
 
 @rich.repr.auto
@@ -107,6 +107,16 @@ def bind(
         key_display: str | None = None,
         universal: bool = False,
     ) -> None:
+        """Bind keys to an action.
+
+        Args:
+            keys (str): The keys to bind. Can be a comma-separated list of keys.
+            action (str): The action to bind the keys to.
+            description (str, optional): An optional description for the binding.
+            show (bool, optional): A flag to say if the binding should appear in the footer.
+            key_display (str | None, optional): Optional string to display in the footer for the key.
+            universal (bool, optional): Allow forwarding from the app to the focused widget.
+        """
         all_keys = [key.strip() for key in keys.split(",")]
         for key in all_keys:
             self.keys[key] = Binding(

src/textual/box_model.py

@@ -33,8 +33,8 @@ def get_box_model(
         viewport (Size): The viewport size.
         width_fraction (Fraction): A fraction used for 1 `fr` unit on the width dimension.
         height_fraction (Fraction):A fraction used for 1 `fr` unit on the height dimension.
-        get_auto_width (Callable): A callable which accepts container size and parent size and returns a width.
-        get_auto_height (Callable): A callable which accepts container size and parent size and returns a height.
+        get_content_width (Callable[[Size, Size], int]): A callable which accepts container size and parent size and returns a width.
+        get_content_height (Callable[[Size, Size, int], int]): A callable which accepts container size and parent size and returns a height.
 
     Returns:
         BoxModel: A tuple with the size of the content area and margin.