Replace deprecated fields/validators. #65

flaskbb/auth/forms.py

@@ -11,8 +11,9 @@
 from datetime import datetime
 
 from flask.ext.wtf import Form, RecaptchaField
-from wtforms import TextField, PasswordField, BooleanField, HiddenField
-from wtforms.validators import Required, Email, EqualTo, regexp, ValidationError
+from wtforms import StringField, PasswordField, BooleanField, HiddenField
+from wtforms.validators import (DataRequired, Email, EqualTo, regexp,
+                                ValidationError)
 
 from flaskbb.user.models import User
 
@@ -22,29 +23,29 @@ is_username = regexp(USERNAME_RE,
 
 
 class LoginForm(Form):
-    login = TextField("Username or E-Mail", validators=[
-        Required(message="You must provide an email adress or username")])
+    login = StringField("Username or E-Mail", validators=[
+        DataRequired(message="You must provide an email adress or username")])
 
     password = PasswordField("Password", validators=[
-        Required(message="Password required")])
+        DataRequired(message="Password required")])
 
     remember_me = BooleanField("Remember Me", default=False)
 
 
 class RegisterForm(Form):
-    username = TextField("Username", validators=[
-        Required(message="Username required"),
+    username = StringField("Username", validators=[
+        DataRequired(message="Username required"),
         is_username])
 
-    email = TextField("E-Mail", validators=[
-        Required(message="Email adress required"),
+    email = StringField("E-Mail", validators=[
+        DataRequired(message="Email adress required"),
         Email(message="This email is invalid")])
 
     password = PasswordField("Password", validators=[
-        Required(message="Password required")])
+        DataRequired(message="Password required")])
 
     confirm_password = PasswordField("Confirm Password", validators=[
-        Required(message="Confirm Password required"),
+        DataRequired(message="Confirm Password required"),
         EqualTo("password", message="Passwords do not match")])
 
     accept_tos = BooleanField("Accept Terms of Service", default=True)
@@ -73,27 +74,28 @@ class RegisterRecaptchaForm(RegisterForm):
 
 
 class ReauthForm(Form):
-    password = PasswordField('Password', [Required()])
+    password = PasswordField('Password', valdidators=[
+        DataRequired()])
 
 
 class ForgotPasswordForm(Form):
-    email = TextField('Email', validators=[
-        Required(message="Email reguired"),
+    email = StringField('Email', validators=[
+        DataRequired(message="Email reguired"),
         Email()])
 
 
 class ResetPasswordForm(Form):
     token = HiddenField('Token')
 
-    email = TextField('Email', validators=[
-        Required(),
+    email = StringField('Email', validators=[
+        DataRequired(),
         Email()])
 
     password = PasswordField('Password', validators=[
-        Required()])
+        DataRequired()])
 
     confirm_password = PasswordField('Confirm password', validators=[
-        Required(),
+        DataRequired(),
         EqualTo('password', message='Passwords must match')])
 
     def validate_email(self, field):

flaskbb/forum/forms.py

@@ -9,8 +9,9 @@
     :license: BSD, see LICENSE for more details.
 """
 from flask.ext.wtf import Form
-from wtforms import TextAreaField, TextField, SelectMultipleField, BooleanField
-from wtforms.validators import Required, Optional, Length
+from wtforms import (TextAreaField, StringField, SelectMultipleField,
+                     BooleanField)
+from wtforms.validators import DataRequired, Optional, Length
 
 from flaskbb.forum.models import Topic, Post, Report, Forum
 from flaskbb.user.models import User
@@ -18,7 +19,7 @@ from flaskbb.user.models import User
 
 class QuickreplyForm(Form):
     content = TextAreaField("Quickreply", validators=[
-        Required(message="You cannot post a reply without content.")])
+        DataRequired(message="You cannot post a reply without content.")])
 
     def save(self, user, topic):
         post = Post(**self.data)
@@ -27,7 +28,7 @@ class QuickreplyForm(Form):
 
 class ReplyForm(Form):
     content = TextAreaField("Content", validators=[
-        Required(message="You cannot post a reply without content.")])
+        DataRequired(message="You cannot post a reply without content.")])
 
     track_topic = BooleanField("Track this topic", default=False, validators=[
         Optional()])
@@ -41,11 +42,11 @@ class ReplyForm(Form):
 
 
 class NewTopicForm(ReplyForm):
-    title = TextField("Topic Title", validators=[
-        Required(message="A topic title is required")])
+    title = StringField("Topic Title", validators=[
+        DataRequired(message="A topic title is required")])
 
     content = TextAreaField("Content", validators=[
-        Required(message="You cannot post a reply without content.")])
+        DataRequired(message="You cannot post a reply without content.")])
 
     track_topic = BooleanField("Track this topic", default=False, validators=[
         Optional()])
@@ -61,8 +62,8 @@ class NewTopicForm(ReplyForm):
 
 class ReportForm(Form):
     reason = TextAreaField("Reason", validators=[
-        Required(message="Please insert a reason why you want to report this \
-                          post")
+        DataRequired(message="Please insert a reason why you want to report \
+                              this post")
     ])
 
     def save(self, user, post):
@@ -71,7 +72,7 @@ class ReportForm(Form):
 
 
 class UserSearchForm(Form):
-    search_query = TextField("Search", validators=[
+    search_query = StringField("Search", validators=[
         Optional(), Length(min=3, max=50)
     ])
 
@@ -81,12 +82,12 @@ class UserSearchForm(Form):
 
 
 class SearchPageForm(Form):
-    search_query = TextField("Criteria", validators=[
-        Required(), Length(min=3, max=50)])
+    search_query = StringField("Criteria", validators=[
+        DataRequired(), Length(min=3, max=50)])
 
     search_types = SelectMultipleField("Content", validators=[
-        Required()], choices=[('post', 'Post'), ('topic', 'Topic'),
-                              ('forum', 'Forum'), ('user', 'Users')])
+        DataRequired()], choices=[('post', 'Post'), ('topic', 'Topic'),
+                                  ('forum', 'Forum'), ('user', 'Users')])
 
     def get_results(self):
         # Because the DB is not yet initialized when this form is loaded,

flaskbb/management/forms.py

@@ -9,9 +9,9 @@
     :license: BSD, see LICENSE for more details.
 """
 from flask.ext.wtf import Form
-from wtforms import (TextField, TextAreaField, PasswordField, IntegerField,
+from wtforms import (StringField, TextAreaField, PasswordField, IntegerField,
                      BooleanField, SelectField, DateField)
-from wtforms.validators import (Required, Optional, Email, regexp, Length, URL,
+from wtforms.validators import (DataRequired, Optional, Email, regexp, Length, URL,
                                 ValidationError)
 
 from wtforms.ext.sqlalchemy.fields import (QuerySelectField,
@@ -40,12 +40,12 @@ def select_primary_group():
 
 
 class UserForm(Form):
-    username = TextField("Username", validators=[
-        Required(),
+    username = StringField("Username", validators=[
+        DataRequired(message="A username is required."),
         is_username])
 
-    email = TextField("E-Mail", validators=[
-        Required(),
+    email = StringField("E-Mail", validators=[
+        DataRequired(message="A E-Mail address is required."),
         Email(message="This email is invalid")])
 
     password = PasswordField("Password", validators=[
@@ -60,13 +60,13 @@ class UserForm(Form):
         ("Male", "Male"),
         ("Female", "Female")])
 
-    location = TextField("Location", validators=[
+    location = StringField("Location", validators=[
         Optional()])
 
-    website = TextField("Website", validators=[
+    website = StringField("Website", validators=[
         Optional(), URL()])
 
-    avatar = TextField("Avatar", validators=[
+    avatar = StringField("Avatar", validators=[
         Optional(), URL()])
 
     signature = TextAreaField("Forum Signature", validators=[
@@ -131,8 +131,8 @@ class EditUserForm(UserForm):
 
 
 class GroupForm(Form):
-    name = TextField("Group Name", validators=[
-        Required(message="Group name required")])
+    name = StringField("Group Name", validators=[
+        DataRequired(message="Group name required")])
 
     description = TextAreaField("Description", validators=[
         Optional()])
@@ -247,15 +247,15 @@ class AddGroupForm(GroupForm):
 
 
 class ForumForm(Form):
-    title = TextField("Forum Title", validators=[
-        Required(message="Forum title required")])
+    title = StringField("Forum Title", validators=[
+        DataRequired(message="Forum title required")])
 
     description = TextAreaField("Description", validators=[
         Optional()],
         description="You can format your description with BBCode.")
 
     position = IntegerField("Position", default=1, validators=[
-        Required(message="Forum position required")])
+        DataRequired(message="Forum position required")])
 
     category = QuerySelectField(
         "Category",
@@ -265,11 +265,11 @@ class ForumForm(Form):
         description="The category that contains this forum."
     )
 
-    external = TextField("External link", validators=[
+    external = StringField("External link", validators=[
         Optional(), URL()],
         description="A link to a website i.e. 'http://flaskbb.org'")
 
-    moderators = TextField(
+    moderators = StringField(
         "Moderators",
         description="Comma seperated usernames. Leave it blank if you do not \
                      want to set any moderators."
@@ -352,15 +352,15 @@ class AddForumForm(ForumForm):
 
 
 class CategoryForm(Form):
-    title = TextField("Category title", validators=[
-        Required(message="Category title required")])
+    title = StringField("Category title", validators=[
+        DataRequired(message="Category title required")])
 
     description = TextAreaField("Description", validators=[
         Optional()],
         description="You can format your description with BBCode.")
 
     position = IntegerField("Position", default=1, validators=[
-        Required(message="Category position required")])
+        DataRequired(message="Category position required")])
 
     def save(self):
         category = Category(**self.data)

flaskbb/user/forms.py

@@ -10,9 +10,9 @@
 """
 from flask.ext.login import current_user
 from flask.ext.wtf import Form
-from wtforms import (TextField, PasswordField, DateField, TextAreaField,
+from wtforms import (StringField, PasswordField, DateField, TextAreaField,
                      SelectField, ValidationError)
-from wtforms.validators import (Length, Required, Email, EqualTo, regexp,
+from wtforms.validators import (Length, DataRequired, Email, EqualTo, regexp,
                                 Optional, URL)
 
 from flaskbb.user.models import User, PrivateMessage
@@ -34,16 +34,16 @@ class GeneralSettingsForm(Form):
 
 
 class ChangeEmailForm(Form):
-    old_email = TextField("Old E-Mail Address", validators=[
-        Required(message="Email adress required"),
+    old_email = StringField("Old E-Mail Address", validators=[
+        DataRequired(message="Email address required"),
         Email(message="This email is invalid")])
 
-    new_email = TextField("New E-Mail Address", validators=[
-        Required(message="Email adress required"),
+    new_email = StringField("New E-Mail Address", validators=[
+        DataRequired(message="Email address required"),
         Email(message="This email is invalid")])
 
-    confirm_new_email = TextField("Confirm E-Mail Address", validators=[
-        Required(message="Email adress required"),
+    confirm_new_email = StringField("Confirm E-Mail Address", validators=[
+        DataRequired(message="Email adress required"),
         Email(message="This email is invalid"),
         EqualTo("new_email", message="E-Mails do not match")])
 
@@ -62,13 +62,13 @@ class ChangeEmailForm(Form):
 
 class ChangePasswordForm(Form):
     old_password = PasswordField("Old Password", validators=[
-        Required(message="Password required")])
+        DataRequired(message="Password required")])
 
     new_password = PasswordField("New Password", validators=[
-        Required(message="Password required")])
+        DataRequired(message="Password required")])
 
     confirm_new_password = PasswordField("Confirm New Password", validators=[
-        Required(message="Password required"),
+        DataRequired(message="Password required"),
         EqualTo("new_password", message="Passwords do not match")])
 
 
@@ -82,13 +82,13 @@ class ChangeUserDetailsForm(Form):
         ("Male", "Male"),
         ("Female", "Female")])
 
-    location = TextField("Location", validators=[
+    location = StringField("Location", validators=[
         Optional()])
 
-    website = TextField("Website", validators=[
+    website = StringField("Website", validators=[
         Optional(), URL()])
 
-    avatar = TextField("Avatar", validators=[
+    avatar = StringField("Avatar", validators=[
         Optional(), URL()])
 
     signature = TextAreaField("Forum Signature", validators=[
@@ -99,12 +99,12 @@ class ChangeUserDetailsForm(Form):
 
 
 class NewMessageForm(Form):
-    to_user = TextField("To User", validators=[
-        Required(message="A username is required.")])
-    subject = TextField("Subject", validators=[
-        Required(message="A subject is required.")])
+    to_user = StringField("To User", validators=[
+        DataRequired(message="A username is required.")])
+    subject = StringField("Subject", validators=[
+        DataRequired(message="A subject is required.")])
     message = TextAreaField("Message", validators=[
-        Required(message="A message is required.")])
+        DataRequired(message="A message is required.")])
 
     def validate_to_user(self, field):
         user = User.query.filter_by(username=field.data).first()