summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-03-12 20:04:11 -0700
committerLance Stout <lancestout@gmail.com>2012-03-12 20:04:11 -0700
commit7284ceb90ccc3f612b93fa5548ba22677f869bc7 (patch)
tree271bef12430b75d6bca84f47557055c97721b92d /sleekxmpp
parent24ec448b7f29b6eb66818715bdbd30e09fd0ed0b (diff)
downloadslixmpp-7284ceb90ccc3f612b93fa5548ba22677f869bc7.tar.gz
slixmpp-7284ceb90ccc3f612b93fa5548ba22677f869bc7.tar.bz2
slixmpp-7284ceb90ccc3f612b93fa5548ba22677f869bc7.tar.xz
slixmpp-7284ceb90ccc3f612b93fa5548ba22677f869bc7.zip
Move feature_rosterver to new system.
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/features/feature_rosterver/__init__.py11
-rw-r--r--sleekxmpp/features/feature_rosterver/rosterver.py14
2 files changed, 17 insertions, 8 deletions
diff --git a/sleekxmpp/features/feature_rosterver/__init__.py b/sleekxmpp/features/feature_rosterver/__init__.py
index c83dd01c..33bbf416 100644
--- a/sleekxmpp/features/feature_rosterver/__init__.py
+++ b/sleekxmpp/features/feature_rosterver/__init__.py
@@ -6,5 +6,14 @@
See the file LICENSE for copying permission.
"""
-from sleekxmpp.features.feature_rosterver.rosterver import feature_rosterver
+from sleekxmpp.plugins.base import register_plugin
+
+from sleekxmpp.features.feature_rosterver.rosterver import FeatureRosterVer
from sleekxmpp.features.feature_rosterver.stanza import RosterVer
+
+
+register_plugin(FeatureRosterVer)
+
+
+# Retain some backwards compatibility
+feature_rosterver = FeatureRosterVer
diff --git a/sleekxmpp/features/feature_rosterver/rosterver.py b/sleekxmpp/features/feature_rosterver/rosterver.py
index 059d20e1..9e0bb8e8 100644
--- a/sleekxmpp/features/feature_rosterver/rosterver.py
+++ b/sleekxmpp/features/feature_rosterver/rosterver.py
@@ -11,20 +11,20 @@ import logging
from sleekxmpp.stanza import Iq, StreamFeatures
from sleekxmpp.features.feature_rosterver import stanza
from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.base import base_plugin
+from sleekxmpp.plugins.base import BasePlugin
log = logging.getLogger(__name__)
-class feature_rosterver(base_plugin):
+class FeatureRosterVer(BasePlugin):
- def plugin_init(self):
- self.name = 'Roster Versioning'
- self.rfc = '6121'
- self.description = 'Roster Versioning'
- self.stanza = stanza
+ name = 'feature_rosterver'
+ description = 'RFC 6121: Stream Feature: Roster Versioning'
+ dependences = set()
+ stanza = stanza
+ def plugin_init(self):
self.xmpp.register_feature('rosterver',
self._handle_rosterver,
restart=False,