From b3d031c473e24a7560cc7d21c7830e81774b6acf Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 21 Jan 2022 02:12:40 +0100 Subject: [PATCH 1/4] make expression simpler --- InvenTree/part/bom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/part/bom.py b/InvenTree/part/bom.py index 71bcf4889b..c60b9a7a77 100644 --- a/InvenTree/part/bom.py +++ b/InvenTree/part/bom.py @@ -205,7 +205,7 @@ def ExportBom(part, fmt='csv', cascade=False, max_levels=None, parameter_data=Fa supplier_parts_used.add(sp_part) - if sp_part.supplier and sp_part.supplier: + if sp_part.supplier: supplier_name = sp_part.supplier.name else: supplier_name = '' From 02058389b2b0845bdc5802129f57b3486ca8b3e1 Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 21 Jan 2022 02:13:41 +0100 Subject: [PATCH 2/4] remove unneeded pass --- InvenTree/InvenTree/middleware.py | 1 - 1 file changed, 1 deletion(-) diff --git a/InvenTree/InvenTree/middleware.py b/InvenTree/InvenTree/middleware.py index 0d7a4f46f7..a9c43c71b6 100644 --- a/InvenTree/InvenTree/middleware.py +++ b/InvenTree/InvenTree/middleware.py @@ -65,7 +65,6 @@ class AuthRequiredMiddleware(object): except Token.DoesNotExist: logger.warning(f"Access denied for unknown token {token_key}") - pass # No authorization was found for the request if not authorized: From 3ab93dcdd50bb094c34cc3d6ba7fe8492ddca8a0 Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 21 Jan 2022 02:17:30 +0100 Subject: [PATCH 3/4] only one exception type needed --- InvenTree/InvenTree/exchange.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/InvenTree/exchange.py b/InvenTree/InvenTree/exchange.py index 936dd7a76e..d3ffcfb8cd 100644 --- a/InvenTree/InvenTree/exchange.py +++ b/InvenTree/InvenTree/exchange.py @@ -31,7 +31,7 @@ class InvenTreeExchange(SimpleExchangeBackend): try: super().update_rates(base=base_currency, symbols=symbols) # catch connection errors - except (HTTPError, URLError): + except URLError: print('Encountered connection error while updating') except OperationalError as e: if 'SerializationFailure' in e.__cause__.__class__.__name__: From 6bfb17f2ab2aed69107d0568a00ce898a74d7166 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 24 Jan 2022 23:38:12 +0100 Subject: [PATCH 4/4] pep fix --- InvenTree/InvenTree/exchange.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/InvenTree/exchange.py b/InvenTree/InvenTree/exchange.py index d3ffcfb8cd..4b99953382 100644 --- a/InvenTree/InvenTree/exchange.py +++ b/InvenTree/InvenTree/exchange.py @@ -1,5 +1,5 @@ from common.settings import currency_code_default, currency_codes -from urllib.error import HTTPError, URLError +from urllib.error import URLError from djmoney.contrib.exchange.backends.base import SimpleExchangeBackend from django.db.utils import OperationalError