pyupgrade

16 files changed, 13 insertions, 35 deletions

diff --git a/examples/complete_receive.py b/examples/complete_receive.py
index e9f2024b..f122262a 100644
--- a/examples/complete_receive.py
+++ b/examples/complete_receive.py
@@ -3,7 +3,6 @@ Example of simple consumer that waits for a single message, acknowledges it
 and exits.
 
 """
-from __future__ import absolute_import, unicode_literals, print_function
 
 from pprint import pformat
 
@@ -21,9 +20,9 @@ def pretty(obj):
 
 #: This is the callback applied when a message is received.
 def handle_message(body, message):
-    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)))
+    print(f'Received message: {body!r}')
+    print('  properties:\n{}'.format(pretty(message.properties)))
+    print('  delivery_info:\n{}'.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 6c33a820..90bd3f9e 100644
--- a/examples/complete_send.py
+++ b/examples/complete_send.py
@@ -5,7 +5,6 @@ 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
 
diff --git a/examples/experimental/async_consume.py b/examples/experimental/async_consume.py
index b794687e..aebb974b 100644
--- a/examples/experimental/async_consume.py
+++ b/examples/experimental/async_consume.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-from __future__ import absolute_import, unicode_literals
 
 from kombu import Connection, Exchange, Queue, Producer, Consumer
 from kombu.asynchronous import Hub
@@ -16,7 +15,7 @@ def send_message(conn):
 
 
 def on_message(message):
-    print('received: {0!r}'.format(message.body))
+    print(f'received: {message.body!r}')
     message.ack()
     hub.stop()  # <-- exit after one message
 
diff --git a/examples/hello_consumer.py b/examples/hello_consumer.py
index 71f40f13..e633e02d 100644
--- a/examples/hello_consumer.py
+++ b/examples/hello_consumer.py
@@ -1,11 +1,9 @@
-from __future__ import absolute_import, unicode_literals, print_function
-
 from kombu import Connection  # noqa
 
 
 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: {0}'.format(message.payload))
+    print(f'Received: {message.payload}')
     message.ack()
     simple_queue.close()
diff --git a/examples/hello_publisher.py b/examples/hello_publisher.py
index e6b07361..d6a49048 100644
--- a/examples/hello_publisher.py
+++ b/examples/hello_publisher.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import datetime
 
 from kombu import Connection
@@ -7,7 +5,7 @@ from kombu import Connection
 
 with Connection('amqp://guest:guest@localhost:5672//') as conn:
     simple_queue = conn.SimpleQueue('simple_queue')
-    message = 'helloworld, sent at {0}'.format(datetime.datetime.today())
+    message = f'helloworld, sent at {datetime.datetime.today()}'
     simple_queue.put(message)
-    print('Sent: {0}'.format(message))
+    print(f'Sent: {message}')
     simple_queue.close()
diff --git a/examples/memory_transport.py b/examples/memory_transport.py
index f0b43940..662c94a0 100644
--- a/examples/memory_transport.py
+++ b/examples/memory_transport.py
@@ -11,7 +11,7 @@ task_queues = [video_queue]
 
 
 def handle_message(body, message):
-    print("%s RECEIVED MESSAGE: %r" % (time.time(), body))
+    print(f"{time.time()} RECEIVED MESSAGE: {body!r}")
     message.ack()
 
 
diff --git a/examples/rpc-tut6/rpc_client.py b/examples/rpc-tut6/rpc_client.py
index bf058f56..6ed5833f 100644
--- a/examples/rpc-tut6/rpc_client.py
+++ b/examples/rpc-tut6/rpc_client.py
@@ -1,10 +1,9 @@
 #!/usr/bin/env python
-from __future__ import absolute_import, unicode_literals
 
 from kombu import Connection, Producer, Consumer, Queue, uuid
 
 
-class FibonacciRpcClient(object):
+class FibonacciRpcClient:
 
     def __init__(self, connection):
         self.connection = connection
@@ -39,7 +38,7 @@ def main(broker_url):
     fibonacci_rpc = FibonacciRpcClient(connection)
     print(' [x] Requesting fib(30)')
     response = fibonacci_rpc.call(30)
-    print(' [.] Got {0!r}'.format(response))
+    print(f' [.] Got {response!r}')
 
 
 if __name__ == '__main__':
diff --git a/examples/rpc-tut6/rpc_server.py b/examples/rpc-tut6/rpc_server.py
index bb64726b..761630ca 100644
--- a/examples/rpc-tut6/rpc_server.py
+++ b/examples/rpc-tut6/rpc_server.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-from __future__ import absolute_import, unicode_literals
 
 from kombu import Connection, Queue
 from kombu.mixins import ConsumerProducerMixin
@@ -31,7 +30,7 @@ class Worker(ConsumerProducerMixin):
 
     def on_request(self, message):
         n = message.payload['n']
-        print(' [.] fib({0})'.format(n))
+        print(f' [.] fib({n})')
         result = fib(n)
 
         self.producer.publish(
diff --git a/examples/simple_eventlet_receive.py b/examples/simple_eventlet_receive.py
index 8d977cc1..18a3f6bb 100644
--- a/examples/simple_eventlet_receive.py
+++ b/examples/simple_eventlet_receive.py
@@ -6,7 +6,6 @@ You can use `simple_receive.py` (or `complete_receive.py`) to receive the
 message sent.
 
 """
-from __future__ import absolute_import, unicode_literals
 
 import eventlet
 
diff --git a/examples/simple_eventlet_send.py b/examples/simple_eventlet_send.py
index 2998fe37..9a753e7a 100644
--- a/examples/simple_eventlet_send.py
+++ b/examples/simple_eventlet_send.py
@@ -6,7 +6,6 @@ You can use `simple_receive.py` (or `complete_receive.py`) to receive the
 message sent.
 
 """
-from __future__ import absolute_import, unicode_literals
 
 import eventlet
 
@@ -30,7 +29,7 @@ def send_many(n):
         with connection.SimpleQueue('kombu_demo') as queue:
 
             def send_message(i):
-                queue.put({'hello': 'world%s' % (i,)})
+                queue.put({'hello': f'world{i}'})
 
             pool = eventlet.GreenPool(10)
             for i in range(n):
diff --git a/examples/simple_receive.py b/examples/simple_receive.py
index a534ff70..90c2d0ae 100644
--- a/examples/simple_receive.py
+++ b/examples/simple_receive.py
@@ -2,7 +2,6 @@
 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 c70d87a6..d2eacea4 100644
--- a/examples/simple_send.py
+++ b/examples/simple_send.py
@@ -6,7 +6,6 @@ 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
 
diff --git a/examples/simple_task_queue/client.py b/examples/simple_task_queue/client.py
index ec348cf5..e19b9476 100644
--- a/examples/simple_task_queue/client.py
+++ b/examples/simple_task_queue/client.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from kombu.pools import producers
 
 from .queues import task_exchange
diff --git a/examples/simple_task_queue/queues.py b/examples/simple_task_queue/queues.py
index ccdc3f2c..602c2b0e 100644
--- a/examples/simple_task_queue/queues.py
+++ b/examples/simple_task_queue/queues.py
@@ -1,5 +1,3 @@
-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 99258ce3..2810f7a8 100644
--- a/examples/simple_task_queue/tasks.py
+++ b/examples/simple_task_queue/tasks.py
@@ -1,5 +1,2 @@
-from __future__ import absolute_import, unicode_literals
-
-
 def hello_task(who='world'):
-    print('Hello {0}'.format(who))
+    print(f'Hello {who}')
diff --git a/examples/simple_task_queue/worker.py b/examples/simple_task_queue/worker.py
index bd2dd7f8..14064ccf 100644
--- a/examples/simple_task_queue/worker.py
+++ b/examples/simple_task_queue/worker.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from kombu.mixins import ConsumerMixin
 from kombu.log import get_logger
 from kombu.utils.functional import reprcall