Replace list with collections.deque

Author: eandersson

amqpstorm/channel.py

@@ -1,5 +1,6 @@
 """AMQPStorm Connection.Channel."""
 
+import collections
 import logging
 import threading
 import time
@@ -48,7 +49,7 @@ def __init__(self, channel_id, connection, rpc_timeout):
         self._consumer_callbacks = {}
         self._confirming_deliveries = False
         self._connection = connection
-        self._inbound = []
+        self._inbound = collections.deque()
         self._basic = Basic(self, connection.max_frame_size)
         self._exchange = Exchange(self)
         self._tx = Tx(self)
@@ -206,7 +207,7 @@ def close(self, reply_code=200, reply_text=''):
             )
         finally:
             if self._inbound:
-                del self._inbound[:]
+                self._inbound.clear()
             self.set_state(self.CLOSED)
         LOGGER.debug('Channel #%d Closed', self.channel_id)
 
@@ -298,7 +299,7 @@ def open(self):
 
         :return:
         """
-        self._inbound = []
+        self._inbound = collections.deque()
         self._exceptions = []
         self._confirming_deliveries = False
         self.set_state(self.OPENING)
@@ -464,15 +465,15 @@ def _build_message_headers(self):
 
         :rtype: tuple,None
         """
-        basic_deliver = self._inbound.pop(0)
+        basic_deliver = self._inbound.popleft()
         if not isinstance(basic_deliver, commands.Basic.Deliver):
             LOGGER.warning(
                 'Received an out-of-order frame: %s was '
                 'expecting a Basic.Deliver frame',
                 type(basic_deliver)
             )
             return None
-        content_header = self._inbound.pop(0)
+        content_header = self._inbound.popleft()
         if not isinstance(content_header, ContentHeader):
             LOGGER.warning(
                 'Received an out-of-order frame: %s was '
@@ -494,7 +495,7 @@ def _build_message_body(self, body_size):
                 self.check_for_errors()
                 time.sleep(IDLE_WAIT)
                 continue
-            body_piece = self._inbound.pop(0)
+            body_piece = self._inbound.popleft()
             if not body_piece.value:
                 break
             body += body_piece.value
@@ -514,7 +515,8 @@ def _close_channel(self, frame_in):
                 pass
         self.remove_consumer_tag()
         if self._inbound:
-            del self._inbound[:]
+            self._inbound.clear()
+            self._inbound = None
         self.exceptions.append(AMQPChannelError(
             'Channel %d was closed by remote server: %s' %
             (

amqpstorm/tests/unit/channel/test_channel.py

@@ -1,3 +1,4 @@
+import collections
 from unittest import mock
 from pamqp import commands
 
@@ -140,7 +141,7 @@ def test_channel_close_channel(self):
         channel = Channel(0, FakeConnection(), 360)
 
         # Set up Fake Channel.
-        channel._inbound = [1, 2, 3]
+        channel._inbound = collections.deque([1, 2, 3])
         channel.set_state(channel.OPEN)
         channel._consumer_tags = [4, 5, 6]
 
@@ -149,7 +150,7 @@ def test_channel_close_channel(self):
         # Close Channel.
         channel._close_channel(close_frame)
 
-        self.assertEqual(channel._inbound, [])
+        self.assertIsNone(channel._inbound)
         self.assertEqual(channel._consumer_tags, [])
         self.assertEqual(channel._state, channel.CLOSED)
 

amqpstorm/tests/unit/channel/test_channel_exception.py

@@ -218,7 +218,7 @@ def test_channel_raise_with_close_reply_code_500(self):
         )
         channel._close_channel(close_frame)
 
-        self.assertEqual(channel._inbound, [])
+        self.assertIsNone(channel._inbound)
         self.assertEqual(channel._consumer_tags, [])
         self.assertEqual(channel._state, channel.CLOSED)
 

amqpstorm/tests/unit/channel/test_channel_message_handling.py

@@ -1,3 +1,4 @@
+import collections
 import threading
 
 from unittest import mock
@@ -24,7 +25,7 @@ def test_channel_build_message(self):
         header = ContentHeader(body_size=message_len)
         body = ContentBody(value=message)
 
-        channel._inbound = [deliver, header, body]
+        channel._inbound = collections.deque([deliver, header, body])
         result = channel._build_message(auto_decode=False,
                                         message_impl=Message)
 
@@ -41,7 +42,7 @@ def test_channel_build_message_auto_decode(self):
         header = ContentHeader(body_size=message_len)
         body = ContentBody(value=message)
 
-        channel._inbound = [deliver, header, body]
+        channel._inbound = collections.deque([deliver, header, body])
         result = channel._build_message(auto_decode=True, message_impl=Message)
 
         self.assertIsInstance(result.body, str)
@@ -56,7 +57,7 @@ def test_channel_build_out_of_order_message_deliver(self):
         deliver = commands.Basic.Deliver()
         header = ContentHeader(body_size=message_len)
 
-        channel._inbound = [deliver, deliver, header]
+        channel._inbound = collections.deque([deliver, deliver, header])
         result = channel._build_message(auto_decode=True, message_impl=Message)
 
         self.assertEqual(result, None)
@@ -73,7 +74,7 @@ def test_channel_build_out_of_order_message_header(self):
         header = ContentHeader(body_size=message_len)
         body = ContentBody(value=message)
 
-        channel._inbound = [header, deliver, header, body]
+        channel._inbound = collections.deque([header, deliver, header, body])
         result = channel._build_message(auto_decode=True, message_impl=Message)
 
         self.assertEqual(result, None)
@@ -86,7 +87,7 @@ def test_channel_build_message_headers(self):
         deliver = commands.Basic.Deliver()
         header = ContentHeader(body_size=10)
 
-        channel._inbound = [deliver, header]
+        channel._inbound = collections.deque([deliver, header])
         result = channel._build_message_headers()
 
         self.assertIsInstance(result[0], commands.Basic.Deliver)
@@ -99,14 +100,14 @@ def test_channel_build_message_headers_out_of_order(self):
         deliver = commands.Basic.Deliver()
         header = ContentHeader(body_size=10)
 
-        channel._inbound = [header, deliver]
+        channel._inbound = collections.deque([header, deliver])
         result = channel._build_message_headers()
 
         self.assertEqual(result, None)
         self.assertIn("Received an out-of-order frame:",
                       self.get_last_log())
 
-        channel._inbound = [deliver, deliver]
+        channel._inbound = collections.deque([deliver, deliver])
         result = channel._build_message_headers()
 
         self.assertEqual(result, None)
@@ -115,7 +116,7 @@ def test_channel_build_message_headers_out_of_order(self):
 
     def test_channel_build_message_headers_empty(self):
         channel = Channel(0, mock.Mock(name='Connection'), 360)
-        channel._inbound = []
+        channel._inbound = collections.deque()
         self.assertRaises(IndexError, channel._build_message_headers)
 
     def test_channel_build_message_empty_and_then_break(self):
@@ -126,7 +127,7 @@ def test_channel_build_message_empty_and_then_break(self):
         """
         channel = Channel(0, FakeConnection(), 360)
         channel.set_state(Channel.OPEN)
-        channel._inbound = []
+        channel._inbound = collections.deque()
 
         def add_inbound():
             channel._inbound.append(ContentBody(None))
@@ -160,7 +161,7 @@ def test_channel_build_message_body(self):
         message_len = len(message)
 
         body = ContentBody(value=message)
-        channel._inbound = [body]
+        channel._inbound = collections.deque([body])
         result = channel._build_message_body(message_len)
 
         self.assertEqual(message, result)
@@ -172,7 +173,7 @@ def test_channel_build_message_body_break_on_none_value(self):
         message_len = len(message)
 
         body = ContentBody(value=None)
-        channel._inbound = [body]
+        channel._inbound = collections.deque([body])
         result = channel._build_message_body(message_len)
 
         self.assertEqual(result, b'')
@@ -184,7 +185,7 @@ def test_channel_build_message_body_break_on_empty_value(self):
         message_len = len(message)
 
         body = ContentBody(value=b'')
-        channel._inbound = [body]
+        channel._inbound = collections.deque([body])
         result = channel._build_message_body(message_len)
 
         self.assertEqual(result, b'')
@@ -211,7 +212,7 @@ def add_content():
             channel._inbound.append(ContentBody(value=message))
 
         deliver = commands.Basic.Deliver()
-        channel._inbound = [deliver]
+        channel._inbound = collections.deque([deliver])
 
         self.assertTrue(channel._inbound)
 
@@ -233,7 +234,7 @@ def test_channel_build_inbound_messages(self):
         header = ContentHeader(body_size=message_len)
         body = ContentBody(value=message)
 
-        channel._inbound = [deliver, header, body]
+        channel._inbound = collections.deque([deliver, header, body])
 
         messages_consumed = 0
         for msg in channel.build_inbound_messages(break_on_empty=True):
@@ -253,8 +254,12 @@ def test_channel_build_multiple_inbound_messages(self):
         header = ContentHeader(body_size=message_len)
         body = ContentBody(value=message)
 
-        channel._inbound = [deliver, header, body, deliver, header, body,
-                            deliver, header, body, deliver, header, body]
+        channel._inbound = collections.deque(
+            [
+                deliver, header, body, deliver, header, body,
+                deliver, header, body, deliver, header, body
+            ]
+        )
 
         messages_consumed = 0
         for msg in channel.build_inbound_messages(break_on_empty=True):
@@ -322,7 +327,7 @@ def test_channel_build_inbound_messages_as_tuple(self):
         header = ContentHeader(body_size=message_len)
         body = ContentBody(value=message)
 
-        channel._inbound = [deliver, header, body]
+        channel._inbound = collections.deque([deliver, header, body])
 
         messages_consumed = 0
         for msg in channel.build_inbound_messages(break_on_empty=True,
@@ -348,7 +353,7 @@ def test_channel_process_data_events(self):
         header = ContentHeader(body_size=message_len)
         body = ContentBody(value=message)
 
-        channel._inbound = [deliver, header, body]
+        channel._inbound = collections.deque([deliver, header, body])
 
         def callback(msg):
             self.msg = msg
@@ -373,7 +378,7 @@ def test_channel_process_data_events_as_tuple(self):
         header = ContentHeader(body_size=message_len)
         body = ContentBody(value=message)
 
-        channel._inbound = [deliver, header, body]
+        channel._inbound = collections.deque([deliver, header, body])
 
         def callback(body, channel, method, properties):
             self.msg = (body, channel, method, properties)
@@ -407,7 +412,7 @@ def test_channel_start_consuming(self):
         header = ContentHeader(body_size=message_len)
         body = ContentBody(value=message)
 
-        channel._inbound = [deliver, header, body]
+        channel._inbound = collections.deque([deliver, header, body])
 
         def callback(msg):
             self.msg = msg
@@ -436,7 +441,7 @@ def add_inbound():
             header = ContentHeader(body_size=message_len)
             body = ContentBody(value=message)
 
-            channel._inbound = [deliver, header, body]
+            channel._inbound = collections.deque([deliver, header, body])
 
         def callback(msg):
             self.msg = msg
@@ -476,11 +481,11 @@ def test_channel_start_consuming_multiple_callbacks(self):
         header = ContentHeader(body_size=message_len)
         body = ContentBody(value=message)
 
-        channel._inbound = [
+        channel._inbound = collections.deque([
             deliver_one, header, body,
             deliver_two, header, body,
             deliver_three, header, body
-        ]
+        ])
 
         def callback_one(msg):
             self.assertEqual(msg.method.get('consumer_tag'), 'travis-ci-1')