summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-03-12 00:29:00 -0700
committerLance Stout <lancestout@gmail.com>2012-03-12 19:32:20 -0700
commit4a009515c1675e8f1ce8003707e71d7377bc4192 (patch)
treed6f23874399a371de6e2761ca763ead3515e942e /sleekxmpp/plugins
parent6497857495d185401426ba31441e3039fb316891 (diff)
downloadslixmpp-4a009515c1675e8f1ce8003707e71d7377bc4192.tar.gz
slixmpp-4a009515c1675e8f1ce8003707e71d7377bc4192.tar.bz2
slixmpp-4a009515c1675e8f1ce8003707e71d7377bc4192.tar.xz
slixmpp-4a009515c1675e8f1ce8003707e71d7377bc4192.zip
Move XEP-0203 to new system.
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r--sleekxmpp/plugins/xep_0203/__init__.py11
-rw-r--r--sleekxmpp/plugins/xep_0203/delay.py13
2 files changed, 17 insertions, 7 deletions
diff --git a/sleekxmpp/plugins/xep_0203/__init__.py b/sleekxmpp/plugins/xep_0203/__init__.py
index 445ccf37..d4d99a6c 100644
--- a/sleekxmpp/plugins/xep_0203/__init__.py
+++ b/sleekxmpp/plugins/xep_0203/__init__.py
@@ -6,7 +6,16 @@
See the file LICENSE for copying permission.
"""
+from sleekxmpp.plugins.base import register_plugin
+
from sleekxmpp.plugins.xep_0203 import stanza
from sleekxmpp.plugins.xep_0203.stanza import Delay
-from sleekxmpp.plugins.xep_0203.delay import xep_0203
+from sleekxmpp.plugins.xep_0203.delay import XEP_0203
+
+
+
+register_plugin(XEP_0203)
+
+# Retain some backwards compatibility
+xep_0203 = XEP_0203
diff --git a/sleekxmpp/plugins/xep_0203/delay.py b/sleekxmpp/plugins/xep_0203/delay.py
index 8ff14d18..31f31ce3 100644
--- a/sleekxmpp/plugins/xep_0203/delay.py
+++ b/sleekxmpp/plugins/xep_0203/delay.py
@@ -9,11 +9,11 @@
from sleekxmpp.stanza import Message, Presence
from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.base import base_plugin
+from sleekxmpp.plugins import BasePlugin
from sleekxmpp.plugins.xep_0203 import stanza
-class xep_0203(base_plugin):
+class XEP_0203(BasePlugin):
"""
XEP-0203: Delayed Delivery
@@ -26,11 +26,12 @@ class xep_0203(base_plugin):
Also see <http://www.xmpp.org/extensions/xep-0203.html>.
"""
+ name = 'xep_0203'
+ description = 'XEP-0203: Delayed Delivery'
+ dependencies = set()
+ stanza = stanza
+
def plugin_init(self):
"""Start the XEP-0203 plugin."""
- self.xep = '0203'
- self.description = 'Delayed Delivery'
- self.stanza = stanza
-
register_stanza_plugin(Message, stanza.Delay)
register_stanza_plugin(Presence, stanza.Delay)