From 8d38fb511b80c6a8d88f6710283698fca7e05020 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Mon, 12 Mar 2012 19:41:49 -0700 Subject: Move feature_bind to new system. --- sleekxmpp/features/feature_bind/__init__.py | 11 ++++++++++- sleekxmpp/features/feature_bind/bind.py | 14 +++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) (limited to 'sleekxmpp/features/feature_bind') diff --git a/sleekxmpp/features/feature_bind/__init__.py b/sleekxmpp/features/feature_bind/__init__.py index aa854f87..9e0831dd 100644 --- a/sleekxmpp/features/feature_bind/__init__.py +++ b/sleekxmpp/features/feature_bind/__init__.py @@ -6,5 +6,14 @@ See the file LICENSE for copying permission. """ -from sleekxmpp.features.feature_bind.bind import feature_bind +from sleekxmpp.plugins.base import register_plugin + +from sleekxmpp.features.feature_bind.bind import FeatureBind from sleekxmpp.features.feature_bind.stanza import Bind + + +register_plugin(FeatureBind) + + +# Retain some backwards compatibility +feature_bind = FeatureBind diff --git a/sleekxmpp/features/feature_bind/bind.py b/sleekxmpp/features/feature_bind/bind.py index 7df8fee1..b828e26f 100644 --- a/sleekxmpp/features/feature_bind/bind.py +++ b/sleekxmpp/features/feature_bind/bind.py @@ -11,20 +11,20 @@ import logging from sleekxmpp.stanza import Iq, StreamFeatures from sleekxmpp.features.feature_bind import stanza from sleekxmpp.xmlstream import register_stanza_plugin -from sleekxmpp.plugins.base import base_plugin +from sleekxmpp.plugins import BasePlugin, register_plugin log = logging.getLogger(__name__) -class feature_bind(base_plugin): +class FeatureBind(BasePlugin): - def plugin_init(self): - self.name = 'Bind Resource' - self.rfc = '6120' - self.description = 'Resource Binding Stream Feature' - self.stanza = stanza + name = 'feature_bind' + description = 'RFC 6120: Stream Feature: Resource Binding' + dependencies = set() + stanza = stanza + def plugin_init(self): self.xmpp.register_feature('bind', self._handle_bind_resource, restart=False, -- cgit v1.2.3