Merge e2d1966 into fce9f7b

.travis.yml

@@ -8,8 +8,6 @@ env:
   - DJANGO_PACKAGE=https://github.com/django/django/archive/stable/1.7.x.zip
 matrix:
   include:
-    - python: "2.6"
-      env: DJANGO_PACKAGE=https://github.com/django/django/archive/stable/1.4.x.zip
     - python: "2.7"
       env: DJANGO_PACKAGE=https://github.com/django/django/archive/stable/1.4.x.zip
 install:

betterforms/changelist.py

@@ -4,11 +4,9 @@
 from django.forms.forms import pretty_name
 from django.core.exceptions import ValidationError, ImproperlyConfigured
 from django.db.models import Q
-try:
-    from collections import OrderedDict
-except ImportError:
-    # Support for Python < 2.6
-    from django.utils.datastructures import SortedDict as OrderedDict
+
+from collections import OrderedDict
+
 from django.utils import six
 from django.utils.six.moves import reduce
 from django.utils.http import urlencode

betterforms/forms.py

@@ -12,11 +12,9 @@
     from django.forms.util import ErrorDict
 from django.core.exceptions import NON_FIELD_ERRORS
 from django.template.loader import render_to_string
-try:
-    from collections import OrderedDict
-except ImportError:
-    # Support for Python < 2.6
-    from django.utils.datastructures import SortedDict as OrderedDict
+
+from collections import OrderedDict
+
 import six  # Django six is buggy with Django < 1.5
 from django.utils.encoding import python_2_unicode_compatible
 

betterforms/multiform.py

@@ -1,10 +1,7 @@
 from itertools import chain
 from operator import add
 
-try:
-    from collections import OrderedDict
-except ImportError:  # Python 2.6, Django < 1.7
-    from django.utils.datastructures import SortedDict as OrderedDict  # NOQA
+from collections import OrderedDict
 
 try:
     from django.forms.utils import ErrorDict, ErrorList

setup.py

@@ -37,7 +37,6 @@ def read(fname):
         'License :: OSI Approved :: BSD License',
         'Topic :: Internet :: WWW/HTTP',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.3',
     ],

tests/tests/forms.py

@@ -1,7 +1,4 @@
-try:
-    from collections import OrderedDict
-except ImportError:  # Python 2.6, Django < 1.7
-    from django.utils.datastructures import SortedDict as OrderedDict  # NOQA
+from collections import OrderedDict
 
 from django import forms
 from django.contrib.admin import widgets as admin_widgets

tests/tests/tests.py

@@ -1,7 +1,4 @@
-try:
-    from collections import OrderedDict
-except ImportError:  # Python 2.6, Django < 1.7
-    from django.utils.datastructures import SortedDict as OrderedDict  # NOQA
+from collections import OrderedDict
 
 from django.test import TestCase
 from django.test.client import RequestFactory

tox.ini

@@ -1,6 +1,5 @@
 [tox]
 envlist=
-    py26-dj14,
     py27-dj14,
     py27-dj15,
     py27-dj16,
@@ -67,11 +66,3 @@ deps =
   # 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