Back-merge branch 'master' into wtforms2

Author: crast

.travis.yml

@@ -1,15 +1,33 @@
 language: python
 python:
-  - "2.6"
-  - "2.7"
-  - "3.2"
-  - "3.3"
-  - "pypy"
+  - 2.6
+  - 2.7
+  - 3.3
+  - pypy
+env:
+  global:
+    - DATEUTIL=python-dateutil==2.1
+    - LOCALFLAVOR=
+  matrix:
+    - DJANGO=Django==1.3.7
+    - DJANGO=Django==1.4.8
+    - DJANGO=Django==1.5.4 DATEUTIL=python-dateutil==2.2
+    - DJANGO=Django==1.5.4 LOCALFLAVOR=django-localflavor
+    - DJANGO=https://github.com/django/django/tarball/stable/1.6.x LOCALFLAVOR=django-localflavor
+
+matrix:
+  exclude:
+    - python: 3.3
+      env: DJANGO=Django==1.3.7
+    - python: 3.3
+      env: DJANGO=Django==1.4.8
+
 # command to install dependencies
 install:
+  - "pip install $DJANGO $DATEUTIL $LOCALFLAVOR --use-mirrors"
   - "pip install . --use-mirrors"
   - "pip install -r tests/test_requirements.txt --use-mirrors"
-  - "if [ ${TRAVIS_PYTHON_VERSION:0:1} != 3 ]; then pip install Babel --use-mirrors; fi"
+
 # command to run tests
 script: coverage run --source=wtforms tests/runtests.py --with-pep8
 after_success:

CHANGES.rst

@@ -11,6 +11,7 @@ Not yet released.
 - Move CSRF into core. Deprecate `wtforms.ext.csrf`.
 - Fix issue rendering SelectFields with ``value=True``
 - Make `DecimalField` able to use babel locale-based number formatting.
+- Drop Python 3.2 support (Python3 support for 3.3+ only)
 
 Version 1.0.5
 -------------

docs/crash_course.rst

@@ -268,7 +268,7 @@ Rendering a field is as simple as coercing it to a string::
 
 However, the real power comes from rendering the field with its :meth:`~wtforms.fields.Field.__call__`
 method. By calling the field, you can provide keyword arguments, which will be
-injected as html parameters in the output::
+injected as html attributes in the output::
 
     >>> form.content(style="width: 200px;", class_="bar")
     u'<input class="bar" id="content" name="content" style="width: 200px;" type="text" value="foobar" />'

docs/ext.rst

@@ -183,15 +183,15 @@ your forms.
 
     def edit_blog_post(request, id):
         post = Post.query.get(id)
-        form = ArticleEdit(obj=post)
+        form = BlogPostEdit(obj=post)
         # Since we didn't provide a query_factory for the 'blog' field, we need
         # to set a dynamic one in the view.
         form.blog.query = Blog.query.filter(Blog.author == request.user).order_by(Blog.name)
 
 
 .. autoclass:: QuerySelectField(default field args, query_factory=None, get_pk=None, get_label=None, allow_blank=False, blank_text=u'')
 
-.. autoclass:: QuerySelectMultipleField(default field args, query_factory=None, get_pk=None, get_label=None, allow_blank=False, blank_text=u'')
+.. autoclass:: QuerySelectMultipleField(default field args, query_factory=None, get_pk=None, get_label=None)
 
 
 CSRF

setup.py

@@ -34,7 +34,6 @@
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Software Development :: Libraries :: Python Modules'

tests/ext_django/models.py

@@ -1,7 +1,11 @@
 from __future__ import unicode_literals
 
 from django.db import models
-from django.contrib.localflavor.us.models import USStateField
+try:
+    from localflavor.us.models import USStateField
+except ImportError:
+    from django.contrib.localflavor.us.models import USStateField
+
 
 class Group(models.Model):
     name  = models.CharField(max_length=20)
@@ -11,6 +15,7 @@ def __unicode__(self):
 
     __str__ = __unicode__
 
+
 class User(models.Model):
     username = models.CharField(max_length=40)
     group    = models.ForeignKey(Group)

tests/ext_django/tests.py

@@ -46,6 +46,11 @@
 from wtforms.compat import text_type
 from wtforms.ext.django.orm import model_form
 from wtforms.ext.django.fields import QuerySetSelectField, ModelSelectField, DateTimeField
+try:
+    import pytz
+    has_pytz = (pytz.VERSION >= '2012')
+except ImportError:
+    has_pytz = False
 
 def contains_validator(field, v_type):
     for v in field.validators:
@@ -213,6 +218,9 @@ def test_convert_input_to_current_timezone(self):
 
     @override_settings(USE_TZ=True, TIME_ZONE='America/Los_Angeles')
     def test_stored_value_converted_to_current_timezone(self):
+        if not has_pytz:
+            # Ignore this test if we don't have pytz.
+            return
         utc_date = datetime.datetime(2013, 9, 25, 2, 15, tzinfo=timezone.utc)
         form = self.F(a=utc_date)
         self.assertTrue('2013-09-24 19:15:00' in form.a())

tests/test_requirements.txt

@@ -1,6 +1,6 @@
-Django
 SQLAlchemy
 python-dateutil
 pep8
 coverage
 coveralls
+Babel>=1.3

wtforms/ext/dateutil/fields.py

@@ -15,6 +15,19 @@
 )
 
 
+# This is a fix to handle issues in dateutil which arose in version 2.2.
+# A bug ticket is filed: https://bugs.launchpad.net/dateutil/+bug/1247643
+try:
+    parser.parse('foobar')
+except TypeError:
+    DATEUTIL_TYPEERROR_ISSUE = True
+except ValueError:
+    DATEUTIL_TYPEERROR_ISSUE = False
+else:
+    import warnings
+    warnings.warn('In testing for a dateutil issue, we ran into a very strange error.', ImportWarning)
+
+
 class DateTimeField(Field):
     """
     DateTimeField represented by a text input, accepts all input text formats
@@ -60,6 +73,14 @@ def process_formdata(self, valuelist):
             except ValueError:
                 self.data = None
                 raise ValidationError(self.gettext('Invalid date/time input'))
+            except TypeError:
+                if not DATEUTIL_TYPEERROR_ISSUE:
+                    raise
+
+                # If we're using dateutil 2.2, then consider it a normal
+                # ValidationError. Hopefully dateutil fixes this issue soon.
+                self.data = None
+                raise ValidationError(self.gettext('Invalid date/time input'))
 
 
 class DateField(DateTimeField):

wtforms/ext/django/fields.py

@@ -7,7 +7,12 @@
 import operator
 
 from django.conf import settings
-from django.utils import timezone
+
+try:
+    from django.utils import timezone
+    has_timezone = True
+except ImportError:
+    has_timezone = False
 
 from wtforms import fields, widgets
 from wtforms.compat import string_types
@@ -103,17 +108,27 @@ def __init__(self, label=None, validators=None, model=None, **kwargs):
 class DateTimeField(fields.DateTimeField):
     """
     Adds support for Django's timezone utilities.
-    Requires Django >= 1.4
+    Requires Django >= 1.5
     """
+    def __init__(self, *args, **kwargs):
+        if not has_timezone:
+            raise ImportError('DateTimeField requires Django >= 1.5')
+
+        super(DateTimeField, self).__init__(*args, **kwargs)
+
     def process_formdata(self, valuelist):
         super(DateTimeField, self).process_formdata(valuelist)
+
         date = self.data
+
         if settings.USE_TZ and date is not None and timezone.is_naive(date):
             current_timezone = timezone.get_current_timezone()
             self.data = timezone.make_aware(date, current_timezone)
 
     def _value(self):
         date = self.data
+
         if settings.USE_TZ and isinstance(date, datetime.datetime) and timezone.is_aware(date):
             self.data = timezone.localtime(date)
+
         return super(DateTimeField, self)._value()