From 2bef5f3911de0f92d1321da2096ec6e7d6227cd7 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Thu, 20 Feb 2020 13:52:05 +0100 Subject: [PATCH] policies: struct -> types to match core --- passbook/core/models.py | 2 +- passbook/policies/engine.py | 10 +++++----- passbook/policies/expiry/models.py | 2 +- passbook/policies/expression/evaluator.py | 2 +- passbook/policies/expression/models.py | 2 +- passbook/policies/password/models.py | 2 +- passbook/policies/process.py | 2 +- passbook/policies/reputation/models.py | 2 +- passbook/policies/{struct.py => types.py} | 0 passbook/policies/webhook/models.py | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) rename passbook/policies/{struct.py => types.py} (100%) diff --git a/passbook/core/models.py b/passbook/core/models.py index 32bda701bf..a27668b45e 100644 --- a/passbook/core/models.py +++ b/passbook/core/models.py @@ -26,7 +26,7 @@ from passbook.core.exceptions import PropertyMappingExpressionException from passbook.core.signals import password_changed from passbook.lib.models import CreatedUpdatedModel, UUIDModel from passbook.policies.exceptions import PolicyException -from passbook.policies.struct import PolicyRequest, PolicyResult +from passbook.policies.types import PolicyRequest, PolicyResult LOGGER = get_logger() NATIVE_ENVIRONMENT = NativeEnvironment() diff --git a/passbook/policies/engine.py b/passbook/policies/engine.py index 25709f1662..62455b0f00 100644 --- a/passbook/policies/engine.py +++ b/passbook/policies/engine.py @@ -9,7 +9,7 @@ from structlog import get_logger from passbook.core.models import Policy, User from passbook.policies.process import PolicyProcess, cache_key -from passbook.policies.struct import PolicyRequest, PolicyResult +from passbook.policies.types import PolicyRequest, PolicyResult LOGGER = get_logger() # This is only really needed for macOS, because Python 3.8 changed the default to spawn @@ -63,13 +63,13 @@ class PolicyEngine: for policy in self._select_subclasses(): cached_policy = cache.get(cache_key(policy, self.request.user), None) if cached_policy and self.use_cache: - LOGGER.debug("Taking result from cache", policy=policy) + LOGGER.debug("P_ENG: Taking result from cache", policy=policy) self.__cached_policies.append(cached_policy) continue - LOGGER.debug("Evaluating policy", policy=policy) + LOGGER.debug("P_ENG: Evaluating policy", policy=policy) our_end, task_end = Pipe(False) task = PolicyProcess(policy, self.request, task_end) - LOGGER.debug("Starting Process", policy=policy) + LOGGER.debug("P_ENG: Starting Process", policy=policy) task.start() self.__processes.append( PolicyProcessInfo(process=task, connection=our_end, policy=policy) @@ -90,7 +90,7 @@ class PolicyEngine: x.result for x in self.__processes if x.result ] for result in process_results + self.__cached_policies: - LOGGER.debug("result", passing=result.passing) + LOGGER.debug("P_ENG: result", passing=result.passing) if result.messages: messages += result.messages if not result.passing: diff --git a/passbook/policies/expiry/models.py b/passbook/policies/expiry/models.py index 94c59a01e7..102360dadd 100644 --- a/passbook/policies/expiry/models.py +++ b/passbook/policies/expiry/models.py @@ -7,7 +7,7 @@ from django.utils.translation import gettext as _ from structlog import get_logger from passbook.core.models import Policy -from passbook.policies.struct import PolicyRequest, PolicyResult +from passbook.policies.types import PolicyRequest, PolicyResult LOGGER = get_logger() diff --git a/passbook/policies/expression/evaluator.py b/passbook/policies/expression/evaluator.py index db14c7eba5..baa22e2783 100644 --- a/passbook/policies/expression/evaluator.py +++ b/passbook/policies/expression/evaluator.py @@ -9,7 +9,7 @@ from jinja2.nativetypes import NativeEnvironment from structlog import get_logger from passbook.factors.view import AuthenticationView -from passbook.policies.struct import PolicyRequest, PolicyResult +from passbook.policies.types import PolicyRequest, PolicyResult if TYPE_CHECKING: from passbook.core.models import User diff --git a/passbook/policies/expression/models.py b/passbook/policies/expression/models.py index 8ec07211f3..2ba3827a6a 100644 --- a/passbook/policies/expression/models.py +++ b/passbook/policies/expression/models.py @@ -4,7 +4,7 @@ from django.utils.translation import gettext as _ from passbook.core.models import Policy from passbook.policies.expression.evaluator import Evaluator -from passbook.policies.struct import PolicyRequest, PolicyResult +from passbook.policies.types import PolicyRequest, PolicyResult class ExpressionPolicy(Policy): diff --git a/passbook/policies/password/models.py b/passbook/policies/password/models.py index 6d81d21096..03b552a21c 100644 --- a/passbook/policies/password/models.py +++ b/passbook/policies/password/models.py @@ -6,7 +6,7 @@ from django.utils.translation import gettext as _ from structlog import get_logger from passbook.core.models import Policy -from passbook.policies.struct import PolicyRequest, PolicyResult +from passbook.policies.types import PolicyRequest, PolicyResult LOGGER = get_logger() diff --git a/passbook/policies/process.py b/passbook/policies/process.py index 9615300cf3..b8114380f5 100644 --- a/passbook/policies/process.py +++ b/passbook/policies/process.py @@ -7,7 +7,7 @@ from structlog import get_logger from passbook.core.models import Policy from passbook.policies.exceptions import PolicyException -from passbook.policies.struct import PolicyRequest, PolicyResult +from passbook.policies.types import PolicyRequest, PolicyResult LOGGER = get_logger() diff --git a/passbook/policies/reputation/models.py b/passbook/policies/reputation/models.py index c1f36e0b82..dfc9014c34 100644 --- a/passbook/policies/reputation/models.py +++ b/passbook/policies/reputation/models.py @@ -4,7 +4,7 @@ from django.utils.translation import gettext as _ from passbook.core.models import Policy, User from passbook.lib.utils.http import get_client_ip -from passbook.policies.struct import PolicyRequest, PolicyResult +from passbook.policies.types import PolicyRequest, PolicyResult class ReputationPolicy(Policy): diff --git a/passbook/policies/struct.py b/passbook/policies/types.py similarity index 100% rename from passbook/policies/struct.py rename to passbook/policies/types.py diff --git a/passbook/policies/webhook/models.py b/passbook/policies/webhook/models.py index d5487ec3fb..9e1f29296b 100644 --- a/passbook/policies/webhook/models.py +++ b/passbook/policies/webhook/models.py @@ -3,7 +3,7 @@ from django.db import models from django.utils.translation import gettext as _ from passbook.core.models import Policy -from passbook.policies.struct import PolicyRequest, PolicyResult +from passbook.policies.types import PolicyRequest, PolicyResult class WebhookPolicy(Policy):