From 75bc72be6d70201ddca5de48a050ce8df8cd8dc8 Mon Sep 17 00:00:00 2001 From: jo Date: Wed, 1 Feb 2023 20:38:58 +0100 Subject: [PATCH] chore: raise from specific exceptions --- api/libretime_api/legacy/migrations/_migrations.py | 4 ++-- api/libretime_api/legacy/migrations/_version.py | 2 +- playout/libretime_playout/main.py | 2 +- playout/libretime_playout/player/file.py | 2 +- playout/libretime_playout/timeout.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/libretime_api/legacy/migrations/_migrations.py b/api/libretime_api/legacy/migrations/_migrations.py index 9f79967c2..bf0873ef3 100644 --- a/api/libretime_api/legacy/migrations/_migrations.py +++ b/api/libretime_api/legacy/migrations/_migrations.py @@ -1,6 +1,6 @@ from typing import Callable, Optional -from django.db import connection +from django.db import DataError, connection from ._version import parse_version @@ -53,7 +53,7 @@ def legacy_migration_factory( def inner(_apps, _schema_editor): current = get_schema_version() if current is None: - raise Exception("current schema version was not found!") + raise DataError("current schema version was not found!") current_version = parse_version(current) if current_version >= target_version and not reverse: diff --git a/api/libretime_api/legacy/migrations/_version.py b/api/libretime_api/legacy/migrations/_version.py index d2e544bab..9b037957d 100644 --- a/api/libretime_api/legacy/migrations/_version.py +++ b/api/libretime_api/legacy/migrations/_version.py @@ -21,7 +21,7 @@ VERSION_RE = re.compile( def parse_version(version: str): match = VERSION_RE.search(version) if not match: - raise Exception(f"invalid version {version}") + raise ValueError(f"invalid version {version}") major, minor, patch = map(int, match.group("release").split(".")) diff --git a/playout/libretime_playout/main.py b/playout/libretime_playout/main.py index 9a8567c38..963ac6dc2 100644 --- a/playout/libretime_playout/main.py +++ b/playout/libretime_playout/main.py @@ -83,7 +83,7 @@ def cli(log_level: str, log_filepath: Optional[Path], config_filepath: Optional[ logger.debug("Checking if Liquidsoap is running") liq_version = liq_client.wait_for_version() if not LIQUIDSOAP_MIN_VERSION <= liq_version: - raise Exception(f"Invalid liquidsoap version {liq_version}") + raise RuntimeError(f"Invalid liquidsoap version {liq_version}") fetch_queue = Queue() recorder_queue = Queue() diff --git a/playout/libretime_playout/player/file.py b/playout/libretime_playout/player/file.py index 23cefd1e7..03cad788f 100644 --- a/playout/libretime_playout/player/file.py +++ b/playout/libretime_playout/player/file.py @@ -64,7 +64,7 @@ class PypoFile(Thread): handle.write(chunk) except HTTPError as exception: - raise Exception( + raise RuntimeError( f"could not download file {media_item['id']}" ) from exception diff --git a/playout/libretime_playout/timeout.py b/playout/libretime_playout/timeout.py index e4a3591bb..f1416cae9 100644 --- a/playout/libretime_playout/timeout.py +++ b/playout/libretime_playout/timeout.py @@ -18,7 +18,7 @@ def __timeout(func, timeout_duration, default, args, kwargs): thread.join(timeout_duration) if thread.is_alive(): - raise Exception("Thread did not terminate") + raise RuntimeError("Thread did not terminate") return thread.result