Use unicode_litereals everywhere and updates flakeplus target to --2.7

15 files changed, 47 insertions, 13 deletions

diff --git a/examples/complete_receive.py b/examples/complete_receive.py
index eb774476..e9f2024b 100644
--- a/examples/complete_receive.py
+++ b/examples/complete_receive.py
@@ -1,10 +1,14 @@
 """
 Example of simple consumer that waits for a single message, acknowledges it
 and exits.
+
 """
-from kombu import Connection, Exchange, Queue, Consumer, eventloop
+from __future__ import absolute_import, unicode_literals, print_function
+
 from pprint import pformat
 
+from kombu import Connection, Exchange, Queue, Consumer, eventloop
+
 #: By default messages sent to exchanges are persistent (delivery_mode=2),
 #: and queues and exchanges are durable.
 exchange = Exchange('kombu_demo', type='direct')
@@ -17,9 +21,9 @@ def pretty(obj):
 
 #: This is the callback applied when a message is received.
 def handle_message(body, message):
-    print('Received message: %r' % (body,))
-    print('  properties:\n%s' % (pretty(message.properties),))
-    print('  delivery_info:\n%s' % (pretty(message.delivery_info),))
+    print('Received message: {0!r}'.format(body))
+    print('  properties:\n{0}'.format(pretty(message.properties)))
+    print('  delivery_info:\n{0}'.format(pretty(message.delivery_info)))
     message.ack()
 
 #: Create a connection and a channel.
diff --git a/examples/complete_send.py b/examples/complete_send.py
index 337083c1..08651b91 100644
--- a/examples/complete_send.py
+++ b/examples/complete_send.py
@@ -5,6 +5,8 @@ Example producer that sends a single message and exits.
 You can use `complete_receive.py` to receive the message sent.
 
 """
+from __future__ import absolute_import, unicode_literals
+
 from kombu import Connection, Producer, Exchange, Queue
 
 #: By default messages sent to exchanges are persistent (delivery_mode=2),
diff --git a/examples/experimental/async_consume.py b/examples/experimental/async_consume.py
index 232292ae..88ec62e4 100644
--- a/examples/experimental/async_consume.py
+++ b/examples/experimental/async_consume.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import absolute_import, unicode_literals
 
 from kombu import Connection, Exchange, Queue, Producer, Consumer
 from kombu.async import Hub
@@ -11,11 +12,11 @@ queue = Queue('asynt', exchange, 'asynt')
 def send_message(conn):
     producer = Producer(conn)
     producer.publish('hello world', exchange=exchange, routing_key='asynt')
-    print('MESSAGE SENT')
+    print('message sent')
 
 
 def on_message(message):
-    print('RECEIVED: {0!r}'.format(message.body))
+    print('received: {0!r}'.format(message.body))
     message.ack()
     hub.stop()  # <-- exit after one message
 
diff --git a/examples/hello_consumer.py b/examples/hello_consumer.py
index ebc6d038..5722450e 100644
--- a/examples/hello_consumer.py
+++ b/examples/hello_consumer.py
@@ -1,8 +1,11 @@
+from __future__ import absolute_import, unicode_literals, print_function
+
 from kombu import Connection
 
+
 with Connection('amqp://guest:guest@localhost:5672//') as conn:
     simple_queue = conn.SimpleQueue('simple_queue')
     message = simple_queue.get(block=True, timeout=1)
-    print('Received: %s' % message.payload)
+    print('Received: {0}'.format(message.payload))
     message.ack()
     simple_queue.close()
diff --git a/examples/hello_publisher.py b/examples/hello_publisher.py
index 80ec2825..0eb9de9e 100644
--- a/examples/hello_publisher.py
+++ b/examples/hello_publisher.py
@@ -1,9 +1,13 @@
-from kombu import Connection
+from __future__ import absolute_import, unicode_literals
+
 import datetime
 
+from kombu import Connection
+
+
 with Connection('amqp://guest:guest@localhost:5672//') as conn:
     simple_queue = conn.SimpleQueue('simple_queue')
-    message = 'helloword, sent at %s' % datetime.datetime.today()
+    message = 'helloword, sent at {0}'.format(datetime.datetime.today())
     simple_queue.put(message)
-    print('Sent: %s' % message)
+    print('Sent: {0}'.format(message))
     simple_queue.close()
diff --git a/examples/rpc-tut6/rpc_client.py b/examples/rpc-tut6/rpc_client.py
index 99b53754..27a23903 100644
--- a/examples/rpc-tut6/rpc_client.py
+++ b/examples/rpc-tut6/rpc_client.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import absolute_import, unicode_literals
 
 from kombu import Connection, Producer, Consumer, Queue
 from kombu.utils import uuid
diff --git a/examples/rpc-tut6/rpc_server.py b/examples/rpc-tut6/rpc_server.py
index dca32d4f..c9c496b7 100644
--- a/examples/rpc-tut6/rpc_server.py
+++ b/examples/rpc-tut6/rpc_server.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import absolute_import, unicode_literals
 
 from kombu import Connection, Queue
 from kombu.mixins import ConsumerProducerMixin
diff --git a/examples/simple_eventlet_receive.py b/examples/simple_eventlet_receive.py
index f353d1c0..8d977cc1 100644
--- a/examples/simple_eventlet_receive.py
+++ b/examples/simple_eventlet_receive.py
@@ -6,6 +6,8 @@ You can use `simple_receive.py` (or `complete_receive.py`) to receive the
 message sent.
 
 """
+from __future__ import absolute_import, unicode_literals
+
 import eventlet
 
 from kombu import Connection
diff --git a/examples/simple_eventlet_send.py b/examples/simple_eventlet_send.py
index 6c3ef003..2998fe37 100644
--- a/examples/simple_eventlet_send.py
+++ b/examples/simple_eventlet_send.py
@@ -6,6 +6,8 @@ You can use `simple_receive.py` (or `complete_receive.py`) to receive the
 message sent.
 
 """
+from __future__ import absolute_import, unicode_literals
+
 import eventlet
 
 from kombu import Connection
diff --git a/examples/simple_receive.py b/examples/simple_receive.py
index 906c2742..a534ff70 100644
--- a/examples/simple_receive.py
+++ b/examples/simple_receive.py
@@ -1,6 +1,8 @@
 """
 Example receiving a message using the SimpleQueue interface.
+
 """
+from __future__ import absolute_import, unicode_literals
 
 from kombu import Connection
 
diff --git a/examples/simple_send.py b/examples/simple_send.py
index 3b3f236e..c70d87a6 100644
--- a/examples/simple_send.py
+++ b/examples/simple_send.py
@@ -6,6 +6,8 @@ You can use `simple_receive.py` (or `complete_receive.py`) to receive the
 message sent.
 
 """
+from __future__ import absolute_import, unicode_literals
+
 from kombu import Connection
 
 #: Create connection
diff --git a/examples/simple_task_queue/client.py b/examples/simple_task_queue/client.py
index 1b249578..ec348cf5 100644
--- a/examples/simple_task_queue/client.py
+++ b/examples/simple_task_queue/client.py
@@ -1,10 +1,14 @@
+from __future__ import absolute_import, unicode_literals
+
 from kombu.pools import producers
 
 from .queues import task_exchange
 
-priority_to_routing_key = {'high': 'hipri',
-                           'mid': 'midpri',
-                           'low': 'lopri'}
+priority_to_routing_key = {
+    'high': 'hipri',
+    'mid': 'midpri',
+    'low': 'lopri',
+}
 
 
 def send_as_task(connection, fun, args=(), kwargs={}, priority='mid'):
diff --git a/examples/simple_task_queue/queues.py b/examples/simple_task_queue/queues.py
index 602c2b0e..ccdc3f2c 100644
--- a/examples/simple_task_queue/queues.py
+++ b/examples/simple_task_queue/queues.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals
+
 from kombu import Exchange, Queue
 
 task_exchange = Exchange('tasks', type='direct')
diff --git a/examples/simple_task_queue/tasks.py b/examples/simple_task_queue/tasks.py
index d3751506..1d520fad 100644
--- a/examples/simple_task_queue/tasks.py
+++ b/examples/simple_task_queue/tasks.py
@@ -1,2 +1,4 @@
+from __future__ import absolute_import, unicode_literals
+
 def hello_task(who='world'):
     print('Hello {0}'.format(who))
diff --git a/examples/simple_task_queue/worker.py b/examples/simple_task_queue/worker.py
index 6113d4ac..6b617cf0 100644
--- a/examples/simple_task_queue/worker.py
+++ b/examples/simple_task_queue/worker.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals
+
 from kombu.mixins import ConsumerMixin
 from kombu.log import get_logger
 from kombu.utils import reprcall