svn commit: r520704 - in /incubator/qpid/trunk/qpid/python: cpp_failing_0-9.txt qpid/client.py qpid/message.py qpid/peer.py

[ac...@apache.org]

Author: aconway
Date: Tue Mar 20 19:03:49 2007
New Revision: 520704

URL: http://svn.apache.org/viewvc?view=rev&rev=520704
Log:
* python/qpid/*.py:: apply 0-9 changes missed by merge.
* python/cpp_failing_0-9.txt: update tests to refer to tess_0-9

Modified:
    incubator/qpid/trunk/qpid/python/cpp_failing_0-9.txt
    incubator/qpid/trunk/qpid/python/qpid/client.py
    incubator/qpid/trunk/qpid/python/qpid/message.py
    incubator/qpid/trunk/qpid/python/qpid/peer.py

Modified: incubator/qpid/trunk/qpid/python/cpp_failing_0-9.txt
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/cpp_failing_0-9.txt?view=diff&rev=520704&r1=520703&r2=520704
==============================================================================
--- incubator/qpid/trunk/qpid/python/cpp_failing_0-9.txt (original)
+++ incubator/qpid/trunk/qpid/python/cpp_failing_0-9.txt Tue Mar 20 19:03:49 2007
@@ -1,4 +1,4 @@
-tests.message.MessageTests.test_checkpoint
-tests.message.MessageTests.test_reject
-tests.basic.BasicTests.test_get
+tests_0-9.message.MessageTests.test_checkpoint
+tests_0-9.message.MessageTests.test_reject
+tests_0-9.basic.BasicTests.test_get
 

Modified: incubator/qpid/trunk/qpid/python/qpid/client.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/qpid/client.py?view=diff&rev=520704&r1=520703&r2=520704
==============================================================================
--- incubator/qpid/trunk/qpid/python/qpid/client.py (original)
+++ incubator/qpid/trunk/qpid/python/qpid/client.py Tue Mar 20 19:03:49 2007
@@ -131,6 +131,9 @@
   def basic_deliver(self, ch, msg):
     self.client.queue(msg.consumer_tag).put(msg)
 
+  def channel_pong(self, ch, msg):
+    msg.ok()
+
   def channel_close(self, ch, msg):
     ch.close(msg)
 

Modified: incubator/qpid/trunk/qpid/python/qpid/message.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/qpid/message.py?view=diff&rev=520704&r1=520703&r2=520704
==============================================================================
--- incubator/qpid/trunk/qpid/python/qpid/message.py (original)
+++ incubator/qpid/trunk/qpid/python/qpid/message.py Tue Mar 20 19:03:49 2007
@@ -47,9 +47,12 @@
     else:
       for r in self.method.responses:
         if attr == r.name:
-          result = lambda *args, **kwargs: \
-                   self.channel.respond(Method(r, r.arguments(*args, **kwargs)),
-                                        self.frame)
+          def respond(*args, **kwargs):
+            batch=0
+            if kwargs.has_key("batchoffset"):
+              batch=kwargs.pop("batchoffset")
+            self.channel.respond(Method(r, r.arguments(*args, **kwargs)), batch, self.frame)
+          result = respond
           break
       else:
         raise AttributeError(attr)

Modified: incubator/qpid/trunk/qpid/python/qpid/peer.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/qpid/peer.py?view=diff&rev=520704&r1=520703&r2=520704
==============================================================================
--- incubator/qpid/trunk/qpid/python/qpid/peer.py (original)
+++ incubator/qpid/trunk/qpid/python/qpid/peer.py Tue Mar 20 19:03:49 2007
@@ -129,6 +129,8 @@
           content = None
 
         self.delegate(channel, Message(channel, frame, content))
+    except QueueClosed, e:
+      self.close(e)
     except:
       self.fatal()
 
@@ -156,12 +158,15 @@
     self.write = writer
     self.sequence = Sequence(1)
 
-  def respond(self, method, request):
+  def respond(self, method, batch, request):
     if isinstance(request, Method):
       self.write(method)
     else:
-      # XXX: batching
-      frame = Response(self.sequence.next(), request.id, 0, method)
+      # allow batching from frame at either end
+      if batch<0:
+        frame = Response(self.sequence.next(), request.id+batch, -batch, method)
+      else:
+        frame = Response(self.sequence.next(), request.id, batch, method)
       self.write(frame)
 
 class Closed(Exception): pass
@@ -238,8 +243,8 @@
   def request(self, method, listener, content = None):
     self.requester.request(method, listener, content)
 
-  def respond(self, method, request):
-    self.responder.respond(method, request)
+  def respond(self, method, batch, request):
+    self.responder.respond(method, batch, request)
 
   def invoke(self, type, args, kwargs):
     content = kwargs.pop("content", None)