diff options
| author | lovetox <philipp@hoerist.com> | 2022-08-16 21:58:52 +0300 |
|---|---|---|
| committer | lovetox <philipp@hoerist.com> | 2022-08-16 21:58:52 +0300 |
| commit | 3913515fa9f4e56fc9d0589842077089e06c20a2 (patch) | |
| tree | 418bd30c9da1c6fb160e198a73d2a31c029703a0 | |
| parent | 015b8548e8cf18ff51b57ad6c2d8cee3d3d20bfb (diff) | |
refactor: Simplify QuoteWidget to prevent import cycles
| -rw-r--r-- | gajim/gtk/conversation/message_widget.py | 2 | ||||
| -rw-r--r-- | gajim/gtk/conversation/quote_widget.py | 18 | ||||
| -rw-r--r-- | pyrightconfig.json | 1 |
3 files changed, 1 insertions, 20 deletions
diff --git a/gajim/gtk/conversation/message_widget.py b/gajim/gtk/conversation/message_widget.py index ba5da2cab..95a93ce8f 100644 --- a/gajim/gtk/conversation/message_widget.py +++ b/gajim/gtk/conversation/message_widget.py @@ -86,7 +86,7 @@ class MessageWidget(Gtk.Box): message_widget = MessageWidget(self._account, self._selectable) message_widget.add_content(block) widget = QuoteWidget(self._account) - widget.attach_message_widget(message_widget) + widget.add(message_widget) self.add(widget) continue diff --git a/gajim/gtk/conversation/quote_widget.py b/gajim/gtk/conversation/quote_widget.py index 0a3782043..26e7c80d2 100644 --- a/gajim/gtk/conversation/quote_widget.py +++ b/gajim/gtk/conversation/quote_widget.py @@ -14,13 +14,8 @@ from __future__ import annotations -import typing - from gi.repository import Gtk -if typing.TYPE_CHECKING: - from .message_widget import MessageWidget - class QuoteWidget(Gtk.Box): def __init__(self, account: str) -> None: @@ -32,16 +27,3 @@ class QuoteWidget(Gtk.Box): quote_bar.set_margin_end(6) quote_bar.get_style_context().add_class('conversation-quote-bar') self.add(quote_bar) - - self._account = account - - self._message_widget = None - - def attach_message_widget(self, message_widget: MessageWidget) -> None: - - # Purpose of this method is to prevent circular imports - if self._message_widget is not None: - raise ValueError( - 'QuoteWidget already has a MessageWidget attached') - self._message_widget = message_widget - self.add(message_widget) diff --git a/pyrightconfig.json b/pyrightconfig.json index 3b2fb60fb..cacddae48 100644 --- a/pyrightconfig.json +++ b/pyrightconfig.json @@ -2,7 +2,6 @@ "pythonPlatform": "All", "pythonVersion": "3.9", "typeCheckingMode": "strict", - "reportImportCycles": "none", "reportUnnecessaryTypeIgnoreComment": "error", "reportPropertyTypeMismatch": "error", "reportMissingModuleSource": "none", |