Rename Form to FlaskForm as it's deprecated

flaskbb/auth/forms.py

@@ -8,7 +8,7 @@
     :copyright: (c) 2014 by the FlaskBB Team.
     :license: BSD, see LICENSE for more details.
 """
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from wtforms import (StringField, PasswordField, BooleanField, HiddenField,
                      SubmitField, SelectField)
 from wtforms.validators import (DataRequired, InputRequired, Email, EqualTo,
@@ -24,7 +24,7 @@ is_username = regexp(USERNAME_RE,
                      message=_("You can only use letters, numbers or dashes."))
 
 
-class LoginForm(Form):
+class LoginForm(FlaskForm):
     login = StringField(_("Username or Email address"), validators=[
         DataRequired(message=_("Please enter your username or email address."))
     ])
@@ -39,7 +39,7 @@ class LoginForm(Form):
     submit = SubmitField(_("Login"))
 
 
-class RegisterForm(Form):
+class RegisterForm(FlaskForm):
     username = StringField(_("Username"), validators=[
         DataRequired(message=_("A valid username is required.")),
         is_username])
@@ -82,14 +82,14 @@ class RegisterForm(Form):
         return user.save()
 
 
-class ReauthForm(Form):
+class ReauthForm(FlaskForm):
     password = PasswordField(_('Password'), validators=[
         DataRequired(message=_("Please enter your password."))])
 
     submit = SubmitField(_("Refresh Login"))
 
 
-class ForgotPasswordForm(Form):
+class ForgotPasswordForm(FlaskForm):
     email = StringField(_('Email address'), validators=[
         DataRequired(message=_("A valid email address is required.")),
         Email()])
@@ -99,7 +99,7 @@ class ForgotPasswordForm(Form):
     submit = SubmitField(_("Request Password"))
 
 
-class ResetPasswordForm(Form):
+class ResetPasswordForm(FlaskForm):
     token = HiddenField('Token')
 
     email = StringField(_('Email address'), validators=[
@@ -120,7 +120,7 @@ class ResetPasswordForm(Form):
             raise ValidationError(_("Wrong email address."))
 
 
-class RequestActivationForm(Form):
+class RequestActivationForm(FlaskForm):
     username = StringField(_("Username"), validators=[
         DataRequired(message=_("A valid username is required.")),
         is_username])
@@ -141,7 +141,7 @@ class RequestActivationForm(Form):
             raise ValidationError(_("User is already active."))
 
 
-class AccountActivationForm(Form):
+class AccountActivationForm(FlaskForm):
     token = StringField(_("Email confirmation token"), validators=[
         DataRequired(message=_("Please enter the token that we have sent to "
                                "you."))

flaskbb/forum/forms.py

@@ -8,7 +8,7 @@
     :copyright: (c) 2014 by the FlaskBB Team.
     :license: BSD, see LICENSE for more details.
 """
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from wtforms import (TextAreaField, StringField, SelectMultipleField,
                      BooleanField, SubmitField)
 from wtforms.validators import DataRequired, Optional, Length
@@ -18,7 +18,7 @@ from flaskbb.forum.models import Topic, Post, Report, Forum
 from flaskbb.user.models import User
 
 
-class QuickreplyForm(Form):
+class QuickreplyForm(FlaskForm):
     content = TextAreaField(_("Quick reply"), validators=[
         DataRequired(message=_("You cannot post a reply without content."))])
 
@@ -29,7 +29,7 @@ class QuickreplyForm(Form):
         return post.save(user=user, topic=topic)
 
 
-class ReplyForm(Form):
+class ReplyForm(FlaskForm):
     content = TextAreaField(_("Content"), validators=[
         DataRequired(message=_("You cannot post a reply without content."))])
 
@@ -69,7 +69,7 @@ class NewTopicForm(ReplyForm):
         return topic.save(user=user, forum=forum, post=post)
 
 
-class ReportForm(Form):
+class ReportForm(FlaskForm):
     reason = TextAreaField(_("Reason"), validators=[
         DataRequired(message=_("What is the reason for reporting this post?"))
     ])
@@ -81,7 +81,7 @@ class ReportForm(Form):
         return report.save(post=post, user=user)
 
 
-class UserSearchForm(Form):
+class UserSearchForm(FlaskForm):
     search_query = StringField(_("Search"), validators=[
         Optional(), Length(min=3, max=50)
     ])
@@ -93,7 +93,7 @@ class UserSearchForm(Form):
         return User.query.whooshee_search(query)
 
 
-class SearchPageForm(Form):
+class SearchPageForm(FlaskForm):
     search_query = StringField(_("Criteria"), validators=[
         DataRequired(), Length(min=3, max=50)])
 

flaskbb/management/forms.py

@@ -8,7 +8,7 @@
     :copyright: (c) 2014 by the FlaskBB Team.
     :license: BSD, see LICENSE for more details.
 """
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from wtforms import (BooleanField, HiddenField, IntegerField, PasswordField,
                      SelectField, StringField, SubmitField, TextAreaField)
 from wtforms.validators import (DataRequired, Optional, Email, regexp, Length,
@@ -48,7 +48,7 @@ def select_primary_group():
     return Group.query.filter(Group.guest != True).order_by(Group.id)
 
 
-class UserForm(Form):
+class UserForm(FlaskForm):
     username = StringField(_("Username"), validators=[
         DataRequired(message=_("A valid username is required.")),
         is_username])
@@ -147,7 +147,7 @@ class EditUserForm(UserForm):
         UserForm.__init__(self, *args, **kwargs)
 
 
-class GroupForm(Form):
+class GroupForm(FlaskForm):
     name = StringField(_("Group name"), validators=[
         DataRequired(message=_("Please enter a name for the group."))])
 
@@ -277,7 +277,7 @@ class AddGroupForm(GroupForm):
     pass
 
 
-class ForumForm(Form):
+class ForumForm(FlaskForm):
     title = StringField(
         _("Forum title"),
         validators=[DataRequired(message=_("Please enter a forum title."))]
@@ -396,7 +396,7 @@ class AddForumForm(ForumForm):
     pass
 
 
-class CategoryForm(Form):
+class CategoryForm(FlaskForm):
     title = StringField(_("Category title"), validators=[
         DataRequired(message=_("Please enter a category title."))])
 

flaskbb/message/forms.py

@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for more details.
 """
 from flask_login import current_user
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from wtforms import StringField, TextAreaField, ValidationError, SubmitField
 from wtforms.validators import DataRequired
 from flask_babelplus import lazy_gettext as _
@@ -18,7 +18,7 @@ from flaskbb.user.models import User
 from flaskbb.message.models import Conversation, Message
 
 
-class ConversationForm(Form):
+class ConversationForm(FlaskForm):
     to_user = StringField(_("Recipient"), validators=[
         DataRequired(message=_("A valid username is required."))])
 
@@ -55,7 +55,7 @@ class ConversationForm(Form):
         return conversation.save(message=message)
 
 
-class MessageForm(Form):
+class MessageForm(FlaskForm):
     message = TextAreaField(_("Message"), validators=[
         DataRequired(message=_("A message is required."))])
     submit = SubmitField(_("Send Message"))

flaskbb/user/forms.py

@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for more details.
 """
 from flask_login import current_user
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from wtforms import (StringField, PasswordField, TextAreaField, SelectField,
                      ValidationError, SubmitField)
 from wtforms.validators import (Length, DataRequired, InputRequired, Email,
@@ -23,7 +23,7 @@ from flaskbb.utils.fields import BirthdayField
 from flaskbb.utils.helpers import check_image
 
 
-class GeneralSettingsForm(Form):
+class GeneralSettingsForm(FlaskForm):
     # The choices for those fields will be generated in the user view
     # because we cannot access the current_app outside of the context
     language = SelectField(_("Language"))
@@ -32,7 +32,7 @@ class GeneralSettingsForm(Form):
     submit = SubmitField(_("Save"))
 
 
-class ChangeEmailForm(Form):
+class ChangeEmailForm(FlaskForm):
     old_email = StringField(_("Old email address"), validators=[
         DataRequired(message=_("A valid email address is required.")),
         Email(message=_("Invalid email address."))])
@@ -60,7 +60,7 @@ class ChangeEmailForm(Form):
             raise ValidationError(_("This email address is already taken."))
 
 
-class ChangePasswordForm(Form):
+class ChangePasswordForm(FlaskForm):
     old_password = PasswordField(_("Password"), validators=[
         DataRequired(message=_("Please enter your password."))])
 
@@ -78,7 +78,7 @@ class ChangePasswordForm(Form):
             raise ValidationError(_("Old password is wrong."))
 
 
-class ChangeUserDetailsForm(Form):
+class ChangeUserDetailsForm(FlaskForm):
     birthday = BirthdayField(_("Birthday"), format="%d %m %Y",
                              validators=[Optional()],
                              widget=SelectBirthdayWidget())