From 91b82ecea9676ddd1455f54e3b5eb4e37581a04e Mon Sep 17 00:00:00 2001 From: Anton Kamalov Date: Wed, 4 Dec 2024 16:39:05 +0300 Subject: [PATCH] =?UTF-8?q?=D0=90=D0=B4=D0=B0=D0=BF=D1=82=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=D0=B0=D1=80=D0=B8=D0=B0=D0=BD=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC?= =?UTF-8?q?=D1=8B=20=D0=BF=D0=BE=D0=B4=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB?= =?UTF-8?q?=D0=B8=20Database=20=D0=B8=20cache?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/Report/__init__.py | 2 +- App/Report/report_model.py | 4 ++-- App/Requests/requests_model.py | 4 ++-- App/Waybill/model.py | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/App/Report/__init__.py b/App/Report/__init__.py index 920a71c..5794625 100644 --- a/App/Report/__init__.py +++ b/App/Report/__init__.py @@ -5,7 +5,7 @@ from datetime import date from .report_model import view_report_model, create_report_model import json -with open(path.join(path.dirname(__file__), 'reports.json')) as f: +with open(path.join(path.dirname(__file__), 'reports.json'), encoding='utf-8') as f: report_list = json.load(f) report_bp = Blueprint('report_bp', __name__, template_folder='templates') diff --git a/App/Report/report_model.py b/App/Report/report_model.py index 8127f5e..11e4568 100644 --- a/App/Report/report_model.py +++ b/App/Report/report_model.py @@ -1,6 +1,6 @@ from dataclasses import dataclass -from .db.work import select_list, procedure -from .db.sql_provider import SQLProvider +from Database.work import select_list, procedure +from Database.sql_provider import SQLProvider from flask import current_app, session from os import path diff --git a/App/Requests/requests_model.py b/App/Requests/requests_model.py index 3841ef7..75466bb 100644 --- a/App/Requests/requests_model.py +++ b/App/Requests/requests_model.py @@ -1,6 +1,6 @@ from dataclasses import dataclass -from .db.select import select_list -from .db.sql_provider import SQLProvider +from Database.work import select_list +from Database.sql_provider import SQLProvider from flask import current_app from os import path diff --git a/App/Waybill/model.py b/App/Waybill/model.py index 01162b1..63cf7d0 100644 --- a/App/Waybill/model.py +++ b/App/Waybill/model.py @@ -1,11 +1,11 @@ -from .db.sql_provider import SQLProvider -from .db.work import select_list, transaction -from .db.DBconnect import DBContextManager +from Database.sql_provider import SQLProvider +from Database.work import select_list, transaction +from Database.DBconnect import DBContextManager from flask import current_app, session from dataclasses import dataclass from datetime import date -from .cache.wrapper import fetch_from_cache +from cache.wrapper import fetch_from_cache import os @dataclass