Handle some errors better.

[pymsnt] / src / register.py

diff --git a/src/register.py b/src/register.py
index dffca0c7feb144836571ef4d4d8f00c5ae12fe08..cdac86845c5145219427f092f8c091754a758189 100644 (file)
--- a/src/register.py
+++ b/src/register.py
@@ -2,12 +2,7 @@
 # Licensed for distribution under the GPL version 2, check COPYING for details
 
 import utils
-if(utils.checkTwisted()):
-       from twisted.xish.domish import Element
-       from twisted.words.protocols.jabber import jid
-else:
-       from tlib.domish import Element
-       from tlib.jabber import jid
+from tlib.xmlw import Element, jid
 from debug import LogEvent, INFO, WARN, ERROR
 import disco
 import session
@@ -43,11 +38,11 @@ class RegisterManager:
                        (blah1, password, blah3) = self.getRegInfo(jabberID)
                
                reginfo = legacy.formRegEntry(username, password)
-               self.pytrans.xdb.set(jid.JID(jabberID).userhost(), legacy.namespace, reginfo)
+               self.pytrans.xdb.set(jid.intern(jabberID).userhost(), legacy.namespace, reginfo)
        
        def getRegInfo(self, jabberID):
                LogEvent(INFO)
-               result = self.pytrans.xdb.request(jid.JID(jabberID).userhost(), legacy.namespace)
+               result = self.pytrans.xdb.request(jid.intern(jabberID).userhost(), legacy.namespace)
                if(result == None):
                        LogEvent(INFO, "", "Not registered!")
                        return None
@@ -103,7 +98,7 @@ class RegisterManager:
                ID = incoming.getAttribute("id")
                fro = incoming.getAttribute("from")
                LogEvent(INFO)
-               source = jid.JID(fro).userhost()
+               source = jid.intern(fro).userhost()
                ulang = utils.getLang(incoming)
                username = None
                password = None