diff options
| author | Matus Valo <matusvalo@gmail.com> | 2019-02-27 15:27:52 -0800 |
|---|---|---|
| committer | Matus Valo <matusvalo@gmail.com> | 2019-02-27 15:27:52 -0800 |
| commit | 23f57db9eeac2b01b52621f82a42da33af9b9ee3 (patch) | |
| tree | 0091a408bb074ca9833ffb15cf2d1b3c796b18d6 | |
| parent | ed759687c069b12c914d8ebdab26ef34d068fca9 (diff) | |
| download | py-amqp-23f57db9eeac2b01b52621f82a42da33af9b9ee3.tar.gz | |
Use __slots__ in GenericContent
| -rw-r--r-- | amqp/basic_message.py | 2 | ||||
| -rw-r--r-- | amqp/channel.py | 24 | ||||
| -rw-r--r-- | amqp/serialization.py | 5 |
3 files changed, 16 insertions, 15 deletions
diff --git a/amqp/basic_message.py b/amqp/basic_message.py index f0857fa..796fe59 100644 --- a/amqp/basic_message.py +++ b/amqp/basic_message.py @@ -105,7 +105,7 @@ class Message(GenericContent): def __init__(self, body='', children=None, channel=None, **properties): super(Message, self).__init__(**properties) #: set by basic_consume/basic_get - self.delivery_info = None + self.delivery_info = dict() self.body = body self.channel = channel diff --git a/amqp/channel.py b/amqp/channel.py index 39d4cb9..06f7c8b 100644 --- a/amqp/channel.py +++ b/amqp/channel.py @@ -1600,13 +1600,11 @@ class Channel(AbstractChannel): def _on_basic_deliver(self, consumer_tag, delivery_tag, redelivered, exchange, routing_key, msg): msg.channel = self - msg.delivery_info = { - 'consumer_tag': consumer_tag, - 'delivery_tag': delivery_tag, - 'redelivered': redelivered, - 'exchange': exchange, - 'routing_key': routing_key, - } + msg.delivery_info['consumer_tag'] = consumer_tag + msg.delivery_info['delivery_tag'] = delivery_tag + msg.delivery_info['redelivered'] = redelivered + msg.delivery_info['exchange'] = exchange + msg.delivery_info['routing_key'] = routing_key try: fun = self.callbacks[consumer_tag] @@ -1670,13 +1668,11 @@ class Channel(AbstractChannel): def _on_get_ok(self, delivery_tag, redelivered, exchange, routing_key, message_count, msg): msg.channel = self - msg.delivery_info = { - 'delivery_tag': delivery_tag, - 'redelivered': redelivered, - 'exchange': exchange, - 'routing_key': routing_key, - 'message_count': message_count - } + msg.delivery_info['delivery_tag'] = delivery_tag + msg.delivery_info['redelivered'] = redelivered + msg.delivery_info['exchange'] = exchange + msg.delivery_info['routing_key'] = routing_key + msg.delivery_info['message_count'] = message_count return msg def _basic_publish(self, msg, exchange='', routing_key='', diff --git a/amqp/serialization.py b/amqp/serialization.py index 183ae2e..1188f0d 100644 --- a/amqp/serialization.py +++ b/amqp/serialization.py @@ -487,6 +487,11 @@ class GenericContent(object): CLASS_ID = None PROPERTIES = [('dummy', 's')] + __slots__ = ( + 'frame_method', 'frame_args', '_pending_chunks', + 'body_received', 'body_size', 'ready', 'properties' + ) + def __init__(self, frame_method=None, frame_args=None, **props): self.frame_method = frame_method self.frame_args = frame_args |