source: ralphm-patches/compat-pre-twisted-8.0.0.patch @ 5:231bc3e8b810

diff -r 6fa0283e522b wokkel/compat.py
--- a/wokkel/compat.py  Wed Mar 25 18:14:08 2009 +0100
+++ b/wokkel/compat.py  Wed Mar 25 18:15:15 2009 +0100
@@ -7,40 +7,6 @@
 from twisted.words.protocols.jabber import xmlstream
 from twisted.words.xish import domish
 
-def toResponse(stanza, stanzaType=None):
-    """
-    Create a response stanza from another stanza.
-
-    This takes the addressing and id attributes from a stanza to create a (new,
-    empty) response stanza. The addressing attributes are swapped and the id
-    copied. Optionally, the stanza type of the response can be specified.
-
-    @param stanza: the original stanza
-    @type stanza: L{domish.Element}
-    @param stanzaType: optional response stanza type
-    @type stanzaType: C{str}
-    @return: the response stanza.
-    @rtype: L{domish.Element}
-    """
-
-    toAddr = stanza.getAttribute('from')
-    fromAddr = stanza.getAttribute('to')
-    stanzaID = stanza.getAttribute('id')
-
-    response = domish.Element((None, stanza.name))
-    if toAddr:
-        response['to'] = toAddr
-    if fromAddr:
-        response['from'] = fromAddr
-    if stanzaID:
-        response['id'] = stanzaID
-    if stanzaType:
-        response['type'] = stanzaType
-
-    return response
-
-
-
 class BootstrapMixin(object):
     """
     XmlStream factory mixin to install bootstrap event observers.
diff -r 6fa0283e522b wokkel/subprotocols.py
--- a/wokkel/subprotocols.py    Wed Mar 25 18:14:08 2009 +0100
+++ b/wokkel/subprotocols.py    Wed Mar 25 18:15:15 2009 +0100
@@ -1,6 +1,6 @@
 # -*- test-case-name: wokkel.test.test_subprotocols -*-
 #
-# Copyright (c) 2001-2007 Twisted Matrix Laboratories.
+# Copyright (c) 2001-2009 Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 """
@@ -12,14 +12,10 @@
 from twisted.internet import defer
 from twisted.python import log
 from twisted.words.protocols.jabber import error, xmlstream
+from twisted.words.protocols.jabber.xmlstream import toResponse
 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
 
 class XMPPHandler(object):
diff -r 6fa0283e522b wokkel/test/test_compat.py
--- a/wokkel/test/test_compat.py        Wed Mar 25 18:14:08 2009 +0100
+++ b/wokkel/test/test_compat.py        Wed Mar 25 18:15:15 2009 +0100
@@ -1,5 +1,5 @@
-# Copyright (c) 2001-2007 Twisted Matrix Laboratories.
-# Copyright (c) 2008 Ralph Meijer
+# Copyright (c) 2001-2008 Twisted Matrix Laboratories.
+# Copyright (c) 2008-2009 Ralph Meijer
 # See LICENSE for details.
 
 """
@@ -12,7 +12,7 @@
 from twisted.trial import unittest
 from twisted.words.xish import domish, utility
 from twisted.words.protocols.jabber import xmlstream
-from wokkel.compat import toResponse, BootstrapMixin, XmlStreamServerFactory
+from wokkel.compat import BootstrapMixin, XmlStreamServerFactory
 
 class DummyProtocol(protocol.Protocol, utility.EventDispatcher):
     """
@@ -80,75 +80,6 @@
 
 
 
-class ToResponseTest(unittest.TestCase):
-
-    def test_toResponse(self):
-        """
-        Test that a response stanza is generated with addressing swapped.
-        """
-        stanza = domish.Element(('jabber:client', 'iq'))
-        stanza['type'] = 'get'
-        stanza['to'] = 'user1@example.com'
-        stanza['from'] = 'user2@example.com/resource'
-        stanza['id'] = 'stanza1'
-        response = toResponse(stanza, 'result')
-        self.assertNotIdentical(stanza, response)
-        self.assertEqual(response['from'], 'user1@example.com')
-        self.assertEqual(response['to'], 'user2@example.com/resource')
-        self.assertEqual(response['type'], 'result')
-        self.assertEqual(response['id'], 'stanza1')
-
-    def test_toResponseNoFrom(self):
-        """
-        Test that a response is generated from a stanza without a from address.
-        """
-        stanza = domish.Element(('jabber:client', 'iq'))
-        stanza['type'] = 'get'
-        stanza['to'] = 'user1@example.com'
-        response = toResponse(stanza)
-        self.assertEqual(response['from'], 'user1@example.com')
-        self.failIf(response.hasAttribute('to'))
-
-    def test_toResponseNoTo(self):
-        """
-        Test that a response is generated from a stanza without a to address.
-        """
-        stanza = domish.Element(('jabber:client', 'iq'))
-        stanza['type'] = 'get'
-        stanza['from'] = 'user2@example.com/resource'
-        response = toResponse(stanza)
-        self.failIf(response.hasAttribute('from'))
-        self.assertEqual(response['to'], 'user2@example.com/resource')
-
-    def test_toResponseNoAddressing(self):
-        """
-        Test that a response is generated from a stanza without any addressing.
-        """
-        stanza = domish.Element(('jabber:client', 'message'))
-        stanza['type'] = 'chat'
-        response = toResponse(stanza)
-        self.failIf(response.hasAttribute('to'))
-        self.failIf(response.hasAttribute('from'))
-
-    def test_noID(self):
-        """
-        Test that a proper response is generated without id attribute.
-        """
-        stanza = domish.Element(('jabber:client', 'message'))
-        response = toResponse(stanza)
-        self.failIf(response.hasAttribute('id'))
-
-
-    def test_noType(self):
-        """
-        Test that a proper response is generated without type attribute.
-        """
-        stanza = domish.Element(('jabber:client', 'message'))
-        response = toResponse(stanza)
-        self.failIf(response.hasAttribute('type'))
-
-
-
 class XmlStreamServerFactoryTest(BootstrapMixinTest):
     """
     Tests for L{XmlStreamServerFactory}.
diff -r 6fa0283e522b wokkel/test/test_disco.py
--- a/wokkel/test/test_disco.py Wed Mar 25 18:14:08 2009 +0100
+++ b/wokkel/test/test_disco.py Wed Mar 25 18:15:15 2009 +0100
@@ -10,6 +10,7 @@
 from twisted.internet import defer
 from twisted.trial import unittest
 from twisted.words.protocols.jabber.jid import JID
+from twisted.words.protocols.jabber.xmlstream import toResponse
 from twisted.words.xish import domish
 
 from wokkel import data_form, disco
@@ -17,11 +18,6 @@
 from wokkel.subprotocols import XMPPHandler
 from wokkel.test.helpers import TestableRequestHandlerMixin, XmlStreamStub
 
-try:
-    from twisted.words.protocols.jabber.xmlstream import toResponse
-except ImportError:
-    from wokkel.compat import toResponse
-
 NS_DISCO_INFO = 'http://jabber.org/protocol/disco#info'
 NS_DISCO_ITEMS = 'http://jabber.org/protocol/disco#items'
 
diff -r 6fa0283e522b wokkel/test/test_pubsub.py
--- a/wokkel/test/test_pubsub.py        Wed Mar 25 18:14:08 2009 +0100
+++ b/wokkel/test/test_pubsub.py        Wed Mar 25 18:15:15 2009 +0100
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2008 Ralph Meijer
+# Copyright (c) 2003-2009 Ralph Meijer
 # See LICENSE for details.
 
 """
@@ -12,16 +12,12 @@
 from twisted.words.xish import domish
 from twisted.words.protocols.jabber import error
 from twisted.words.protocols.jabber.jid import JID
+from twisted.words.protocols.jabber.xmlstream import toResponse
 
 from wokkel import data_form, disco, iwokkel, pubsub, shim
 from wokkel.generic import parseXml
 from wokkel.test.helpers import TestableRequestHandlerMixin, XmlStreamStub
 
-try:
-    from twisted.words.protocols.jabber.xmlstream import toResponse
-except ImportError:
-    from wokkel.compat import toResponse
-
 NS_PUBSUB = 'http://jabber.org/protocol/pubsub'
 NS_PUBSUB_CONFIG = 'http://jabber.org/protocol/pubsub#node_config'
 NS_PUBSUB_ERRORS = 'http://jabber.org/protocol/pubsub#errors'