From c66b04d42fbe8a76283182b2ae661567a0334fe4 Mon Sep 17 00:00:00 2001 From: Adam Jacobus Date: Wed, 5 Feb 2014 22:30:59 +1000 Subject: [PATCH 1/4] Update fields and validators to 1.0.5 --- wtformsparsleyjs/core.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/wtformsparsleyjs/core.py b/wtformsparsleyjs/core.py index e0f54b7..3a5465d 100644 --- a/wtformsparsleyjs/core.py +++ b/wtformsparsleyjs/core.py @@ -4,11 +4,11 @@ import re import copy from wtforms.validators import Length, NumberRange, Email, EqualTo, IPAddress, \ - Required, Regexp, URL, AnyOf -from wtforms import TextField + InputRequired, Regexp, URL, AnyOf +from wtforms import StringField from wtforms.widgets import TextInput as _TextInput, PasswordInput as _PasswordInput, \ CheckboxInput as _CheckboxInput, Select as _Select, Input -from wtforms.fields import TextField as _TextField, BooleanField as _BooleanField, \ +from wtforms.fields import StringField as _StringField, BooleanField as _BooleanField, \ DecimalField as _DecimalField, IntegerField as _IntegerField, \ FloatField as _FloatField, PasswordField as _PasswordField, \ SelectField as _SelectField @@ -41,8 +41,8 @@ def parsley_kwargs(field, kwargs): _length_kwargs(new_kwargs, vali) if isinstance(vali, NumberRange): _number_range_kwargs(new_kwargs, vali) - if isinstance(vali, Required): - _required_kwargs(new_kwargs) + if isinstance(vali, InputRequired): + _input_required_kwargs(new_kwargs) _trigger_kwargs(new_kwargs, u'key') if isinstance(vali, Regexp) and not 'data_regexp' in new_kwargs: _regexp_kwargs(new_kwargs, vali) @@ -92,7 +92,7 @@ def _number_range_kwargs(kwargs, vali): kwargs[u'parsley-range'] = u'[' + str(vali.min) + u',' + str(vali.max) + u']' -def _required_kwargs(kwargs): +def _input_required_kwargs(kwargs): kwargs[u'parsley-required'] = u'true' @@ -163,9 +163,9 @@ class Select(_Select): return super(Select, self).__call__(field, **kwargs) -class TextField(_TextField): +class StringField(_StringField): def __init__(self, *args, **kwargs): - super(TextField, self).__init__(widget=TextInput(), *args, **kwargs) + super(StringField, self).__init__(widget=TextInput(), *args, **kwargs) class IntegerField(_IntegerField): From 7f7b10cbfb2239790856c662f0df7411e70cc810 Mon Sep 17 00:00:00 2001 From: Adam Jacobus Date: Wed, 5 Feb 2014 22:31:46 +1000 Subject: [PATCH 2/4] Update wtforms to 1.0.5 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d6737d8..26c7775 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ Flask>=0.9 Jinja2>=2.7 -WTForms>=1.0.4 +WTForms>=1.0.5 Werkzeug>=0.8.3 gunicorn>=0.17.4 From 8bb4374783e3c3808b3d6e1a8d54fc8c5a705504 Mon Sep 17 00:00:00 2001 From: Adam Jacobus Date: Wed, 5 Feb 2014 22:32:27 +1000 Subject: [PATCH 3/4] Change author --- wtformsparsleyjs/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wtformsparsleyjs/__init__.py b/wtformsparsleyjs/__init__.py index 0592301..a54e9d9 100644 --- a/wtformsparsleyjs/__init__.py +++ b/wtformsparsleyjs/__init__.py @@ -1,3 +1,3 @@ -__author__ = 'johannes' +__author__ = 'synthsym' from .core import * From 614217c6f424a4c40678dd09ba094317fe72bc0e Mon Sep 17 00:00:00 2001 From: Adam Jacobus Date: Wed, 5 Feb 2014 22:35:19 +1000 Subject: [PATCH 4/4] un-update author --- wtformsparsleyjs/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wtformsparsleyjs/__init__.py b/wtformsparsleyjs/__init__.py index a54e9d9..0592301 100644 --- a/wtformsparsleyjs/__init__.py +++ b/wtformsparsleyjs/__init__.py @@ -1,3 +1,3 @@ -__author__ = 'synthsym' +__author__ = 'johannes' from .core import *