Skip to content

Commit 15f5a2b

Browse files
committed
FIX PRECOMMIT
1 parent 7dd33b8 commit 15f5a2b

File tree

4 files changed

+13
-15
lines changed

4 files changed

+13
-15
lines changed

delivery_ups_oca/__manifest__.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"development_status": "Beta",
99
"category": "Delivery",
1010
"website": "https://github.com/OCA/delivery-carrier",
11-
"author": "Hunki Enterprises BV, Tecnativa, ForgeFlow, Odoo Community Association (OCA)",
11+
"author": """Hunki Enterprises BV, Tecnativa, ForgeFlow,
12+
Odoo Community Association (OCA)""",
1213
"license": "AGPL-3",
1314
"excludes": ["delivery_ups"],
1415
"depends": [

delivery_ups_oca/models/delivery_carrier.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,7 @@ def _create_ups_label(self, picking, labels):
156156
val_list = []
157157
for label in labels:
158158
format_code = label["format_code"].upper()
159-
attachment_name = "%s-%s.%s" % (
160-
label["tracking_ref"],
161-
format_code,
162-
format_code,
163-
)
159+
attachment_name = f"{label['tracking_ref']}-{format_code}.{format_code}"
164160
val_list.append(
165161
self._prepare_ups_label_attachment(
166162
picking,

delivery_ups_oca/models/ups_request.py

+9-8
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ def __init__(self, carrier):
3636
def _raise_for_status(self, status, skip_errors=True):
3737
errors = status.get("response", {}).get("errors")
3838
if errors:
39-
msg = _("Sending to UPS: %s") % (
40-
"\n".join("%(code)s %(message)s" % error for error in errors),
39+
msg = _("Sending to UPS: {}").format(
40+
"\n".join("{code} {message}".format(**error) for error in errors),
4141
)
4242
if skip_errors:
4343
_logger.info(msg)
@@ -55,7 +55,8 @@ def _get_new_token(self):
5555
if not (self.client_id and self.client_secret):
5656
raise UserError(
5757
_(
58-
"Both Client ID and Client Secret must be set in UPS delivery carriers."
58+
"Both Client ID and Client Secret"
59+
" must be set in UPS delivery carriers."
5960
)
6061
)
6162
url = "%s/security/v1/oauth/token" % self.url
@@ -175,7 +176,7 @@ def _prepare_create_shipping(self, picking):
175176
)
176177
for i in range(0, picking.number_of_packages):
177178
package_item = package_info
178-
package_name = "%s (%s)" % (picking.name, i + 1)
179+
package_name = f"{picking.name} ({i+1})"
179180
package_item["Description"] = package_name
180181
package_item["NumOfPieces"] = "1"
181182
package_item["Packaging"]["Description"] = package_name
@@ -363,7 +364,7 @@ def tracking_state_update(self, picking):
363364
"M": "in_transit",
364365
}
365366
status = self._process_reply(
366-
url="%s/api/track/v1/details/%s" % (self.url, picking.carrier_tracking_ref),
367+
url=f"{self.url}/api/track/v1/details/{picking.carrier_tracking_ref}",
367368
method="get",
368369
headers_extra={
369370
"transId": f"{datetime.datetime.now().timestamp()}",
@@ -396,9 +397,9 @@ def tracking_state_update(self, picking):
396397
else:
397398
for warning in shipment.get("warnings"):
398399
states_list.append(
399-
_("{} - Warning: {}").format(
400-
datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
401-
warning.get("message"),
400+
_("{date} - Warning: {warn}").format(
401+
date=datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
402+
warn=warning.get("message"),
402403
)
403404
)
404405

delivery_ups_oca/tests/test_delivery_ups.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def _create_sale_order(self):
7070
sale = order_form.save()
7171
delivery_wizard = Form(
7272
self.env["choose.delivery.carrier"].with_context(
73-
{"default_order_id": sale.id, "default_carrier_id": self.carrier.id}
73+
**{"default_order_id": sale.id, "default_carrier_id": self.carrier.id}
7474
)
7575
).save()
7676
delivery_wizard.button_confirm()

0 commit comments

Comments
 (0)