From 6d9c61dc0072b96b12153e64940b465306f25bfb Mon Sep 17 00:00:00 2001 From: Frederick Muriuki Muriithi Date: Mon, 7 Aug 2023 07:58:09 +0300 Subject: Change imports to new unified db module. --- gn_auth/auth/authorisation/users/admin/ui.py | 2 +- gn_auth/auth/authorisation/users/admin/views.py | 4 ++-- gn_auth/auth/authorisation/users/collections/views.py | 4 ++-- gn_auth/auth/authorisation/users/masquerade/models.py | 2 +- gn_auth/auth/authorisation/users/masquerade/views.py | 2 +- gn_auth/auth/authorisation/users/models.py | 2 +- gn_auth/auth/authorisation/users/views.py | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'gn_auth/auth/authorisation/users') diff --git a/gn_auth/auth/authorisation/users/admin/ui.py b/gn_auth/auth/authorisation/users/admin/ui.py index 4351a68..9087412 100644 --- a/gn_auth/auth/authorisation/users/admin/ui.py +++ b/gn_auth/auth/authorisation/users/admin/ui.py @@ -3,7 +3,7 @@ from functools import wraps from flask import flash, url_for, redirect from gn_auth.auth.authentication.users import User -from gn_auth.auth.db_utils import with_db_connection +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 diff --git a/gn_auth/auth/authorisation/users/admin/views.py b/gn_auth/auth/authorisation/users/admin/views.py index ab04f91..4a37bc5 100644 --- a/gn_auth/auth/authorisation/users/admin/views.py +++ b/gn_auth/auth/authorisation/users/admin/views.py @@ -18,8 +18,8 @@ from flask import ( from gn_auth import session -from gn_auth.auth import db -from gn_auth.auth.db_utils import with_db_connection +from gn_auth.auth.db import sqlite3 as db +from gn_auth.auth.db.sqlite3 import with_db_connection from gn_auth.auth.authentication.oauth2.models.oauth2client import ( save_client, diff --git a/gn_auth/auth/authorisation/users/collections/views.py b/gn_auth/auth/authorisation/users/collections/views.py index 3dcc10f..9900205 100644 --- a/gn_auth/auth/authorisation/users/collections/views.py +++ b/gn_auth/auth/authorisation/users/collections/views.py @@ -4,8 +4,8 @@ from uuid import UUID from redis import Redis from flask import jsonify, request, Response, Blueprint, current_app -from gn_auth.auth import db -from gn_auth.auth.db_utils import with_db_connection +from gn_auth.auth.db import sqlite3 as db +from gn_auth.auth.db.sqlite3 import with_db_connection from gn_auth.auth.authorisation.checks import require_json from gn_auth.auth.authorisation.errors import NotFoundError diff --git a/gn_auth/auth/authorisation/users/masquerade/models.py b/gn_auth/auth/authorisation/users/masquerade/models.py index c45d761..9779764 100644 --- a/gn_auth/auth/authorisation/users/masquerade/models.py +++ b/gn_auth/auth/authorisation/users/masquerade/models.py @@ -5,7 +5,7 @@ from datetime import datetime from flask import current_app as app -from gn_auth.auth import db +from gn_auth.auth.db import sqlite3 as db from gn_auth.auth.authorisation.errors import ForbiddenAccess from gn_auth.auth.authorisation.roles.models import user_roles diff --git a/gn_auth/auth/authorisation/users/masquerade/views.py b/gn_auth/auth/authorisation/users/masquerade/views.py index 9e42945..7bd8ddb 100644 --- a/gn_auth/auth/authorisation/users/masquerade/views.py +++ b/gn_auth/auth/authorisation/users/masquerade/views.py @@ -4,7 +4,7 @@ from functools import partial from flask import request, jsonify, Response, Blueprint -from gn_auth.auth.db_utils import with_db_connection +from gn_auth.auth.db.sqlite3 import with_db_connection from gn_auth.auth.authorisation.errors import InvalidData from gn_auth.auth.authorisation.checks import require_json diff --git a/gn_auth/auth/authorisation/users/models.py b/gn_auth/auth/authorisation/users/models.py index 71fa390..61489cf 100644 --- a/gn_auth/auth/authorisation/users/models.py +++ b/gn_auth/auth/authorisation/users/models.py @@ -2,7 +2,7 @@ import uuid from functools import reduce -from gn_auth.auth import db +from gn_auth.auth.db import sqlite3 as db from gn_auth.auth.authorisation.roles.models import Role from gn_auth.auth.authorisation.checks import authorised_p from gn_auth.auth.authorisation.privileges import Privilege diff --git a/gn_auth/auth/authorisation/users/views.py b/gn_auth/auth/authorisation/users/views.py index 7783dca..0646e3a 100644 --- a/gn_auth/auth/authorisation/users/views.py +++ b/gn_auth/auth/authorisation/users/views.py @@ -7,9 +7,9 @@ import sqlite3 from email_validator import validate_email, EmailNotValidError from flask import request, jsonify, Response, Blueprint, current_app -from gn_auth.auth import db +from gn_auth.auth.db import sqlite3 as db from gn_auth.auth.dictify import dictify -from gn_auth.auth.db_utils import with_db_connection +from gn_auth.auth.db.sqlite3 import with_db_connection from .models import list_users from .masquerade.views import masq -- cgit v1.2.3