Skip to content
This repository was archived by the owner on Sep 7, 2018. It is now read-only.

Commit ec81d49

Browse files
dahliadahlia
committed
Merge pull request #4 from Kroisse/master
불필요한 import 제거
2 parents 1e86fae + 8a9ca93 commit ec81d49

File tree

5 files changed

+79
-74
lines changed

5 files changed

+79
-74
lines changed

‎langdev/objsimplify.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
33
44
"""
5-
import types
65
import collections
76
import langdev.util.visitor
87
import langdev.user

‎langdev/web/forum.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
"""
55
import re
66
import math
7-
from flask import *
8-
from flaskext.wtf import *
7+
from flask import (Blueprint, request, g, abort, render_template,
8+
make_response, redirect, url_for)
9+
from flask.ext import wtf
910
from wtforms.ext.sqlalchemy.fields import QuerySelectField
1011
from langdev.forum import Post, Comment
1112
from langdev.web import render
@@ -71,22 +72,22 @@ def atom():
7172
return response
7273

7374

74-
class PostForm(Form):
75+
class PostForm(wtf.Form):
7576

76-
title = TextField('Title', validators=[Required()],
77-
description='This will be shown on the list.')
78-
body = TextAreaField('Body', validators=[Required()],
79-
description='Markdown format enabled.')
80-
sticky = BooleanField('Sticky',
81-
description='Show this post always on top.')
82-
submit = SubmitField('Submit')
77+
title = wtf.TextField('Title', validators=[wtf.Required()],
78+
description='This will be shown on the list.')
79+
body = wtf.TextAreaField('Body', validators=[wtf.Required()],
80+
description='Markdown format enabled.')
81+
sticky = wtf.BooleanField('Sticky',
82+
description='Show this post always on top.')
83+
submit = wtf.SubmitField('Submit')
8384

8485

85-
class CommentForm(Form):
86+
class CommentForm(wtf.Form):
8687

8788
parent = QuerySelectField('Reply to', allow_blank=True)
88-
body = TextAreaField('Comment', validators=[Required()])
89-
submit = SubmitField('Submit')
89+
body = wtf.TextAreaField('Comment', validators=[wtf.Required()])
90+
submit = wtf.SubmitField('Submit')
9091

9192
def fill_comments(self, post):
9293
self.parent.query = post.comments
@@ -165,7 +166,7 @@ def get_comment(comment_id, post_id=None):
165166
def write_comment(post_id, comment_id=None):
166167
if comment_id:
167168
parent = get_comment(comment_id, post_id)
168-
post_object = comment_object.post
169+
post_object = parent.post
169170
else:
170171
post_object = get_post(post_id)
171172
parent = None

‎langdev/web/serializers.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
import datetime
77
import plistlib
88
import flask
9-
import langdev.user
10-
from langdev.objsimplify import *
9+
from langdev.objsimplify import simplify, camelCase, PascalCase
1110

1211

1312
def json(value):

‎langdev/web/thirdparty.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
33
44
"""
5-
import re
6-
from flask import *
7-
from flaskext.wtf import *
5+
from flask import Blueprint, request, g, redirect, url_for, abort
6+
from flaskext import wtf
87
import werkzeug.exceptions
98
import sqlalchemy.orm.exc
109
from langdev.user import User
@@ -19,13 +18,14 @@
1918
thirdparty = Blueprint('thirdparty', __name__)
2019

2120

22-
class ApplicationForm(Form):
21+
class ApplicationForm(wtf.Form):
2322

24-
title = TextField('Application title',
25-
validators=[Required(), Length(2, 100)])
26-
url = html5.URLField('Application website', validators=[Required()])
27-
description = TextAreaField('Description', validators=[Required()])
28-
submit = SubmitField('Create application')
23+
title = wtf.TextField('Application title',
24+
validators=[wtf.Required(), wtf.Length(2, 100)])
25+
url = wtf.html5.URLField('Application website',
26+
validators=[wtf.Required()])
27+
description = wtf.TextAreaField('Description', validators=[wtf.Required()])
28+
submit = wtf.SubmitField('Create application')
2929

3030

3131
@thirdparty.route('/')

‎langdev/web/user.py

Lines changed: 54 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
import hmac
1414
import hashlib
1515
import textwrap
16-
from flask import *
17-
from flaskext.wtf import *
18-
from flaskext.mail import Message
16+
from flask import (Blueprint, request, session, g, abort, redirect,
17+
url_for, current_app)
18+
from flask.ext import wtf
19+
from flask.ext.mail import Message
1920
from sqlalchemy import orm
2021
from langdev.user import User
2122
from langdev.web import before_request, errorhandler, render
@@ -109,18 +110,18 @@ def signout():
109110
return redirect(return_url)
110111

111112

112-
class SignInForm(Form):
113+
class SignInForm(wtf.Form):
113114

114-
login = TextField('Login name',
115-
validators=[Required(), Length(2, 45),
116-
Regexp(User.LOGIN_PATTERN)])
117-
password = PasswordField('Password', validators=[Required()])
118-
return_url = HiddenField(validators=[Optional()])
119-
submit = SubmitField('Login')
115+
login = wtf.TextField('Login name',
116+
validators=[wtf.Required(), wtf.Length(2, 45),
117+
wtf.Regexp(User.LOGIN_PATTERN)])
118+
password = wtf.PasswordField('Password', validators=[wtf.Required()])
119+
return_url = wtf.HiddenField(validators=[wtf.Optional()])
120+
submit = wtf.SubmitField('Login')
120121

121122
def validate_login(form, field):
122123
if g.session.query(User).filter_by(login=field.data).count() < 1:
123-
raise ValidationError('There is no {0}.'.format(field.data))
124+
raise wtf.ValidationError('There is no {0}.'.format(field.data))
124125

125126
def validate_password(form, field):
126127
try:
@@ -129,7 +130,7 @@ def validate_password(form, field):
129130
pass
130131
else:
131132
if user.password != field.data:
132-
raise ValidationError('Incorrect password.')
133+
raise wtf.ValidationError('Incorrect password.')
133134

134135

135136
@user.route('/f/signin')
@@ -154,50 +155,55 @@ def signin():
154155
return signin_form(form=form)
155156

156157

157-
class SignUpForm(Form):
158+
class SignUpForm(wtf.Form):
158159

159-
login = TextField('Login name',
160-
validators=[Required(), Length(2, 45),
161-
Regexp(User.LOGIN_PATTERN)])
162-
password = PasswordField(
160+
login = wtf.TextField('Login name',
161+
validators=[wtf.Required(), wtf.Length(2, 45),
162+
wtf.Regexp(User.LOGIN_PATTERN)])
163+
password = wtf.PasswordField(
163164
'Password',
164-
validators=[Required(), EqualTo('confirm',
165-
message='Passwords must match.')]
165+
validators=[wtf.Required(),
166+
wtf.EqualTo('confirm', message='Passwords must match.')]
166167
)
167-
confirm = PasswordField('Repeat Password', validators=[Required()])
168-
name = TextField('Screen name', validators=[Required(), Length(1, 45)])
169-
email = html5.EmailField('Email', validators=[Optional(), Email()])
170-
url = html5.URLField('Website', validators=[Optional(), URL()])
168+
confirm = wtf.PasswordField('Repeat Password', validators=[wtf.Required()])
169+
name = wtf.TextField('Screen name',
170+
validators=[wtf.Required(), wtf.Length(1, 45)])
171+
email = wtf.html5.EmailField('Email',
172+
validators=[wtf.Optional(), wtf.Email()])
173+
url = wtf.html5.URLField('Website', validators=[wtf.Optional(), wtf.URL()])
171174

172175
@classmethod
173176
def get_instance(cls, *args, **kwargs):
174177
if ('RECAPTCHA_PUBLIC_KEY' in current_app.config and
175178
'RECAPTCHA_PRIVATE_KEY' in current_app.config):
176179
class SignUpForm_recaptcha(cls):
177-
recaptcha = RecaptchaField()
178-
submit = SubmitField('Sign up')
180+
recaptcha = wtf.RecaptchaField()
181+
submit = wtf.SubmitField('Sign up')
179182
return SignUpForm_recaptcha(*args, **kwargs)
180183
class SignUpForm_plain(cls):
181-
submit = SubmitField('Sign up')
184+
submit = wtf.SubmitField('Sign up')
182185
return SignUpForm_plain(*args, **kwargs)
183186

184187
def validate_login(form, field):
185188
if g.session.query(User).filter_by(login=field.data).count():
186-
raise ValidationError('{0} is already taken.'.format(field.data))
189+
raise wtf.ValidationError(
190+
'{0} is already taken.'.format(field.data))
187191

188192

189-
class ProfileForm(Form):
193+
class ProfileForm(wtf.Form):
190194

191-
password = PasswordField(
195+
password = wtf.PasswordField(
192196
'Password',
193-
validators=[Required(), EqualTo('confirm',
194-
message='Passwords must match.')]
197+
validators=[wtf.Required(),
198+
wtf.EqualTo('confirm', message='Passwords must match.')]
195199
)
196-
confirm = PasswordField('Repeat Password', validators=[Required()])
197-
name = TextField('Screen name', validators=[Required(), Length(1, 45)])
198-
email = html5.EmailField('Email', validators=[Optional(), Email()])
199-
url = html5.URLField('Website', validators=[Optional(), URL()])
200-
submit = SubmitField('Save')
200+
confirm = wtf.PasswordField('Repeat Password', validators=[wtf.Required()])
201+
name = wtf.TextField('Screen name',
202+
validators=[wtf.Required(), wtf.Length(1, 45)])
203+
email = wtf.html5.EmailField('Email',
204+
validators=[wtf.Optional(), wtf.Email()])
205+
url = wtf.html5.URLField('Website', validators=[wtf.Optional(), wtf.URL()])
206+
submit = wtf.SubmitField('Save')
201207

202208

203209
@user.route('/f/signup')
@@ -282,16 +288,16 @@ def posts(user_login):
282288
return render('user/posts', posts, user=user, posts=posts)
283289

284290

285-
class PasswordFindingForm(Form):
291+
class PasswordFindingForm(wtf.Form):
286292

287-
login = TextField('Login name',
288-
validators=[Required(), Length(2, 45),
289-
Regexp(User.LOGIN_PATTERN)])
290-
submit = SubmitField('Find')
293+
login = wtf.TextField('Login name',
294+
validators=[wtf.Required(), wtf.Length(2, 45),
295+
wtf.Regexp(User.LOGIN_PATTERN)])
296+
submit = wtf.SubmitField('Find')
291297

292298
def validate_login(form, field):
293299
if g.session.query(User).filter_by(login=field.data).count() < 1:
294-
raise ValidationError('There is no {0}.'.format(field.data))
300+
raise wtf.ValidationError('There is no {0}.'.format(field.data))
295301

296302

297303
@user.route('/f/orgot')
@@ -386,15 +392,15 @@ def request_find_password(user_login):
386392
return response
387393

388394

389-
class ChangePasswordForm(Form):
395+
class ChangePasswordForm(wtf.Form):
390396

391-
password = PasswordField(
397+
password = wtf.PasswordField(
392398
'Password',
393-
validators=[Required(), EqualTo('confirm',
394-
message='Passwords must match.')]
399+
validators=[wtf.Required(),
400+
wtf.EqualTo('confirm', message='Passwords must match.')]
395401
)
396-
confirm = PasswordField('Repeat Password', validators=[Required()])
397-
submit = SubmitField('Save')
402+
confirm = wtf.PasswordField('Repeat Password', validators=[wtf.Required()])
403+
submit = wtf.SubmitField('Save')
398404

399405

400406
@user.route('/<user_login>/password-findings/<token>')

0 commit comments

Comments
 (0)