diff --git a/app/bug_reports.py b/app/bug_reports.py index ce5c95a..bc9c714 100644 --- a/app/bug_reports.py +++ b/app/bug_reports.py @@ -66,7 +66,7 @@ def get(status): if status == "all": query = db.session.query().select_from(BugReport) elif status == "resolved": - query = db.session.query().select_from(BugReport).filter(BugReport.resolved_time not None) + query = db.session.query().select_from(BugReport).filter(BugReport.resolved_time is not None) elif status == "unresolved": query = db.session.query().select_from(BugReport).filter(BugReport.resolved_time is None) else: diff --git a/app/mail.py b/app/mail.py index a3541dc..7844c0b 100644 --- a/app/mail.py +++ b/app/mail.py @@ -76,7 +76,7 @@ def send(): for item in items: name = translate_from_locale(f'Objects_{item[0]}_name') if name == f'Objects_{item[0]}_name': - name = (item[2] if (item[2] != "None" and item[2] != "" and item[2] not None) else item[1]) + name = (item[2] if (item[2] != "None" and item[2] != "" and item[2] is not None) else item[1]) form.attachment.choices.append( ( item[0], @@ -84,6 +84,4 @@ def send(): ) ) - return render_template('mail/send.html.j2', form=form) - diff --git a/app/reports.py b/app/reports.py index 6c444d6..1ee5d6b 100644 --- a/app/reports.py +++ b/app/reports.py @@ -50,7 +50,7 @@ def gen_item_report(): report = Reports.query.filter(Reports.date == date).filter(Reports.report_type == "items").first() # Only one report per day - if report not None: + if report is not None: current_app.logger.info(f"Item Report Already Generated for {date}") return @@ -104,7 +104,7 @@ def gen_currency_report(): report = Reports.query.filter(Reports.date == date).filter(Reports.report_type == "currency").first() # Only one report per day - if report not None: + if report is not None: current_app.logger.info(f"Currency Report Already Generated for {date}") return @@ -152,7 +152,7 @@ def gen_uscore_report(): report = Reports.query.filter(Reports.date == date).filter(Reports.report_type == "uscore").first() # Only one report per day - if report not None: + if report is not None: current_app.logger.info(f"U-Score Report Already Generated for {date}") return diff --git a/app/schemas.py b/app/schemas.py index 9ae924f..b9e1b18 100644 --- a/app/schemas.py +++ b/app/schemas.py @@ -1,16 +1,16 @@ from flask_marshmallow import Marshmallow from app.models import ( - PlayKey - PetNames - Mail - UGC - PropertyContent - Property - CharacterXML - CharacterInfo - Account - AccountInvitation - ActivityLog + PlayKey, + PetNames, + Mail, + UGC, + PropertyContent, + Property, + CharacterXML, + CharacterInfo, + Account, + AccountInvitation, + ActivityLog, CommandLog ) ma = Marshmallow()