diff options
| author | Ask Solem <ask@celeryproject.org> | 2013-10-29 13:52:07 +0000 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2013-10-29 13:52:07 +0000 |
| commit | befc8036819fe0eac0821d9a61fd6db1e49b6c09 (patch) | |
| tree | b05d1e02cd05d5b5c020c1fb36221996d918fc99 | |
| parent | 840ba58a39fbc737a77be4b4c62aa3b9828c936d (diff) | |
| download | py-amqp-befc8036819fe0eac0821d9a61fd6db1e49b6c09.tar.gz | |
Message.channel must be channel object, not id. Closes #24
| -rw-r--r-- | amqp/channel.py | 9 | ||||
| -rw-r--r-- | amqp/method_framing.py | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/amqp/channel.py b/amqp/channel.py index 109d6c4..ea59f0c 100644 --- a/amqp/channel.py +++ b/amqp/channel.py @@ -1883,6 +1883,7 @@ class Channel(AbstractChannel): exchange = args.read_shortstr() routing_key = args.read_shortstr() + msg.channel = self msg.delivery_info = { 'consumer_tag': consumer_tag, 'delivery_tag': delivery_tag, @@ -1891,8 +1892,11 @@ class Channel(AbstractChannel): 'routing_key': routing_key, } - fun = self.callbacks.get(consumer_tag, None) - if fun is not None: + try: + fun = self.callbacks[consumer_tag] + except KeyError: + pass + else: fun(msg) def basic_get(self, queue='', no_ack=False): @@ -2023,6 +2027,7 @@ class Channel(AbstractChannel): routing_key = args.read_shortstr() message_count = args.read_long() + msg.channel = self msg.delivery_info = { 'delivery_tag': delivery_tag, 'redelivered': redelivered, diff --git a/amqp/method_framing.py b/amqp/method_framing.py index cee05ba..85fbfba 100644 --- a/amqp/method_framing.py +++ b/amqp/method_framing.py @@ -49,7 +49,7 @@ class _PartialMessage(object): def __init__(self, method_sig, args, channel): self.method_sig = method_sig self.args = args - self.msg = Message(channel=channel) + self.msg = Message() self.body_parts = [] self.body_received = 0 self.body_size = None |