Merge pull request #1765 from Textualize/typing-10-feb

typing fixes

src/textual/css/parse.py

@@ -183,7 +183,7 @@ def parse_declarations(css: str, path: str) -> Styles:
     styles_builder = StylesBuilder()
 
     declaration: Declaration | None = None
-    errors: list[tuple[Token, str]] = []
+    errors: list[tuple[Token, str | HelpText]] = []
 
     while True:
         token = next(tokens, None)

src/textual/css/query.py

@@ -255,7 +255,7 @@ class DOMQuery(Generic[QueryType]):
             # The IndexError was got, that's a good thing in this case. So
             # we return what we found.
             pass
-        return the_one
+        return cast("Widget", the_one)
 
     @overload
     def last(self) -> Widget:

src/textual/css/styles.py

@@ -474,7 +474,7 @@ class StylesBase(ABC):
 
     @classmethod
     @lru_cache(maxsize=1024)
-    def parse(cls, css: str, path: str, *, node: DOMNode = None) -> Styles:
+    def parse(cls, css: str, path: str, *, node: DOMNode | None = None) -> Styles:
         """Parse CSS and return a Styles object.
 
         Args:

src/textual/dom.py

@@ -111,7 +111,7 @@ class DOMNode(MessagePump):
     _css_type_names: ClassVar[frozenset[str]] = frozenset()
 
     # Generated list of bindings
-    _merged_bindings: ClassVar[Bindings] | None = None
+    _merged_bindings: ClassVar[Bindings | None] = None
 
     _reactives: ClassVar[dict[str, Reactive]]
 

src/textual/screen.py

@@ -231,7 +231,7 @@ class Screen(Widget):
         else:
             # Only move the focus if we are currently showing the focus
             if direction:
-                to_focus: Widget | None = None
+                to_focus = None
                 chain_length = len(focus_chain)
                 for step in range(1, len(focus_chain) + 1):
                     node = focus_chain[