summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2012-07-23 16:25:26 +0100
committerAsk Solem <ask@celeryproject.org>2012-07-23 16:25:26 +0100
commitcf2b319789a03444f466f8a0b67e6433f988a3a8 (patch)
tree20667c13708dcce3e142fccd1b898bab0c32c9b1
parent16e39bab355f12755df6c1b1cf4475332ad90c8a (diff)
downloadpy-amqp-cf2b319789a03444f466f8a0b67e6433f988a3a8.tar.gz
Remove channel from Message.delivery_info
-rw-r--r--amqp/abstract_channel.py4
-rw-r--r--amqp/channel.py1
2 files changed, 2 insertions, 3 deletions
diff --git a/amqp/abstract_channel.py b/amqp/abstract_channel.py
index 333513f..1bc58ee 100644
--- a/amqp/abstract_channel.py
+++ b/amqp/abstract_channel.py
@@ -42,7 +42,6 @@ class AbstractChannel(object):
connection.channels[channel_id] = self
self.method_queue = [] # Higher level queue for methods
self.auto_decode = False
- self._write_method = self.connection.method_writer.write_method
def __enter__(self):
return self
@@ -55,7 +54,8 @@ class AbstractChannel(object):
if isinstance(args, AMQPWriter):
args = args.getvalue()
- self._write_method(self.channel_id, method_sig, args, content)
+ self.connection.method_writer.write_method(
+ self.channel_id, method_sig, args, content)
def close(self):
"""Close this Channel or Connection"""
diff --git a/amqp/channel.py b/amqp/channel.py
index 08ecdb7..20aed5d 100644
--- a/amqp/channel.py
+++ b/amqp/channel.py
@@ -1920,7 +1920,6 @@ class Channel(AbstractChannel):
routing_key = args.read_shortstr()
msg.delivery_info = {
- 'channel': self,
'consumer_tag': consumer_tag,
'delivery_tag': delivery_tag,
'redelivered': redelivered,