jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mypy-workaround' into 'master'

Browse Source 
Fix gitlab pipelines

See merge request poezio/slixmpp!217
This commit is contained in:
mathieui 2022-09-09 16:02:18 +00:00
commit 11e27d1d7d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slixmpp/plugins/xep_0444/stanza.py
View File

@ -6,9 +6,7 @@
from typing import Set, Iterable from typing import Set, Iterable
from slixmpp.xmlstream import ElementBase from slixmpp.xmlstream import ElementBase
try: try:
from emoji import UNICODE_EMOJI from emoji import EMOJI_DATA as UNICODE_EMOJI
if UNICODE_EMOJI.get('en'):
UNICODE_EMOJI = UNICODE_EMOJI['en']
except ImportError: except ImportError:
UNICODE_EMOJI = None UNICODE_EMOJI = None

4
slixmpp/xmlstream/xmlstream.py
View File

@ -574,7 +574,7 @@ class XMLStream(asyncio.BaseProtocol):
stream=self, stream=self,
top_level=True, top_level=True,
open_only=True)) open_only=True))
self.start_stream_handler(self.xml_root) self.start_stream_handler(self.xml_root) # type:ignore
self.xml_depth += 1 self.xml_depth += 1
if event == 'end': if event == 'end':
self.xml_depth -= 1 self.xml_depth -= 1
@ -1267,7 +1267,7 @@ class XMLStream(asyncio.BaseProtocol):
already_run_filters.add(filter) already_run_filters.add(filter)
if iscoroutinefunction(filter): if iscoroutinefunction(filter):
filter = cast(AsyncFilter, filter) filter = cast(AsyncFilter, filter)
task = asyncio.create_task(filter(data)) task = asyncio.create_task(filter(data)) # type:ignore
completed, pending = await wait( completed, pending = await wait(
{task}, {task},
timeout=1, timeout=1,