Small fixes to xmlw.

git-svn-id: http://delx.cjb.net/svn/pymsnt/trunk@53 55fbd22a-6204-0410-b2f0-b6c764c7e90a

committer: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>

diff --git a/src/main.py b/src/main.py
index f23a19f61aa08c2389c83af657e02b7271c44334..0799098d5779c0a4f341c26a97d476b55befa56d 100644 (file)
--- a/src/main.py
+++ b/src/main.py
@@ -17,7 +17,7 @@ xmlconfig.reloadConfig()
 
 from twisted.internet import reactor, task
 from twisted.internet.defer import Deferred
-from tlib.xmlw import Element
+from tlib.xmlw import Element, jid, component
 from debug import LogEvent, INFO, WARN, ERROR
 
 import xdb

diff --git a/src/tlib/xmlw.py b/src/tlib/xmlw.py
index de1d060147042e0f43319f03d75efb9bc9d27260..c6f615e03d873ab6a90a14e0cfe5f96d83f1206d 100644 (file)
--- a/src/tlib/xmlw.py
+++ b/src/tlib/xmlw.py
@@ -63,15 +63,18 @@ def parseFile(filename, beExtremelyLenient=False):
 try:
        log.msg("Trying to import XML DOM")
        from twisted.words.xish.domish import SuxElementStream, Element
+       from twisted.words.protocols.jabber import jid, component
        log.msg("Using Twisted >= 2.0, Words >= 0.3, Words DOM")
 except ImportError:
        try:
                log.msg("Checking Twisted version...")
                if checkTwisted():
                        from twisted.xish.domish import SuxElementStream, Element
+                       from twisted.words.protocols.jabber import jid, component
                        log.msg("Using Twisted >= 2.0, Words < 0.3, Twisted DOM")
                else:
                        from tlib.domish import SuxElementStream, Element
+                       from tlib.jabber import jid, component
                        log.msg("Using Twisted < 2.0, Internal patched DOM")
        except ImportError:
                print "Could not find the XML DOM. If you're using Twisted 2.x make sure you have twisted.words installed."

diff --git a/src/xdb.py b/src/xdb.py
index 83d4f748a0ec0d24b2225c0a19487dd2ebe34c3f..664848f548163420dac55bc33effec1b8f2756ce 100644 (file)
--- a/src/xdb.py
+++ b/src/xdb.py
@@ -2,10 +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
-else:
-       from tlib.domish import Element
+from tlib.xmlw import Element
 from debug import LogEvent, INFO, WARN
 import os
 import os.path