summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--slixmpp/plugins/xep_0444/stanza.py4
-rw-r--r--slixmpp/xmlstream/xmlstream.py4
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,