From 5cb84716c8041492ecef18d21347efbf196ec47b Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 8 Aug 2019 17:53:28 +0200 Subject: [PATCH 2/4] create authentic2.utils package (#35302) --- src/authentic2/{utils.py => utils/__init__.py} | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) rename src/authentic2/{utils.py => utils/__init__.py} (99%) diff --git a/src/authentic2/utils.py b/src/authentic2/utils/__init__.py similarity index 99% rename from src/authentic2/utils.py rename to src/authentic2/utils/__init__.py index 851bdf79..82051076 100644 --- a/src/authentic2/utils.py +++ b/src/authentic2/utils/__init__.py @@ -65,7 +65,7 @@ except ImportError: from authentic2.saml.saml2utils import filter_attribute_private_key, \ filter_element_private_key -from . import plugins, app_settings, constants, crypto +from .. import plugins, app_settings, constants, crypto class CleanLogMessage(logging.Filter): @@ -368,7 +368,7 @@ def get_nonce(request): def record_authentication_event(request, how, nonce=None): '''Record an authentication event in the session and in the database, in later version the database persistence can be removed''' - from . import models + from .. import models logging.getLogger(__name__).info('logged in (%s)', how) authentication_events = request.session.setdefault(constants.AUTHENTICATION_EVENTS_SESSION_KEY, []) @@ -414,7 +414,7 @@ def last_authentication_event(request=None, session=None): def login(request, user, how, service_slug=None, nonce=None, **kwargs): '''Login a user model, record the authentication event and redirect to next URL or settings.LOGIN_REDIRECT_URL.''' - from . import hooks + from .. import hooks last_login = user.last_login auth_login(request, user) @@ -607,7 +607,7 @@ def send_templated_mail(user_or_email, template_names, context=None, with_html=T - _body.txt for the plain text body - _body.html for the HTML body ''' - from . import middleware + from .. import middleware if isinstance(template_names, six.string_types): template_names = [template_names] if hasattr(user_or_email, 'email'): @@ -736,7 +736,7 @@ def send_account_deletion_mail(request, user): def build_reset_password_url(user, request=None, next_url=None, set_random_password=True, sign_next_url=True): '''Build a reset password URL''' - from .compat import default_token_generator + from ..compat import default_token_generator if set_random_password: user.set_password(uuid.uuid4().hex) @@ -762,7 +762,7 @@ def send_password_reset_mail(user, template_names=None, request=None, set_random_password=True, sign_next_url=True, **kwargs): - from . import middleware + from .. import middleware if not user.email: raise ValueError('user must have an email') @@ -877,7 +877,7 @@ def utf8_encode(v): def good_next_url(request, next_url): '''Check if an URL is a good next_url''' - from . import hooks + from .. import hooks if not next_url: return False @@ -1090,7 +1090,7 @@ def send_email_change_email(user, email, request=None, context=None, template_na def get_user_flag(user, name, default=None): '''Get a boolean flag settable at user, by a hook, globally or ou wide''' - from . import hooks + from .. import hooks setting_value = getattr(app_settings, 'A2_USER_' + name.upper(), None) if setting_value is not None: @@ -1112,7 +1112,7 @@ def get_user_flag(user, name, default=None): def user_can_change_password(user=None, request=None): - from . import hooks + from .. import hooks if not app_settings.A2_REGISTRATION_CAN_CHANGE_PASSWORD: return False if request is not None and user is None and hasattr(request, 'user'): -- 2.23.0.rc1