From c8a5e1b8322bb7250ede540d7b6d25eefa72cef1 Mon Sep 17 00:00:00 2001 From: Cameron Clough Date: Fri, 25 Apr 2025 22:48:07 +0100 Subject: [PATCH] test without typing --- system/ui/lib/window.py | 15 +++------------ system/ui/spinner.py | 2 +- system/ui/text.py | 2 +- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/system/ui/lib/window.py b/system/ui/lib/window.py index 81e6455abb..4907b85d79 100644 --- a/system/ui/lib/window.py +++ b/system/ui/lib/window.py @@ -1,23 +1,14 @@ import threading import time import os -from typing import Generic, Protocol, TypeVar from openpilot.system.ui.lib.application import gui_app -class RendererProtocol(Protocol): - def render(self): - ... - - -R = TypeVar("R", bound=RendererProtocol) - - -class BaseWindow(Generic[R]): +class BaseWindow: def __init__(self, title: str): self._title = title - self._renderer: R | None = None + self._renderer = None self._stop_event = threading.Event() self._thread = threading.Thread(target=self._run) self._thread.start() @@ -26,7 +17,7 @@ class BaseWindow(Generic[R]): while self._renderer is None and self._thread.is_alive(): time.sleep(0.01) - def _create_renderer(self) -> R: + def _create_renderer(self): raise NotImplementedError("Subclasses of BaseWindow must implement _create_renderer()") def _run(self): diff --git a/system/ui/spinner.py b/system/ui/spinner.py index dffe89935f..5dfd0a4fe8 100755 --- a/system/ui/spinner.py +++ b/system/ui/spinner.py @@ -86,7 +86,7 @@ class SpinnerRenderer: FONT_SIZE, 0.0, rl.WHITE) -class Spinner(BaseWindow[SpinnerRenderer]): +class Spinner(BaseWindow): def __init__(self): super().__init__("Spinner") diff --git a/system/ui/text.py b/system/ui/text.py index 33e8167c64..56f642dfca 100755 --- a/system/ui/text.py +++ b/system/ui/text.py @@ -73,7 +73,7 @@ class TextWindowRenderer: return ret -class TextWindow(BaseWindow[TextWindowRenderer]): +class TextWindow(BaseWindow): def __init__(self, text: str): self._text = text super().__init__("Text")