aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mediagoblin/edit/forms.py22
-rw-r--r--mediagoblin/media_types/blog/forms.py27
-rw-r--r--mediagoblin/plugins/basic_auth/forms.py8
-rw-r--r--mediagoblin/plugins/ldap/forms.py4
-rw-r--r--mediagoblin/plugins/openid/forms.py6
-rw-r--r--mediagoblin/plugins/persona/forms.py6
-rw-r--r--mediagoblin/plugins/piwigo/forms.py18
-rw-r--r--mediagoblin/submit/forms.py6
-rw-r--r--mediagoblin/user_pages/forms.py2
9 files changed, 49 insertions, 50 deletions
diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index f0a03e04..cf5056cf 100644
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -25,7 +25,7 @@ from mediagoblin.auth.tools import normalize_user_or_email_field
class EditForm(wtforms.Form):
- title = wtforms.TextField(
+ title = wtforms.StringField(
_('Title'),
[wtforms.validators.Length(min=0, max=500)])
description = wtforms.TextAreaField(
@@ -33,12 +33,12 @@ class EditForm(wtforms.Form):
description=_("""You can use
<a href="http://daringfireball.net/projects/markdown/basics">
Markdown</a> for formatting."""))
- tags = wtforms.TextField(
+ tags = wtforms.StringField(
_('Tags'),
[tag_length_validator],
description=_(
"Separate tags by commas."))
- slug = wtforms.TextField(
+ slug = wtforms.StringField(
_('Slug'),
[wtforms.validators.InputRequired(message=_("The slug can't be empty"))],
description=_(
@@ -56,12 +56,12 @@ class EditProfileForm(wtforms.Form):
description=_("""You can use
<a href="http://daringfireball.net/projects/markdown/basics">
Markdown</a> for formatting."""))
- url = wtforms.TextField(
+ url = wtforms.StringField(
_('Website'),
[wtforms.validators.Optional(),
wtforms.validators.URL(message=_("This address contains errors"))])
- location = wtforms.TextField(_('Hometown'))
+ location = wtforms.StringField(_('Hometown'))
class EditAccountForm(wtforms.Form):
wants_comment_notification = wtforms.BooleanField(
@@ -79,14 +79,14 @@ class EditAccountForm(wtforms.Form):
class EditAttachmentsForm(wtforms.Form):
- attachment_name = wtforms.TextField(
+ attachment_name = wtforms.StringField(
'Title')
attachment_file = wtforms.FileField(
'File')
class EditCollectionForm(wtforms.Form):
- title = wtforms.TextField(
+ title = wtforms.StringField(
_('Title'),
[wtforms.validators.Length(min=0, max=500), wtforms.validators.InputRequired(message=_("The title can't be empty"))])
description = wtforms.TextAreaField(
@@ -94,7 +94,7 @@ class EditCollectionForm(wtforms.Form):
description=_("""You can use
<a href="http://daringfireball.net/projects/markdown/basics">
Markdown</a> for formatting."""))
- slug = wtforms.TextField(
+ slug = wtforms.StringField(
_('Slug'),
[wtforms.validators.InputRequired(message=_("The slug can't be empty"))],
description=_(
@@ -116,7 +116,7 @@ class ChangePassForm(wtforms.Form):
class ChangeEmailForm(wtforms.Form):
- new_email = wtforms.TextField(
+ new_email = wtforms.StringField(
_('New email address'),
[wtforms.validators.InputRequired(),
normalize_user_or_email_field(allow_user=False)])
@@ -153,8 +153,8 @@ class MetaDataValidator(object):
errors.pop())
class MetaDataForm(wtforms.Form):
- identifier = wtforms.TextField(_(u'Identifier'),[MetaDataValidator()])
- value = wtforms.TextField(_(u'Value'))
+ identifier = wtforms.StringField(_(u'Identifier'),[MetaDataValidator()])
+ value = wtforms.StringField(_(u'Value'))
class EditMetaDataForm(wtforms.Form):
media_metadata = wtforms.FieldList(
diff --git a/mediagoblin/media_types/blog/forms.py b/mediagoblin/media_types/blog/forms.py
index 1cc41a02..12857e28 100644
--- a/mediagoblin/media_types/blog/forms.py
+++ b/mediagoblin/media_types/blog/forms.py
@@ -21,26 +21,25 @@ from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
from mediagoblin.tools.licenses import licenses_as_choices
class BlogPostEditForm(wtforms.Form):
- title = wtforms.TextField(_('Title'),
- [wtforms.validators.Length(min=0, max=500)])
+ title = wtforms.StringField(_('Title'),
+ [wtforms.validators.Length(min=0, max=500)])
description = wtforms.TextAreaField(_('Description'))
- tags = wtforms.TextField(_('Tags'), [tag_length_validator],
- description="Seperate tags by commas.")
- license = wtforms.SelectField(_('License'),
- [wtforms.validators.Optional(),], choices=licenses_as_choices())
+ tags = wtforms.StringField(
+ _('Tags'), [tag_length_validator],
+ description="Seperate tags by commas."
+ )
+ license = wtforms.SelectField(
+ _('License'),
+ [wtforms.validators.Optional()],
+ choices=licenses_as_choices()
+ )
class BlogEditForm(wtforms.Form):
- title = wtforms.TextField(_('Title'),
- [wtforms.validators.Length(min=0, max=500)])
+ title = wtforms.StringField(_('Title'),
+ [wtforms.validators.Length(min=0, max=500)])
description = wtforms.TextAreaField(_('Description'))
class ConfirmDeleteForm(wtforms.Form):
confirm = wtforms.BooleanField(
_('I am sure I want to delete this'))
-
-
-
-
-
-
diff --git a/mediagoblin/plugins/basic_auth/forms.py b/mediagoblin/plugins/basic_auth/forms.py
index 42b84bf3..9a6db226 100644
--- a/mediagoblin/plugins/basic_auth/forms.py
+++ b/mediagoblin/plugins/basic_auth/forms.py
@@ -20,7 +20,7 @@ from mediagoblin.auth.tools import normalize_user_or_email_field
class RegistrationForm(wtforms.Form):
- username = wtforms.TextField(
+ username = wtforms.StringField(
_('Username'),
[wtforms.validators.InputRequired(),
normalize_user_or_email_field(allow_email=False)])
@@ -28,14 +28,14 @@ class RegistrationForm(wtforms.Form):
_('Password'),
[wtforms.validators.InputRequired(),
wtforms.validators.Length(min=5, max=1024)])
- email = wtforms.TextField(
+ email = wtforms.StringField(
_('Email address'),
[wtforms.validators.InputRequired(),
normalize_user_or_email_field(allow_user=False)])
class LoginForm(wtforms.Form):
- username = wtforms.TextField(
+ username = wtforms.StringField(
_('Username or Email'),
[wtforms.validators.InputRequired(),
normalize_user_or_email_field()])
@@ -47,7 +47,7 @@ class LoginForm(wtforms.Form):
class ForgotPassForm(wtforms.Form):
- username = wtforms.TextField(
+ username = wtforms.StringField(
_('Username or email'),
[wtforms.validators.InputRequired(),
normalize_user_or_email_field()])
diff --git a/mediagoblin/plugins/ldap/forms.py b/mediagoblin/plugins/ldap/forms.py
index 1f1439ab..3d966e03 100644
--- a/mediagoblin/plugins/ldap/forms.py
+++ b/mediagoblin/plugins/ldap/forms.py
@@ -24,14 +24,14 @@ class RegisterForm(wtforms.Form):
'',
[wtforms.validators.InputRequired(),
normalize_user_or_email_field(allow_email=False)])
- email = wtforms.TextField(
+ email = wtforms.StringField(
_('Email address'),
[wtforms.validators.InputRequired(),
normalize_user_or_email_field(allow_user=False)])
class LoginForm(wtforms.Form):
- username = wtforms.TextField(
+ username = wtforms.StringField(
_('Username'),
[wtforms.validators.InputRequired(),
normalize_user_or_email_field()])
diff --git a/mediagoblin/plugins/openid/forms.py b/mediagoblin/plugins/openid/forms.py
index d47369dc..6dfde0c8 100644
--- a/mediagoblin/plugins/openid/forms.py
+++ b/mediagoblin/plugins/openid/forms.py
@@ -23,18 +23,18 @@ class RegistrationForm(wtforms.Form):
openid = wtforms.HiddenField(
'',
[wtforms.validators.InputRequired()])
- username = wtforms.TextField(
+ username = wtforms.StringField(
_('Username'),
[wtforms.validators.InputRequired(),
normalize_user_or_email_field(allow_email=False)])
- email = wtforms.TextField(
+ email = wtforms.StringField(
_('Email address'),
[wtforms.validators.InputRequired(),
normalize_user_or_email_field(allow_user=False)])
class LoginForm(wtforms.Form):
- openid = wtforms.TextField(
+ openid = wtforms.StringField(
_('OpenID'),
[wtforms.validators.InputRequired(),
# Can openid's only be urls?
diff --git a/mediagoblin/plugins/persona/forms.py b/mediagoblin/plugins/persona/forms.py
index 7d632344..f74d97fa 100644
--- a/mediagoblin/plugins/persona/forms.py
+++ b/mediagoblin/plugins/persona/forms.py
@@ -20,11 +20,11 @@ from mediagoblin.auth.tools import normalize_user_or_email_field
class RegistrationForm(wtforms.Form):
- username = wtforms.TextField(
+ username = wtforms.StringField(
_('Username'),
[wtforms.validators.InputRequired(),
normalize_user_or_email_field(allow_email=False)])
- email = wtforms.TextField(
+ email = wtforms.StringField(
_('Email address'),
[wtforms.validators.InputRequired(),
normalize_user_or_email_field(allow_user=False)])
@@ -35,7 +35,7 @@ class RegistrationForm(wtforms.Form):
class EditForm(wtforms.Form):
- email = wtforms.TextField(
+ email = wtforms.StringField(
_('Email address'),
[wtforms.validators.InputRequired(),
normalize_user_or_email_field(allow_user=False)])
diff --git a/mediagoblin/plugins/piwigo/forms.py b/mediagoblin/plugins/piwigo/forms.py
index fd545a3e..b501562b 100644
--- a/mediagoblin/plugins/piwigo/forms.py
+++ b/mediagoblin/plugins/piwigo/forms.py
@@ -20,10 +20,10 @@ import wtforms
class AddSimpleForm(wtforms.Form):
image = wtforms.FileField()
- name = wtforms.TextField(
+ name = wtforms.StringField(
validators=[wtforms.validators.Length(min=0, max=500)])
- comment = wtforms.TextField()
- # tags = wtforms.FieldList(wtforms.TextField())
+ comment = wtforms.StringField()
+ # tags = wtforms.FieldList(wtforms.StringField())
category = wtforms.IntegerField()
level = wtforms.IntegerField()
@@ -32,13 +32,13 @@ _md5_validator = wtforms.validators.Regexp(r"^[0-9a-fA-F]{32}$")
class AddForm(wtforms.Form):
- original_sum = wtforms.TextField(None,
+ original_sum = wtforms.StringField(None,
[_md5_validator,
wtforms.validators.InputRequired()])
- thumbnail_sum = wtforms.TextField(None,
+ thumbnail_sum = wtforms.StringField(None,
[wtforms.validators.Optional(),
_md5_validator])
- file_sum = wtforms.TextField(None, [_md5_validator])
- name = wtforms.TextField()
- date_creation = wtforms.TextField()
- categories = wtforms.TextField()
+ file_sum = wtforms.StringField(None, [_md5_validator])
+ name = wtforms.StringField()
+ date_creation = wtforms.StringField()
+ categories = wtforms.StringField()
diff --git a/mediagoblin/submit/forms.py b/mediagoblin/submit/forms.py
index 6c0e8e9c..c5bacc44 100644
--- a/mediagoblin/submit/forms.py
+++ b/mediagoblin/submit/forms.py
@@ -33,7 +33,7 @@ def get_submit_start_form(form, **kwargs):
file = wtforms.FileField(
_('File'),
description=desc)
- title = wtforms.TextField(
+ title = wtforms.StringField(
_('Title'),
[wtforms.validators.Length(min=0, max=500)])
description = wtforms.TextAreaField(
@@ -41,7 +41,7 @@ def get_submit_start_form(form, **kwargs):
description=_("""You can use
<a href="http://daringfireball.net/projects/markdown/basics">
Markdown</a> for formatting."""))
- tags = wtforms.TextField(
+ tags = wtforms.StringField(
_('Tags'),
[tag_length_validator],
description=_(
@@ -57,7 +57,7 @@ def get_submit_start_form(form, **kwargs):
return SubmitStartForm(form, **kwargs)
class AddCollectionForm(wtforms.Form):
- title = wtforms.TextField(
+ title = wtforms.StringField(
_('Title'),
[wtforms.validators.Length(min=0, max=500), wtforms.validators.InputRequired()])
description = wtforms.TextAreaField(
diff --git a/mediagoblin/user_pages/forms.py b/mediagoblin/user_pages/forms.py
index 1a09864b..77e280e1 100644
--- a/mediagoblin/user_pages/forms.py
+++ b/mediagoblin/user_pages/forms.py
@@ -41,7 +41,7 @@ class MediaCollectForm(wtforms.Form):
note = wtforms.TextAreaField(
_('Include a note'),
[wtforms.validators.Optional()],)
- collection_title = wtforms.TextField(
+ collection_title = wtforms.StringField(
_('Title'),
[wtforms.validators.Length(min=0, max=500)])
collection_description = wtforms.TextAreaField(
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-08 00:32:46 +0000