From d42a8a95f463dc5b051a6616b3726c8cede3d228 Mon Sep 17 00:00:00 2001
From: Iacopo Spalletti <i.spalletti@nephila.it>
Date: Thu, 18 Aug 2016 23:04:02 +0200
Subject: [PATCH] Django 1.10 compatibility

---
 .travis.yml                                   | 51 ++++++++++++++++-
 cms/appresolver.py                            |  7 ++-
 cms/forms/widgets.py                          | 13 +----
 cms/plugin_rendering.py                       | 14 ++++-
 .../migrations/0002_auto_20160816_1216.py     | 26 +++++++++
 ...bletitleextension_multitabletitleextens.py | 57 +++++++++++++++++++
 ...409_0838.py => 0003_auto_20160818_2218.py} | 11 ++--
 .../project/mti_pluginapp/models.py           |  2 +-
 .../migrations/0006_auto_20160816_1216.py     | 19 +++++++
 .../migrations/0003_auto_20160816_1216.py     | 31 ++++++++++
 .../migrations/0002_auto_20160816_1216.py     | 31 ++++++++++
 .../migrations/0002_auto_20160816_1216.py     | 26 +++++++++
 .../migrations/0002_auto_20160816_1216.py     | 21 +++++++
 cms/test_utils/testcases.py                   |  5 +-
 cms/tests/test_page.py                        |  5 +-
 cms/tests/test_rendering.py                   |  6 +-
 cms/tests/test_toolbar.py                     |  2 +-
 cms/utils/compat/__init__.py                  |  3 +-
 cms/utils/conf.py                             |  7 +--
 manage.py                                     |  1 -
 test_requirements/django-1.10.txt             |  6 ++
 test_requirements/requirements_base.txt       |  6 +-
 22 files changed, 310 insertions(+), 40 deletions(-)
 create mode 100644 cms/test_utils/project/bunch_of_plugins/migrations/0002_auto_20160816_1216.py
 create mode 100644 cms/test_utils/project/extensionapp/migrations/0003_multitablepageextension_multitablepageextensionparent_multitabletitleextension_multitabletitleextens.py
 rename cms/test_utils/project/mti_pluginapp/migrations/{0003_auto_20160409_0838.py => 0003_auto_20160818_2218.py} (76%)
 create mode 100644 cms/test_utils/project/placeholderapp/migrations/0006_auto_20160816_1216.py
 create mode 100644 cms/test_utils/project/pluginapp/plugins/manytomany_rel/migrations/0003_auto_20160816_1216.py
 create mode 100644 cms/test_utils/project/pluginapp/plugins/meta/migrations/0002_auto_20160816_1216.py
 create mode 100644 cms/test_utils/project/pluginapp/plugins/one_thing/migrations/0002_auto_20160816_1216.py
 create mode 100644 cms/test_utils/project/pluginapp/plugins/revdesc/migrations/0002_auto_20160816_1216.py
 create mode 100644 test_requirements/django-1.10.txt

diff --git a/.travis.yml b/.travis.yml
index 6cebfed45cc..16c60967d53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,11 @@ env:
     - FRONTEND=1 INTEGRATION=1 INTEGRATION_TESTS_BUCKET=1 DJANGO=1.8 DATABASE_URL='sqlite://localhost/testdb.sqlite' MIGRATE_OPTION='--migrate'
     - FRONTEND=1 INTEGRATION=1 INTEGRATION_TESTS_BUCKET=2 DJANGO=1.8 DATABASE_URL='sqlite://localhost/testdb.sqlite' MIGRATE_OPTION='--migrate'
     - FRONTEND=1 INTEGRATION=1 INTEGRATION_TESTS_BUCKET=3 DJANGO=1.8 DATABASE_URL='sqlite://localhost/testdb.sqlite' MIGRATE_OPTION='--migrate'
+    - DJANGO=1.10 DATABASE_URL='sqlite://localhost/:memory:' MIGRATE_OPTION='--migrate'
+    - DJANGO=1.10 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
+    - DJANGO=1.10 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' MIGRATE_OPTION='--migrate'
+    - DJANGO=1.10 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='emailuserapp.EmailUser'
+    - DJANGO=1.10 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
     - DJANGO=1.9 DATABASE_URL='sqlite://localhost/:memory:' MIGRATE_OPTION='--migrate'
     - DJANGO=1.9 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
     - DJANGO=1.9 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' MIGRATE_OPTION='--migrate'
@@ -86,6 +91,17 @@ notifications:
 matrix:
   exclude:
 
+    - python: 3.3
+      env: DJANGO=1.10 DATABASE_URL='sqlite://localhost/:memory:' MIGRATE_OPTION='--migrate'
+    - python: 3.3
+      env: DJANGO=1.10 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
+    - python: 3.3
+      env: DJANGO=1.10 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' MIGRATE_OPTION='--migrate'
+    - python: 3.3
+      env: DJANGO=1.10 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='emailuserapp.EmailUser'
+    - python: 3.3
+      env: DJANGO=1.10 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
+
     - python: 3.3
       env: DJANGO=1.9 DATABASE_URL='sqlite://localhost/:memory:' MIGRATE_OPTION='--migrate'
     - python: 3.3
@@ -141,10 +157,43 @@ matrix:
       env: FRONTEND=1 INTEGRATION=1 INTEGRATION_TESTS_BUCKET=3 DJANGO=1.8 DATABASE_URL='sqlite://localhost/testdb.sqlite' MIGRATE_OPTION='--migrate'
 
   allow_failures:
+
+    - python: 3.5
+      env: DJANGO=1.10 DATABASE_URL='sqlite://localhost/:memory:' MIGRATE_OPTION='--migrate'
+    - python: 3.5
+      env: DJANGO=1.10 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
+    - python: 3.5
+      env: DJANGO=1.10 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' MIGRATE_OPTION='--migrate'
+    - python: 3.5
+      env: DJANGO=1.10 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='emailuserapp.EmailUser'
+    - python: 3.5
+      env: DJANGO=1.10 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
+
+    - python: 3.4
+      env: DJANGO=1.10 DATABASE_URL='sqlite://localhost/:memory:' MIGRATE_OPTION='--migrate'
+    - python: 3.4
+      env: DJANGO=1.10 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
+    - python: 3.4
+      env: DJANGO=1.10 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' MIGRATE_OPTION='--migrate'
+    - python: 3.4
+      env: DJANGO=1.10 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='emailuserapp.EmailUser'
+    - python: 3.4
+      env: DJANGO=1.10 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
+
     - python: 2.7
-      env: DJANGO=1.8 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
+      env: DJANGO=1.10 DATABASE_URL='sqlite://localhost/:memory:' MIGRATE_OPTION='--migrate'
     - python: 2.7
+      env: DJANGO=1.10 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
+    - python: 2.7
+      env: DJANGO=1.10 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' MIGRATE_OPTION='--migrate'
+    - python: 2.7
+      env: DJANGO=1.10 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='emailuserapp.EmailUser'
+    - python: 2.7
+      env: DJANGO=1.10 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
 
+    - python: 2.7
+      env: DJANGO=1.8 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
+    - python: 2.7
       env: DJANGO=1.9 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
 
     - python: 3.4
diff --git a/cms/appresolver.py b/cms/appresolver.py
index f1f3ba7108b..7b529a0155f 100644
--- a/cms/appresolver.py
+++ b/cms/appresolver.py
@@ -13,7 +13,7 @@
 
 from cms.apphook_pool import apphook_pool
 from cms.models.pagemodel import Page
-from cms.utils.compat import DJANGO_1_8
+from cms.utils.compat import DJANGO_1_8, DJANGO_1_9
 from cms.utils.i18n import get_language_list
 
 APP_RESOLVERS = []
@@ -149,7 +149,10 @@ def _set_permissions(patterns, exclude_permissions):
             _set_permissions(pattern.url_patterns, exclude_permissions)
         else:
             from cms.utils.decorators import cms_perms
-            pattern._callback = cms_perms(pattern.callback)
+            if DJANGO_1_9:
+                pattern._callback = cms_perms(pattern.callback)
+            else:
+                pattern.callback = cms_perms(pattern.callback)
 
 
 def get_app_urls(urls):
diff --git a/cms/forms/widgets.py b/cms/forms/widgets.py
index 496e74c4933..1220b062ffd 100644
--- a/cms/forms/widgets.py
+++ b/cms/forms/widgets.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from itertools import chain
-
 from django.contrib.admin.templatetags.admin_static import static
 from django.contrib.auth import get_permission_codename
 from django.contrib.sites.models import Site
@@ -175,7 +173,7 @@ class UserSelectAdminWidget(Select):
     attribute.
     """
     def render(self, name, value, attrs=None, choices=()):
-        output = [super(UserSelectAdminWidget, self).render(name, value, attrs, choices)]
+        output = [super(UserSelectAdminWidget, self).render(name, value, attrs)]
         if hasattr(self, 'user') and (self.user.is_superuser or \
             self.user.has_perm(PageUser._meta.app_label + '.' + get_permission_codename('add', PageUser._meta))):
             # append + icon
@@ -225,13 +223,6 @@ def render_option(self, selected_choices, option_value, option_label):
             force_text(option_label),
         )
 
-    def render_options(self, choices, selected_choices):
-        selected_choices = set(force_text(v) for v in selected_choices)
-        output = []
-        for option_value, option_label in chain(self.choices, choices):
-            output.append(self.render_option(selected_choices, option_value, option_label))
-        return '\n'.join(output)
-
 
 class ApplicationConfigSelect(Select):
     """
@@ -255,7 +246,7 @@ def __init__(self, attrs=None, choices=(), app_configs={}):
         super(ApplicationConfigSelect, self).__init__(attrs, choices)
 
     def render(self, name, value, attrs=None, choices=()):
-        output = list(super(ApplicationConfigSelect, self).render(name, value, attrs, choices))
+        output = list(super(ApplicationConfigSelect, self).render(name, value, attrs))
         output.append('<script>\n')
         output.append('var apphooks_configuration = {\n')
         for application, cms_app in self.app_configs.items():
diff --git a/cms/plugin_rendering.py b/cms/plugin_rendering.py
index a2647d99d23..edd5356939d 100644
--- a/cms/plugin_rendering.py
+++ b/cms/plugin_rendering.py
@@ -2,7 +2,7 @@
 from collections import deque
 
 from classytags.utils import flatten_context
-from django.template import Template, Context
+from django.template import Context
 from django.template.loader import get_template
 from django.utils.functional import cached_property
 from django.utils.safestring import mark_safe
@@ -83,10 +83,13 @@ def placeholder_cache_is_enabled(self):
         return not self.user_is_on_edit_mode()
 
     def get_cached_template(self, template):
-        if isinstance(template, Template):
+        # we check if template quacks like a Template, as generic Template and engine-specific Template
+        # does not share a common ancestor
+        if hasattr(template, 'render'):
             return template
 
         if not template in self._cached_templates:
+            # this always return a enging-specific template object
             self._cached_templates[template] = get_template(template)
         return self._cached_templates[template]
 
@@ -289,8 +292,15 @@ def render_plugin(self, instance, context, placeholder=None, editable=False):
         if not instance or not plugin.render_plugin:
             return ''
 
+        # we'd better pass a flat dict to template.render
+        # as plugin.render can return pretty much any kind of context / dictionary
+        # we'd better flatten it and force to a Context object
+        # flattening the context means that template must be an engine-specific template object
+        # which is guaranteed by get_cached_template if the template returned by
+        # plugin._get_render_template is either a string or an engine-specific template object
         context = PluginContext(context, instance, placeholder)
         context = plugin.render(context, instance, placeholder.slot)
+        context = flatten_context(context)
 
         template = plugin._get_render_template(context, instance, placeholder)
         template = self.get_cached_template(template)
diff --git a/cms/test_utils/project/bunch_of_plugins/migrations/0002_auto_20160816_1216.py b/cms/test_utils/project/bunch_of_plugins/migrations/0002_auto_20160816_1216.py
new file mode 100644
index 00000000000..bf6c2ae2677
--- /dev/null
+++ b/cms/test_utils/project/bunch_of_plugins/migrations/0002_auto_20160816_1216.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.9 on 2016-08-16 12:16
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bunch_of_plugins', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='testplugin1',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='bunch_of_plugins_testplugin1', serialize=False, to='cms.CMSPlugin'),
+        ),
+        migrations.AlterField(
+            model_name='testplugin2',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='bunch_of_plugins_testplugin2', serialize=False, to='cms.CMSPlugin'),
+        ),
+    ]
diff --git a/cms/test_utils/project/extensionapp/migrations/0003_multitablepageextension_multitablepageextensionparent_multitabletitleextension_multitabletitleextens.py b/cms/test_utils/project/extensionapp/migrations/0003_multitablepageextension_multitablepageextensionparent_multitabletitleextension_multitabletitleextens.py
new file mode 100644
index 00000000000..f60514597cf
--- /dev/null
+++ b/cms/test_utils/project/extensionapp/migrations/0003_multitablepageextension_multitablepageextensionparent_multitabletitleextension_multitabletitleextens.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.9 on 2016-08-16 12:16
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0016_auto_20160608_1535'),
+        ('extensionapp', '0002_auto_20150607_2207'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MultiTablePageExtensionParent',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('extension_parent_field', models.CharField(blank=True, default=b'', max_length=255)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='MultiTableTitleExtensionParent',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('extension_title_parent_field', models.CharField(blank=True, default=b'', max_length=255)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='MultiTablePageExtension',
+            fields=[
+                ('multitablepageextensionparent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='extensionapp.MultiTablePageExtensionParent')),
+                ('multitable_extra', models.CharField(blank=True, default=b'', max_length=255)),
+                ('extended_object', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, to='cms.Page')),
+                ('public_extension', models.OneToOneField(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='draft_extension', to='extensionapp.MultiTablePageExtension')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('extensionapp.multitablepageextensionparent', models.Model),
+        ),
+        migrations.CreateModel(
+            name='MultiTableTitleExtension',
+            fields=[
+                ('multitabletitleextensionparent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='extensionapp.MultiTableTitleExtensionParent')),
+                ('multitable_extra_title', models.CharField(blank=True, default=b'', max_length=255)),
+                ('extended_object', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, to='cms.Title')),
+                ('public_extension', models.OneToOneField(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='draft_extension', to='extensionapp.MultiTableTitleExtension')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('extensionapp.multitabletitleextensionparent', models.Model),
+        ),
+    ]
diff --git a/cms/test_utils/project/mti_pluginapp/migrations/0003_auto_20160409_0838.py b/cms/test_utils/project/mti_pluginapp/migrations/0003_auto_20160818_2218.py
similarity index 76%
rename from cms/test_utils/project/mti_pluginapp/migrations/0003_auto_20160409_0838.py
rename to cms/test_utils/project/mti_pluginapp/migrations/0003_auto_20160818_2218.py
index 3c8c9f0182c..4769558ec28 100644
--- a/cms/test_utils/project/mti_pluginapp/migrations/0003_auto_20160409_0838.py
+++ b/cms/test_utils/project/mti_pluginapp/migrations/0003_auto_20160818_2218.py
@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('cms', '0015_auto_20160409_0838'),
+        ('cms', '0016_auto_20160608_1535'),
         ('mti_pluginapp', '0002_auto_20150112_2250'),
     ]
 
@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='TestPluginGammaModel',
             fields=[
-                ('cmsplugin_ptr', models.OneToOneField(parent_link=True, related_name=b'mti_pluginapp_testplugingammamodel', auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
+                ('cmsplugin_ptr', models.OneToOneField(parent_link=True, related_name='mti_pluginapp_testplugingammamodel', auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
                 ('abs', models.CharField(default=b'test plugin abs', max_length=32, verbose_name=b'abs')),
                 ('gamma', models.CharField(default=b'test plugin gamma', max_length=32, verbose_name=b'gamma')),
             ],
@@ -57,17 +57,20 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='LessMixedPlugin',
             fields=[
+                ('nonpluginmodel_ptr', models.OneToOneField(parent_link=True, auto_created=True, to='mti_pluginapp.NonPluginModel')),
+                ('cmsplugin_ptr', models.OneToOneField(parent_link=True, related_name='mti_pluginapp_lessmixedplugin', auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
                 ('less_mixed', models.CharField(default=b'test plugin mixed', max_length=32, verbose_name=b'mixed')),
             ],
             options={
                 'abstract': False,
             },
-            bases=('mti_pluginapp.nonpluginmodel', 'cms.cmsplugin'),
+            bases=('cms.cmsplugin', 'mti_pluginapp.nonpluginmodel'),
         ),
         migrations.CreateModel(
             name='MixedPlugin',
             fields=[
-                ('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, to='cms.CMSPlugin')),
+                ('nonpluginmodel_ptr', models.OneToOneField(parent_link=True, auto_created=True, to='mti_pluginapp.NonPluginModel')),
+                ('cmsplugin_ptr', models.OneToOneField(parent_link=True, related_name='mti_pluginapp_mixedplugin', auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
                 ('abs', models.CharField(default=b'test plugin abs', max_length=32, verbose_name=b'abs')),
                 ('mixed', models.CharField(default=b'test plugin mixed', max_length=32, verbose_name=b'mixed')),
             ],
diff --git a/cms/test_utils/project/mti_pluginapp/models.py b/cms/test_utils/project/mti_pluginapp/models.py
index d878ec54d1b..f236f12e52e 100644
--- a/cms/test_utils/project/mti_pluginapp/models.py
+++ b/cms/test_utils/project/mti_pluginapp/models.py
@@ -87,7 +87,7 @@ class MixedPlugin(AbstractPluginParent, NonPluginModel):
     mixed = models.CharField('mixed', blank=False, default='test plugin mixed', max_length=32)
 
 
-class LessMixedPlugin(NonPluginModel, CMSPlugin):
+class LessMixedPlugin(CMSPlugin, NonPluginModel):
     """
     Plugin which inherits from two concrete models, one of which is CMSPlugin
     """
diff --git a/cms/test_utils/project/placeholderapp/migrations/0006_auto_20160816_1216.py b/cms/test_utils/project/placeholderapp/migrations/0006_auto_20160816_1216.py
new file mode 100644
index 00000000000..c04724130a3
--- /dev/null
+++ b/cms/test_utils/project/placeholderapp/migrations/0006_auto_20160816_1216.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.9 on 2016-08-16 12:16
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('placeholderapp', '0005_example1_decimal_field'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='multilingualexample1translation',
+            options={'default_permissions': (), 'managed': True},
+        ),
+    ]
diff --git a/cms/test_utils/project/pluginapp/plugins/manytomany_rel/migrations/0003_auto_20160816_1216.py b/cms/test_utils/project/pluginapp/plugins/manytomany_rel/migrations/0003_auto_20160816_1216.py
new file mode 100644
index 00000000000..59f0f143143
--- /dev/null
+++ b/cms/test_utils/project/pluginapp/plugins/manytomany_rel/migrations/0003_auto_20160816_1216.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.9 on 2016-08-16 12:16
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('manytomany_rel', '0002_auto_20151101_0919'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='articlepluginmodel',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='manytomany_rel_articlepluginmodel', serialize=False, to='cms.CMSPlugin'),
+        ),
+        migrations.AlterField(
+            model_name='pluginmodelwithfkfrommodel',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='manytomany_rel_pluginmodelwithfkfrommodel', serialize=False, to='cms.CMSPlugin'),
+        ),
+        migrations.AlterField(
+            model_name='pluginmodelwithm2mtomodel',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='manytomany_rel_pluginmodelwithm2mtomodel', serialize=False, to='cms.CMSPlugin'),
+        ),
+    ]
diff --git a/cms/test_utils/project/pluginapp/plugins/meta/migrations/0002_auto_20160816_1216.py b/cms/test_utils/project/pluginapp/plugins/meta/migrations/0002_auto_20160816_1216.py
new file mode 100644
index 00000000000..9c6c915cbae
--- /dev/null
+++ b/cms/test_utils/project/pluginapp/plugins/meta/migrations/0002_auto_20160816_1216.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.9 on 2016-08-16 12:16
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meta', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='testpluginmodel',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='meta_testpluginmodel', serialize=False, to='cms.CMSPlugin'),
+        ),
+        migrations.AlterField(
+            model_name='testpluginmodel2',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='meta_testpluginmodel2', serialize=False, to='cms.CMSPlugin'),
+        ),
+        migrations.AlterField(
+            model_name='testpluginmodel4',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='meta_testpluginmodel4', serialize=False, to='cms.CMSPlugin'),
+        ),
+    ]
diff --git a/cms/test_utils/project/pluginapp/plugins/one_thing/migrations/0002_auto_20160816_1216.py b/cms/test_utils/project/pluginapp/plugins/one_thing/migrations/0002_auto_20160816_1216.py
new file mode 100644
index 00000000000..7e05ffdc457
--- /dev/null
+++ b/cms/test_utils/project/pluginapp/plugins/one_thing/migrations/0002_auto_20160816_1216.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.9 on 2016-08-16 12:16
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('one_thing', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='testpluginmodel3',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='one_thing_testpluginmodel3', serialize=False, to='cms.CMSPlugin'),
+        ),
+        migrations.AlterField(
+            model_name='testpluginmodel5',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='one_thing_testpluginmodel5', serialize=False, to='cms.CMSPlugin'),
+        ),
+    ]
diff --git a/cms/test_utils/project/pluginapp/plugins/revdesc/migrations/0002_auto_20160816_1216.py b/cms/test_utils/project/pluginapp/plugins/revdesc/migrations/0002_auto_20160816_1216.py
new file mode 100644
index 00000000000..f326dccfbbe
--- /dev/null
+++ b/cms/test_utils/project/pluginapp/plugins/revdesc/migrations/0002_auto_20160816_1216.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.9 on 2016-08-16 12:16
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('revdesc', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='unalteredpm',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='revdesc_unalteredpm', serialize=False, to='cms.CMSPlugin'),
+        ),
+    ]
diff --git a/cms/test_utils/testcases.py b/cms/test_utils/testcases.py
index a3d1a087dbb..cb63c4e75e3 100644
--- a/cms/test_utils/testcases.py
+++ b/cms/test_utils/testcases.py
@@ -471,8 +471,11 @@ def failUnlessWarns(self, category, message, f, *args, **kwargs):
 
     assertWarns = failUnlessWarns
 
+    def load_template_from_string(self, template):
+        return engines['django'].from_string(template)
+
     def render_template_obj(self, template, context, request):
-        template_obj = engines['django'].from_string(template)
+        template_obj = self.load_template_from_string(template)
         return template_obj.render(context, request)
 
     def apphook_clear(self):
diff --git a/cms/tests/test_page.py b/cms/tests/test_page.py
index 2751869f524..77f2fa42043 100644
--- a/cms/tests/test_page.py
+++ b/cms/tests/test_page.py
@@ -358,10 +358,7 @@ def test_add_placeholder(self):
         url = page.get_absolute_url()
         response = self.client.get(url)
         self.assertEqual(200, response.status_code)
-        try:
-            path = os.path.join(settings.TEMPLATE_DIRS[0], 'add_placeholder.html')
-        except IndexError:
-            path = os.path.join(settings.TEMPLATES[0]['DIRS'][0], 'add_placeholder.html')
+        path = os.path.join(settings.TEMPLATES[0]['DIRS'][0], 'add_placeholder.html')
         with open(path, 'r') as fobj:
             old = fobj.read()
         try:
diff --git a/cms/tests/test_rendering.py b/cms/tests/test_rendering.py
index 8ac44226aaa..2ee01042fb5 100644
--- a/cms/tests/test_rendering.py
+++ b/cms/tests/test_rendering.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from django.core.cache import cache
-from django.template import Template
 from django.test.utils import override_settings
 from sekizai.context import SekizaiContext
 
@@ -197,9 +196,10 @@ def test_passed_plugin_context_processor(instance, placeholder, context):
             return {'test_passed_plugin_context_processor': 'test_passed_plugin_context_processor_ok'}
 
         t = u'{% load cms_tags %}' + \
-            u'{{ plugin.counter }}|{{ plugin.instance.body }}|{{ test_passed_plugin_context_processor }}|{{ test_plugin_context_processor }}'
+            u'{{ plugin.counter }}|{{ plugin.instance.body }}|{{ test_passed_plugin_context_processor }}|' \
+            u'{{ test_plugin_context_processor }}'
         instance, plugin = CMSPlugin.objects.all()[0].get_plugin_instance()
-        instance.render_template = Template(t)
+        instance.render_template = self.load_template_from_string(t)
         context = PluginContext({'original_context_var': 'original_context_var_ok'}, instance,
                                 self.test_placeholders['main'], processors=(test_passed_plugin_context_processor,))
         plugin_rendering._standard_processors = {}
diff --git a/cms/tests/test_toolbar.py b/cms/tests/test_toolbar.py
index 45fa0a90835..92a68a9728a 100644
--- a/cms/tests/test_toolbar.py
+++ b/cms/tests/test_toolbar.py
@@ -926,8 +926,8 @@ def test_toolbar_logout_redirect(self):
             self.assertEquals(admin_menu.find_first(AjaxItem, name=menu_name).item.on_success, '/')
 
 
+@override_settings(ROOT_URLCONF='cms.test_utils.project.placeholderapp_urls')
 class EditModelTemplateTagTest(ToolbarTestBase):
-    urls = 'cms.test_utils.project.placeholderapp_urls'
     edit_fields_rx = "(\?|&amp;)edit_fields=%s"
 
     def tearDown(self):
diff --git a/cms/utils/compat/__init__.py b/cms/utils/compat/__init__.py
index 26890153b44..9482d645a6a 100644
--- a/cms/utils/compat/__init__.py
+++ b/cms/utils/compat/__init__.py
@@ -4,4 +4,5 @@
 
 # These means "less than or equal to DJANGO_FOO_BAR"
 DJANGO_1_8 = LooseVersion(django.get_version()) < LooseVersion('1.9')
-DJANGO_1_9 = LooseVersion(django.get_version()) < LooseVersion('2.0')
+DJANGO_1_9 = LooseVersion(django.get_version()) < LooseVersion('1.10')
+DJANGO_1_10 = LooseVersion(django.get_version()) < LooseVersion('1.11')
diff --git a/cms/utils/conf.py b/cms/utils/conf.py
index 0c0aa916863..b809ca012d1 100644
--- a/cms/utils/conf.py
+++ b/cms/utils/conf.py
@@ -127,12 +127,9 @@ def get_templates():
         # valid templates directory. Here we mimick what the filesystem and
         # app_directories template loaders do
         prefix = ''
-        # Relative to TEMPLATE_DIRS for filesystem loader
+        # Relative to TEMPLATE['DIRS'] for filesystem loader
 
-        try:
-            path = settings.TEMPLATE_DIRS
-        except IndexError:
-            path = [template['DIRS'][0] for template in settings.TEMPLATES]
+        path = [template['DIRS'][0] for template in settings.TEMPLATES]
 
         for basedir in path:
             if tpldir.find(basedir) == 0:
diff --git a/manage.py b/manage.py
index c09beca99f5..97f661f3bf2 100755
--- a/manage.py
+++ b/manage.py
@@ -84,7 +84,6 @@ def _get_migration_modules(apps):
         'reversion',
         'sekizai',
         'hvad',
-        'better_test',
     ] + PLUGIN_APPS
 
     dynamic_configs = {
diff --git a/test_requirements/django-1.10.txt b/test_requirements/django-1.10.txt
new file mode 100644
index 00000000000..9fed48bcc4b
--- /dev/null
+++ b/test_requirements/django-1.10.txt
@@ -0,0 +1,6 @@
+-r requirements_base.txt
+https://github.com/django/django/archive/stable/1.10.x.zip
+django-reversion==1.10,<1.11
+https://github.com/KristianOellegaard/django-hvad/archive/master.zip
+django-formtools
+django-debug-toolbar
diff --git a/test_requirements/requirements_base.txt b/test_requirements/requirements_base.txt
index 6a0e8ee7dc8..de247572b0b 100644
--- a/test_requirements/requirements_base.txt
+++ b/test_requirements/requirements_base.txt
@@ -1,8 +1,8 @@
-coverage==3.7.1
+coverage==4.2
 python-coveralls==2.5.0
 unittest-xml-reporting==1.11.0
-Pillow==3.0
-django-treebeard==4.0
+Pillow==3.3
+https://github.com/fladi/django-treebeard/archive/django-1.10.zip
 argparse
 dj-database-url
 djangocms-admin-style>=1.0