archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Fix deprecation warning, rename Form to FlaskForm

Browse Source 
Starting with flask_wtform version 1.0, Form will be dropped in favor
of FlaskForm.
This commit is contained in:
Francesco Siddi 2018-04-26 10:39:45 +02:00
parent 1bfb6cd2f6
commit 530302b74f
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pillar/web/nodes/forms.py
View File

@ -4,7 +4,7 @@ from datetime import datetime
from datetime import date from datetime import date
import pillarsdk import pillarsdk
from flask import current_app from flask import current_app
from flask_wtf import Form from flask_wtf import FlaskForm
from wtforms import StringField from wtforms import StringField
from wtforms import DateField from wtforms import DateField
from wtforms import SelectField from wtforms import SelectField
@ -110,7 +110,7 @@ def get_node_form(node_type):
:param node_type: Describes the node type via dyn_schema, form_schema and :param node_type: Describes the node type via dyn_schema, form_schema and
parent parent
""" """
class ProceduralForm(Form): class ProceduralForm(FlaskForm):
pass pass
parent_prop = node_type['parent'] parent_prop = node_type['parent']

8
pillar/web/projects/forms.py
View File

@ -1,4 +1,4 @@
from flask_wtf import Form from flask_wtf import FlaskForm
from wtforms import StringField from wtforms import StringField
from wtforms import BooleanField from wtforms import BooleanField
from wtforms import HiddenField from wtforms import HiddenField
@ -12,7 +12,7 @@ from pillar.web import system_util
from pillar.web.utils.forms import FileSelectField, JSONRequired from pillar.web.utils.forms import FileSelectField, JSONRequired
class ProjectForm(Form): class ProjectForm(FlaskForm):
project_id = HiddenField('project_id', validators=[DataRequired()]) project_id = HiddenField('project_id', validators=[DataRequired()])
name = StringField('Name', validators=[DataRequired()]) name = StringField('Name', validators=[DataRequired()])
url = StringField('Url', validators=[DataRequired()]) url = StringField('Url', validators=[DataRequired()])
@ -32,7 +32,7 @@ class ProjectForm(Form):
picture_square = FileSelectField('Picture square', file_format='image') picture_square = FileSelectField('Picture square', file_format='image')
def validate(self): def validate(self):
rv = Form.validate(self) rv = FlaskForm.validate(self)
if not rv: if not rv:
return False return False
@ -54,7 +54,7 @@ class ProjectForm(Form):
return True return True
class NodeTypeForm(Form): class NodeTypeForm(FlaskForm):
project_id = HiddenField('project_id', validators=[DataRequired()]) project_id = HiddenField('project_id', validators=[DataRequired()])
name = StringField('Name', validators=[DataRequired()]) name = StringField('Name', validators=[DataRequired()])
parent = StringField('Parent') parent = StringField('Parent')

10
pillar/web/users/forms.py
View File

@ -1,5 +1,5 @@
from flask_login import current_user from flask_login import current_user
from flask_wtf import Form from flask_wtf import FlaskForm
from pillar.web import system_util from pillar.web import system_util
from pillarsdk.users import User from pillarsdk.users import User
@ -14,7 +14,7 @@ from wtforms.validators import Regexp
import wtforms.validators as wtvalid import wtforms.validators as wtvalid
class UserLoginForm(Form): class UserLoginForm(FlaskForm):
username = StringField('Username', validators=[DataRequired()]) username = StringField('Username', validators=[DataRequired()])
password = PasswordField('Password', validators=[DataRequired()]) password = PasswordField('Password', validators=[DataRequired()])
remember_me = BooleanField('Remember Me') remember_me = BooleanField('Remember Me')
@ -23,7 +23,7 @@ class UserLoginForm(Form):
super(UserLoginForm, self).__init__(csrf_enabled=False, *args, **kwargs) super(UserLoginForm, self).__init__(csrf_enabled=False, *args, **kwargs)
class UserProfileForm(Form): class UserProfileForm(FlaskForm):
username = StringField('Username', validators=[DataRequired(), Length( username = StringField('Username', validators=[DataRequired(), Length(
min=3, max=128, message="Min. 3, max. 128 chars please"), Regexp( min=3, max=128, message="Min. 3, max. 128 chars please"), Regexp(
r'^[\w.@+-]+$', message="Please do not use spaces")]) r'^[\w.@+-]+$', message="Please do not use spaces")])
@ -52,7 +52,7 @@ class UserProfileForm(Form):
return True return True
class UserSettingsEmailsForm(Form): class UserSettingsEmailsForm(FlaskForm):
choices = [ choices = [
(1, 'Keep me updated with Blender Cloud news.'), (1, 'Keep me updated with Blender Cloud news.'),
(0, 'Do not mail me news update.')] (0, 'Do not mail me news update.')]
@ -74,7 +74,7 @@ class RolesField(SelectMultipleField):
return current_app.user_roles return current_app.user_roles
class UserEditForm(Form): class UserEditForm(FlaskForm):
roles = RolesField('Roles') roles = RolesField('Roles')
email = StringField( email = StringField(
validators=[wtvalid.DataRequired(), wtvalid.Email()], validators=[wtvalid.DataRequired(), wtvalid.Email()],