Skip to content

Commit

Permalink
pre-commit fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ByteMeAsap committed Dec 16, 2024
1 parent 74ad3fb commit 7eb01b5
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
18 changes: 11 additions & 7 deletions delivery_sendcloud_official/models/abstract_sendcloud_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,17 @@ def _do_request(self, type_request, url, data=None, auth=None, headers=None):
resp = requests.get(url=url, params=data, auth=auth)
elif type_request == "PUT":
resp = requests.put(url=url, json=data, auth=auth)
except requests.ConnectionError:
raise UserError(_("Sendcloud: server not reachable, try again later"))
except requests.Timeout:
raise UserError(_("Sendcloud timeout: the server didn't reply within 30s"))
except requests.HTTPError:
except requests.ConnectionError as CE:
raise UserError(
_("Sendcloud: server not reachable, try again later")
) from CE
except requests.Timeout as TO:
raise UserError(
_("Sendcloud timeout: the server didn't reply within 30s")
) from TO
except requests.HTTPError as HE:
error_msg = resp.json().get("error", {}).get("message", "")
raise UserError(_("Sendcloud: %s") % error_msg or resp.text)
raise UserError(_("Sendcloud: %s") % error_msg or resp.text) from HE

# Handle request limiting (retry after one second)
if resp.status_code == 429:
Expand Down Expand Up @@ -113,7 +117,7 @@ def _log_response_in_action(
decoded_content = "Byte content"
try:
decoded_content = resp.content.decode()
except:
except Exception:
pass
if resp.status_code == 401 and not self.env.context.get("skip_raise_error_401"):
error_msg = resp.json().get("error", {}).get("message", "")
Expand Down
1 change: 1 addition & 0 deletions delivery_sendcloud_official/models/sendcloud_action.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ def _compute_resource_record(self):
else:
action.record_id = False

# flake8: noqa: C901
def parse_result(self):
self.ensure_one()

Expand Down
2 changes: 1 addition & 1 deletion delivery_sendcloud_official/models/sendcloud_parcel.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def action_get_return_portal_url(self):
code = parcel.sendcloud_code
integration = parcel.company_id.sendcloud_default_integration_id
response = integration.get_return_portal_url(code)
if response.get("url") == None:
if response.get("url") is None:
parcel.return_portal_url = "None"
else:
parcel.return_portal_url = response.get("url")
Expand Down
1 change: 1 addition & 0 deletions delivery_sendcloud_official/models/stock_picking.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ def _compute_sendcloud_parcel_count(self):
for picking in self:
picking.sendcloud_parcel_count = len(picking.sendcloud_parcel_ids)

# flake8: noqa: C901
def _prepare_sendcloud_vals_from_picking(self, package=False):
self.ensure_one()

Expand Down

0 comments on commit 7eb01b5

Please sign in to comment.