Changeset 5:231bc3e8b810 in ralphm-patches for compat-pre-twisted-8.0.0.patch


Ignore:
Timestamp:
Apr 1, 2009, 2:17:03 PM (14 years ago)
Author:
Ralph Meijer <ralphm@…>
Branch:
default
Message:

A gazillion changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • compat-pre-twisted-8.0.0.patch

    r1 r5  
    1 diff -r 9c14d48c54b2 wokkel/compat.py
    2 --- a/wokkel/compat.py  Wed Feb 04 14:41:26 2009 +0100
    3 +++ b/wokkel/compat.py  Wed Feb 04 14:42:14 2009 +0100
    4 @@ -6,40 +6,6 @@
    5  from twisted.internet import protocol
     1diff -r 6fa0283e522b wokkel/compat.py
     2--- a/wokkel/compat.py  Wed Mar 25 18:14:08 2009 +0100
     3+++ b/wokkel/compat.py  Wed Mar 25 18:15:15 2009 +0100
     4@@ -7,40 +7,6 @@
    65 from twisted.words.protocols.jabber import xmlstream
    76 from twisted.words.xish import domish
    8 -
     7 
    98-def toResponse(stanza, stanzaType=None):
    109-    """
     
    4039-
    4140-
    42  
     41-
    4342 class BootstrapMixin(object):
    4443     """
    45 diff -r 9c14d48c54b2 wokkel/subprotocols.py
    46 --- a/wokkel/subprotocols.py    Wed Feb 04 14:41:26 2009 +0100
    47 +++ b/wokkel/subprotocols.py    Wed Feb 04 14:42:14 2009 +0100
     44     XmlStream factory mixin to install bootstrap event observers.
     45diff -r 6fa0283e522b wokkel/subprotocols.py
     46--- a/wokkel/subprotocols.py    Wed Mar 25 18:14:08 2009 +0100
     47+++ b/wokkel/subprotocols.py    Wed Mar 25 18:15:15 2009 +0100
    4848@@ -1,6 +1,6 @@
    4949 # -*- test-case-name: wokkel.test.test_subprotocols -*-
     
    5454 
    5555 """
    56 @@ -12,13 +12,9 @@
     56@@ -12,14 +12,10 @@
    5757 from twisted.internet import defer
    5858 from twisted.python import log
     
    6161 from twisted.words.xish import xpath
    6262 from twisted.words.xish.domish import IElement
    63 -
     63 
    6464-try:
    6565-    from twisted.words.protocols.jabber.xmlstream import toResponse
    6666-except ImportError:
    6767-    from wokkel.compat import toResponse
    68  
     68-
    6969 from wokkel.iwokkel import IXMPPHandler, IXMPPHandlerCollection
    7070 
    71 diff -r 9c14d48c54b2 wokkel/test/test_compat.py
    72 --- a/wokkel/test/test_compat.py        Wed Feb 04 14:41:26 2009 +0100
    73 +++ b/wokkel/test/test_compat.py        Wed Feb 04 14:42:14 2009 +0100
     71 class XMPPHandler(object):
     72diff -r 6fa0283e522b wokkel/test/test_compat.py
     73--- a/wokkel/test/test_compat.py        Wed Mar 25 18:14:08 2009 +0100
     74+++ b/wokkel/test/test_compat.py        Wed Mar 25 18:15:15 2009 +0100
    7475@@ -1,5 +1,5 @@
    7576-# Copyright (c) 2001-2007 Twisted Matrix Laboratories.
     
    8990 class DummyProtocol(protocol.Protocol, utility.EventDispatcher):
    9091     """
    91 @@ -77,75 +77,6 @@
    92  
    93          dispatcher.dispatch(None, '//event/myevent')
    94          self.assertFalse(called)
    95 -
    96 -
    97 -
     92@@ -80,75 +80,6 @@
     93 
     94 
     95 
    9896-class ToResponseTest(unittest.TestCase):
    9997-
     
    162160-        response = toResponse(stanza)
    163161-        self.failIf(response.hasAttribute('type'))
    164  
    165  
    166  
    167 diff -r 9c14d48c54b2 wokkel/test/test_disco.py
    168 --- a/wokkel/test/test_disco.py Wed Feb 04 14:41:26 2009 +0100
    169 +++ b/wokkel/test/test_disco.py Wed Feb 04 14:42:14 2009 +0100
    170 @@ -10,17 +10,13 @@
     162-
     163-
     164-
     165 class XmlStreamServerFactoryTest(BootstrapMixinTest):
     166     """
     167     Tests for L{XmlStreamServerFactory}.
     168diff -r 6fa0283e522b wokkel/test/test_disco.py
     169--- a/wokkel/test/test_disco.py Wed Mar 25 18:14:08 2009 +0100
     170+++ b/wokkel/test/test_disco.py Wed Mar 25 18:15:15 2009 +0100
     171@@ -10,6 +10,7 @@
    171172 from twisted.internet import defer
    172173 from twisted.trial import unittest
     
    176177 
    177178 from wokkel import data_form, disco
    178  from wokkel.generic import parseXml
     179@@ -17,11 +18,6 @@
    179180 from wokkel.subprotocols import XMPPHandler
    180181 from wokkel.test.helpers import TestableRequestHandlerMixin, XmlStreamStub
    181 -
     182 
    182183-try:
    183184-    from twisted.words.protocols.jabber.xmlstream import toResponse
    184185-except ImportError:
    185186-    from wokkel.compat import toResponse
    186  
     187-
    187188 NS_DISCO_INFO = 'http://jabber.org/protocol/disco#info'
    188189 NS_DISCO_ITEMS = 'http://jabber.org/protocol/disco#items'
    189 diff -r 9c14d48c54b2 wokkel/test/test_pubsub.py
    190 --- a/wokkel/test/test_pubsub.py        Wed Feb 04 14:41:26 2009 +0100
    191 +++ b/wokkel/test/test_pubsub.py        Wed Feb 04 14:42:14 2009 +0100
     190 
     191diff -r 6fa0283e522b wokkel/test/test_pubsub.py
     192--- a/wokkel/test/test_pubsub.py        Wed Mar 25 18:14:08 2009 +0100
     193+++ b/wokkel/test/test_pubsub.py        Wed Mar 25 18:15:15 2009 +0100
    192194@@ -1,4 +1,4 @@
    193195-# Copyright (c) 2003-2008 Ralph Meijer
     
    196198 
    197199 """
    198 @@ -12,14 +12,10 @@
     200@@ -12,16 +12,12 @@
    199201 from twisted.words.xish import domish
    200202 from twisted.words.protocols.jabber import error
     
    202204+from twisted.words.protocols.jabber.xmlstream import toResponse
    203205 
    204  from wokkel import data_form, iwokkel, pubsub, shim
     206 from wokkel import data_form, disco, iwokkel, pubsub, shim
     207 from wokkel.generic import parseXml
    205208 from wokkel.test.helpers import TestableRequestHandlerMixin, XmlStreamStub
    206 -
     209 
    207210-try:
    208211-    from twisted.words.protocols.jabber.xmlstream import toResponse
    209212-except ImportError:
    210213-    from wokkel.compat import toResponse
    211  
     214-
    212215 NS_PUBSUB = 'http://jabber.org/protocol/pubsub'
    213216 NS_PUBSUB_CONFIG = 'http://jabber.org/protocol/pubsub#node_config'
     217 NS_PUBSUB_ERRORS = 'http://jabber.org/protocol/pubsub#errors'
Note: See TracChangeset for help on using the changeset viewer.