Move return statements to else block (#84)

miaucl · Sep 19, 2024 · d59e31c · d59e31c
1 parent d5424b9
commit d59e31c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/bring_api/bring.py b/bring_api/bring.py
@@ -242,14 +242,15 @@ async def load_lists(self) -> BringListResponse:
                             if key in BringListResponse.__annotations__
                         },
                     )
-                    return data
                 except JSONDecodeError as e:
                     _LOGGER.debug(
                         "Exception: Cannot get lists:\n %s", traceback.format_exc()
                     )
                     raise BringParseException(
                         "Loading lists failed during parsing of request response."
                     ) from e
+                else:
+                    return data
         except TimeoutError as e:
             _LOGGER.debug("Exception: Cannot get lists:\n %s", traceback.format_exc())
             raise BringRequestException(
@@ -1133,8 +1134,6 @@ async def get_all_user_settings(self) -> BringUserSettingsResponse:
                         },
                     )
 
-                    return data
-
                 except JSONDecodeError as e:
                     _LOGGER.debug(
                         "Exception: Cannot get user settings for uuid %s:\n%s",
@@ -1144,6 +1143,8 @@ async def get_all_user_settings(self) -> BringUserSettingsResponse:
                     raise BringParseException(
                         "Loading user settings failed during parsing of request response."
                     ) from e
+                else:
+                    return data
         except TimeoutError as e:
             _LOGGER.debug(
                 "Exception: Cannot get user settings for uuid %s:\n%s",
@@ -1272,14 +1273,15 @@ async def get_user_account(self) -> BringSyncCurrentUserResponse:
                             if key in BringSyncCurrentUserResponse.__annotations__
                         },
                     )
-                    return data
                 except JSONDecodeError as e:
                     _LOGGER.debug(
                         "Exception: Cannot get lists:\n %s", traceback.format_exc()
                     )
                     raise BringParseException(
                         "Loading lists failed during parsing of request response."
                     ) from e
+                else:
+                    return data
         except TimeoutError as e:
             _LOGGER.debug(
                 "Exception: Cannot get current user settings:\n %s",

diff --git a/pyproject.toml b/pyproject.toml
@@ -66,9 +66,8 @@ select = [
     "T100", # Trace found: {name} used
     "T20",  # flake8-print
     "TID251", # Banned imports
-    "TRY004", # Prefer TypeError exception for invalid type
     "B904", # Use raise from to specify exception cause
-    "TRY302", # Remove exception handler; error is immediately re-raised
+    "TRY", # tryceratops
     "UP",  # pyupgrade
     "W",  # pycodestyle
 ]
@@ -95,6 +94,7 @@ ignore = [
     "PLR0915", # Too many statements ({statements} > {max_statements})
     "PLR2004",  # Magic value used in comparison, consider replacing {value} with a constant variable
     "PLW2901", # Outer {outer_kind} variable {name} overwritten by inner {inner_kind} target
+    "TRY003", # Avoid specifying long messages outside the exception class
 
     # May conflict with the formatter, https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
     "W191",