diff options
| author | mathieui <mathieui@mathieui.net> | 2022-09-09 16:02:18 +0000 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2022-09-09 16:02:18 +0000 |
| commit | 11e27d1d7d1d15ff404ed9bff7b28c2d1f8ffd16 (patch) | |
| tree | f0efe2261312631c7554f460608911c7451d7723 | |
| parent | f5cb9fe66b010793e087c8b27176b1d227dd4ba2 (diff) | |
| parent | fbdff30ddabefc6beff90205b870194f3158d3f5 (diff) | |
| download | slixmpp-11e27d1d7d1d15ff404ed9bff7b28c2d1f8ffd16.tar.gz slixmpp-11e27d1d7d1d15ff404ed9bff7b28c2d1f8ffd16.tar.bz2 slixmpp-11e27d1d7d1d15ff404ed9bff7b28c2d1f8ffd16.tar.xz slixmpp-11e27d1d7d1d15ff404ed9bff7b28c2d1f8ffd16.zip | |
Merge branch 'mypy-workaround' into 'master'
Fix gitlab pipelines
See merge request poezio/slixmpp!217
| -rw-r--r-- | slixmpp/plugins/xep_0444/stanza.py | 4 | ||||
| -rw-r--r-- | slixmpp/xmlstream/xmlstream.py | 4 |
2 files changed, 3 insertions, 5 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 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, |