summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-03-11 23:47:41 -0700
committerLance Stout <lancestout@gmail.com>2012-03-12 19:32:19 -0700
commit17279de4a366bdec55382ff20fdee825f003bb4d (patch)
treefb930fbb4b57bc6bfdb4760454b3ab5fcd048c30
parent34a7a62c35ab9ef0c3ac7b3c86455402ac3386ab (diff)
downloadslixmpp-17279de4a366bdec55382ff20fdee825f003bb4d.tar.gz
slixmpp-17279de4a366bdec55382ff20fdee825f003bb4d.tar.bz2
slixmpp-17279de4a366bdec55382ff20fdee825f003bb4d.tar.xz
slixmpp-17279de4a366bdec55382ff20fdee825f003bb4d.zip
Move XEP-0184 to new system.
-rw-r--r--sleekxmpp/plugins/xep_0184/__init__.py11
-rw-r--r--sleekxmpp/plugins/xep_0184/reciept.py16
2 files changed, 18 insertions, 9 deletions
diff --git a/sleekxmpp/plugins/xep_0184/__init__.py b/sleekxmpp/plugins/xep_0184/__init__.py
index e401eb76..01de14aa 100644
--- a/sleekxmpp/plugins/xep_0184/__init__.py
+++ b/sleekxmpp/plugins/xep_0184/__init__.py
@@ -6,5 +6,14 @@
See the file LICENSE for copying permission.
"""
+from sleekxmpp.plugins.base import register_plugin
+
from sleekxmpp.plugins.xep_0184.stanza import Request, Received
-from sleekxmpp.plugins.xep_0184.reciept import xep_0184
+from sleekxmpp.plugins.xep_0184.reciept import XEP_0184
+
+
+register_plugin(XEP_0184)
+
+
+# Retain some backwards compatibility
+xep_0184 = XEP_0184
diff --git a/sleekxmpp/plugins/xep_0184/reciept.py b/sleekxmpp/plugins/xep_0184/reciept.py
index 0cbc833d..fd3f24e7 100644
--- a/sleekxmpp/plugins/xep_0184/reciept.py
+++ b/sleekxmpp/plugins/xep_0184/reciept.py
@@ -8,25 +8,25 @@
from sleekxmpp.stanza import Message
from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.base import base_plugin
+from sleekxmpp.plugins import BasePlugin
from sleekxmpp.plugins.xep_0184 import stanza, Request, Received
-class xep_0184(base_plugin):
+class XEP_0184(BasePlugin):
+
"""
XEP-0184: Message Delivery Receipts
"""
- def plugin_init(self):
- self.xep = '0184'
- self.description = 'Message Delivery Receipts'
- self.stanza = stanza
+ name = 'xep_0184'
+ description = 'XEP-0184: Message Delivery Receipts'
+ dependencies = set(['xep_0030'])
+ stanza = stanza
+ def plugin_init(self):
register_stanza_plugin(Message, Request)
register_stanza_plugin(Message, Received)
- def post_init(self):
- base_plugin.post_init(self)
self.xmpp.plugin['xep_0030'].add_feature('urn:xmpp:receipts')
def ack(self, message):