summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sleekxmpp/clientxmpp.py1
-rw-r--r--sleekxmpp/features/feature_mechanisms/mechanisms.py13
-rw-r--r--sleekxmpp/features/sasl_anonymous.py3
-rw-r--r--sleekxmpp/features/sasl_plain.py3
4 files changed, 9 insertions, 11 deletions
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py
index 7245053f..17a7582f 100644
--- a/sleekxmpp/clientxmpp.py
+++ b/sleekxmpp/clientxmpp.py
@@ -21,7 +21,6 @@ from sleekxmpp import stanza
from sleekxmpp import features
from sleekxmpp.basexmpp import BaseXMPP
from sleekxmpp.stanza import *
-from sleekxmpp.stanza.stream import tls, sasl
from sleekxmpp.xmlstream import XMLStream, RestartStream
from sleekxmpp.xmlstream import StanzaBase, ET, register_stanza_plugin
from sleekxmpp.xmlstream.matcher import *
diff --git a/sleekxmpp/features/feature_mechanisms/mechanisms.py b/sleekxmpp/features/feature_mechanisms/mechanisms.py
index 994c9bed..3cdb1b0a 100644
--- a/sleekxmpp/features/feature_mechanisms/mechanisms.py
+++ b/sleekxmpp/features/feature_mechanisms/mechanisms.py
@@ -8,11 +8,11 @@
import logging
-from sleekxmpp.stanza import stream
from sleekxmpp.xmlstream import RestartStream
from sleekxmpp.xmlstream.matcher import *
from sleekxmpp.xmlstream.handler import *
from sleekxmpp.plugins.base import base_plugin
+from sleekxmpp.features.feature_mechanisms import stanza
log = logging.getLogger(__name__)
@@ -24,23 +24,24 @@ class feature_mechanisms(base_plugin):
self.name = 'SASL Mechanisms'
self.rfc = '6120'
self.description = "SASL Stream Feature"
+ self.stanza = stanza
- self.xmpp.register_stanza(stream.sasl.Success)
- self.xmpp.register_stanza(stream.sasl.Failure)
- self.xmpp.register_stanza(stream.sasl.Auth)
+ self.xmpp.register_stanza(stanza.Success)
+ self.xmpp.register_stanza(stanza.Failure)
+ self.xmpp.register_stanza(stanza.Auth)
self._mechanism_handlers = {}
self._mechanism_priorities = []
self.xmpp.register_handler(
Callback('SASL Success',
- MatchXPath(stream.sasl.Success.tag_name()),
+ MatchXPath(stanza.Success.tag_name()),
self._handle_success,
instream=True,
once=True))
self.xmpp.register_handler(
Callback('SASL Failure',
- MatchXPath(stream.sasl.Failure.tag_name()),
+ MatchXPath(stanza.Failure.tag_name()),
self._handle_fail,
instream=True,
once=True))
diff --git a/sleekxmpp/features/sasl_anonymous.py b/sleekxmpp/features/sasl_anonymous.py
index 469d9d19..71a4b2e5 100644
--- a/sleekxmpp/features/sasl_anonymous.py
+++ b/sleekxmpp/features/sasl_anonymous.py
@@ -2,7 +2,6 @@ import base64
import sys
import logging
-from sleekxmpp.stanza.stream import sasl
from sleekxmpp.plugins.base import base_plugin
@@ -24,7 +23,7 @@ class sasl_anonymous(base_plugin):
if self.xmpp.boundjid.user:
return False
- resp = sasl.Auth(self.xmpp)
+ resp = self.xmpp['feature_sasl'].stanza.Auth(self.xmpp)
resp['mechanism'] = 'ANONYMOUS'
resp.send(now=True)
diff --git a/sleekxmpp/features/sasl_plain.py b/sleekxmpp/features/sasl_plain.py
index 36c7d9df..270d28fe 100644
--- a/sleekxmpp/features/sasl_plain.py
+++ b/sleekxmpp/features/sasl_plain.py
@@ -2,7 +2,6 @@ import base64
import sys
import logging
-from sleekxmpp.stanza.stream import sasl
from sleekxmpp.plugins.base import base_plugin
@@ -34,7 +33,7 @@ class sasl_plain(base_plugin):
auth = base64.b64encode(b'\x00' + user + \
b'\x00' + password).decode('utf-8')
- resp = sasl.Auth(self.xmpp)
+ resp = self.xmpp['feature_mechanisms'].stanza.Auth(self.xmpp)
resp['mechanism'] = 'PLAIN'
resp['value'] = auth
resp.send(now=True)