Skip to content

Commit 722833d

Browse files
committed
Moved exception from utils to core module
1 parent a4ad731 commit 722833d

9 files changed

+25
-10
lines changed
File renamed without changes.

core/startup.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@
44
import os
55
import re
66
import logging
7+
from json import loads
78
from datetime import timedelta
8-
from utils.constants import CONFIG_PATH
9+
910
from flask import Flask
10-
from json import loads
11+
1112
from core.jwt import init_jwt
12-
from core.db import init_db, db
13+
from core.db import db
14+
from core.db import init_db
1315
from core.lang import init_lang
16+
from utils.constants import CONFIG_PATH
1417

1518

1619
def create_app(name: str, config: dict) -> Flask:

models/user.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
# -*- coding: utf-8 -*-
22
from flask_language import current_language
3+
34
from core.db import db
45
from core.lang import get_str
6+
from core.exception import ErrorMessagePromise
7+
58
from utils.hash import hash_data
6-
from utils.exception import ErrorMessagePromise
7-
from utils.validation import is_valid_username, is_valid_password
9+
from utils.validation import is_valid_username
10+
from utils.validation import is_valid_password
811

912

1013
class UserModel(db.Model):

resources/demo_resource.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
from flask_jwt_extended import jwt_required
66

77
from core.lang import get_str
8-
from utils.exception import excpetion_handler
8+
from core.exception import excpetion_handler
9+
910
from models.demo import DemoModel
1011

1112
class DemoResource(Resource):

resources/user_login.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
from flask_jwt_extended import set_access_cookies
77

88
from utils.hash import verify_hash
9-
from utils.exception import excpetion_handler
9+
from core.exception import excpetion_handler
10+
1011
from models.user import UserModel
1112

1213

resources/user_logout.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
from flask_jwt_extended import jwt_required
66
from flask_jwt_extended import unset_jwt_cookies
77

8-
from utils.exception import excpetion_handler
8+
from core.exception import excpetion_handler
9+
910
from models.user import UserModel
1011

1112

resources/user_register.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# -*- coding: utf-8 -*-
2-
from flask_restful import Resource, reqparse
3-
from utils.exception import excpetion_handler
2+
from flask_restful import Resource
3+
from flask_restful import reqparse
4+
5+
from core.exception import excpetion_handler
6+
47
from models.user import UserModel
58

69

utils/auth.py

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"""
88

99
from utils.hash import verify_hash
10+
1011
from models.user import UserModel
1112

1213

utils/http_server.py

+2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@
2020
"""
2121

2222
from os import path
23+
2324
from flask import Blueprint
2425
from flask import redirect
2526
from flask import current_app
2627
from flask import send_from_directory
28+
2729
from utils.constants import SERVE_FOLDER
2830

2931
DEFAULT_404 = """<h1 style="text-align:center;">404 Not Found</h1>

0 commit comments

Comments
 (0)