simplify

Author: willmcgugan

src/textual/_slug.py

@@ -128,13 +128,9 @@ def slug_for_tcss_id(text: str) -> str:
     Returns:
         A slugified version of text suitable for use as a TCSS id.
     """
-
+    is_valid = VALID_ID_CHARACTERS.__contains__
     slug = "".join(
-        (
-            character
-            if character in VALID_ID_CHARACTERS
-            else ord(character).__format__("x")
-        )
+        (character if is_valid(character) else "{:x}".format(ord(character)))
         for character in text.casefold().replace(" ", "-")
     )
     if not slug:

src/textual/content.py

@@ -1231,6 +1231,7 @@ def render_segments(
         return segments
 
     def __rich__(self):
+        """Allow Content to be rendered with rich.print."""
         from rich.segment import Segments
 
         return Segments(self.render_segments(Style(), "\n"))

src/textual/getters.py

@@ -5,37 +5,12 @@
 
 from __future__ import annotations
 
-from typing import Generic, TypeVar, overload
+from typing import Generic, overload
 
 from textual.css.query import NoMatches, QueryType, WrongType
 from textual.dom import DOMNode
 from textual.widget import Widget
 
-AppType = TypeVar("AppType", bound="App")
-
-
-class app(Generic[AppType]):
-    """A typed getter for the app.
-
-    Example:
-        ```python
-        class MyWidget(Widget):
-            app = getters.app(MyApp)
-        ```
-
-
-    Args:
-        Generic (_type_): _description_
-    """
-
-    def __init__(self, app_type: type[AppType]) -> None:
-        self._app_type = app_type
-
-    def __get__(self, obj: DOMNode, obj_type: type[DOMNode]) -> AppType:
-        app = obj.app
-        assert isinstance(app, self._app_type)
-        return app
-
 
 class query_one(Generic[QueryType]):
     """Create a query one property.
@@ -79,23 +54,17 @@ def __init__(self, selector: str) -> None:
         Args:
             selector: A TCSS selector, e.g. "#mywidget"
         """
-        self.selector = selector
-        self.expect_type = Widget
 
     @overload
-    def __init__(self, selector: type[QueryType]) -> None:
-        self.selector = selector.__name__
-        self.expect_type = selector
+    def __init__(self, selector: type[QueryType]) -> None: ...
 
     @overload
-    def __init__(self, selector: str, expect_type: type[QueryType]) -> None:
-        self.selector = selector
-        self.expect_type = expect_type
+    def __init__(self, selector: str, expect_type: type[QueryType]) -> None: ...
 
     @overload
-    def __init__(self, selector: type[QueryType], expect_type: type[QueryType]) -> None:
-        self.selector = selector.__name__
-        self.expect_type = expect_type
+    def __init__(
+        self, selector: type[QueryType], expect_type: type[QueryType]
+    ) -> None: ...
 
     def __init__(
         self,
@@ -165,14 +134,10 @@ def on_mount(self) -> None:
     expect_type: type[Widget]
 
     @overload
-    def __init__(self, child_id: str) -> None:
-        self.child_id = child_id
-        self.expect_type = Widget
+    def __init__(self, child_id: str) -> None: ...
 
     @overload
-    def __init__(self, child_id: str, expect_type: type[QueryType]) -> None:
-        self.child_id = child_id
-        self.expect_type = expect_type
+    def __init__(self, child_id: str, expect_type: type[QueryType]) -> None: ...
 
     def __init__(
         self,