Daniel Brötzmann pushed to branch mainwindow at gajim / gajim
Commits: 530a4902 by wurstsalat at 2021-11-24T21:51:41+01:00 CodeWidget: Fix missing imports - - - - - c15e3e8a by wurstsalat at 2021-11-24T22:11:02+01:00 Types: Prevent circular imports - - - - - bbf649fc by wurstsalat at 2021-11-24T22:11:02+01:00 MessageRow: Fix unknown type - - - - - 813ba5a8 by wurstsalat at 2021-11-24T22:14:40+01:00 QuoteWidget: Remove typing - - - - - 4 changed files: - gajim/gtk/conversation/code_widget.py - gajim/gtk/conversation/quote_widget.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/types.py Changes: ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -12,11 +12,13 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Tuple +from typing import Optional + import logging import gi gi.require_version('GtkSource', '4') -from gi.repository import GObject from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GtkSource @@ -76,7 +78,7 @@ def add_content(self, block): self._textview.print_code(code) @staticmethod - def _prepare_code(text: str) -> Tuple[str, str]: + def _prepare_code(text: str) -> Tuple[str, Optional[str]]: code_start = text.partition('\n')[0] lang = None if len(code_start) > 3: ===================================== gajim/gtk/conversation/quote_widget.py ===================================== @@ -12,12 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import Optional - from gi.repository import Gtk -from .message_widget import MessageWidget - class QuoteWidget(Gtk.Box): def __init__(self, account: str) -> None: @@ -32,9 +28,9 @@ def __init__(self, account: str) -> None: self._account = account - self._message_widget: Optional[MessageWidget] = None + self._message_widget = None - def attach_message_widget(self, message_widget: MessageWidget) -> None: + def attach_message_widget(self, message_widget): # Purpose of this method is to prevent circular imports if self._message_widget is not None: raise ValueError( ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -247,10 +247,10 @@ def _on_avatar_clicked(self, _widget, event, name): def _on_realize(event_box): event_box.get_window().set_cursor(get_cursor('pointer')) - def is_same_sender(self, message: MessageRow) -> bool: + def is_same_sender(self, message): return message.name == self.name - def is_same_encryption(self, message: MessageRow) -> bool: + def is_same_encryption(self, message): message_details = self._get_encryption_details(message.additional_data) own_details = self._get_encryption_details(self.additional_data) if message_details is None and own_details is None: ===================================== gajim/gtk/types.py ===================================== @@ -15,41 +15,43 @@ # Types for typechecking from typing import Union +from typing import TYPE_CHECKING -from .controls.chat import ChatControl -from .controls.private import PrivateChatControl -from .controls.groupchat import GroupchatControl -from .conversation.rows.call import CallRow -from .conversation.rows.command_output import CommandOutputRow -from .conversation.rows.date import DateRow -from .conversation.rows.file_transfer_jingle import FileTransferJingleRow -from .conversation.rows.file_transfer import FileTransferRow -from .conversation.rows.info import InfoMessage -from .conversation.rows.message import MessageRow -from .conversation.rows.muc_join_left import MUCJoinLeft -from .conversation.rows.muc_subject import MUCSubject -from .conversation.rows.muc_user_status import MUCUserStatus -from .conversation.rows.read_marker import ReadMarkerRow -from .conversation.rows.scroll_hint import ScrollHintRow +if TYPE_CHECKING: + from .controls.chat import ChatControl + from .controls.private import PrivateChatControl + from .controls.groupchat import GroupchatControl + from .conversation.rows.call import CallRow + from .conversation.rows.command_output import CommandOutputRow + from .conversation.rows.date import DateRow + from .conversation.rows.file_transfer_jingle import FileTransferJingleRow + from .conversation.rows.file_transfer import FileTransferRow + from .conversation.rows.info import InfoMessage + from .conversation.rows.message import MessageRow + from .conversation.rows.muc_join_left import MUCJoinLeft + from .conversation.rows.muc_subject import MUCSubject + from .conversation.rows.muc_user_status import MUCUserStatus + from .conversation.rows.read_marker import ReadMarkerRow + from .conversation.rows.scroll_hint import ScrollHintRow ConversationRowType = Union[ - CallRow, - CommandOutputRow, - DateRow, - FileTransferJingleRow, - FileTransferRow, - InfoMessage, - MessageRow, - MUCJoinLeft, - MUCSubject, - MUCUserStatus, - ReadMarkerRow, - ScrollHintRow + 'CallRow', + 'CommandOutputRow', + 'DateRow', + 'FileTransferJingleRow', + 'FileTransferRow', + 'InfoMessage', + 'MessageRow', + 'MUCJoinLeft', + 'MUCSubject', + 'MUCUserStatus', + 'ReadMarkerRow', + 'ScrollHintRow' ] ControlType = Union [ - ChatControl, - PrivateChatControl, - GroupchatControl + 'ChatControl', + 'PrivateChatControl', + 'GroupchatControl' ] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1cd0e8ab9e064928f151efca79651a5251e7a3fe...813ba5a8bdc17ba934961574c9a93e8f49dc9b8e -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1cd0e8ab9e064928f151efca79651a5251e7a3fe...813ba5a8bdc17ba934961574c9a93e8f49dc9b8e You're receiving this email because of your account on dev.gajim.org.
_______________________________________________ Commits mailing list [email protected] https://lists.gajim.org/cgi-bin/listinfo/commits
