Skip to content

Commit 5676d8b

Browse files
sandlerbensandlerben
authored
Merge pull request hack4impact#151 from ozbek/format
Apply 'python manage.py format'
2 parents 325474c + 5d57727 commit 5676d8b

File tree

7 files changed

+59
-36
lines changed

7 files changed

+59
-36
lines changed

‎app/account/forms.py‎

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,46 @@
1111

1212
class LoginForm(Form):
1313
email = EmailField(
14-
'Email', validators=[InputRequired(), Length(1, 64), Email()])
14+
'Email', validators=[InputRequired(),
15+
Length(1, 64),
16+
Email()])
1517
password = PasswordField('Password', validators=[InputRequired()])
1618
remember_me = BooleanField('Keep me logged in')
1719
submit = SubmitField('Log in')
1820

1921

2022
class RegistrationForm(Form):
2123
first_name = StringField(
22-
'First name', validators=[InputRequired(), Length(1, 64)])
24+
'First name', validators=[InputRequired(),
25+
Length(1, 64)])
2326
last_name = StringField(
24-
'Last name', validators=[InputRequired(), Length(1, 64)])
27+
'Last name', validators=[InputRequired(),
28+
Length(1, 64)])
2529
email = EmailField(
26-
'Email', validators=[InputRequired(), Length(1, 64), Email()])
30+
'Email', validators=[InputRequired(),
31+
Length(1, 64),
32+
Email()])
2733
password = PasswordField(
2834
'Password',
2935
validators=[
30-
InputRequired(), EqualTo('password2', 'Passwords must match')
36+
InputRequired(),
37+
EqualTo('password2', 'Passwords must match')
3138
])
3239
password2 = PasswordField('Confirm password', validators=[InputRequired()])
3340
submit = SubmitField('Register')
3441

3542
def validate_email(self, field):
3643
if User.query.filter_by(email=field.data).first():
3744
raise ValidationError('Email already registered. (Did you mean to '
38-
'<a href="{}">log in</a> instead?)'
39-
.format(url_for('account.login')))
45+
'<a href="{}">log in</a> instead?)'.format(
46+
url_for('account.login')))
4047

4148

4249
class RequestResetPasswordForm(Form):
4350
email = EmailField(
44-
'Email', validators=[InputRequired(), Length(1, 64), Email()])
51+
'Email', validators=[InputRequired(),
52+
Length(1, 64),
53+
Email()])
4554
submit = SubmitField('Reset password')
4655

4756
# We don't validate the email address so we don't confirm to attackers
@@ -50,11 +59,14 @@ class RequestResetPasswordForm(Form):
5059

5160
class ResetPasswordForm(Form):
5261
email = EmailField(
53-
'Email', validators=[InputRequired(), Length(1, 64), Email()])
62+
'Email', validators=[InputRequired(),
63+
Length(1, 64),
64+
Email()])
5465
new_password = PasswordField(
5566
'New password',
5667
validators=[
57-
InputRequired(), EqualTo('new_password2', 'Passwords must match.')
68+
InputRequired(),
69+
EqualTo('new_password2', 'Passwords must match.')
5870
])
5971
new_password2 = PasswordField(
6072
'Confirm new password', validators=[InputRequired()])
@@ -69,7 +81,8 @@ class CreatePasswordForm(Form):
6981
password = PasswordField(
7082
'Password',
7183
validators=[
72-
InputRequired(), EqualTo('password2', 'Passwords must match.')
84+
InputRequired(),
85+
EqualTo('password2', 'Passwords must match.')
7386
])
7487
password2 = PasswordField(
7588
'Confirm new password', validators=[InputRequired()])
@@ -81,7 +94,8 @@ class ChangePasswordForm(Form):
8194
new_password = PasswordField(
8295
'New password',
8396
validators=[
84-
InputRequired(), EqualTo('new_password2', 'Passwords must match.')
97+
InputRequired(),
98+
EqualTo('new_password2', 'Passwords must match.')
8599
])
86100
new_password2 = PasswordField(
87101
'Confirm new password', validators=[InputRequired()])
@@ -90,7 +104,9 @@ class ChangePasswordForm(Form):
90104

91105
class ChangeEmailForm(Form):
92106
email = EmailField(
93-
'New email', validators=[InputRequired(), Length(1, 64), Email()])
107+
'New email', validators=[InputRequired(),
108+
Length(1, 64),
109+
Email()])
94110
password = PasswordField('Password', validators=[InputRequired()])
95111
submit = SubmitField('Update email')
96112

‎app/account/views.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from flask import flash, redirect, render_template, request, url_for
2-
from flask_login import (current_user, login_required, login_user,
3-
logout_user)
2+
from flask_login import current_user, login_required, login_user, logout_user
43
from flask_rq import get_queue
54

65
from . import account
@@ -91,8 +90,8 @@ def reset_password_request():
9190
user=user,
9291
reset_link=reset_link,
9392
next=request.args.get('next'))
94-
flash('A password reset link has been sent to {}.'
95-
.format(form.email.data), 'warning')
93+
flash('A password reset link has been sent to {}.'.format(
94+
form.email.data), 'warning')
9695
return redirect(url_for('account.login'))
9796
return render_template('account/reset_password.html', form=form)
9897

‎app/admin/forms.py‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111

1212
class ChangeUserEmailForm(Form):
1313
email = EmailField(
14-
'New email', validators=[InputRequired(), Length(1, 64), Email()])
14+
'New email', validators=[InputRequired(),
15+
Length(1, 64),
16+
Email()])
1517
submit = SubmitField('Update email')
1618

1719
def validate_email(self, field):
@@ -35,11 +37,15 @@ class InviteUserForm(Form):
3537
get_label='name',
3638
query_factory=lambda: db.session.query(Role).order_by('permissions'))
3739
first_name = StringField(
38-
'First name', validators=[InputRequired(), Length(1, 64)])
40+
'First name', validators=[InputRequired(),
41+
Length(1, 64)])
3942
last_name = StringField(
40-
'Last name', validators=[InputRequired(), Length(1, 64)])
43+
'Last name', validators=[InputRequired(),
44+
Length(1, 64)])
4145
email = EmailField(
42-
'Email', validators=[InputRequired(), Length(1, 64), Email()])
46+
'Email', validators=[InputRequired(),
47+
Length(1, 64),
48+
Email()])
4349
submit = SubmitField('Invite')
4450

4551
def validate_email(self, field):
@@ -51,7 +57,8 @@ class NewUserForm(InviteUserForm):
5157
password = PasswordField(
5258
'Password',
5359
validators=[
54-
InputRequired(), EqualTo('password2', 'Passwords must match.')
60+
InputRequired(),
61+
EqualTo('password2', 'Passwords must match.')
5562
])
5663
password2 = PasswordField('Confirm password', validators=[InputRequired()])
5764

‎app/admin/views.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
from flask import abort, flash, redirect, render_template, url_for, request
1+
from flask import abort, flash, redirect, render_template, request, url_for
22
from flask_login import current_user, login_required
33
from flask_rq import get_queue
44

5-
from .forms import (ChangeAccountTypeForm, ChangeUserEmailForm, InviteUserForm,
6-
NewUserForm)
75
from . import admin
86
from .. import db
97
from ..decorators import admin_required
108
from ..email import send_email
11-
from ..models import Role, User, EditableHTML
9+
from ..models import EditableHTML, Role, User
10+
from .forms import (ChangeAccountTypeForm, ChangeUserEmailForm, InviteUserForm,
11+
NewUserForm)
1212

1313

1414
@admin.route('/')
@@ -65,7 +65,8 @@ def invite_user():
6565
subject='You Are Invited To Join',
6666
template='account/email/invite',
6767
user=user,
68-
invite_link=invite_link, )
68+
invite_link=invite_link,
69+
)
6970
flash('User {} successfully invited'.format(user.full_name()),
7071
'form-success')
7172
return render_template('admin/new_user.html', form=form)
@@ -107,8 +108,8 @@ def change_user_email(user_id):
107108
user.email = form.email.data
108109
db.session.add(user)
109110
db.session.commit()
110-
flash('Email for user {} successfully changed to {}.'
111-
.format(user.full_name(), user.email), 'form-success')
111+
flash('Email for user {} successfully changed to {}.'.format(
112+
user.full_name(), user.email), 'form-success')
112113
return render_template('admin/manage_user.html', user=user, form=form)
113114

114115

@@ -131,8 +132,8 @@ def change_account_type(user_id):
131132
user.role = form.role.data
132133
db.session.add(user)
133134
db.session.commit()
134-
flash('Role for user {} successfully changed to {}.'
135-
.format(user.full_name(), user.role.name), 'form-success')
135+
flash('Role for user {} successfully changed to {}.'.format(
136+
user.full_name(), user.role.name), 'form-success')
136137
return render_template('admin/manage_user.html', user=user, form=form)
137138

138139

‎app/main/views.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from flask import render_template
2-
from ..models import EditableHTML
32

43
from . import main
4+
from ..models import EditableHTML
55

66

77
@main.route('/')
@@ -12,5 +12,5 @@ def index():
1212
@main.route('/about')
1313
def about():
1414
editable_html_obj = EditableHTML.get_editable_html('about')
15-
return render_template('main/about.html',
16-
editable_html_obj=editable_html_obj)
15+
return render_template(
16+
'main/about.html', editable_html_obj=editable_html_obj)

‎config.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import os
22
import sys
3+
34
from raygun4py.middleware import flask as flask_raygun
45

56
PYTHON_VERSION = sys.version_info[0]

‎manage.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/usr/bin/env python
22
import os
33
import subprocess
4-
from config import Config
54

65
from flask_migrate import Migrate, MigrateCommand
76
from flask_script import Manager, Shell
@@ -10,7 +9,7 @@
109

1110
from app import create_app, db
1211
from app.models import Role, User
13-
12+
from config import Config
1413

1514
app = create_app(os.getenv('FLASK_CONFIG') or 'default')
1615
manager = Manager(app)

0 commit comments

Comments
 (0)