From 5922bfcef0412790b9a79abf432153d9a1b7c17c Mon Sep 17 00:00:00 2001 From: crunk Date: Mon, 21 Mar 2022 20:08:56 +0100 Subject: [PATCH] a little code clean up --- verse/admintool.py | 1 + verse/distribusiworkflow.py | 8 +++----- verse/editor.py | 4 ++-- verse/usermodel.py | 1 - 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/verse/admintool.py b/verse/admintool.py index 0d644a3..9410eaa 100644 --- a/verse/admintool.py +++ b/verse/admintool.py @@ -9,6 +9,7 @@ from sqlalchemy.exc import ( from usermodel import User # noqa: F401 from distribusimodel import Distribusis # noqa: F401 + def admintool(): """Admin CLI tool. To elevate a user to admin""" app = create_app() diff --git a/verse/distribusiworkflow.py b/verse/distribusiworkflow.py index 2db9b7e..57367a0 100644 --- a/verse/distribusiworkflow.py +++ b/verse/distribusiworkflow.py @@ -5,9 +5,9 @@ from flask import ( render_template, redirect, url_for, + flash, ) from sqlalchemy.exc import ( - IntegrityError, InvalidRequestError, DataError, InterfaceError, @@ -77,9 +77,7 @@ def UnzipDistribusiFiles(distribusi, userfolder): def GetCssFile(distribusi): cssfile = "" - cssfolder = os.path.join( - "themes/userthemes", distribusi.distribusiname - ) + cssfolder = os.path.join("themes/userthemes", distribusi.distribusiname) for filename in os.listdir(cssfolder): if filename.endswith(".css"): cssfile = os.path.join(cssfolder, filename) @@ -99,7 +97,7 @@ def SetDistribusiToVisible(distribusi, user): db.session.commit() except (InvalidRequestError, DataError, InterfaceError, DatabaseError): db.session.rollback() - distribusiform.submit.errors.append("Unknown error occured!") + flash("Unknown error occured!") def DeleteCssFile(cssfile): diff --git a/verse/editor.py b/verse/editor.py index aab61f7..aa474b5 100644 --- a/verse/editor.py +++ b/verse/editor.py @@ -63,10 +63,10 @@ def SaveUploadCssFile(editorform, newcssfolder): cssfile = editorform.cssfile.data cssfilename = f"{secure_filename(editorform.cssname.data)}.css" cssfile.save(os.path.join(newcssfolder, cssfilename)) - openfile = open(os.path.join(newcssfolder, cssfilename), 'r') + openfile = open(os.path.join(newcssfolder, cssfilename), "r") cleancss = bleach.clean(openfile.read()) openfile.close() - cleanfile = open(os.path.join(newcssfolder, cssfilename), 'w') + cleanfile = open(os.path.join(newcssfolder, cssfilename), "w") cleanfile.write(cleancss) cleanfile.close() diff --git a/verse/usermodel.py b/verse/usermodel.py index 1506a7c..af40e19 100644 --- a/verse/usermodel.py +++ b/verse/usermodel.py @@ -15,6 +15,5 @@ class User(UserMixin, db.Model): tutor = db.Column(db.Boolean, default=False) admin = db.Column(db.Boolean, default=False) - def __repr__(self): return "" % self.email