Fix tests for Django 1.4/Python 2.6

betterforms/forms.py

@@ -17,7 +17,7 @@
 except ImportError:
     # Support for Python < 2.6
     from django.utils.datastructures import SortedDict as OrderedDict
-from django.utils import six
+import six  # Django six is buggy with Django < 1.5
 from django.utils.encoding import python_2_unicode_compatible
 
 

betterforms/tests.py

@@ -1,4 +1,10 @@
-import unittest  # NOQA
+import sys
+if sys.version_info < (2, 7):
+    # In python < 2.7 unittest doesn't have expectedFailure
+    from django.utils import unittest
+else:
+    # django.utils.unittest became deprecated in Django 1.7
+    import unittest  # NOQA
 
 import mock
 

setup.py

@@ -37,6 +37,7 @@ def get_version():
     packages=[package for package in find_packages() if package.startswith('betterforms')],
     install_requires=[
         'Django>=1.4',
+        'six',
     ],
     tests_require=[
         'mock>=1.0.1',

tox.ini

@@ -18,52 +18,60 @@ deps =
   https://github.com/django/django/archive/stable/1.4.x.zip#egg=Django
   # https://bitbucket.org/hpk42/tox/issue/13/tox-should-reuse-tests_require
   mock
+  six
 
 [testenv:py27-dj15]
 basepython=python2.7
 deps =
   https://github.com/django/django/archive/stable/1.5.x.zip#egg=Django
   # https://bitbucket.org/hpk42/tox/issue/13/tox-should-reuse-tests_require
   mock
+  six
 
 [testenv:py27-dj16]
 basepython=python2.7
 deps =
   https://github.com/django/django/archive/stable/1.6.x.zip#egg=Django
   # https://bitbucket.org/hpk42/tox/issue/13/tox-should-reuse-tests_require
   mock
+  six
 
 [testenv:py27-dj17]
 basepython=python2.7
 deps =
   https://github.com/django/django/archive/stable/1.7.x.zip#egg=Django
   # https://bitbucket.org/hpk42/tox/issue/13/tox-should-reuse-tests_require
   mock
+  six
 
 [testenv:py33-dj15]
 basepython=python3.3
 deps =
   https://github.com/django/django/archive/stable/1.5.x.zip#egg=Django
   # https://bitbucket.org/hpk42/tox/issue/13/tox-should-reuse-tests_require
   mock
+  six
 
 [testenv:py33-dj16]
 basepython=python3.3
 deps =
   https://github.com/django/django/archive/stable/1.6.x.zip#egg=Django
   # https://bitbucket.org/hpk42/tox/issue/13/tox-should-reuse-tests_require
   mock
+  six
 
 [testenv:py33-dj17]
 basepython=python3.3
 deps =
   https://github.com/django/django/archive/stable/1.7.x.zip#egg=Django
   # https://bitbucket.org/hpk42/tox/issue/13/tox-should-reuse-tests_require
   mock
+  six
 
 [testenv:py26-dj14]
 basepython=python2.6
 deps =
   Django==1.4.8
   # https://bitbucket.org/hpk42/tox/issue/13/tox-should-reuse-tests_require
   mock
+  six