From e39676ba8c5d677b889a9f8b7fa15f27d392d8ec Mon Sep 17 00:00:00 2001 From: TaaviE Date: Fri, 30 Aug 2019 21:50:17 +0300 Subject: [PATCH] Auto-formatted all files --- background.py | 2 -- forms.py | 3 +-- models/audit_events_model.py | 2 +- models/events_model.py | 3 ++- models/family_model.py | 2 +- models/groups_model.py | 4 ++-- models/names_model.py | 2 +- models/shuffles_model.py | 2 +- models/subscriptions_model.py | 2 +- models/users_model.py | 7 +++---- models/wishlist_model.py | 2 +- utility_standalone.py | 1 + wsgi.py | 2 +- 13 files changed, 16 insertions(+), 18 deletions(-) diff --git a/background.py b/background.py index b9546ca..56dd9c2 100644 --- a/background.py +++ b/background.py @@ -3,9 +3,7 @@ # SPDX-License-Identifier: AGPL-3.0-only # Background tasks -from logging import getLogger -from config import Config from main import mail from models.wishlist_model import NoteState from utility import * diff --git a/forms.py b/forms.py index e128af4..b18fa80 100644 --- a/forms.py +++ b/forms.py @@ -3,8 +3,7 @@ This file contains all the changes to forms required for this application """ from flask_babelex import gettext as _ -from flask_security.forms import StringField, RegisterForm, ResetPasswordForm, SendConfirmationForm, \ - ForgotPasswordForm +from flask_security.forms import ForgotPasswordForm, RegisterForm, ResetPasswordForm, SendConfirmationForm, StringField from flask_wtf import RecaptchaField from wtforms.validators import DataRequired diff --git a/models/audit_events_model.py b/models/audit_events_model.py index 152b780..c1d2500 100644 --- a/models/audit_events_model.py +++ b/models/audit_events_model.py @@ -5,7 +5,7 @@ from datetime import datetime -from sqlalchemy import FetchedValue, BigInteger, Column, Integer, ForeignKey, TIMESTAMP, VARCHAR +from sqlalchemy import BigInteger, Column, FetchedValue, ForeignKey, Integer, TIMESTAMP, VARCHAR from main import db from models.groups_model import Group diff --git a/models/events_model.py b/models/events_model.py index c15e801..d7aafb3 100644 --- a/models/events_model.py +++ b/models/events_model.py @@ -5,7 +5,7 @@ from datetime import datetime -from sqlalchemy import FetchedValue, BigInteger, Column, Integer, ForeignKey, TIMESTAMP, VARCHAR +from sqlalchemy import BigInteger, Column, FetchedValue, ForeignKey, Integer, TIMESTAMP, VARCHAR from main import db from models.groups_model import Group @@ -21,6 +21,7 @@ class ShufflingEventType(db.Model): id: int = Column(BigInteger(), server_default=FetchedValue(), primary_key=True, unique=True, nullable=False) name: str = Column(VARCHAR(), nullable=True) + class ShufflingEvent(db.Model): """ Specifies how events are stored in the database diff --git a/models/family_model.py b/models/family_model.py index fa8b322..d2a6293 100644 --- a/models/family_model.py +++ b/models/family_model.py @@ -4,7 +4,7 @@ """ from datetime import datetime -from sqlalchemy import FetchedValue, String, BigInteger, DateTime, Column, Boolean, Integer, ForeignKey +from sqlalchemy import BigInteger, Boolean, Column, DateTime, FetchedValue, ForeignKey, Integer, String from main import db from models.groups_model import Group diff --git a/models/groups_model.py b/models/groups_model.py index 225e7df..2962932 100644 --- a/models/groups_model.py +++ b/models/groups_model.py @@ -3,7 +3,7 @@ Specifies how groups of people are stored in a database """ -from sqlalchemy import FetchedValue, VARCHAR, BigInteger, Boolean, Integer, ForeignKey, Column +from sqlalchemy import BigInteger, Boolean, Column, FetchedValue, ForeignKey, Integer, VARCHAR from main import db @@ -53,4 +53,4 @@ def __init__(self, user_id: int, group_id: int, admin: bool): self.admin = admin def __repr__(self): - return "".format(self.user_id, self.group_id) \ No newline at end of file + return "".format(self.user_id, self.group_id) diff --git a/models/names_model.py b/models/names_model.py index a5d35f5..261012d 100644 --- a/models/names_model.py +++ b/models/names_model.py @@ -2,7 +2,7 @@ """ Specifies how Estonian names are stored in the DB with cases """ -from sqlalchemy import VARCHAR, Column +from sqlalchemy import Column, VARCHAR from main import db diff --git a/models/shuffles_model.py b/models/shuffles_model.py index b702eaa..73b860b 100644 --- a/models/shuffles_model.py +++ b/models/shuffles_model.py @@ -4,7 +4,7 @@ """ from datetime import datetime -from sqlalchemy import FetchedValue, BigInteger, Column, Integer, ForeignKey +from sqlalchemy import BigInteger, Column, FetchedValue, ForeignKey, Integer from main import db from models.groups_model import Group diff --git a/models/subscriptions_model.py b/models/subscriptions_model.py index 14ef13e..ad4ddca 100644 --- a/models/subscriptions_model.py +++ b/models/subscriptions_model.py @@ -4,7 +4,7 @@ """ from datetime import datetime -from sqlalchemy import ForeignKey, TIMESTAMP, Integer, FetchedValue, VARCHAR, BigInteger, Column, Boolean +from sqlalchemy import BigInteger, Boolean, Column, FetchedValue, ForeignKey, Integer, TIMESTAMP, VARCHAR from main import db from models.users_model import User diff --git a/models/users_model.py b/models/users_model.py index d1e8883..a2c394f 100644 --- a/models/users_model.py +++ b/models/users_model.py @@ -5,9 +5,8 @@ from datetime import datetime from flask_dance.consumer.storage.sqla import OAuthConsumerMixin -from flask_security import UserMixin, RoleMixin -from sqlalchemy import DateTime, FetchedValue, VARCHAR -from sqlalchemy import Integer, ForeignKey, Boolean, Column +from flask_security import RoleMixin, UserMixin +from sqlalchemy import Boolean, Column, DateTime, FetchedValue, ForeignKey, Integer, VARCHAR from sqlalchemy.orm import backref, relationship from main import db @@ -162,4 +161,4 @@ def __init__(self, user_id, family_id, admin): self.admin = admin def __repr__(self): - return "".format(self.user_id) \ No newline at end of file + return "".format(self.user_id) diff --git a/models/wishlist_model.py b/models/wishlist_model.py index 3f4ec6d..a01eeb2 100644 --- a/models/wishlist_model.py +++ b/models/wishlist_model.py @@ -3,7 +3,7 @@ from enum import Enum from flask_babelex import gettext as _ -from sqlalchemy import VARCHAR, Integer, Column, TIMESTAMP, BigInteger, ForeignKey +from sqlalchemy import BigInteger, Column, ForeignKey, Integer, TIMESTAMP, VARCHAR from main import db # To make sure these strings get translated diff --git a/utility_standalone.py b/utility_standalone.py index 9ed7775..25a578b 100644 --- a/utility_standalone.py +++ b/utility_standalone.py @@ -4,6 +4,7 @@ # Cython import pyximport + pyximport.install() from functools import lru_cache diff --git a/wsgi.py b/wsgi.py index ee090d3..e724fef 100644 --- a/wsgi.py +++ b/wsgi.py @@ -1,6 +1,6 @@ # coding=utf-8 import logging -from logging import getLogger, basicConfig +from logging import basicConfig, getLogger from werkzeug.middleware.proxy_fix import ProxyFix