From e7937ade8d91f7741a649de24faacbe194a3c0d0 Mon Sep 17 00:00:00 2001 From: Frederick Muriuki Muriithi Date: Tue, 8 Aug 2023 06:48:14 +0300 Subject: Use relative imports to break circular import errors --- gn_auth/auth/authorisation/users/admin/ui.py | 9 +++++---- gn_auth/auth/authorisation/users/admin/views.py | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'gn_auth/auth/authorisation/users/admin') diff --git a/gn_auth/auth/authorisation/users/admin/ui.py b/gn_auth/auth/authorisation/users/admin/ui.py index 9087412..68e1ba5 100644 --- a/gn_auth/auth/authorisation/users/admin/ui.py +++ b/gn_auth/auth/authorisation/users/admin/ui.py @@ -2,12 +2,13 @@ from functools import wraps from flask import flash, url_for, redirect -from gn_auth.auth.authentication.users import User -from gn_auth.auth.db.sqlite3 import with_db_connection -from gn_auth.auth.authorisation.roles.models import user_roles - from gn_auth.session import logged_in, session_user, clear_session_info +from ....authentication.users import User +from ....db.sqlite3 import with_db_connection + +from ...roles.models import user_roles + def is_admin(func): """Verify user is a system admin.""" @wraps(func) diff --git a/gn_auth/auth/authorisation/users/admin/views.py b/gn_auth/auth/authorisation/users/admin/views.py index 4a37bc5..6ace0e5 100644 --- a/gn_auth/auth/authorisation/users/admin/views.py +++ b/gn_auth/auth/authorisation/users/admin/views.py @@ -18,16 +18,16 @@ from flask import ( from gn_auth import session -from gn_auth.auth.db import sqlite3 as db -from gn_auth.auth.db.sqlite3 import with_db_connection +from ....db import sqlite3 as db +from ....db.sqlite3 import with_db_connection -from gn_auth.auth.authentication.oauth2.models.oauth2client import ( +from ....authentication.oauth2.models.oauth2client import ( save_client, OAuth2Client, oauth2_clients, client as oauth2_client, delete_client as _delete_client) -from gn_auth.auth.authentication.users import ( +from ....authentication.users import ( User, user_by_id, valid_login, -- cgit v1.2.3