From 7db20b290e33a35c609b0b5650a7eb9e5a85f919 Mon Sep 17 00:00:00 2001 From: crunk Date: Sun, 3 Dec 2023 14:19:53 +0100 Subject: [PATCH] sort and format --- library/app.py | 11 ++++------- library/application/user/forgotpassword.py | 14 +++++++------- library/application/user/loginuser.py | 15 ++++----------- library/application/user/registeruser.py | 21 ++++++++------------- library/application/user/resetpassword.py | 22 +++++++++------------- library/deploydb.py | 2 +- library/forms/forgotpasswordform.py | 9 ++------- library/forms/loginform.py | 10 ++-------- library/forms/registerform.py | 10 ++-------- library/forms/resetpasswordform.py | 9 ++------- library/page.py | 13 ++++++------- library/search.py | 3 +-- setup.py | 4 ++-- 13 files changed, 50 insertions(+), 93 deletions(-) diff --git a/library/app.py b/library/app.py index d9b35c2..8cfbd58 100644 --- a/library/app.py +++ b/library/app.py @@ -3,21 +3,17 @@ import os import tomllib import flask_apscheduler +from application.csvparser import CsvParser from flask import Flask -from flask_sqlalchemy import SQLAlchemy from flask_bcrypt import Bcrypt +from flask_login import LoginManager from flask_migrate import Migrate +from flask_sqlalchemy import SQLAlchemy from flask_wtf.csrf import CSRFProtect -from flask_login import ( - LoginManager, -) - from whoosh.fields import * from whoosh.index import create_in from whoosh.qparser import QueryParser -from application.csvparser import CsvParser - db = SQLAlchemy() migrate = Migrate() bcrypt = Bcrypt() @@ -26,6 +22,7 @@ login_manager = LoginManager() SCRIPT_DIR = os.path.dirname(__file__) DATA_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, "data")) + def create_app(): settings = settings_from_file() diff --git a/library/application/user/forgotpassword.py b/library/application/user/forgotpassword.py index ad4250e..eda9882 100644 --- a/library/application/user/forgotpassword.py +++ b/library/application/user/forgotpassword.py @@ -1,17 +1,17 @@ -from uuid import uuid1 from datetime import datetime +from uuid import uuid1 + +from app import db +from flask import render_template +from flask_mail import Message +from forms.forgotpasswordform import ForgotPasswordForm from sqlalchemy.exc import ( - DataError, DatabaseError, + DataError, InterfaceError, InvalidRequestError, ) -from flask import render_template -from flask_mail import Message - from usermodel import User -from forms.forgotpasswordform import ForgotPasswordForm -from app import db def ForgotPassword(mail): diff --git a/library/application/user/loginuser.py b/library/application/user/loginuser.py index 2d5e349..4966680 100644 --- a/library/application/user/loginuser.py +++ b/library/application/user/loginuser.py @@ -1,15 +1,8 @@ -from flask import ( - render_template, - redirect, - request, - flash, - url_for, - abort, -) -from usermodel import User -from forms.loginform import LoginForm -from flask_login import login_user +from flask import abort, flash, redirect, render_template, request, url_for from flask_bcrypt import check_password_hash +from flask_login import login_user +from forms.loginform import LoginForm +from usermodel import User def LoginUser(): diff --git a/library/application/user/registeruser.py b/library/application/user/registeruser.py index 722f3c8..d12ae9d 100644 --- a/library/application/user/registeruser.py +++ b/library/application/user/registeruser.py @@ -1,22 +1,17 @@ -from flask import ( - render_template, - redirect, - flash, - url_for, -) +from app import db +from flask import flash, redirect, render_template, url_for +from flask_bcrypt import generate_password_hash +from flask_login import login_user +from forms.registerform import RegisterForm from sqlalchemy.exc import ( - IntegrityError, - DataError, DatabaseError, + DataError, + IntegrityError, InterfaceError, InvalidRequestError, ) -from werkzeug.routing import BuildError from usermodel import User -from forms.registerform import RegisterForm -from flask_login import login_user -from flask_bcrypt import generate_password_hash -from app import db +from werkzeug.routing import BuildError def RegisterUser(): diff --git a/library/application/user/resetpassword.py b/library/application/user/resetpassword.py index b802dab..9ee436d 100644 --- a/library/application/user/resetpassword.py +++ b/library/application/user/resetpassword.py @@ -1,23 +1,19 @@ from datetime import datetime -from flask import ( - render_template, - redirect, - flash, - url_for, -) + +from app import db +from flask import flash, redirect, render_template, url_for +from flask_bcrypt import generate_password_hash +from flask_login import login_user +from forms.resetpasswordform import ResetPasswordForm from sqlalchemy.exc import ( - IntegrityError, - DataError, DatabaseError, + DataError, + IntegrityError, InterfaceError, InvalidRequestError, ) -from werkzeug.routing import BuildError from usermodel import User -from forms.resetpasswordform import ResetPasswordForm -from flask_login import login_user -from flask_bcrypt import generate_password_hash -from app import db +from werkzeug.routing import BuildError def ResetPassword(path): diff --git a/library/deploydb.py b/library/deploydb.py index 35dfe8a..4378712 100644 --- a/library/deploydb.py +++ b/library/deploydb.py @@ -1,5 +1,5 @@ from app import create_app, db -from flask_migrate import upgrade, migrate, init, stamp +from flask_migrate import init, migrate, stamp, upgrade def deploy(): diff --git a/library/forms/forgotpasswordform.py b/library/forms/forgotpasswordform.py index 0ddc0d6..50db65e 100644 --- a/library/forms/forgotpasswordform.py +++ b/library/forms/forgotpasswordform.py @@ -1,12 +1,7 @@ """Forgotten password form to help user.""" -from wtforms import ( - StringField, - SubmitField, -) - -from wtforms import validators -from wtforms.validators import Length, Email from flask_wtf import FlaskForm +from wtforms import StringField, SubmitField, validators +from wtforms.validators import Email, Length class ForgotPasswordForm(FlaskForm): diff --git a/library/forms/loginform.py b/library/forms/loginform.py index 262bb5d..80f5580 100644 --- a/library/forms/loginform.py +++ b/library/forms/loginform.py @@ -1,13 +1,7 @@ """Login form to validate user.""" -from wtforms import ( - StringField, - SubmitField, - PasswordField, -) - -from wtforms import validators -from wtforms.validators import Length, Email from flask_wtf import FlaskForm +from wtforms import PasswordField, StringField, SubmitField, validators +from wtforms.validators import Email, Length class LoginForm(FlaskForm): diff --git a/library/forms/registerform.py b/library/forms/registerform.py index 28b3bc9..c90d27b 100644 --- a/library/forms/registerform.py +++ b/library/forms/registerform.py @@ -1,13 +1,7 @@ """Register form to make a new user.""" -from wtforms import ( - StringField, - SubmitField, - PasswordField, -) - -from wtforms import validators -from wtforms.validators import Length, Email, EqualTo, ValidationError from flask_wtf import FlaskForm +from wtforms import PasswordField, StringField, SubmitField, validators +from wtforms.validators import Email, EqualTo, Length, ValidationError class RegisterForm(FlaskForm): diff --git a/library/forms/resetpasswordform.py b/library/forms/resetpasswordform.py index d24da84..cc8a302 100644 --- a/library/forms/resetpasswordform.py +++ b/library/forms/resetpasswordform.py @@ -1,12 +1,7 @@ """Reset Password Form form to reset a users PasswordField.""" -from wtforms import ( - SubmitField, - PasswordField, -) - -from wtforms import validators -from wtforms.validators import Length, EqualTo from flask_wtf import FlaskForm +from wtforms import PasswordField, SubmitField, validators +from wtforms.validators import EqualTo, Length class ResetPasswordForm(FlaskForm): diff --git a/library/page.py b/library/page.py index 059c7d6..a2af1c0 100644 --- a/library/page.py +++ b/library/page.py @@ -6,18 +6,17 @@ import json import os import bcrypt -from flask import redirect, render_template, request, Blueprint -from flask_wtf.csrf import CSRFProtect -from icalendar import Calendar -from PIL import Image -from requests import get -from werkzeug.utils import secure_filename - from app import create_app from application.csvparser import CsvParser +from flask import Blueprint, redirect, render_template, request +from flask_wtf.csrf import CSRFProtect from forms.borrowform import BorrowForm from forms.uploadform import PublicationForm +from icalendar import Calendar +from PIL import Image +from requests import get from search import search +from werkzeug.utils import secure_filename APP = create_app() csrf = CSRFProtect() diff --git a/library/search.py b/library/search.py index 2f00d4b..55b7bcb 100644 --- a/library/search.py +++ b/library/search.py @@ -1,11 +1,10 @@ import os +from application.csvparser import CsvParser from whoosh.fields import * from whoosh.index import open_dir from whoosh.qparser import QueryParser -from application.csvparser import CsvParser - SCRIPT_DIR = os.path.dirname(__file__) DATA_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, "data")) diff --git a/setup.py b/setup.py index c0c27fd..12d9afc 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,3 @@ -from setuptools import setup, find_packages +from setuptools import find_packages, setup -setup(name='library', version='1.1', packages=find_packages()) +setup(name="library", version="1.1", packages=find_packages())