Words 0.3 support.

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

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

diff --git a/src/tlib/msn/msn.py b/src/tlib/msn/msn.py
index 9e558c9bbddb22e6d639587f6bf7256c60414b45..68d0f5f91e3f80156c332a1a87d1cccb6b2409c7 100644 (file)
--- a/src/tlib/msn/msn.py
+++ b/src/tlib/msn/msn.py
@@ -106,7 +106,6 @@ except ImportError:
        print "You must install pycrypto and pyopenssl."
        raise
 from twisted.python import failure, log
-from twisted.xish.domish import unescapeFromXml
 
 # Compat stuff
 from tlib import xmlw
@@ -1055,7 +1054,7 @@ class NotificationClient(MSNEventBase):
         p1 = lm.find("<psm>") + 5
         p2 = lm.find("</psm>")
         if p1 >= 0 and p2 >= 0:
-            personal = unescapeFromXml(message.message[p1:p2])
+            personal = xmlw.unescapeFromXml(message.message[p1:p2])
             msnContact.personal = personal
             self.contactPersonalChanged(message.userHandle, personal)
         else:

diff --git a/src/tlib/xmlw.py b/src/tlib/xmlw.py
index da71a8b2d32ea272dc99a563133ecb31a9d7d481..ea96e9b5c033476a820577596df5510ac8ea5f2b 100644 (file)
--- a/src/tlib/xmlw.py
+++ b/src/tlib/xmlw.py
@@ -66,7 +66,7 @@ warnings.filters.append(("ignore", None, UserWarning, re.compile("twisted.words.
 
 try:
        log.msg("Trying to import XML DOM")
-       from twisted.words.xish.domish import SuxElementStream, Element
+       from twisted.words.xish.domish import SuxElementStream, Element, unescapeFromXml
        from twisted.words.protocols.jabber import jid, component
        jid.intern = jid.internJID # This got renamed for some reason
        log.msg("Using Twisted >= 2.0, Words >= 0.3, Words DOM")
@@ -74,12 +74,12 @@ except ImportError:
        try:
                log.msg("Checking Twisted version...")
                if checkTwisted():
-                       from twisted.xish.domish import SuxElementStream, Element
+                       from twisted.xish.domish import SuxElementStream, Element, unescapeFromXml
                        from twisted.words.protocols.jabber import jid, component
                        jid.intern = jid.internJID # This got renamed for some reason
                        log.msg("Using Twisted >= 2.0, Words < 0.3, Twisted DOM")
                else:
-                       from tlib.domish import SuxElementStream, Element
+                       from tlib.domish import SuxElementStream, Element, unescapeFromXml
                        from tlib.jabber import jid, component
                        log.msg("Using Twisted < 2.0, Internal patched DOM")
        except ImportError: