From 9e9a365962456023fff8825aa0cfa7ae2064c9b4 Mon Sep 17 00:00:00 2001 From: Stephen Tramer Date: Mon, 1 Jul 2019 11:13:10 -0700 Subject: [PATCH] Updated Python content to comply with PEP8 (via autopep8) --- app/app.py | 11 +++++------ app/migrations/env.py | 3 ++- app/migrations/versions/32b48058cd02_.py | 3 ++- app/migrations/versions/791cd7d80402_.py | 10 +++++----- app/models.py | 4 ++-- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/app.py b/app/app.py index d52372f..67876cf 100644 --- a/app/app.py +++ b/app/app.py @@ -1,3 +1,4 @@ +from models import * import os from flask import Flask, request, render_template @@ -18,8 +19,6 @@ # initialize database migration management MIGRATE = Migrate(APP, DB) -from models import * - @APP.route('/') def view_registered_guests(): @@ -27,17 +26,17 @@ def view_registered_guests(): return render_template('guest_list.html', guests=guests) -@APP.route('/register', methods = ['GET']) +@APP.route('/register', methods=['GET']) def view_registration_form(): return render_template('guest_registration.html') -@APP.route('/register', methods = ['POST']) +@APP.route('/register', methods=['POST']) def register_guest(): name = request.form.get('name') email = request.form.get('email') partysize = request.form.get('partysize') - if not partysize or partysize=='': + if not partysize or partysize == '': partysize = 1 guest = Guest(name, email, partysize) @@ -45,4 +44,4 @@ def register_guest(): DB.session.commit() return render_template('guest_confirmation.html', - name=name, email=email, partysize=partysize) + name=name, email=email, partysize=partysize) diff --git a/app/migrations/env.py b/app/migrations/env.py index 4593816..141938a 100755 --- a/app/migrations/env.py +++ b/app/migrations/env.py @@ -1,4 +1,5 @@ from __future__ import with_statement +from flask import current_app from alembic import context from sqlalchemy import engine_from_config, pool from logging.config import fileConfig @@ -17,7 +18,6 @@ # for 'autogenerate' support # from myapp import mymodel # target_metadata = mymodel.Base.metadata -from flask import current_app config.set_main_option('sqlalchemy.url', current_app.config.get('SQLALCHEMY_DATABASE_URI')) target_metadata = current_app.extensions['migrate'].db.metadata @@ -81,6 +81,7 @@ def process_revision_directives(context, revision, directives): finally: connection.close() + if context.is_offline_mode(): run_migrations_offline() else: diff --git a/app/migrations/versions/32b48058cd02_.py b/app/migrations/versions/32b48058cd02_.py index 9a5006e..f5ce065 100644 --- a/app/migrations/versions/32b48058cd02_.py +++ b/app/migrations/versions/32b48058cd02_.py @@ -18,7 +18,8 @@ def upgrade(): # ### commands auto generated by Alembic - please adjust! ### - op.add_column('guests', sa.Column('partysize', sa.Integer(), nullable=True)) + op.add_column('guests', sa.Column( + 'partysize', sa.Integer(), nullable=True)) # ### end Alembic commands ### diff --git a/app/migrations/versions/791cd7d80402_.py b/app/migrations/versions/791cd7d80402_.py index 5e3705a..6c09090 100644 --- a/app/migrations/versions/791cd7d80402_.py +++ b/app/migrations/versions/791cd7d80402_.py @@ -19,11 +19,11 @@ def upgrade(): # ### commands auto generated by Alembic - please adjust! ### op.create_table('guests', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('name', sa.String(length=80), nullable=True), - sa.Column('email', sa.String(length=120), nullable=True), - sa.PrimaryKeyConstraint('id') - ) + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('name', sa.String(length=80), nullable=True), + sa.Column('email', sa.String(length=120), nullable=True), + sa.PrimaryKeyConstraint('id') + ) # ### end Alembic commands ### diff --git a/app/models.py b/app/models.py index cae11a9..fafb9ac 100644 --- a/app/models.py +++ b/app/models.py @@ -1,8 +1,9 @@ from app import DB + class Guest(DB.Model): """Simple database model to track event attendees.""" - + __tablename__ = 'guests' id = DB.Column(DB.Integer, primary_key=True) name = DB.Column(DB.String(80)) @@ -13,4 +14,3 @@ def __init__(self, name=None, email=None, partysize=1): self.name = name self.email = email self.partysize = partysize - \ No newline at end of file