From 530302b74f27a93417abe7745f2467528aab77e8 Mon Sep 17 00:00:00 2001 From: Francesco Siddi Date: Thu, 26 Apr 2018 10:39:45 +0200 Subject: [PATCH] Fix deprecation warning, rename Form to FlaskForm Starting with flask_wtform version 1.0, Form will be dropped in favor of FlaskForm. --- pillar/web/nodes/forms.py | 4 ++-- pillar/web/projects/forms.py | 8 ++++---- pillar/web/users/forms.py | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pillar/web/nodes/forms.py b/pillar/web/nodes/forms.py index bd0dfb38..8cd00a47 100644 --- a/pillar/web/nodes/forms.py +++ b/pillar/web/nodes/forms.py @@ -4,7 +4,7 @@ from datetime import datetime from datetime import date import pillarsdk from flask import current_app -from flask_wtf import Form +from flask_wtf import FlaskForm from wtforms import StringField from wtforms import DateField 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 parent """ - class ProceduralForm(Form): + class ProceduralForm(FlaskForm): pass parent_prop = node_type['parent'] diff --git a/pillar/web/projects/forms.py b/pillar/web/projects/forms.py index 9bf4fa09..e67aef08 100644 --- a/pillar/web/projects/forms.py +++ b/pillar/web/projects/forms.py @@ -1,4 +1,4 @@ -from flask_wtf import Form +from flask_wtf import FlaskForm from wtforms import StringField from wtforms import BooleanField from wtforms import HiddenField @@ -12,7 +12,7 @@ from pillar.web import system_util from pillar.web.utils.forms import FileSelectField, JSONRequired -class ProjectForm(Form): +class ProjectForm(FlaskForm): project_id = HiddenField('project_id', validators=[DataRequired()]) name = StringField('Name', validators=[DataRequired()]) url = StringField('Url', validators=[DataRequired()]) @@ -32,7 +32,7 @@ class ProjectForm(Form): picture_square = FileSelectField('Picture square', file_format='image') def validate(self): - rv = Form.validate(self) + rv = FlaskForm.validate(self) if not rv: return False @@ -54,7 +54,7 @@ class ProjectForm(Form): return True -class NodeTypeForm(Form): +class NodeTypeForm(FlaskForm): project_id = HiddenField('project_id', validators=[DataRequired()]) name = StringField('Name', validators=[DataRequired()]) parent = StringField('Parent') diff --git a/pillar/web/users/forms.py b/pillar/web/users/forms.py index 3ba76c65..bcdb4b32 100644 --- a/pillar/web/users/forms.py +++ b/pillar/web/users/forms.py @@ -1,5 +1,5 @@ from flask_login import current_user -from flask_wtf import Form +from flask_wtf import FlaskForm from pillar.web import system_util from pillarsdk.users import User @@ -14,7 +14,7 @@ from wtforms.validators import Regexp import wtforms.validators as wtvalid -class UserLoginForm(Form): +class UserLoginForm(FlaskForm): username = StringField('Username', validators=[DataRequired()]) password = PasswordField('Password', validators=[DataRequired()]) remember_me = BooleanField('Remember Me') @@ -23,7 +23,7 @@ class UserLoginForm(Form): super(UserLoginForm, self).__init__(csrf_enabled=False, *args, **kwargs) -class UserProfileForm(Form): +class UserProfileForm(FlaskForm): username = StringField('Username', validators=[DataRequired(), Length( min=3, max=128, message="Min. 3, max. 128 chars please"), Regexp( r'^[\w.@+-]+$', message="Please do not use spaces")]) @@ -52,7 +52,7 @@ class UserProfileForm(Form): return True -class UserSettingsEmailsForm(Form): +class UserSettingsEmailsForm(FlaskForm): choices = [ (1, 'Keep me updated with Blender Cloud news.'), (0, 'Do not mail me news update.')] @@ -74,7 +74,7 @@ class RolesField(SelectMultipleField): return current_app.user_roles -class UserEditForm(Form): +class UserEditForm(FlaskForm): roles = RolesField('Roles') email = StringField( validators=[wtvalid.DataRequired(), wtvalid.Email()],