From 62701bc56276a85ba4ad22ddbec8acc0112116f9 Mon Sep 17 00:00:00 2001 From: nicoco Date: Mon, 29 Aug 2022 00:12:40 +0200 Subject: [PATCH 1/2] xmlstream: ignore task type (mypy) This is not satisfying, but having gitlab pipelines running would be nice, wouldn't it? --- slixmpp/xmlstream/xmlstream.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slixmpp/xmlstream/xmlstream.py b/slixmpp/xmlstream/xmlstream.py index 18464ccd..19c4ddcc 100644 --- a/slixmpp/xmlstream/xmlstream.py +++ b/slixmpp/xmlstream/xmlstream.py @@ -574,7 +574,7 @@ class XMLStream(asyncio.BaseProtocol): stream=self, top_level=True, open_only=True)) - self.start_stream_handler(self.xml_root) + self.start_stream_handler(self.xml_root) # type:ignore self.xml_depth += 1 if event == 'end': self.xml_depth -= 1 @@ -1267,7 +1267,7 @@ class XMLStream(asyncio.BaseProtocol): already_run_filters.add(filter) if iscoroutinefunction(filter): filter = cast(AsyncFilter, filter) - task = asyncio.create_task(filter(data)) + task = asyncio.create_task(filter(data)) # type:ignore completed, pending = await wait( {task}, timeout=1, From fbdff30ddabefc6beff90205b870194f3158d3f5 Mon Sep 17 00:00:00 2001 From: nicoco Date: Mon, 29 Aug 2022 00:59:14 +0200 Subject: [PATCH 2/2] fix emoji==2.0.0 compatibility --- slixmpp/plugins/xep_0444/stanza.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/slixmpp/plugins/xep_0444/stanza.py b/slixmpp/plugins/xep_0444/stanza.py index 02684df1..c9ee07d7 100644 --- a/slixmpp/plugins/xep_0444/stanza.py +++ b/slixmpp/plugins/xep_0444/stanza.py @@ -6,9 +6,7 @@ from typing import Set, Iterable from slixmpp.xmlstream import ElementBase try: - from emoji import UNICODE_EMOJI - if UNICODE_EMOJI.get('en'): - UNICODE_EMOJI = UNICODE_EMOJI['en'] + from emoji import EMOJI_DATA as UNICODE_EMOJI except ImportError: UNICODE_EMOJI = None