From bb4e52997c9451b9a343cda0383f49cdfe2510d4 Mon Sep 17 00:00:00 2001 From: Sourcery AI <> Date: Mon, 1 Aug 2022 21:47:33 +0000 Subject: [PATCH] 'Refactored by Sourcery' --- conreq/_core/sign_up/components.py | 16 +++++++++++----- conreq/utils/environment.py | 9 ++------- conreq/utils/views.py | 4 +--- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/conreq/_core/sign_up/components.py b/conreq/_core/sign_up/components.py index 3567bca1..457a24a2 100644 --- a/conreq/_core/sign_up/components.py +++ b/conreq/_core/sign_up/components.py @@ -15,10 +15,16 @@ def _lock_invite_code(_event): code.save() set_locked(True) - if not locked: - return html.button( + return ( + None + if locked + else html.button( {"className": "btn btn-sm", "onClick": _lock_invite_code}, - html.span({"className": "glyphicon glyphicon-lock", "aria-hidden": "true"}), + html.span( + { + "className": "glyphicon glyphicon-lock", + "aria-hidden": "true", + } + ), ) - - return None + ) diff --git a/conreq/utils/environment.py b/conreq/utils/environment.py index 1f607fe7..1a79004b 100644 --- a/conreq/utils/environment.py +++ b/conreq/utils/environment.py @@ -34,9 +34,7 @@ def _parse_env_value(value: Any, default_value: Any, return_type: Callable) -> A return default_value if return_type in {list, dict} and isinstance(value, str): return json.loads(value) - if not isinstance(value, return_type): - return return_type(value) - return value + return value if isinstance(value, return_type) else return_type(value) def get_env( @@ -137,10 +135,7 @@ def get_database_engine() -> str: if _DB_ENGINE is None: _DB_ENGINE = get_env("DB_ENGINE", "").upper() - if _DB_ENGINE in {"MYSQL"}: - return _DB_ENGINE - - return "SQLITE3" + return _DB_ENGINE if _DB_ENGINE in {"MYSQL"} else "SQLITE3" def set_env(name: str, value: Any, sys_env=False, dot_env=True) -> Tuple[str, str]: diff --git a/conreq/utils/views.py b/conreq/utils/views.py index 44512428..7d15097b 100644 --- a/conreq/utils/views.py +++ b/conreq/utils/views.py @@ -106,9 +106,7 @@ def staff_required(view, login_url=None, redirect_field_name=None): def authenticated(view, auth_level: str = AuthLevel.user): if auth_level == AuthLevel.user: return login_required(view) - if auth_level == AuthLevel.admin: - return staff_required(view) - return view + return staff_required(view) if auth_level == AuthLevel.admin else view def stub(request, *args, **kwargs):