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/groups/data.py | 11 ++++++----- gn_auth/auth/authorisation/groups/models.py | 6 +++--- gn_auth/auth/authorisation/groups/views.py | 8 ++++---- 3 files changed, 13 insertions(+), 12 deletions(-) (limited to 'gn_auth/auth/authorisation/groups') diff --git a/gn_auth/auth/authorisation/groups/data.py b/gn_auth/auth/authorisation/groups/data.py index a73ae3d..1650405 100644 --- a/gn_auth/auth/authorisation/groups/data.py +++ b/gn_auth/auth/authorisation/groups/data.py @@ -1,11 +1,12 @@ """Handles the resource objects' data.""" from MySQLdb.cursors import DictCursor -from gn_auth.auth.db import mariadb as gn3db -import gn_auth.auth.db.sqlite3 as authdb -from gn_auth.auth.authorisation.groups import Group -from gn_auth.auth.authorisation.checks import authorised_p -from gn_auth.auth.authorisation.errors import NotFoundError +from ..groups import Group +from ..checks import authorised_p +from ..errors import NotFoundError + +from ...db import mariadb as gn3db +from ...db import sqlite3 as authdb def __fetch_mrna_data_by_ids__( conn: gn3db.DbConnection, dataset_ids: tuple[str, ...]) -> tuple[ diff --git a/gn_auth/auth/authorisation/groups/models.py b/gn_auth/auth/authorisation/groups/models.py index 0ffd3a7..6a39681 100644 --- a/gn_auth/auth/authorisation/groups/models.py +++ b/gn_auth/auth/authorisation/groups/models.py @@ -7,9 +7,9 @@ from typing import Any, Sequence, Iterable, Optional, NamedTuple from flask import g from pymonad.maybe import Just, Maybe, Nothing -from gn_auth.auth.db import sqlite3 as db -from gn_auth.auth.dictify import dictify -from gn_auth.auth.authentication.users import User, user_by_id +from ...db import sqlite3 as db +from ...dictify import dictify +from ...authentication.users import User, user_by_id from ..checks import authorised_p from ..privileges import Privilege diff --git a/gn_auth/auth/authorisation/groups/views.py b/gn_auth/auth/authorisation/groups/views.py index a63e09d..4dc17e0 100644 --- a/gn_auth/auth/authorisation/groups/views.py +++ b/gn_auth/auth/authorisation/groups/views.py @@ -7,11 +7,11 @@ from functools import partial from MySQLdb.cursors import DictCursor from flask import request, jsonify, Response, Blueprint, current_app -from gn_auth.auth.db import sqlite3 as db -from gn_auth.auth.db import mariadb as gn3db +from ...db import sqlite3 as db +from ...db import mariadb as gn3db -from gn_auth.auth.dictify import dictify -from gn_auth.auth.db.sqlite3 import with_db_connection +from ...dictify import dictify +from ...db.sqlite3 import with_db_connection from .data import link_data_to_group from .models import ( -- cgit v1.2.3