Move feature_mechanisms to new system.
This commit is contained in:
parent
8d38fb511b
commit
9596616b42
2 changed files with 17 additions and 8 deletions
|
@ -6,8 +6,17 @@
|
||||||
See the file LICENSE for copying permission.
|
See the file LICENSE for copying permission.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from sleekxmpp.features.feature_mechanisms.mechanisms import feature_mechanisms
|
from sleekxmpp.plugins.base import register_plugin
|
||||||
|
|
||||||
|
from sleekxmpp.features.feature_mechanisms.mechanisms import FeatureMechanisms
|
||||||
from sleekxmpp.features.feature_mechanisms.stanza import Mechanisms
|
from sleekxmpp.features.feature_mechanisms.stanza import Mechanisms
|
||||||
from sleekxmpp.features.feature_mechanisms.stanza import Auth
|
from sleekxmpp.features.feature_mechanisms.stanza import Auth
|
||||||
from sleekxmpp.features.feature_mechanisms.stanza import Success
|
from sleekxmpp.features.feature_mechanisms.stanza import Success
|
||||||
from sleekxmpp.features.feature_mechanisms.stanza import Failure
|
from sleekxmpp.features.feature_mechanisms.stanza import Failure
|
||||||
|
|
||||||
|
|
||||||
|
register_plugin(FeatureMechanisms)
|
||||||
|
|
||||||
|
|
||||||
|
# Retain some backwards compatibility
|
||||||
|
feature_mechanisms = FeatureMechanisms
|
||||||
|
|
|
@ -13,23 +13,23 @@ from sleekxmpp.thirdparty.suelta.exceptions import SASLCancelled, SASLError
|
||||||
|
|
||||||
from sleekxmpp.stanza import StreamFeatures
|
from sleekxmpp.stanza import StreamFeatures
|
||||||
from sleekxmpp.xmlstream import RestartStream, register_stanza_plugin
|
from sleekxmpp.xmlstream import RestartStream, register_stanza_plugin
|
||||||
|
from sleekxmpp.plugins import BasePlugin
|
||||||
from sleekxmpp.xmlstream.matcher import MatchXPath
|
from sleekxmpp.xmlstream.matcher import MatchXPath
|
||||||
from sleekxmpp.xmlstream.handler import Callback
|
from sleekxmpp.xmlstream.handler import Callback
|
||||||
from sleekxmpp.plugins.base import base_plugin
|
|
||||||
from sleekxmpp.features.feature_mechanisms import stanza
|
from sleekxmpp.features.feature_mechanisms import stanza
|
||||||
|
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class feature_mechanisms(base_plugin):
|
class FeatureMechanisms(BasePlugin):
|
||||||
|
|
||||||
|
name = 'feature_mechanisms'
|
||||||
|
description = 'RFC 6120: Stream Feature: SASL'
|
||||||
|
dependencies = set()
|
||||||
|
stanza = stanza
|
||||||
|
|
||||||
def plugin_init(self):
|
def plugin_init(self):
|
||||||
self.name = 'SASL Mechanisms'
|
|
||||||
self.rfc = '6120'
|
|
||||||
self.description = "SASL Stream Feature"
|
|
||||||
self.stanza = stanza
|
|
||||||
|
|
||||||
self.use_mech = self.config.get('use_mech', None)
|
self.use_mech = self.config.get('use_mech', None)
|
||||||
|
|
||||||
def tls_active():
|
def tls_active():
|
||||||
|
|
Loading…
Reference in a new issue