txAMQP

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

  1. fixed-ref-cycle
  2. Merge into trunk
Proposed by Dan Di Spaltro
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~dan-dispaltro/txamqp/fixed-ref-cycle
Merge into: lp://staging/txamqp
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~dan-dispaltro/txamqp/fixed-ref-cycle
Reviewer Review Type Date Requested Status
Esteve Fernandez Approve
Review via email: mp+6743@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Dan Di Spaltro (dan-dispaltro) wrote :

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

lp://staging/~dan-dispaltro/txamqp/fixed-ref-cycle updated
18. By Dan Di Spaltro <dan@muffy>

Added channel number as an arg to create thrift client

19. By Dan Di Spaltro <dan@muffy>

Merge from main branch

Revision history for this message
Esteve Fernandez (esteve) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2008-11-14 09:05:03 +0000
3+++ setup.py 2009-05-22 15:29:06 +0000
4@@ -6,10 +6,11 @@
5 version = '0.2',
6 author = 'Esteve Fernandez',
7 author_email = 'esteve@fluidinfo.com',
8- packages = ['txamqp', 'txamqp.contrib', ],
9+ packages = ['txamqp', 'txamqp.contrib', 'txamqp.contrib.thrift'],
10 package_dir = {
11 'txamqp': 'src/txamqp',
12 'txamqp.contrib': 'src/txamqp/contrib',
13+ 'txamqp.contrib.thrift': 'src/txamqp/contrib/thrift',
14 },
15 url = 'https://launchpad.net/txamqp',
16 )
17
18=== modified file 'src/txamqp/contrib/thrift/protocol.py'
19--- src/txamqp/contrib/thrift/protocol.py 2009-02-11 22:28:45 +0000
20+++ src/txamqp/contrib/thrift/protocol.py 2009-05-22 15:28:45 +0000
21@@ -97,7 +97,7 @@
22 d = processor.process(iprot, oprot)
23 channel.basic_ack(deliveryTag, True)
24
25- return queue.get().addCallback(self.parseServerMessage, channel,
26+ queue.get().addCallback(self.parseServerMessage, channel,
27 exchange, queue, processor, iprot_factory, oprot_factory)
28
29

Subscribers

People subscribed via source and target branches

to status/vote changes: