From d15a854d528ea614fe1ec509b1a3e9dc22ec775d Mon Sep 17 00:00:00 2001 From: Will McGugan Date: Fri, 10 Feb 2023 09:59:17 +0000 Subject: [PATCH] typing fixes --- src/textual/css/parse.py | 2 +- src/textual/css/query.py | 2 +- src/textual/css/styles.py | 2 +- src/textual/dom.py | 2 +- src/textual/screen.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/textual/css/parse.py b/src/textual/css/parse.py index a9a8fd668..d1c5f709b 100644 --- a/src/textual/css/parse.py +++ b/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) diff --git a/src/textual/css/query.py b/src/textual/css/query.py index 7e5c149cc..428209fa4 100644 --- a/src/textual/css/query.py +++ b/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: diff --git a/src/textual/css/styles.py b/src/textual/css/styles.py index 644d94f74..b23bad368 100644 --- a/src/textual/css/styles.py +++ b/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: diff --git a/src/textual/dom.py b/src/textual/dom.py index 0497f623f..1ed204aa9 100644 --- a/src/textual/dom.py +++ b/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]] diff --git a/src/textual/screen.py b/src/textual/screen.py index 86ea1c4b9..5a0ccb7b4 100644 --- a/src/textual/screen.py +++ b/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[