From 23cc62fe7cf10afed331d9130dad46f14fc6aa42 Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Sun, 11 Mar 2012 22:40:38 -0700
Subject: Move XEP-0078 to new system.

---
 sleekxmpp/plugins/xep_0078/__init__.py   | 10 +++++++++-
 sleekxmpp/plugins/xep_0078/legacyauth.py | 14 +++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'sleekxmpp/plugins')

diff --git a/sleekxmpp/plugins/xep_0078/__init__.py b/sleekxmpp/plugins/xep_0078/__init__.py
index 5a2bda77..2ea72ffb 100644
--- a/sleekxmpp/plugins/xep_0078/__init__.py
+++ b/sleekxmpp/plugins/xep_0078/__init__.py
@@ -6,7 +6,15 @@
     See the file LICENSE for copying permission.
 """
 
+from sleekxmpp.plugins.base import register_plugin
+
 from sleekxmpp.plugins.xep_0078 import stanza
 from sleekxmpp.plugins.xep_0078.stanza import IqAuth, AuthFeature
-from sleekxmpp.plugins.xep_0078.legacyauth import xep_0078
+from sleekxmpp.plugins.xep_0078.legacyauth import XEP_0078
+
+
+register_plugin(XEP_0078)
+
 
+# Retain some backwards compatibility
+xep_0078 = XEP_0078
diff --git a/sleekxmpp/plugins/xep_0078/legacyauth.py b/sleekxmpp/plugins/xep_0078/legacyauth.py
index d1495c78..95587843 100644
--- a/sleekxmpp/plugins/xep_0078/legacyauth.py
+++ b/sleekxmpp/plugins/xep_0078/legacyauth.py
@@ -14,14 +14,14 @@ import sys
 from sleekxmpp.exceptions import IqError, IqTimeout
 from sleekxmpp.stanza import Iq, StreamFeatures
 from sleekxmpp.xmlstream import ElementBase, ET, register_stanza_plugin
-from sleekxmpp.plugins.base import base_plugin
+from sleekxmpp.plugins import BasePlugin
 from sleekxmpp.plugins.xep_0078 import stanza
 
 
 log = logging.getLogger(__name__)
 
 
-class xep_0078(base_plugin):
+class XEP_0078(BasePlugin):
 
     """
     XEP-0078 NON-SASL Authentication
@@ -30,11 +30,12 @@ class xep_0078(base_plugin):
     unless you are forced to use an old XMPP server implementation.
     """
 
-    def plugin_init(self):
-        self.xep = "0078"
-        self.description = "Non-SASL Authentication"
-        self.stanza = stanza
+    name = 'xep_0078'
+    description = 'XEP-0078: Non-SASL Authentication'
+    dependencies = set()
+    stanza = stanza
 
+    def plugin_init(self):
         self.xmpp.register_feature('auth',
                 self._handle_auth,
                 restart=False,
@@ -43,7 +44,6 @@ class xep_0078(base_plugin):
         register_stanza_plugin(Iq, stanza.IqAuth)
         register_stanza_plugin(StreamFeatures, stanza.AuthFeature)
 
-
     def _handle_auth(self, features):
         # If we can or have already authenticated with SASL, do nothing.
         if 'mechanisms' in features['features']:
-- 
cgit v1.2.3