Changeset 8:af29fb9001cb for wokkel

Timestamp:

Jan 2, 2008, 1:01:10 PM (15 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Convert:

svn:b33ecbfc-034c-dc11-8662-000475d9059e/trunk@25

Message:

Add compatiblity module to have wokkel work with Twisted Words 0.5.

Author: ralphm
Fixes #5.

Location:

wokkel

Files:

• client.py (modified) (2 diffs)
• compat.py (added)
• subprotocols.py (modified) (2 diffs)
• test/test_client.py (added)
• test/test_compat.py (added)

wokkel/client.py

@@ +1 @@
+# -*- test-case-name: wokkel.test.test_client -*-
+#
 # Copyright (c) 2003-2007 Ralph Meijer
 # See LICENSE for details.
@@ -13 +15 @@
 from twisted.names.srvconnect import SRVConnector
 from twisted.words.protocols.jabber import client, sasl, xmlstream
-from twisted.words.xish.xmlstream import XmlStreamFactoryMixin
+
+try:
+    from twisted.words.xish.xmlstream import XmlStreamFactoryMixin
+except ImportError:
+    from wokkel.compat import XmlStreamFactoryMixin
+
 
 from wokkel.subprotocols import StreamManager

wokkel/subprotocols.py

@@ -15 +15 @@
 from twisted.words.xish import xpath
 from twisted.words.xish.domish import IElement
+
+try:
+    from twisted.words.protocols.jabber.xmlstream import toResponse
+except ImportError:
+    from wokkel.compat import toResponse
 
 from wokkel.iwokkel import IXMPPHandler, IXMPPHandlerCollection
@@ -242 +247 @@
         """
         def toResult(result, iq):
-            response = xmlstream.toResponse(iq, 'result')
+            response = toResponse(iq, 'result')
 
             if result: