diff options
| author | Maxime Buquet <pep@bouah.net> | 2020-05-24 14:54:18 +0200 |
|---|---|---|
| committer | Maxime Buquet <pep@bouah.net> | 2020-05-24 14:54:18 +0200 |
| commit | 95d4de917ddbd0f09c612bb762963cd9279006e6 (patch) | |
| tree | 96d2b01d751423c76b93a32e92b0c7b581d7c377 | |
| parent | e48780ddf0a6a80e0c36eaa8f8165c8d14ad63b1 (diff) | |
| parent | 3132b2495344b178e47cceda29e39c6c0a4b4e0e (diff) | |
| download | poezio-95d4de917ddbd0f09c612bb762963cd9279006e6.tar.gz poezio-95d4de917ddbd0f09c612bb762963cd9279006e6.tar.bz2 poezio-95d4de917ddbd0f09c612bb762963cd9279006e6.tar.xz poezio-95d4de917ddbd0f09c612bb762963cd9279006e6.zip | |
Merge branch 'fix-message-basetabs' into 'master'
Fix a type collision between Messages
See merge request poezio/poezio!107
| -rw-r--r-- | poezio/tabs/basetabs.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/poezio/tabs/basetabs.py b/poezio/tabs/basetabs.py index a42ee41b..a0adb6da 100644 --- a/poezio/tabs/basetabs.py +++ b/poezio/tabs/basetabs.py @@ -48,7 +48,7 @@ from poezio.ui.funcs import truncate_nick from poezio.ui.consts import LONG_FORMAT_LENGTH from poezio.ui.types import BaseMessage, InfoMessage -from slixmpp import JID, InvalidJID, Message +from slixmpp import JID, InvalidJID, Message as SMessage if TYPE_CHECKING: from _curses import _CursesWindow # pylint: disable=E0611 @@ -638,7 +638,7 @@ class ChatTab(Tab): if message: message.send() - def generate_xhtml_message(self, arg: str) -> Message: + def generate_xhtml_message(self, arg: str) -> SMessage: if not arg: return try: |