From 0b1b649c28df043f1c69b8f97e701f29e225522b Mon Sep 17 00:00:00 2001 From: Dylan Young Date: Thu, 26 May 2022 02:17:02 -0300 Subject: [PATCH] fixup! GH-36 Disallow mixing deprecated settings with CSP_POLICY_DEFINITIONS --- csp/utils.py | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/csp/utils.py b/csp/utils.py index 54cc816..bfb54f9 100644 --- a/csp/utils.py +++ b/csp/utils.py @@ -32,31 +32,7 @@ http_client.NOT_FOUND, } - -def get_declared_policy_definitions(): - custom_definitions = csp_definitions_update( - {}, - getattr( - settings, - 'CSP_POLICY_DEFINITIONS', - {'default': {}}, - ), - ) - deprecation._handle_legacy_settings( - custom_definitions['default'], - allow_legacy=not hasattr(settings, 'CSP_POLICY_DEFINITIONS'), - ) - definitions = csp_definitions_update( - {}, - {name: defaults.POLICY for name in custom_definitions} - ) - for name, csp in custom_definitions.items(): - definitions.setdefault(name, {}).update(csp) - return definitions - - -def get_declared_policies(): - return getattr(settings, 'CSP_POLICIES', defaults.POLICIES) +SINGLE_POLICY_KWARGS = {directive_to_setting(d, prefix='') for d in DIRECTIVES} def _normalize_config(config, key='default'):