Changeset 53:fd2b3f70b221 in ralphm-patches

Timestamp:

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

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Small cleanups for request handling.

Files:

• disco-addressing.patch (modified) (5 diffs)
• request-stanza.patch (modified) (2 diffs)
• request-tracking.patch (modified) (14 diffs)
• request-xmpphandler.patch (modified) (4 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.

request-stanza.patch

@@ -1 +1 @@
 # HG changeset patch
-# Parent cddd993198e15f928c472d299e3351b8802e3608
+# Parent 02050b16f4310d9875ae26fbe70ec31415a5d829
 Add base class for IQ get/set request stanzas: Request.
 
-diff -r cddd993198e1 wokkel/generic.py
---- a/wokkel/generic.py Fri Mar 04 09:48:19 2011 +0100
-+++ b/wokkel/generic.py Fri Mar 04 09:49:28 2011 +0100
-@@ -236,6 +236,27 @@
+diff -r 02050b16f431 wokkel/generic.py
+--- a/wokkel/generic.py Wed Aug 03 09:00:34 2011 +0200
++++ b/wokkel/generic.py Wed Aug 03 09:14:08 2011 +0200
+@@ -236,6 +236,34 @@
          self.exception = error.exceptionFromStanza(element)
  
  
 +class Request(Stanza):
++    """
++    IQ request stanza.
++
++    This is a base class for IQ get or set stanzas, to be used with
++    L{wokkel.subprotocols.StreamManager.request}.
++    """
++
 +    stanzaKind = 'iq'
 +    stanzaType = 'get'
 +    timeout = None
 +
-+    def __init__(self, stanzaType='get', recipient=None, sender=None):
++    def __init__(self, recipient=None, sender=None, stanzaType='get'):
 +        Stanza.__init__(self, recipient=recipient, sender=sender)
 +        self.stanzaType = stanzaType
@@ -34 +41 @@
      protocol = xmlstream.XmlStream
  
-diff -r cddd993198e1 wokkel/test/test_generic.py
---- a/wokkel/test/test_generic.py       Fri Mar 04 09:48:19 2011 +0100
-+++ b/wokkel/test/test_generic.py       Fri Mar 04 09:49:28 2011 +0100
+diff -r 02050b16f431 wokkel/test/test_generic.py
+--- a/wokkel/test/test_generic.py       Wed Aug 03 09:00:34 2011 +0200
++++ b/wokkel/test/test_generic.py       Wed Aug 03 09:14:08 2011 +0200
 @@ -7,6 +7,7 @@
  

request-tracking.patch

@@ -1 +1 @@
 # HG changeset patch
-# Parent 60dcf9e2441bb510f1da17e6bc4401ef7b6db0e9
+# Parent 6f36a7f92973d3843a42b4c80791715e694b66a3
 Add iq request (set/get) tracking for StreamManager.
 
@@ -20 +20 @@
     from the moment request is sent over the wire.
 
-diff -r 60dcf9e2441b wokkel/subprotocols.py
---- a/wokkel/subprotocols.py    Mon Feb 28 21:04:37 2011 +0100
-+++ b/wokkel/subprotocols.py    Fri Mar 04 09:45:24 2011 +0100
+diff -r 6f36a7f92973 wokkel/subprotocols.py
+--- a/wokkel/subprotocols.py    Thu Jul 28 20:14:02 2011 +0200
++++ b/wokkel/subprotocols.py    Wed Aug 03 09:45:01 2011 +0200
 @@ -156,11 +156,23 @@
      @type _initialized: C{bool}
@@ -73 +73 @@
          for p in self._packetQueue:
              xs.send(p)
-@@ -268,6 +291,34 @@
+@@ -268,6 +291,31 @@
          for e in list(self):
              e.connectionLost(reason)
@@ -90 +90 @@
 +        Handle iq response by firing associated deferred.
 +        """
-+        if getattr(iq, 'handled', False):
-+            return
-+
 +        try:
 +            d = self._iqDeferreds[iq["id"]]
@@ -108 +105 @@
      def send(self, obj):
          """
-@@ -285,6 +336,68 @@
+@@ -285,6 +333,68 @@
              self._packetQueue.append(obj)
  
@@ -141 +138 @@
 +        if (request.stanzaKind != 'iq' or
 +            request.stanzaType not in ('get', 'set')):
-+            return defer.fail(Exception("Not a request"))
++            return defer.fail(ValueError("Not a request"))
 +
 +        element = request.toElement()
@@ -154 +151 @@
 +        self._iqDeferreds[element['id']] = d
 +
-+        timeout = request.timeout or self.timeout
++        timeout = getattr(request, 'timeout', self.timeout)
 +
 +        if timeout is not None:
@@ -177 +174 @@
  class IQHandlerMixin(object):
      """
-diff -r 60dcf9e2441b wokkel/test/test_subprotocols.py
---- a/wokkel/test/test_subprotocols.py  Mon Feb 28 21:04:37 2011 +0100
-+++ b/wokkel/test/test_subprotocols.py  Fri Mar 04 09:45:24 2011 +0100
+diff -r 6f36a7f92973 wokkel/test/test_subprotocols.py
+--- a/wokkel/test/test_subprotocols.py  Thu Jul 28 20:14:02 2011 +0200
++++ b/wokkel/test/test_subprotocols.py  Wed Aug 03 09:45:01 2011 +0200
 @@ -9,12 +9,13 @@
  
@@ -196 +193 @@
  class DummyFactory(object):
      """
-@@ -164,20 +165,48 @@
+@@ -164,20 +165,46 @@
  
  
  
 +class IQGetStanza(generic.Stanza):
-+    timeout = None
-+
 +    stanzaKind = 'iq'
 +    stanzaType = 'get'
@@ -248 +243 @@
          self.assertEquals([], sm.handlers)
          self.assertEquals(sm._connected,
-@@ -407,6 +436,7 @@
+@@ -407,6 +434,7 @@
          self.assertEquals(0, handler.nestedHandler.doneLost)
  
@@ -256 +251 @@
          """
          Test removal of protocol handler.
-@@ -418,6 +448,7 @@
+@@ -418,6 +446,7 @@
          self.assertNotIn(handler, sm)
          self.assertIdentical(None, handler.parent)
@@ -264 +259 @@
          """
          Test send when the stream has been initialized.
-@@ -509,6 +540,194 @@
+@@ -509,6 +538,228 @@
          self.assertEquals("<presence/>", sm._packetQueue[0])
  
@@ -449 +444 @@
 +        d = self.streamManager.request(self.request)
 +
-+        xs = self.xmlstream
 +        self.xmlstream.connectionLost(failure.Failure(ConnectionDone()))
 +        self.assertFailure(d, ConnectionDone)
@@ -456 +450 @@
 +
 +
++    def test_requestNotIQ(self):
++        """
++        The request stanza must be an iq.
++        """
++        stanza = generic.Stanza()
++        stanza.stanzaKind = 'message'
++
++        d = self.streamManager.request(stanza)
++        self.assertFailure(d, ValueError)
++
++
++    def test_requestNotResult(self):
++        """
++        The request stanza cannot be of type 'result'.
++        """
++        stanza = generic.Stanza()
++        stanza.stanzaKind = 'iq'
++        stanza.stanzaType = 'result'
++
++        d = self.streamManager.request(stanza)
++        self.assertFailure(d, ValueError)
++
++
++    def test_requestNotError(self):
++        """
++        The request stanza cannot be of type 'error'.
++        """
++        stanza = generic.Stanza()
++        stanza.stanzaKind = 'iq'
++        stanza.stanzaType = 'error'
++
++        d = self.streamManager.request(stanza)
++        self.assertFailure(d, ValueError)
++
++
  
  class DummyIQHandler(subprotocols.IQHandlerMixin):

request-xmpphandler.patch

@@ -1 +1 @@
 # HG changeset patch
-# Parent b05489ad4987a5e6263513c26048be801f7ce42b
+# Parent 4d60ea3a5ab59d48e5080c913f6aeea9af55fccb
 Add request method to XMPPHandler, passing up to its StreamManager.
 
-diff -r b05489ad4987 wokkel/subprotocols.py
---- a/wokkel/subprotocols.py    Fri Mar 04 09:45:25 2011 +0100
-+++ b/wokkel/subprotocols.py    Fri Mar 04 09:48:19 2011 +0100
+diff -r 4d60ea3a5ab5 wokkel/subprotocols.py
+--- a/wokkel/subprotocols.py    Wed Aug 03 09:45:01 2011 +0200
++++ b/wokkel/subprotocols.py    Wed Aug 03 09:46:32 2011 +0200
 @@ -94,6 +94,18 @@
          self.parent.send(obj)
@@ -25 +25 @@
  class XMPPHandlerCollection(object):
      """
-diff -r b05489ad4987 wokkel/test/test_subprotocols.py
---- a/wokkel/test/test_subprotocols.py  Fri Mar 04 09:45:25 2011 +0100
-+++ b/wokkel/test/test_subprotocols.py  Fri Mar 04 09:48:19 2011 +0100
+diff -r 4d60ea3a5ab5 wokkel/test/test_subprotocols.py
+--- a/wokkel/test/test_subprotocols.py  Wed Aug 03 09:45:01 2011 +0200
++++ b/wokkel/test/test_subprotocols.py  Wed Aug 03 09:46:32 2011 +0200
 @@ -71,6 +71,15 @@
  
@@ -58 +58 @@
 +            def request(self, request):
 +                self.requests.append(request)
-+                d = defer.succeed(None)
++                return defer.succeed(None)
 +
 +        handler = subprotocols.XMPPHandler()
@@ -72 +72 @@
  class XMPPHandlerCollectionTest(unittest.TestCase):
      """
-@@ -165,15 +195,6 @@
+@@ -165,13 +195,6 @@
  
  
  
 -class IQGetStanza(generic.Stanza):
--    timeout = None
--
 -    stanzaKind = 'iq'
 -    stanzaType = 'get'