Rebase fixes

ThePalaceProject · Aug 15, 2023 · 108c105 · 108c105
1 parent c63f426
commit 108c105
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/core/feed_protocol/annotator/circulation.py b/core/feed_protocol/annotator/circulation.py
@@ -320,11 +320,12 @@ def _prioritized_formats_for_pool(
         # information _might_ contain a set of prioritized DRM schemes and
         # content types.
         prioritized_drm_schemes: list[str] = (
-            config.settings.get(FormatPriorities.PRIORITIZED_DRM_SCHEMES_KEY) or []
+            config.settings_dict.get(FormatPriorities.PRIORITIZED_DRM_SCHEMES_KEY) or []
         )
 
         content_setting: List[str] = (
-            config.settings.get(FormatPriorities.PRIORITIZED_CONTENT_TYPES_KEY) or []
+            config.settings_dict.get(FormatPriorities.PRIORITIZED_CONTENT_TYPES_KEY)
+            or []
         )
         return prioritized_drm_schemes, content_setting
 
@@ -341,7 +342,7 @@ def _deprioritized_lcp_content(
         # LCP content. By default, if no configuration value is specified, then
         # the priority of LCP content will be left completely unchanged.
 
-        _prioritize: bool = config.settings.get(
+        _prioritize: bool = config.settings_dict.get(
             FormatPriorities.DEPRIORITIZE_LCP_NON_EPUBS_KEY, False
         )
         return _prioritize

diff --git a/tests/api/feed_protocol/test_annotators.py b/tests/api/feed_protocol/test_annotators.py
@@ -7,7 +7,7 @@
 from core.model.measurement import Measurement
 from core.model.resource import Hyperlink, Resource
 from core.model.work import Work
-from tests.core.test_opds import TestAnnotatorsFixture
+from tests.core.test_opds import TestAnnotatorsFixture, annotators_fixture  # noqa
 from tests.fixtures.database import DBStatementCounter  # noqa