From 896a83938bfbec3a8d95d6960113367ca35f223c Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Wed, 27 Dec 2023 10:31:02 -0800 Subject: [PATCH] fix --- src/ytdl_sub/subscriptions/subscription.py | 4 +--- tests/unit/config/test_subscription.py | 18 +----------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/ytdl_sub/subscriptions/subscription.py b/src/ytdl_sub/subscriptions/subscription.py index 31b13284..50b2f319 100644 --- a/src/ytdl_sub/subscriptions/subscription.py +++ b/src/ytdl_sub/subscriptions/subscription.py @@ -72,9 +72,7 @@ class Subscription(SubscriptionDownload): cls, config: ConfigFile, subscription_path: str | Path ) -> List["Subscription"]: """ - Loads subscriptions from a file and applies ``__preset__`` to all of them if present. - If a subscription is in the form of key: value, it will set value to the override - variable defined in ``__value__``. + Loads subscriptions from a file. Parameters ---------- diff --git a/tests/unit/config/test_subscription.py b/tests/unit/config/test_subscription.py index 08ad05d2..c4309e43 100644 --- a/tests/unit/config/test_subscription.py +++ b/tests/unit/config/test_subscription.py @@ -57,17 +57,6 @@ def preset_with_subscription_value(preset_with_file_preset: Dict): ) -@pytest.fixture -def preset_with_subscription_file_value(preset_with_subscription_value: Dict): - return dict( - preset_with_subscription_value, - **{ - "__value__": "test_file_subscription_value", - "test_value": "is_overwritten", - }, - ) - - @pytest.fixture def preset_with_subscription_value_nested_presets(preset_with_subscription_value: Dict): return dict( @@ -236,7 +225,6 @@ def test_subscription_overrides_tilda( subs = Subscription.from_file_path(config=config_file, subscription_path="mocked") assert len(subs) == 3 - # Test __value__ worked correctly from the config sub_2_1 = [sub for sub in subs if sub.name == "test_2_1"][0].overrides.dict_with_format_strings assert sub_2_1.get("subscription_name") == "test_2_1" @@ -253,7 +241,6 @@ def test_subscription_file_value_applies_from_config_and_nested_and_indent_varia subs = Subscription.from_file_path(config=config_file, subscription_path="mocked") assert len(subs) == 4 - # Test __value__ worked correctly from the config sub_test_value = [sub for sub in subs if sub.name == "test_value"][ 0 ].overrides.dict_with_format_strings @@ -293,7 +280,6 @@ def test_subscription_file_value_applies_from_config_and_nested_and_indent_varia subs = Subscription.from_file_path(config=config_file, subscription_path="mocked") assert len(subs) == 4 - # Test __value__ worked correctly from the config sub_test_value = [sub for sub in subs if sub.name == "test_value"][ 0 ].overrides.dict_with_format_strings @@ -337,9 +323,7 @@ def test_subscription_file_value_applies_from_config_and_nested_and_indent_varia def test_subscription_file_using_conflicting_preset_name(config_file: ConfigFile): with mock_load_yaml( preset_dict={ - "= INDENTS_IN_ERR_MSG ": { - "=ANOTHER": {"jellyfin_tv_show_by_date": "single value, __value__ not defined"} - } + "= INDENTS_IN_ERR_MSG ": {"=ANOTHER": {"jellyfin_tv_show_by_date": "single value"}} } ), pytest.raises( ValidationException,