summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-03-12 00:32:39 -0700
committerLance Stout <lancestout@gmail.com>2012-03-12 19:32:20 -0700
commit87d6ade06d0c51245e2dc4292f5dfb802f98d453 (patch)
treeea1308e6209908bbd6f2efe88b1e5bd410a8a0b2 /sleekxmpp/plugins
parent4a009515c1675e8f1ce8003707e71d7377bc4192 (diff)
downloadslixmpp-87d6ade06d0c51245e2dc4292f5dfb802f98d453.tar.gz
slixmpp-87d6ade06d0c51245e2dc4292f5dfb802f98d453.tar.bz2
slixmpp-87d6ade06d0c51245e2dc4292f5dfb802f98d453.tar.xz
slixmpp-87d6ade06d0c51245e2dc4292f5dfb802f98d453.zip
Move XEP-0224 to new system.
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r--sleekxmpp/plugins/xep_0224/__init__.py11
-rw-r--r--sleekxmpp/plugins/xep_0224/attention.py16
2 files changed, 17 insertions, 10 deletions
diff --git a/sleekxmpp/plugins/xep_0224/__init__.py b/sleekxmpp/plugins/xep_0224/__init__.py
index 62f5bf82..1a9d2342 100644
--- a/sleekxmpp/plugins/xep_0224/__init__.py
+++ b/sleekxmpp/plugins/xep_0224/__init__.py
@@ -6,6 +6,15 @@
See the file LICENSE for copying permission.
"""
+from sleekxmpp.plugins.base import register_plugin
+
from sleekxmpp.plugins.xep_0224 import stanza
from sleekxmpp.plugins.xep_0224.stanza import Attention
-from sleekxmpp.plugins.xep_0224.attention import xep_0224
+from sleekxmpp.plugins.xep_0224.attention import XEP_0224
+
+
+register_plugin(XEP_0224)
+
+
+# Retain some backwards compatibility
+xep_0224 = XEP_0224
diff --git a/sleekxmpp/plugins/xep_0224/attention.py b/sleekxmpp/plugins/xep_0224/attention.py
index 4a3ff368..6eea5d9d 100644
--- a/sleekxmpp/plugins/xep_0224/attention.py
+++ b/sleekxmpp/plugins/xep_0224/attention.py
@@ -12,25 +12,26 @@ from sleekxmpp.stanza import Message
from sleekxmpp.xmlstream import register_stanza_plugin
from sleekxmpp.xmlstream.handler import Callback
from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.plugins.base import base_plugin
+from sleekxmpp.plugins import BasePlugin
from sleekxmpp.plugins.xep_0224 import stanza
log = logging.getLogger(__name__)
-class xep_0224(base_plugin):
+class XEP_0224(BasePlugin):
"""
XEP-0224: Attention
"""
+ name = 'xep_0224'
+ description = 'XEP-0224: Attention'
+ dependencies = set(['xep_0030'])
+ stanza = stanza
+
def plugin_init(self):
"""Start the XEP-0224 plugin."""
- self.xep = '0224'
- self.description = 'Attention'
- self.stanza = stanza
-
register_stanza_plugin(Message, stanza.Attention)
self.xmpp.register_handler(
@@ -38,9 +39,6 @@ class xep_0224(base_plugin):
StanzaPath('message/attention'),
self._handle_attention))
- def post_init(self):
- """Handle cross-plugin dependencies."""
- base_plugin.post_init(self)
self.xmpp['xep_0030'].add_feature(stanza.Attention.namespace)
def request_attention(self, to, mfrom=None, mbody=''):