From 17279de4a366bdec55382ff20fdee825f003bb4d Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Sun, 11 Mar 2012 23:47:41 -0700 Subject: [PATCH] Move XEP-0184 to new system. --- sleekxmpp/plugins/xep_0184/__init__.py | 11 ++++++++++- sleekxmpp/plugins/xep_0184/reciept.py | 16 ++++++++-------- 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):