Changeset 53:fd2b3f70b221 in ralphm-patches for disco-addressing.patch

Timestamp:

Aug 3, 2011, 9:48:58 AM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Small cleanups for request handling.

File:

• disco-addressing.patch (modified) (5 diffs)

disco-addressing.patch

@@ -1 +1 @@
 # HG changeset patch
-# Parent ec507e96d825c087430df236727e6f6161d8af12
+# Parent 038fd78ebd5cdc8d25d00e4bc33a0c263eed277a
 Reimplement _DiscoRequest as generic.Request.
 
@@ -6 +6 @@
 Fixes: #73.
 
-diff -r ec507e96d825 wokkel/disco.py
---- a/wokkel/disco.py   Fri Mar 04 09:49:28 2011 +0100
-+++ b/wokkel/disco.py   Mon Mar 07 19:08:18 2011 +0100
-@@ -14,7 +14,7 @@
+diff -r 038fd78ebd5c wokkel/disco.py
+--- a/wokkel/disco.py   Wed Aug 03 09:14:08 2011 +0200
++++ b/wokkel/disco.py   Wed Aug 03 09:26:08 2011 +0200
+@@ -14,8 +14,7 @@
  from twisted.words.protocols.jabber import error, jid
  from twisted.words.xish import domish
  
 -from wokkel import data_form
+-from wokkel.compat import IQ
 +from wokkel import data_form, generic
- from wokkel.compat import IQ
  from wokkel.iwokkel import IDisco
  from wokkel.subprotocols import IQHandlerMixin, XMPPHandler
-@@ -346,26 +346,56 @@
+ 
+@@ -346,26 +345,57 @@
  
  
@@ -60 +61 @@
 +    def __init__(self, verb=None, nodeIdentifier='',
 +                       recipient=None, sender=None):
-+        generic.Request.__init__(self, 'get', recipient, sender)
++        generic.Request.__init__(self, recipient=recipient, sender=sender,
++                                       stanzaType='get')
 +        self.verb = verb
 +        self.nodeIdentifier = nodeIdentifier
@@ -177 +179 @@
          return d
  
-diff -r ec507e96d825 wokkel/generic.py
---- a/wokkel/generic.py Fri Mar 04 09:49:28 2011 +0100
-+++ b/wokkel/generic.py Mon Mar 07 19:08:18 2011 +0100
+diff -r 038fd78ebd5c wokkel/generic.py
+--- a/wokkel/generic.py Wed Aug 03 09:14:08 2011 +0200
++++ b/wokkel/generic.py Wed Aug 03 09:26:08 2011 +0200
 @@ -20,7 +20,6 @@
  except ImportError:
@@ -205 +207 @@
      stanzaID = None
      stanzaType = None
-diff -r ec507e96d825 wokkel/test/test_disco.py
---- a/wokkel/test/test_disco.py Fri Mar 04 09:49:28 2011 +0100
-+++ b/wokkel/test/test_disco.py Mon Mar 07 19:08:18 2011 +0100
+diff -r 038fd78ebd5c wokkel/test/test_disco.py
+--- a/wokkel/test/test_disco.py Wed Aug 03 09:14:08 2011 +0200
++++ b/wokkel/test/test_disco.py Wed Aug 03 09:26:08 2011 +0200
 @@ -477,9 +477,14 @@
          Set up stub and protocol for testing.