Merge lp:~dan-dispaltro/txamqp/fixed-ref-cycle into lp:txamqp

[Dan Di Spaltro]

[Dan Di Spaltro (dan-dispaltro)]

Very simple changes that fix a bug and correctly install the thrift portion of the code.

[lp:~dan-dispaltro/txamqp/fixed-ref-cycle]

18. By Dan Di Spaltro <dan@muffy> on 2009-05-29

Added channel number as an arg to create thrift client

19. By Dan Di Spaltro <dan@muffy> on 2009-05-31

Merge from main branch

[Esteve Fernandez (esteve)]

review: Approve

=== modified file 'setup.py'
--- setup.py	2008-11-14 09:05:03 +0000
+++ setup.py	2009-05-22 15:29:06 +0000
@@ -6,10 +6,11 @@
     version = '0.2',
     author = 'Esteve Fernandez',
     author_email = '[e-mail]',
-    packages = ['txamqp', 'txamqp.contrib', ],
+    packages = ['txamqp', 'txamqp.contrib', 'txamqp.contrib.thrift'],
     package_dir = {
         'txamqp': 'src/txamqp',
         'txamqp.contrib': 'src/txamqp/contrib',
+        'txamqp.contrib.thrift': 'src/txamqp/contrib/thrift',
         },
     url = 'https://launchpad.net/txamqp',
 )

=== modified file 'src/txamqp/contrib/thrift/protocol.py'
--- src/txamqp/contrib/thrift/protocol.py	2009-02-11 22:28:45 +0000
+++ src/txamqp/contrib/thrift/protocol.py	2009-05-22 15:28:45 +0000
@@ -97,7 +97,7 @@
         d = processor.process(iprot, oprot)
         channel.basic_ack(deliveryTag, True)
 
-        return queue.get().addCallback(self.parseServerMessage, channel,
+        queue.get().addCallback(self.parseServerMessage, channel,
             exchange, queue, processor, iprot_factory, oprot_factory)