@@ -36,8 +36,8 @@ def __init__(self, carrier):
36
36
def _raise_for_status (self , status , skip_errors = True ):
37
37
errors = status .get ("response" , {}).get ("errors" )
38
38
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 ),
41
41
)
42
42
if skip_errors :
43
43
_logger .info (msg )
@@ -55,7 +55,8 @@ def _get_new_token(self):
55
55
if not (self .client_id and self .client_secret ):
56
56
raise UserError (
57
57
_ (
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."
59
60
)
60
61
)
61
62
url = "%s/security/v1/oauth/token" % self .url
@@ -175,7 +176,7 @@ def _prepare_create_shipping(self, picking):
175
176
)
176
177
for i in range (0 , picking .number_of_packages ):
177
178
package_item = package_info
178
- package_name = "%s (%s)" % ( picking .name , i + 1 )
179
+ package_name = f" { picking .name } ( { i + 1 } )"
179
180
package_item ["Description" ] = package_name
180
181
package_item ["NumOfPieces" ] = "1"
181
182
package_item ["Packaging" ]["Description" ] = package_name
@@ -363,7 +364,7 @@ def tracking_state_update(self, picking):
363
364
"M" : "in_transit" ,
364
365
}
365
366
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 } " ,
367
368
method = "get" ,
368
369
headers_extra = {
369
370
"transId" : f"{ datetime .datetime .now ().timestamp ()} " ,
@@ -396,9 +397,9 @@ def tracking_state_update(self, picking):
396
397
else :
397
398
for warning in shipment .get ("warnings" ):
398
399
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" ),
402
403
)
403
404
)
404
405
0 commit comments