Suppress SSL warning

[pymsnt] / src / tlib / xmlw.py

diff --git a/src/tlib/xmlw.py b/src/tlib/xmlw.py
index c6f615e03d873ab6a90a14e0cfe5f96d83f1206d..7341636f1c869dd3f3872f423a733dcc045cb80b 100644 (file)
--- a/src/tlib/xmlw.py
+++ b/src/tlib/xmlw.py
@@ -60,20 +60,29 @@ def parseFile(filename, beExtremelyLenient=False):
        return t.root
 
 
+import warnings, re
+# Suppress the annoying warning we get with Twisted 1.3 words being deprecated
+warnings.filters.append(("ignore", None, UserWarning, re.compile("twisted.words"), 21))
+# Suppress the OpenSSL UserWarning
+warnings.filters.append(("ignore", re.compile("SSL connection shutdown possibly unreliable, please upgrade to ver 0.XX"), UserWarning, re.compile("twisted.internet.tcp"), 216))
+
+
 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")
 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: