Move inline import to top of file

Usually we have imports at the top. It looks like the reason for
them being inline was to avoid a circular import, but we can also
avoid this by not importing everything from the app module.

Since we're about to add more imports from event_handlers, now is
a good time to refactor them. Note this matches how we import the
event handlers in every other module.
This commit is contained in:
Ben Thorner
2021-07-15 11:18:36 +01:00
parent d414e6d345
commit 0f87ffe093
4 changed files with 6 additions and 7 deletions

View File

@@ -4,6 +4,7 @@ from notifications_python_client.errors import HTTPError
from notifications_utils.timezones import utc_string_to_aware_gmt_datetime
from werkzeug.utils import cached_property
from app.event_handlers import create_add_user_to_service_event
from app.models import JSONModel, ModelList
from app.models.organisation import Organisation
from app.models.roles_and_permissions import (
@@ -401,8 +402,6 @@ class User(JSONModel, UserMixin):
session['current_session_id'] = self.current_session_id
def add_to_service(self, service_id, permissions, folder_permissions, invited_by_id):
from app.event_handlers import create_add_user_to_service_event
try:
user_api_client.add_user_to_service(
service_id,