Fixed getAllAvatars, changeCount race condition and intern->internJID

[pymsnt] / src / tlib / xmlw.py

diff --git a/src/tlib/xmlw.py b/src/tlib/xmlw.py
index c6f615e03d873ab6a90a14e0cfe5f96d83f1206d..e1e7c430f4490b9bd87105b0fbeeb2584d13a0d7 100644 (file)
--- a/src/tlib/xmlw.py
+++ b/src/tlib/xmlw.py
@@ -71,10 +71,12 @@ except ImportError:
                if checkTwisted():
                        from twisted.xish.domish import SuxElementStream, Element
                        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.jabber import jid, component
+                       jid.intern = jid.internJID # This got renamed for some reason
                        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."