summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLink Mauve <linkmauve@linkmauve.fr>2021-02-11 20:21:37 +0100
committerLink Mauve <linkmauve@linkmauve.fr>2021-02-11 20:21:37 +0100
commitbfbc433c8d0497b14b649a5fb1c3ee5789f9f63f (patch)
treec32bb88c35e06d78fb21389eca202c9ea0138984
parent7cde0db4aa990f5c45b080b57652fe48e750d604 (diff)
parentba7c7f4bb97a33c3af53ca5f2db05e032a682789 (diff)
downloadslixmpp-bfbc433c8d0497b14b649a5fb1c3ee5789f9f63f.tar.gz
slixmpp-bfbc433c8d0497b14b649a5fb1c3ee5789f9f63f.tar.bz2
slixmpp-bfbc433c8d0497b14b649a5fb1c3ee5789f9f63f.tar.xz
slixmpp-bfbc433c8d0497b14b649a5fb1c3ee5789f9f63f.zip
Merge branch 'remove-old-python-workaround' into 'master'
slixmpp: remove asyncio hack for older python versions See merge request poezio/slixmpp!124
-rw-r--r--slixmpp/__init__.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/slixmpp/__init__.py b/slixmpp/__init__.py
index 94cd85cc..1badccb6 100644
--- a/slixmpp/__init__.py
+++ b/slixmpp/__init__.py
@@ -6,11 +6,6 @@
import logging
logging.getLogger(__name__).addHandler(logging.NullHandler())
-import asyncio
-# Required for python < 3.7 to use the old ssl implementation
-# and manage to do starttls as an unintended side effect
-asyncio.sslproto._is_sslproto_available = lambda: False
-
from slixmpp.stanza import Message, Presence, Iq
from slixmpp.jid import JID, InvalidJID
from slixmpp.xmlstream.stanzabase import ET, ElementBase, register_stanza_plugin