Drop support for Python 2.6.

timgraham · timgraham · commit d98bb0f6d036 · 2015-11-28T09:03:58.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,6 @@ python:
   - 3.4
   - 3.3
   - 2.7
-  - 2.6
 
 sudo: false
 
@@ -65,26 +64,6 @@ notifications:
 matrix:
   exclude:
 
-    - python: 2.6
-      env: DJANGO=1.7 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
-    - python: 2.6
-      env: DJANGO=1.7 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
-    - python: 2.6
-      env: DJANGO=1.7 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0
-    - python: 2.6
-      env: DJANGO=1.7 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='emailuserapp.EmailUser'
-
-    - python: 2.6
-      env: DJANGO=1.8 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0 MIGRATE_OPTION='--migrate'
-    - python: 2.6
-      env: DJANGO=1.8 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
-    - python: 2.6
-      env: DJANGO=1.8 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0 MIGRATE_OPTION='--migrate'
-    - python: 2.6
-      env: DJANGO=1.8 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='emailuserapp.EmailUser'
-    - python: 2.6
-      env: DJANGO=1.8 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='customuserapp.User'
-
     - python: 2.7
       env: DJANGO=1.7 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
     - python: 2.7
@@ -115,8 +94,6 @@ matrix:
     - python: 3.5
       env: DJANGO=1.7 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='emailuserapp.EmailUser'
 
-    - python: 2.6
-      env: DJANGO=1.9 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='customuserapp.User'
     - python: 2.7
       env: DJANGO=1.9 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='customuserapp.User'
     - python: 3.3
diff --git a/README.rst b/README.rst
@@ -66,7 +66,7 @@ More information on `our website <http://www.django-cms.org>`_.
 Requirements
 ************
 
-django CMS requires Django version 1.7 or 1.8, and Python 2.6, 2.7, 3.3 or 3.4.
+django CMS requires Django version 1.7 or 1.8, and Python 2.7, 3.3 or 3.4.
 
 *************
 Documentation
diff --git a/cms/appresolver.py b/cms/appresolver.py
@@ -1,16 +1,6 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
-
-try:
-    from collections import OrderedDict
-except ImportError:
-    # Python < 2.7
-    from django.utils.datastructures import SortedDict as OrderedDict
-try:
-    from importlib import import_module
-except ImportError:
-    # Python < 2.7
-    from django.utils.importlib import import_module
+from collections import OrderedDict
+from importlib import import_module
 
 from django.conf import settings
 from django.contrib.sites.models import Site
diff --git a/cms/forms/utils.py b/cms/forms/utils.py
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
-from collections import defaultdict
-try:
-    from collections import OrderedDict
-except ImportError:
-    from django.utils.datastructures import SortedDict as OrderedDict
+from collections import OrderedDict, defaultdict
 
 from django.contrib.sites.models import Site
 from django.db.models.signals import post_save, post_delete
diff --git a/cms/templatetags/cms_tags.py b/cms/templatetags/cms_tags.py
@@ -1,14 +1,9 @@
 # -*- coding: utf-8 -*-
+from collections import OrderedDict
+from copy import copy
 from datetime import datetime
 from itertools import chain
 
-from copy import copy
-
-try:
-    from collections import OrderedDict
-except ImportError:
-    from django.utils.datastructures import SortedDict as OrderedDict
-
 from django import template
 from django.conf import settings
 from django.contrib.sites.models import Site
diff --git a/cms/test_utils/cli.py b/cms/test_utils/cli.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 import os
 import dj_database_url
 
diff --git a/cms/test_utils/fixtures/menus.py b/cms/test_utils/fixtures/menus.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 from cms.api import create_page
 
 
diff --git a/cms/test_utils/fixtures/navextenders.py b/cms/test_utils/fixtures/navextenders.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 from cms.api import create_page
 from cms.models.pagemodel import Page
 
diff --git a/cms/test_utils/fixtures/templatetags.py b/cms/test_utils/fixtures/templatetags.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 from cms.api import create_page, create_title
 
 
diff --git a/cms/tests/test_admin.py b/cms/tests/test_admin.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 import json
 import datetime
 from cms import api
diff --git a/cms/tests/test_api.py b/cms/tests/test_api.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 import sys
 
 from django.contrib.auth import get_user_model
diff --git a/cms/tests/test_apphooks.py b/cms/tests/test_apphooks.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 import sys
 
 from django.contrib.admin.models import CHANGE, LogEntry
diff --git a/cms/tests/test_check.py b/cms/tests/test_check.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 from copy import deepcopy
 import os
 
diff --git a/cms/tests/test_django_load.py b/cms/tests/test_django_load.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 from collections import Iterator
 
 from cms.test_utils.testcases import CMSTestCase
diff --git a/cms/tests/test_docs.py b/cms/tests/test_docs.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 from contextlib import contextmanager
 from unittest import skipIf, skipUnless
 
diff --git a/cms/tests/test_forms.py b/cms/tests/test_forms.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 from datetime import datetime
 
 from django.contrib.auth import get_user_model
diff --git a/cms/tests/test_frontend.py b/cms/tests/test_frontend.py
@@ -3,6 +3,7 @@
 import os
 import sys
 import time
+from importlib import import_module
 try:
     from urllib.parse import urlparse
 except ImportError:
@@ -17,7 +18,6 @@
 from django.core.urlresolvers import clear_url_caches
 from django.test.utils import override_settings
 from django.utils import unittest
-from django.utils.importlib import import_module
 from selenium import webdriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.wait import WebDriverWait
diff --git a/cms/tests/test_i18n.py b/cms/tests/test_i18n.py
@@ -1,8 +1,4 @@
-try:
-    from importlib import import_module
-except ImportError:
-    # Python < 2.7
-    from django.utils.importlib import import_module
+from importlib import import_module
 
 from django.conf import settings
 from django.test.utils import override_settings
diff --git a/cms/tests/test_management.py b/cms/tests/test_management.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 import uuid
 
 from django.conf import settings
diff --git a/cms/tests/test_menu.py b/cms/tests/test_menu.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 import copy
 
 from django.conf import settings
diff --git a/cms/tests/test_menu_page_viewperm.py b/cms/tests/test_menu_page_viewperm.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
-
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AnonymousUser, Group
 from django.contrib.sites.models import Site
diff --git a/cms/tests/test_menu_page_viewperm_staff.py b/cms/tests/test_menu_page_viewperm_staff.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
-
 from django.test.utils import override_settings
 from django.contrib.auth import get_user_model
 
diff --git a/cms/tests/test_multilingual.py b/cms/tests/test_multilingual.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 import copy
 
 from django.contrib.auth import get_user_model
diff --git a/cms/tests/test_navextender.py b/cms/tests/test_navextender.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 from cms.models import Page
 from cms.test_utils.fixtures.navextenders import NavextendersFixture
 from cms.test_utils.testcases import CMSTestCase
diff --git a/cms/tests/test_nested_plugins.py b/cms/tests/test_nested_plugins.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 import json
 
 from djangocms_text_ckeditor.models import Text
diff --git a/cms/tests/test_nonroot.py b/cms/tests/test_nonroot.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
-
 from django.template import Template
 
 from cms.api import create_page
diff --git a/cms/tests/test_page.py b/cms/tests/test_page.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 import datetime
 import os.path
 from unittest import skipIf
diff --git a/cms/tests/test_permmod.py b/cms/tests/test_permmod.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
-
 from djangocms_text_ckeditor.models import Text
 from django.contrib.admin.sites import site
 from django.contrib.admin.utils import unquote
diff --git a/cms/tests/test_placeholder.py b/cms/tests/test_placeholder.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 import itertools
 
 from django.conf import settings
diff --git a/cms/tests/test_plugins.py b/cms/tests/test_plugins.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 import base64
 import datetime
 import json
@@ -1542,7 +1541,7 @@ def test_copy_plugin_with_m2m(self):
 
 class PluginCopyRelationsTestCase(PluginsTestBaseCase):
     """Test the suggestions in the docs for copy_relations()"""
-    
+
     def setUp(self):
         self.super_user = self._create_user("test", True, True)
         self.FIRST_LANG = settings.LANGUAGES[0][0]
@@ -1556,7 +1555,7 @@ def setUp(self):
         self.page2 = api.create_page(**page_data2)
         self.placeholder1 = self.page1.placeholders.get(slot='body')
         self.placeholder2 = self.page2.placeholders.get(slot='body')
-    
+
     def test_copy_fk_from_model(self):
         plugin = api.add_plugin(
             placeholder=self.placeholder1,
@@ -1579,7 +1578,7 @@ def test_copy_fk_from_model(self):
             new_public_count,
             old_public_count + 1
         )
-    
+
     def test_copy_m2m_to_model(self):
         plugin = api.add_plugin(
             placeholder=self.placeholder1,
diff --git a/cms/tests/test_po.py b/cms/tests/test_po.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 from cms.test_utils.util.context_managers import TemporaryDirectory
 from django.core.management.base import CommandError
 from django.core.management.commands.compilemessages import has_bom
diff --git a/cms/tests/test_publisher.py b/cms/tests/test_publisher.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
-
 from djangocms_text_ckeditor.models import Text
 from django.contrib.auth import get_user_model
 from django.contrib.sites.models import Site
diff --git a/cms/tests/test_rendering.py b/cms/tests/test_rendering.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
-
 from django.core.cache import cache
 from django.template import Template, RequestContext
 from django.test.utils import override_settings
diff --git a/cms/tests/test_reversion_tests.py b/cms/tests/test_reversion_tests.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 import shutil
 from os.path import join
 from cms.utils.conf import get_cms_setting
diff --git a/cms/tests/test_security.py b/cms/tests/test_security.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 from cms.utils.urlutils import admin_reverse
 
 from django.conf import settings
diff --git a/cms/tests/test_signals.py b/cms/tests/test_signals.py
@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-
-from __future__ import with_statement
-
 from contextlib import contextmanager
 
 from django.conf import settings
diff --git a/cms/tests/test_site.py b/cms/tests/test_site.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 import copy
 from cms.utils.urlutils import admin_reverse
 
diff --git a/cms/tests/test_static_placeholder.py b/cms/tests/test_static_placeholder.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 import json
 
 from django.contrib.admin.sites import site
diff --git a/cms/tests/test_staticfiles.py b/cms/tests/test_staticfiles.py
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 from django.core import management
 from django.test import TestCase
 
diff --git a/cms/tests/test_templatetags.py b/cms/tests/test_templatetags.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 from copy import deepcopy
 import os
 from classytags.tests import DummyParser, DummyTokens
diff --git a/cms/tests/test_toolbar.py b/cms/tests/test_toolbar.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 import datetime
 from operator import attrgetter
 import re
diff --git a/cms/tests/test_toolbar_pool.py b/cms/tests/test_toolbar_pool.py
@@ -1,5 +1,6 @@
+from collections import OrderedDict
+
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.datastructures import SortedDict
 
 from cms import api
 from cms.exceptions import ToolbarAlreadyRegistered, ToolbarNotRegistered
@@ -35,7 +36,7 @@ def test_register_order(self):
         pool.register(TestToolbar)
         pool.register(CMSToolbar)
 
-        test_toolbar = SortedDict()
+        test_toolbar = OrderedDict()
         test_toolbar['cms.tests.test_toolbar_pool.TestToolbar'] = TestToolbar
         test_toolbar['cms.toolbar_base.CMSToolbar'] = CMSToolbar
         self.assertEqual(list(test_toolbar.keys()), list(pool.toolbars.keys()))
diff --git a/cms/tests/test_urlutils.py b/cms/tests/test_urlutils.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 from cms.test_utils.testcases import CMSTestCase
 from cms.utils import urlutils
 
diff --git a/cms/tests/test_views.py b/cms/tests/test_views.py
@@ -1,4 +1,3 @@
-from __future__ import with_statement
 from copy import deepcopy
 import re
 import sys
diff --git a/cms/toolbar/toolbar.py b/cms/toolbar/toolbar.py
diff --git a/cms/toolbar_pool.py b/cms/toolbar_pool.py
diff --git a/cms/utils/check.py b/cms/utils/check.py
diff --git a/cms/utils/compat/forms.py b/cms/utils/compat/forms.py
diff --git a/cms/utils/django_load.py b/cms/utils/django_load.py
diff --git a/cms/views.py b/cms/views.py
diff --git a/docs/how_to/install.rst b/docs/how_to/install.rst
diff --git a/docs/introduction/install.rst b/docs/introduction/install.rst
diff --git a/menus/templatetags/menu_tags.py b/menus/templatetags/menu_tags.py
diff --git a/menus/utils.py b/menus/utils.py
diff --git a/setup.py b/setup.py
