Set YAPF and flake8 to do 99 columns, not 79

python-trio · Feb 14, 2018 · 16c4f66 · 16c4f66
1 parent cda68c7
commit 16c4f66
Show file tree

Hide file tree

Showing 17 changed files with 242 additions and 670 deletions.
diff --git a/.style.yapf b/.style.yapf
@@ -45,7 +45,7 @@ blank_line_before_nested_class_or_def=False
 coalesce_brackets=False
 
 # The column limit.
-column_limit=79
+column_limit=99
 
 # Indent width used for line continuations.
 continuation_indent_width=4

diff --git a/tests/test_basic.py b/tests/test_basic.py
@@ -33,9 +33,7 @@ async def test_basic_qos_prefetch_size(self):
             async with amqp.new_channel() as channel:
                 with pytest.raises(exceptions.ChannelClosed) as cm:
                     await channel.basic_qos(
-                        prefetch_size=10,
-                        prefetch_count=100,
-                        connection_global=False
+                        prefetch_size=10, prefetch_count=100, connection_global=False
                     )
 
         assert cm.value.code == 540
@@ -48,9 +46,7 @@ async def test_basic_qos_wrong_values(self):
             async with amqp.new_channel() as channel:
                 with pytest.raises(struct.error):
                     await channel.basic_qos(
-                        prefetch_size=100000,
-                        prefetch_count=1000000000,
-                        connection_global=False
+                        prefetch_size=100000, prefetch_count=1000000000, connection_global=False
                     )
 
 
@@ -68,9 +64,7 @@ async def callback(channel, body, envelope, _properties):
         result = await channel.basic_consume(callback, queue_name=queue_name)
         result = await channel.basic_cancel(result['consumer_tag'])
 
-        result = await channel.publish(
-            "payload", exchange_name, routing_key=''
-        )
+        result = await channel.publish("payload", exchange_name, routing_key='')
 
         await trio.sleep(1)
         result = await channel.queue_declare(queue_name, passive=True)
@@ -92,20 +86,15 @@ async def test_basic_get(self, channel):
 
         await channel.queue_declare(queue_name)
         await channel.exchange_declare(exchange_name, type_name='direct')
-        await channel.queue_bind(
-            queue_name, exchange_name, routing_key=routing_key
-        )
+        await channel.queue_bind(queue_name, exchange_name, routing_key=routing_key)
 
-        await channel.publish(
-            "payload", exchange_name, routing_key=routing_key
-        )
+        await channel.publish("payload", exchange_name, routing_key=routing_key)
 
         result = await channel.basic_get(queue_name)
         assert result['routing_key'] == routing_key
         assert not result['redelivered']
         assert 'delivery_tag' in result
-        assert result['exchange_name'
-                      ] == channel.protocol.full_name(exchange_name)
+        assert result['exchange_name'] == channel.protocol.full_name(exchange_name)
         assert result['message'] == b'payload'
         assert isinstance(result['properties'], properties.Properties)
 
@@ -116,26 +105,18 @@ async def test_basic_get_empty(self, channel):
         routing_key = ''
         await channel.queue_declare(queue_name)
         await channel.exchange_declare(exchange_name, type_name='direct')
-        await channel.queue_bind(
-            queue_name, exchange_name, routing_key=routing_key
-        )
+        await channel.queue_bind(queue_name, exchange_name, routing_key=routing_key)
 
         with pytest.raises(exceptions.EmptyQueue):
             await channel.basic_get(queue_name)
 
 
 class TestBasicDelivery(testcase.RabbitTestCase):
-    async def publish(
-        self, amqp, queue_name, exchange_name, routing_key, payload
-    ):
+    async def publish(self, amqp, queue_name, exchange_name, routing_key, payload):
         async with amqp.new_channel() as channel:
-            await channel.queue_declare(
-                queue_name, exclusive=False, no_wait=False
-            )
+            await channel.queue_declare(queue_name, exclusive=False, no_wait=False)
             await channel.exchange_declare(exchange_name, type_name='fanout')
-            await channel.queue_bind(
-                queue_name, exchange_name, routing_key=routing_key
-            )
+            await channel.queue_bind(queue_name, exchange_name, routing_key=routing_key)
             await channel.publish(payload, exchange_name, queue_name)
 
     @pytest.mark.trio
@@ -144,9 +125,7 @@ async def test_ack_message(self, amqp):
         exchange_name = 'exchange_name'
         routing_key = ''
 
-        await self.publish(
-            amqp, queue_name, exchange_name, routing_key, "payload"
-        )
+        await self.publish(amqp, queue_name, exchange_name, routing_key, "payload")
 
         qfuture = trio.Event()
 
@@ -167,9 +146,7 @@ async def test_basic_nack(self, amqp):
         exchange_name = 'exchange_name'
         routing_key = ''
 
-        await self.publish(
-            amqp, queue_name, exchange_name, routing_key, "payload"
-        )
+        await self.publish(amqp, queue_name, exchange_name, routing_key, "payload")
 
         qfuture = trio.Event()
 
@@ -190,18 +167,14 @@ async def test_basic_nack_norequeue(self, amqp):
         exchange_name = 'exchange_name'
         routing_key = ''
 
-        await self.publish(
-            amqp, queue_name, exchange_name, routing_key, "payload"
-        )
+        await self.publish(amqp, queue_name, exchange_name, routing_key, "payload")
 
         qfuture = trio.Event()
 
         async with amqp.new_channel() as channel:
 
             async def qcallback(channel, body, envelope, _properties):
-                await channel.basic_client_nack(
-                    envelope.delivery_tag, requeue=False
-                )
+                await channel.basic_client_nack(envelope.delivery_tag, requeue=False)
                 qfuture.set()
 
             await channel.basic_consume(qcallback, queue_name=queue_name)
@@ -213,9 +186,7 @@ async def test_basic_nack_requeue(self, amqp):
         exchange_name = 'exchange_name'
         routing_key = ''
 
-        await self.publish(
-            amqp, queue_name, exchange_name, routing_key, "payload"
-        )
+        await self.publish(amqp, queue_name, exchange_name, routing_key, "payload")
 
         qfuture = trio.Event()
         called = False
@@ -226,9 +197,7 @@ async def qcallback(channel, body, envelope, _properties):
                 nonlocal called
                 if not called:
                     called = True
-                    await channel.basic_client_nack(
-                        envelope.delivery_tag, requeue=True
-                    )
+                    await channel.basic_client_nack(envelope.delivery_tag, requeue=True)
                 else:
                     await channel.basic_client_ack(envelope.delivery_tag)
                     qfuture.set()
@@ -241,9 +210,7 @@ async def test_basic_reject(self, amqp):
         queue_name = 'queue_name'
         exchange_name = 'exchange_name'
         routing_key = ''
-        await self.publish(
-            amqp, queue_name, exchange_name, routing_key, "payload"
-        )
+        await self.publish(amqp, queue_name, exchange_name, routing_key, "payload")
 
         qfuture = trio.Event()
 

diff --git a/tests/test_channel.py b/tests/test_channel.py
@@ -55,8 +55,7 @@ async def test_channel_active_flow(self, channel):
         assert result['active']
 
     @pytest.mark.skipif(
-        IMPLEMENT_CHANNEL_FLOW is False,
-        reason="active=false is not implemented in RabbitMQ"
+        IMPLEMENT_CHANNEL_FLOW is False, reason="active=false is not implemented in RabbitMQ"
     )
     @pytest.mark.trio
     async def test_channel_inactive_flow(self, channel):
@@ -71,8 +70,7 @@ async def test_channel_active_flow_twice(self, channel):
         result = await channel.flow(active=True)
 
     @pytest.mark.skipif(
-        IMPLEMENT_CHANNEL_FLOW is False,
-        reason="active=false is not implemented in RabbitMQ"
+        IMPLEMENT_CHANNEL_FLOW is False, reason="active=false is not implemented in RabbitMQ"
     )
     @pytest.mark.trio
     async def test_channel_active_inactive_flow(self, channel):

diff --git a/tests/test_consume.py b/tests/test_consume.py
@@ -35,9 +35,7 @@ def badcallback():
         with pytest.raises(TypeError):
             async with proto as amqp:
                 async with amqp.new_channel() as chan:
-                    await chan.queue_declare(
-                        "q", exclusive=True, no_wait=False
-                    )
+                    await chan.queue_declare("q", exclusive=True, no_wait=False)
                     await chan.exchange_declare("e", "fanout")
                     await chan.queue_bind("q", "e", routing_key='')
 
@@ -54,9 +52,7 @@ def badcallback():
                         await self.check_messages(amqp, "q", 1)
 
                         # start consume
-                        await channel.basic_consume(
-                            badcallback, queue_name="q"
-                        )
+                        await channel.basic_consume(badcallback, queue_name="q")
                         await trio.sleep(1)
 
     @pytest.mark.trio
@@ -138,13 +134,9 @@ async def q2_callback(channel, body, envelope, properties):
                     q2_future.set()
 
                 # start consumers
-                result = await channel.basic_consume(
-                    q1_callback, queue_name="q1"
-                )
+                result = await channel.basic_consume(q1_callback, queue_name="q1")
                 ctag_q1 = result['consumer_tag']
-                result = await channel.basic_consume(
-                    q2_callback, queue_name="q2"
-                )
+                result = await channel.basic_consume(q2_callback, queue_name="q2")
                 ctag_q2 = result['consumer_tag']
 
                 # put message in q1
@@ -172,14 +164,10 @@ async def q2_callback(channel, body, envelope, properties):
     async def test_duplicate_consumer_tag(self, channel):
         await channel.queue_declare("q1", exclusive=True, no_wait=False)
         await channel.queue_declare("q2", exclusive=True, no_wait=False)
-        await channel.basic_consume(
-            self.callback, queue_name="q1", consumer_tag='tag'
-        )
+        await channel.basic_consume(self.callback, queue_name="q1", consumer_tag='tag')
 
         with pytest.raises(exceptions.ChannelClosed) as cm:
-            await channel.basic_consume(
-                self.callback, queue_name="q2", consumer_tag='tag'
-            )
+            await channel.basic_consume(self.callback, queue_name="q2", consumer_tag='tag')
 
         assert cm.value.code == 530
 

diff --git a/tests/test_exchange.py b/tests/test_exchange.py
@@ -14,74 +14,49 @@ class TestExchangeDeclare(testcase.RabbitTestCase):
 
     @pytest.mark.trio
     async def test_exchange_direct_declare(self, channel):
-        result = await channel.exchange_declare(
-            'exchange_name', type_name='direct'
-        )
+        result = await channel.exchange_declare('exchange_name', type_name='direct')
         assert result
 
     @pytest.mark.trio
     async def test_exchange_fanout_declare(self, channel):
-        result = await channel.exchange_declare(
-            'exchange_name', type_name='fanout'
-        )
+        result = await channel.exchange_declare('exchange_name', type_name='fanout')
         assert result
 
     @pytest.mark.trio
     async def test_exchange_topic_declare(self, channel):
-        result = await channel.exchange_declare(
-            'exchange_name', type_name='topic'
-        )
+        result = await channel.exchange_declare('exchange_name', type_name='topic')
         assert result
 
     @pytest.mark.trio
     async def test_exchange_headers_declare(self, channel):
-        result = await channel.exchange_declare(
-            'exchange_name', type_name='headers'
-        )
+        result = await channel.exchange_declare('exchange_name', type_name='headers')
         assert result
 
     @pytest.mark.trio
     async def test_exchange_declare_wrong_types(self, channel):
         result = await channel.exchange_declare(
-            'exchange_name',
-            type_name='headers',
-            auto_delete=True,
-            durable=True
+            'exchange_name', type_name='headers', auto_delete=True, durable=True
         )
         assert result
 
         with pytest.raises(exceptions.ChannelClosed):
             result = await channel.exchange_declare(
-                'exchange_name',
-                type_name='fanout',
-                auto_delete=False,
-                durable=False
+                'exchange_name', type_name='fanout', auto_delete=False, durable=False
             )
 
     @pytest.mark.trio
     async def test_exchange_declare_passive(self, channel):
         result = await channel.exchange_declare(
-            'exchange_name',
-            type_name='headers',
-            auto_delete=True,
-            durable=True
+            'exchange_name', type_name='headers', auto_delete=True, durable=True
         )
         assert result
         result = await channel.exchange_declare(
-            'exchange_name',
-            type_name='headers',
-            auto_delete=True,
-            durable=True,
-            passive=True
+            'exchange_name', type_name='headers', auto_delete=True, durable=True, passive=True
         )
         assert result
 
         result = await channel.exchange_declare(
-            'exchange_name',
-            type_name='headers',
-            auto_delete=False,
-            durable=False,
-            passive=True
+            'exchange_name', type_name='headers', auto_delete=False, durable=False, passive=True
         )
         assert result
 
@@ -117,9 +92,7 @@ async def test_delete(self, channel):
         result = await channel.exchange_delete(exchange_name)
         assert result
         with pytest.raises(exceptions.ChannelClosed) as cm:
-            await channel.exchange_declare(
-                exchange_name, type_name='direct', passive=True
-            )
+            await channel.exchange_declare(exchange_name, type_name='direct', passive=True)
 
         assert cm.value.code == 404
 
@@ -144,9 +117,7 @@ async def test_double_delete(self, channel):
 class TestExchangeBind(testcase.RabbitTestCase):
     @pytest.mark.trio
     async def test_exchange_bind(self, channel):
-        await channel.exchange_declare(
-            'exchange_destination', type_name='direct'
-        )
+        await channel.exchange_declare('exchange_destination', type_name='direct')
         await channel.exchange_declare('exchange_source', type_name='direct')
 
         result = await channel.exchange_bind(
@@ -158,9 +129,7 @@ async def test_exchange_bind(self, channel):
     @pytest.mark.trio
     async def test_inexistant_exchange_bind(self, channel):
         with pytest.raises(exceptions.ChannelClosed) as cm:
-            await channel.exchange_bind(
-                'exchange_destination', 'exchange_source', routing_key=''
-            )
+            await channel.exchange_bind('exchange_destination', 'exchange_source', routing_key='')
 
         assert cm.value.code == 404
 
@@ -175,9 +144,7 @@ async def test_exchange_unbind(self, channel):
 
         await channel.exchange_bind(ex_destination, ex_source, routing_key='')
 
-        await channel.exchange_unbind(
-            ex_destination, ex_source, routing_key=''
-        )
+        await channel.exchange_unbind(ex_destination, ex_source, routing_key='')
 
     @pytest.mark.trio
     async def test_exchange_unbind_reversed(self, channel):
@@ -190,15 +157,11 @@ async def test_exchange_unbind_reversed(self, channel):
 
         if self.server_version(channel.protocol) < (3, 3, 5):
             with pytest.raises(exceptions.ChannelClosed) as cm:
-                result = await channel.exchange_unbind(
-                    ex_source, ex_destination, routing_key=''
-                )
+                result = await channel.exchange_unbind(ex_source, ex_destination, routing_key='')
 
             assert cm.value.code == 404
 
         else:
             # weird result from rabbitmq 3.3.5
-            result = await channel.exchange_unbind(
-                ex_source, ex_destination, routing_key=''
-            )
+            result = await channel.exchange_unbind(ex_source, ex_destination, routing_key='')
             assert result