Merge pull request #91 from duffelhq/f-strings

Use f-strings in examples output

Author: sgerrand

.flake8

@@ -2,3 +2,6 @@
 max-line-length = 90
 exclude = .tox
 max-complexity = 10
+per-file-ignores =
+  # The output from examples are longer than the max line length defined above
+  examples/*.py:E501

examples/book-and-change.py

@@ -20,22 +20,21 @@
         .execute()
     )
 
-    print("Created offer request: %s" % (offer_request.id))
+    print(f"Created offer request: {offer_request.id}")
 
     offers = client.offers.list(offer_request.id)
     offers_list = list(enumerate(offers))
 
-    print("Got %d offers" % len(offers_list))
+    print(f"Got {len(offers_list)} offers")
 
     selected_offer = offers_list[0][1]
 
-    print("Selected offer %s to book" % (selected_offer.id))
+    print(f"Selected offer {selected_offer.id} to book")
 
     priced_offer = client.offers.get(selected_offer.id)
 
     print(
-        "The final price for offer %s is %s (%s)"
-        % (priced_offer.id, priced_offer.total_amount, priced_offer.total_currency)
+        f"The final price for offer {priced_offer.id} is {priced_offer.total_amount} ({priced_offer.total_currency})"
     )
 
     payments = [
@@ -66,10 +65,7 @@
         .execute()
     )
 
-    print(
-        "Created order %s with booking reference %s"
-        % (order.id, order.booking_reference)
-    )
+    print(f"Created order {order.id} with booking reference {order.booking_reference}")
 
     order_change_request_slices = {
         "add": [
@@ -99,13 +95,12 @@
     order_change_offers_list = list(enumerate(order_change_offers))
 
     print(
-        "Got %d options for changing the order; picking first option"
-        % (len(order_change_offers_list))
+        f"Got {len(order_change_offers_list)} options for changing the order; picking first option"
     )
 
     order_change = client.order_changes.create(order_change_offers_list[0][1].id)
 
-    print("Created order change %s, confirming..." % order_change.id)
+    print(f"Created order change {order_change.id}, confirming...")
 
     payment = {
         "amount": order_change.change_total_amount,
@@ -116,10 +111,5 @@
     client.order_changes.confirm(order_change.id, payment)
 
     print(
-        "Processed change to order %s costing %s (%s)"
-        % (
-            order.id,
-            order_change.change_total_amount,
-            order_change.change_total_currency,
-        )
+        f"Processed change to order {order.id} costing {order_change.change_total_amount} ({order_change.change_total_currency})"
     )

examples/book-with-adult-and-infant.py

@@ -23,27 +23,26 @@
         .execute()
     )
 
-    print("Created offer request: %s" % (offer_request.id))
+    print(f"Created offer request: {offer_request.id}")
 
     offers = client.offers.list(offer_request.id)
     offers_list = list(enumerate(offers))
 
-    print("Got %d offers" % len(offers_list))
+    print(f"Got {len(offers_list)} offers")
 
     selected_offer = offers_list[0][1]
 
-    print("Selected offer %s to book" % (selected_offer.id))
+    print(f"Selected offer {selected_offer.id} to book")
 
     priced_offer = client.offers.get(selected_offer.id)
 
     print(
-        "The final price for offer %s is %s (%s)"
-        % (priced_offer.id, priced_offer.total_amount, priced_offer.total_currency)
+        f"The final price for offer {priced_offer.id} is {priced_offer.total_amount} ({priced_offer.total_currency})"
     )
 
     payments = [
         {
-            "currency": selected_offer.total_currency,
+            "currency": priced_offer.total_currency,
             "amount": priced_offer.total_amount,
             "type": "balance",
         }
@@ -90,22 +89,14 @@
         .execute()
     )
 
-    print(
-        "Created order %s with booking reference %s"
-        % (order.id, order.booking_reference)
-    )
+    print(f"Created order {order.id} with booking reference {order.booking_reference}")
 
     order_cancellation = client.order_cancellations.create(order.id)
 
     print(
-        "Requested refund quote for order %s – %s (%s) is available"
-        % (
-            order.id,
-            order_cancellation.refund_amount,
-            order_cancellation.refund_currency,
-        )
+        f"Requested refund quote for order {order.id} – {order_cancellation.refund_amount} ({order_cancellation.refund_currency}) is available"
     )
 
     client.order_cancellations.confirm(order_cancellation.id)
 
-    print("Confirmed refund quote for order %s" % (order.id))
+    print(f"Confirmed refund quote for order {order.id}")

examples/book-with-seat.py

@@ -22,22 +22,21 @@
         .execute()
     )
 
-    print("Created offer request: %s" % (offer_request.id))
+    print(f"Created offer request: {offer_request.id}")
 
     offers = client.offers.list(offer_request.id)
     offers_list = list(enumerate(offers))
 
-    print("Got %d offers" % len(offers_list))
+    print(f"Got {len(offers_list)} offers")
 
     selected_offer = offers_list[0][1]
 
-    print("Selected offer %s to book" % (selected_offer.id))
+    print(f"Selected offer {selected_offer.id} to book")
 
     priced_offer = client.offers.get(selected_offer.id)
 
     print(
-        "The final price for offer %s is %s (%s)"
-        % (priced_offer.id, priced_offer.total_amount, priced_offer.total_currency)
+        f"The final price for offer {priced_offer.id} is {priced_offer.total_amount} ({priced_offer.total_currency})"
     )
 
     seat_maps = client.seat_maps.get(priced_offer.id)
@@ -58,12 +57,7 @@
     available_seat_service = available_seat.available_services[0]
 
     print(
-        "Adding seat %s costing %s (%s)"
-        % (
-            available_seat.designator,
-            available_seat_service.total_amount,
-            available_seat_service.total_currency,
-        )
+        f"Adding seat {available_seat.designator} costing {available_seat_service.total_amount} ({available_seat_service.total_currency})"
     )
 
     total_amount = str(
@@ -106,7 +100,4 @@
         .execute()
     )
 
-    print(
-        "Created order %s with booking reference %s"
-        % (order.id, order.booking_reference)
-    )
+    print(f"Created order {order.id} with booking reference {order.booking_reference}")

examples/hold-and-pay-later.py

@@ -21,16 +21,16 @@
         .execute()
     )
 
-    print("Created offer request: %s" % (offer_request.id))
+    print(f"Created offer request: {offer_request.id}")
 
     offers = client.offers.list(offer_request.id)
     offers_list = list(enumerate(offers))
 
-    print("Got %d offers" % len(offers_list))
+    print(f"Got {len(offers_list)} offers")
 
     selected_offer = offers_list[0][1]
 
-    print("Selected offer %s to book" % (selected_offer.id))
+    print(f"Selected offer {selected_offer.id} to book")
 
     priced_offer = client.offers.get(selected_offer.id)
     passengers = [
@@ -55,15 +55,13 @@
     )
 
     print(
-        "Created hold order %s with booking reference %s"
-        % (order.id, order.booking_reference)
+        f"Created hold order {order.id} with booking reference {order.booking_reference}"
     )
 
     updated_order = client.orders.get(order.id)
 
     print(
-        "Retrieved order and up-to-date price is %s (%s)"
-        % (updated_order.total_amount, updated_order.total_currency)
+        f"Retrieved order and up-to-date price is {updated_order.total_amount} ({updated_order.total_currency})"
     )
 
     payment = (
@@ -79,8 +77,8 @@
         .execute()
     )
 
-    print("Paid for order %s with payment %s" % (order.id, payment.id))
+    print(f"Paid for order {order.id} with payment {payment.id}")
 
     paid_order = client.orders.get(order.id)
 
-    print("After payment, order has %d documents" % len(paid_order.documents))
+    print(f"After payment, order has {len(paid_order.documents)} documents")

examples/search-and-book.py

@@ -22,33 +22,27 @@
         .execute()
     )
 
-    print("Created offer request: %s" % (offer_request.id))
+    print(f"Created offer request: {offer_request.id}")
 
     offers = client.offers.list(offer_request.id)
     offers_list = list(enumerate(offers))
 
-    print("Got %d offers" % len(offers_list))
+    print(f"Got {len(offers_list)} offers")
 
     selected_offer = offers_list[0][1]
 
-    print("Selected offer %s to book" % (selected_offer.id))
+    print(f"Selected offer {selected_offer.id} to book")
 
     priced_offer = client.offers.get(selected_offer.id, return_available_services=True)
 
     print(
-        "The final price for offer %s is %s (%s)"
-        % (priced_offer.id, priced_offer.total_amount, priced_offer.total_currency)
+        f"The final price for offer {priced_offer.id} is {priced_offer.total_amount} ({priced_offer.total_currency})"
     )
 
     available_service = priced_offer.available_services[0]
 
     print(
-        "Adding an extra bag with service %s, costing %s (%s)"
-        % (
-            available_service.id,
-            available_service.total_amount,
-            available_service.total_currency,
-        )
+        f"Adding an extra bag with service {available_service.id}, costing {available_service.total_amount} ({available_service.total_currency})"
     )
 
     total_amount = str(
@@ -89,22 +83,14 @@
         .execute()
     )
 
-    print(
-        "Created order %s with booking reference %s"
-        % (order.id, order.booking_reference)
-    )
+    print(f"Created order {order.id} with booking reference {order.booking_reference}")
 
     order_cancellation = client.order_cancellations.create(order.id)
 
     print(
-        "Requested refund quote for order %s – %s (%s) is available"
-        % (
-            order.id,
-            order_cancellation.refund_amount,
-            order_cancellation.refund_currency,
-        )
+        f"Requested refund quote for order {order.id} – {order_cancellation.refund_amount} ({order_cancellation.refund_currency}) is available"
     )
 
     client.order_cancellations.confirm(order_cancellation.id)
 
-    print("Confirmed refund quote for order %s" % (order.id))
+    print(f"Confirmed refund quote for order {order.id}")