Merge pull request #397 from metabrainz/fix-form-imports

Change base form class to FlaskForm

metabrainz/admin/forms.py

@@ -1,4 +1,4 @@
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from flask_wtf.file import FileField, FileAllowed
 from wtforms import StringField, BooleanField, SelectField, TextAreaField
 from wtforms.fields.html5 import EmailField, URLField, DecimalField
@@ -20,7 +20,7 @@
 )
 
 
-class UserEditForm(Form):
+class UserEditForm(FlaskForm):
     # General info
     musicbrainz_id = StringField("MusicBrainz Username")
     contact_name = StringField("Name")
@@ -64,6 +64,6 @@ class UserEditForm(Form):
     def __init__(self, defaults=None, **kwargs):
         for key, val in defaults.items():
             kwargs.setdefault(key, val)
-        Form.__init__(self, **kwargs)
+        FlaskForm.__init__(self, **kwargs)
         self.tier.choices = [(str(t["id"]), t["name"]) for t in db_tier.get_all()]
         self.tier.choices.insert(0, ("None", "None"))

metabrainz/users/forms.py

@@ -1,11 +1,11 @@
-from flask_wtf import Form, RecaptchaField
+from flask_wtf import FlaskForm, RecaptchaField
 from flask_babel import gettext
 from wtforms import StringField, BooleanField, TextAreaField, RadioField, validators
 from wtforms.fields.html5 import EmailField, URLField, DecimalField
 from wtforms.validators import DataRequired, Length
 
 
-class UserSignUpForm(Form):
+class UserSignUpForm(FlaskForm):
     """Base sign up form for new users.
 
     Contains common fields required from both commercial and non-commercial
@@ -64,7 +64,7 @@ class CommercialSignUpForm(UserSignUpForm):
     amount_pledged = DecimalField()
 
 
-class UserEditForm(Form):
+class UserEditForm(FlaskForm):
     """User profile editing form."""
     contact_name = StringField(gettext("Name"), [
         validators.DataRequired(message=gettext("Contact name field is empty.")),