*) Fixed WTForms 2.0 -- The TextField alias for StringField is deprecated.

examples/auth-mongoengine/auth.py

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

examples/auth/auth.py

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

examples/pymongo/simple.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/fileadmin.py

@@ -24,7 +24,7 @@ class NameForm(form.BaseForm):
 
         Validates if provided name is valid for *nix and Windows systems.
     """
-    name = fields.TextField()
+    name = fields.StringField()
 
     regexp = re.compile(r'^(?!^(PRN|AUX|CLOCK\$|NUL|CON|COM\d|LPT\d|\..*)(\..+)?$)[^\x00-\x1f\\?*:\";|/]+$')
 

flask_admin/contrib/sqla/form.py

@@ -274,7 +274,7 @@ class AdminModelConverter(ModelConverterBase):
             field_args['filters'] = filters
 
         self._string_common(column=column, field_args=field_args, **extra)
-        return fields.TextField(**field_args)
+        return fields.StringField(**field_args)
 
     @converts('Text', 'UnicodeText',
               'sqlalchemy.types.LargeBinary', 'sqlalchemy.types.Binary')
@@ -316,25 +316,25 @@ class AdminModelConverter(ModelConverterBase):
     @converts('databases.mysql.MSYear')
     def conv_MSYear(self, field_args, **extra):
         field_args['validators'].append(validators.NumberRange(min=1901, max=2155))
-        return fields.TextField(**field_args)
+        return fields.StringField(**field_args)
 
     @converts('databases.postgres.PGInet', 'dialects.postgresql.base.INET')
     def conv_PGInet(self, field_args, **extra):
         field_args.setdefault('label', u'IP Address')
         field_args['validators'].append(validators.IPAddress())
-        return fields.TextField(**field_args)
+        return fields.StringField(**field_args)
 
     @converts('dialects.postgresql.base.MACADDR')
     def conv_PGMacaddr(self, field_args, **extra):
         field_args.setdefault('label', u'MAC Address')
         field_args['validators'].append(validators.MacAddress())
-        return fields.TextField(**field_args)
+        return fields.StringField(**field_args)
 
     @converts('dialects.postgresql.base.UUID')
     def conv_PGUuid(self, field_args, **extra):
         field_args.setdefault('label', u'UUID')
         field_args['validators'].append(validators.UUID())
-        return fields.TextField(**field_args)
+        return fields.StringField(**field_args)
 
     @converts('sqlalchemy.dialects.postgresql.base.ARRAY')
     def conv_ARRAY(self, field_args, **extra):

flask_admin/form/fields.py

@@ -139,7 +139,7 @@ class Select2Field(fields.SelectField):
         super(Select2Field, self).pre_validate(form)
 
 
-class Select2TagsField(fields.TextField):
+class Select2TagsField(fields.StringField):
     """`Select2 <http://ivaynberg.github.com/select2/#tags>`_ styled text field.
     You must include select2.js, form.js and select2 stylesheet for it to work.
     """

flask_admin/form/upload.py

@@ -110,7 +110,7 @@ class ImageUploadInput(object):
 
 
 # Fields
-class FileUploadField(fields.TextField):
+class FileUploadField(fields.StringField):
     """
         Customizable file-upload field.
 

flask_admin/tests/mongoengine/test_basic.py

@@ -70,8 +70,8 @@ def test_model():
     # Verify form
     # TODO: Figure out why there's inconsistency
     try:
-        eq_(view._create_form_class.test1.field_class, fields.TextField)
-        eq_(view._create_form_class.test2.field_class, fields.TextField)
+        eq_(view._create_form_class.test1.field_class, fields.StringField)
+        eq_(view._create_form_class.test2.field_class, fields.StringField)
     except AssertionError:
         eq_(view._create_form_class.test1.field_class, fields.StringField)
         eq_(view._create_form_class.test2.field_class, fields.StringField)
@@ -150,7 +150,7 @@ def test_extra_fields():
     view = CustomModelView(
         Model1,
         form_extra_fields={
-            'extra_field': fields.TextField('Extra Field')
+            'extra_field': fields.StringField('Extra Field')
         }
     )
     admin.add_view(view)
@@ -177,7 +177,7 @@ def test_extra_field_order():
         Model1,
         form_columns=('extra_field', 'test1'),
         form_extra_fields={
-            'extra_field': fields.TextField('Extra Field')
+            'extra_field': fields.StringField('Extra Field')
         }
     )
     admin.add_view(view)

flask_admin/tests/peeweemodel/test_basic.py

@@ -82,8 +82,8 @@ def test_model():
     eq_(view._filters, None)
 
     # Verify form
-    eq_(view._create_form_class.test1.field_class, fields.TextField)
-    eq_(view._create_form_class.test2.field_class, fields.TextField)
+    eq_(view._create_form_class.test1.field_class, fields.StringField)
+    eq_(view._create_form_class.test2.field_class, fields.StringField)
     eq_(view._create_form_class.test3.field_class, fields.TextAreaField)
     eq_(view._create_form_class.test4.field_class, fields.TextAreaField)
 
@@ -158,7 +158,7 @@ def test_extra_fields():
     view = CustomModelView(
         Model1,
         form_extra_fields={
-            'extra_field': fields.TextField('Extra Field')
+            'extra_field': fields.StringField('Extra Field')
         }
     )
     admin.add_view(view)

flask_admin/tests/pymongo/test_basic.py

@@ -8,8 +8,8 @@ from . import setup
 
 
 class TestForm(form.Form):
-    test1 = fields.TextField('Test1')
-    test2 = fields.TextField('Test2')
+    test1 = fields.StringField('Test1')
+    test2 = fields.StringField('Test2')
 
 
 class TestView(ModelView):

flask_admin/tests/sqlamodel/test_basic.py

@@ -88,8 +88,8 @@ def test_model():
     eq_(view._filters, None)
 
     # Verify form
-    eq_(view._create_form_class.test1.field_class, fields.TextField)
-    eq_(view._create_form_class.test2.field_class, fields.TextField)
+    eq_(view._create_form_class.test1.field_class, fields.StringField)
+    eq_(view._create_form_class.test2.field_class, fields.StringField)
     eq_(view._create_form_class.test3.field_class, fields.TextAreaField)
     eq_(view._create_form_class.test4.field_class, fields.TextAreaField)
 
@@ -521,7 +521,7 @@ def test_form_override():
     admin.add_view(view1)
     admin.add_view(view2)
 
-    eq_(view1._create_form_class.test.field_class, fields.TextField)
+    eq_(view1._create_form_class.test.field_class, fields.StringField)
     eq_(view2._create_form_class.test.field_class, fields.FileField)
 
 
@@ -642,7 +642,7 @@ def test_extra_fields():
     view = CustomModelView(
         Model1, db.session,
         form_extra_fields={
-            'extra_field': fields.TextField('Extra Field')
+            'extra_field': fields.StringField('Extra Field')
         }
     )
     admin.add_view(view)
@@ -669,7 +669,7 @@ def test_extra_field_order():
         Model1, db.session,
         form_columns=('extra_field', 'test1'),
         form_extra_fields={
-            'extra_field': fields.TextField('Extra Field')
+            'extra_field': fields.StringField('Extra Field')
         }
     )
     admin.add_view(view)

flask_admin/tests/sqlamodel/test_inlineform.py

@@ -45,7 +45,7 @@ def test_inline_form():
     eq_(view.endpoint, 'user')
 
     # Verify form
-    eq_(view._create_form_class.name.field_class, fields.TextField)
+    eq_(view._create_form_class.name.field_class, fields.StringField)
     eq_(view._create_form_class.info.field_class, InlineModelFormList)
 
     rv = client.get('/admin/user/')

flask_admin/tests/test_model.py

@@ -21,9 +21,9 @@ class Model(object):
 
 
 class Form(form.BaseForm):
-    col1 = fields.TextField()
-    col2 = fields.TextField()
-    col3 = fields.TextField()
+    col1 = fields.StringField()
+    col2 = fields.StringField()
+    col3 = fields.StringField()
 
 
 class SimpleFilter(filters.BaseFilter):