Cleaned up with flake8

advlabdb/__init__.py

@@ -3,13 +3,13 @@ from flask_sqlalchemy import SQLAlchemy
 from flask_security import Security, SQLAlchemyUserDatastore
 from flask_security.models import fsqla_v2 as fsqla
 from flask_admin import Admin
-#DEBUG
+# DEBUG
 from flask_debugtoolbar import DebugToolbarExtension
 
 app = Flask(__name__)
-app.debug = True #DEBUG
+app.debug = True # DEBUG
 
-app.config["SERVER_NAME"] = "127.0.0.1:5000" #DEBUG
+app.config["SERVER_NAME"] = "127.0.0.1:5000" # DEBUG
 
 app.config["SECRET_KEY"] = "dev"
 app.config["SECURITY_PASSWORD_SALT"] = "devSalt" # os.environ.get("SECURITY_PASSWORD_SALT", "")
@@ -19,8 +19,8 @@ db = SQLAlchemy(app)
 
 fsqla.FsModels.set_db_info(db)
 
-app.config["DEBUG_TB_INTERCEPT_REDIRECTS"] = False #DEBUG
+# app.config["DEBUG_TB_INTERCEPT_REDIRECTS"] = False # DEBUG
-DebugToolbarExtension(app) #DEBUG
+# DebugToolbarExtension(app) # DEBUG
 
 from advlabdb import customClasses
 admin = Admin(app,
@@ -35,5 +35,4 @@ user_datastore = SQLAlchemyUserDatastore(db, models.User, models.Role)
 Security(app, user_datastore)
 
 from advlabdb import routes
-from advlabdb import forms
 from advlabdb import modelViews

advlabdb/customClasses.py

@@ -1,10 +1,7 @@
 from flask_admin import AdminIndexView
 from flask_security import current_user
-from flask import flash
 from flask_admin.contrib.sqla import ModelView
 
-from advlabdb.utils import userActiveSemester
-
 
 def adminViewIsAccessible():
     return current_user.has_role("admin")

advlabdb/modelViews.py

@@ -1,4 +1,4 @@
-from flask import url_for, render_template, flash, request
+from flask import url_for, flash, request
 from flask_admin.menu import MenuLink
 from flask_admin.contrib.sqla.filters import BaseSQLAFilter
 from flask_security import hash_password
@@ -6,9 +6,9 @@ from wtforms import BooleanField, SelectField, TextField
 from wtforms.validators import DataRequired, Email
 
 from advlabdb import admin, app, user_datastore, db
-from advlabdb.models import *
 from advlabdb.utils import randomPassword, userActiveSemester, partFromLabelInUserActiveSemester
 from advlabdb.customClasses import SecureModelView
+from advlabdb.models import User, Role, Semester, Part, Student, PartStudent, Group, GroupExperiment, Experiment, Assistant, Appointment, PartExperiment, ExperimentMark
 
 partsLabels = ["A/1", "A/2", "A/m", "B/1", "B/2"]
 

advlabdb/routes.py

@@ -1,11 +1,9 @@
-import json
+from advlabdb import app, db
-from advlabdb import app, user_datastore
 from flask import render_template, request, url_for, flash, redirect
-from flask_security import auth_required, roles_required, hash_password, current_user
+from flask_security import auth_required, current_user
 
-from advlabdb.utils import *
+from advlabdb.utils import titleToTemplate, userActiveSemester
-from advlabdb.models import *
+from advlabdb.models import Semester
-from advlabdb.forms import *
 
 
 @app.context_processor
@@ -63,6 +61,7 @@ def index():
     else:
         return render_template("index.html")
 
+
 """
 @app.route("/assistants")
 @roles_required("admin")
@@ -163,6 +162,7 @@ def deactivate_users():
     return redirect(url_for("users"))
 """
 
+
 @app.route("/set_semester", methods=["GET"])
 @auth_required()
 def set_semester():

advlabdb/utils.py

@@ -6,6 +6,7 @@ from flask import flash
 from advlabdb.models import Semester
 from advlabdb import db
 
+
 def makeTable(headerAndDataList, rows, tableId="table"):
     def cellString(cell):
         cell = str(cell)

copy_admin_templates.py

@@ -2,6 +2,7 @@ from os.path import exists
 from shutil import copytree, rmtree
 from flask_admin import __file__ as flaskAdminPath
 
+
 def copyAdminTemplates():
     src = flaskAdminPath.removesuffix("__init__.py") + "templates/bootstrap3/admin"
     if not exists(src):
@@ -25,6 +26,7 @@ def copyAdminTemplates():
     print("Copied", src, "->", dist)
     return True
 
+
 if __name__ == "__main__":
     if copyAdminTemplates():
         print("Done!")