Merge pull request #1334 from alanhamlett/master

support for WTForms >= 3.0

doc/advanced.rst

@@ -428,8 +428,8 @@ The bare minimum you have to provide for Flask-Admin to work with PyMongo:
 This is minimal PyMongo view::
 
   class UserForm(Form):
-      name = TextField('Name')
-      email = TextField('Email')
+      name = StringField('Name')
+      email = StringField('Email')
 
   class UserView(ModelView):
       column_list = ('name', 'email')
@@ -519,7 +519,7 @@ do with it, so it won't generate a form field. In this case, you would need to m
     class MyView(ModelView):
         def scaffold_form(self):
             form_class = super(UserView, self).scaffold_form()
-            form_class.extra = TextField('Extra')
+            form_class.extra = StringField('Extra')
             return form_class
 
 Customizing Batch Actions

examples/auth-flask-login/app.py

@@ -51,7 +51,7 @@ class User(db.Model):
 
 # Define login and registration forms (for flask-login)
 class LoginForm(form.Form):
-    login = fields.TextField(validators=[validators.required()])
+    login = fields.StringField(validators=[validators.required()])
     password = fields.PasswordField(validators=[validators.required()])
 
     def validate_login(self, field):
@@ -71,8 +71,8 @@ class LoginForm(form.Form):
 
 
 class RegistrationForm(form.Form):
-    login = fields.TextField(validators=[validators.required()])
-    email = fields.TextField()
+    login = fields.StringField(validators=[validators.required()])
+    email = fields.StringField()
     password = fields.PasswordField(validators=[validators.required()])
 
     def validate_login(self, field):

examples/auth-mongoengine/app.py

@@ -6,7 +6,6 @@ from wtforms import form, fields, validators
 import flask_admin as admin
 import flask_login as login
 from flask_admin.contrib.mongoengine import ModelView
-from flask_admin import helpers
 
 # Create application
 app = Flask(__name__)
@@ -47,7 +46,7 @@ class User(db.Document):
 
 # Define login and registration forms (for flask-login)
 class LoginForm(form.Form):
-    login = fields.TextField(validators=[validators.required()])
+    login = fields.StringField(validators=[validators.required()])
     password = fields.PasswordField(validators=[validators.required()])
 
     def validate_login(self, field):
@@ -64,8 +63,8 @@ class LoginForm(form.Form):
 
 
 class RegistrationForm(form.Form):
-    login = fields.TextField(validators=[validators.required()])
-    email = fields.TextField()
+    login = fields.StringField(validators=[validators.required()])
+    email = fields.StringField()
     password = fields.PasswordField(validators=[validators.required()])
 
     def validate_login(self, field):

examples/pymongo/app.py

@@ -23,14 +23,14 @@ db = conn.test
 
 # User admin
 class InnerForm(form.Form):
-    name = fields.TextField('Name')
-    test = fields.TextField('Test')
+    name = fields.StringField('Name')
+    test = fields.StringField('Test')
 
 
 class UserForm(form.Form):
-    name = fields.TextField('Name')
-    email = fields.TextField('Email')
-    password = fields.TextField('Password')
+    name = fields.StringField('Name')
+    email = fields.StringField('Email')
+    password = fields.StringField('Password')
 
     # Inner form
     inner = InlineFormField(InnerForm)
@@ -48,9 +48,9 @@ class UserView(ModelView):
 
 # Tweet view
 class TweetForm(form.Form):
-    name = fields.TextField('Name')
+    name = fields.StringField('Name')
     user_id = fields.SelectField('User', widget=Select2Widget())
-    text = fields.TextField('Text')
+    text = fields.StringField('Text')
 
     testie = fields.BooleanField('Test')
 

flask_admin/contrib/appengine/fields.py

-from wtforms.fields import TextField
+from wtforms.fields import StringField
 from google.appengine.ext import ndb
 
 import decimal
 
-class GeoPtPropertyField(TextField):
+class GeoPtPropertyField(StringField):
     def process_formdata(self, valuelist):
         if valuelist:
             try:

flask_admin/contrib/peewee/filters.py

-import time
-import datetime
-
 from flask_admin.babel import lazy_gettext
 
 from flask_admin.model import filters

flask_admin/contrib/sqla/fields.py

@@ -3,8 +3,7 @@
 """
 import operator
 
-from wtforms import widgets
-from wtforms.fields import SelectFieldBase, TextField
+from wtforms.fields import SelectFieldBase, StringField
 from wtforms.validators import ValidationError
 
 try:
@@ -184,8 +183,8 @@ class QuerySelectMultipleField(QuerySelectField):
 
 class HstoreForm(BaseForm):
     """ Form used in InlineFormField/InlineHstoreList for HSTORE columns """
-    key = TextField(lazy_gettext('Key'))
-    value = TextField(lazy_gettext('Value'))
+    key = StringField(lazy_gettext('Key'))
+    value = StringField(lazy_gettext('Value'))
 
 
 class KeyValue(object):

flask_admin/model/widgets.py

@@ -98,7 +98,7 @@ class XEditableWidget(object):
         """
             Return extra kwargs based on the field type.
         """
-        if field.type in ['StringField', 'TextField']:
+        if field.type == 'StringField':
             kwargs['data-type'] = 'text'
         elif field.type == 'TextAreaField':
             kwargs['data-type'] = 'textarea'