fixes from linting changes

This commit is contained in:
Aaron Kimbre 2022-03-13 06:27:10 -05:00
parent 7cb0b94972
commit 3fed8cb02f
4 changed files with 16 additions and 18 deletions

View File

@ -66,7 +66,7 @@ def get(status):
if status == "all": if status == "all":
query = db.session.query().select_from(BugReport) query = db.session.query().select_from(BugReport)
elif status == "resolved": 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": elif status == "unresolved":
query = db.session.query().select_from(BugReport).filter(BugReport.resolved_time is None) query = db.session.query().select_from(BugReport).filter(BugReport.resolved_time is None)
else: else:

View File

@ -76,7 +76,7 @@ def send():
for item in items: for item in items:
name = translate_from_locale(f'Objects_{item[0]}_name') name = translate_from_locale(f'Objects_{item[0]}_name')
if name == 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( form.attachment.choices.append(
( (
item[0], item[0],
@ -84,6 +84,4 @@ def send():
) )
) )
return render_template('mail/send.html.j2', form=form) return render_template('mail/send.html.j2', form=form)

View File

@ -50,7 +50,7 @@ def gen_item_report():
report = Reports.query.filter(Reports.date == date).filter(Reports.report_type == "items").first() report = Reports.query.filter(Reports.date == date).filter(Reports.report_type == "items").first()
# Only one report per day # 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}") current_app.logger.info(f"Item Report Already Generated for {date}")
return return
@ -104,7 +104,7 @@ def gen_currency_report():
report = Reports.query.filter(Reports.date == date).filter(Reports.report_type == "currency").first() report = Reports.query.filter(Reports.date == date).filter(Reports.report_type == "currency").first()
# Only one report per day # 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}") current_app.logger.info(f"Currency Report Already Generated for {date}")
return return
@ -152,7 +152,7 @@ def gen_uscore_report():
report = Reports.query.filter(Reports.date == date).filter(Reports.report_type == "uscore").first() report = Reports.query.filter(Reports.date == date).filter(Reports.report_type == "uscore").first()
# Only one report per day # 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}") current_app.logger.info(f"U-Score Report Already Generated for {date}")
return return

View File

@ -1,16 +1,16 @@
from flask_marshmallow import Marshmallow from flask_marshmallow import Marshmallow
from app.models import ( from app.models import (
PlayKey PlayKey,
PetNames PetNames,
Mail Mail,
UGC UGC,
PropertyContent PropertyContent,
Property Property,
CharacterXML CharacterXML,
CharacterInfo CharacterInfo,
Account Account,
AccountInvitation AccountInvitation,
ActivityLog ActivityLog,
CommandLog CommandLog
) )
ma = Marshmallow() ma = Marshmallow()