Support for Django 1.10. New meta API for related_manager will be implemented in Django 1.11, in the meantime go with a workaround and silence deprecation warning.

Author: spectras

.travis.yml

@@ -7,10 +7,12 @@ python:
 env:
   - DJANGO=django==1.7.11 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
   - DJANGO=django==1.7.11 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
-  - DJANGO=django==1.8.9 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
-  - DJANGO=django==1.8.9 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
-  - DJANGO=django==1.9.2 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
-  - DJANGO=django==1.9.2 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
+  - DJANGO=django==1.8.13 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
+  - DJANGO=django==1.8.13 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
+  - DJANGO=django==1.9.7 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
+  - DJANGO=django==1.9.7 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
+  - DJANGO=https://github.com/django/django/archive/stable/1.10.x.tar.gz DRF=3.3.3 DATABASE_URL=mysql://root@localhost/test
+  - DJANGO=https://github.com/django/django/archive/stable/1.10.x.tar.gz DRF=3.3.3 DATABASE_URL=postgres://postgres@localhost/test
 
 sudo: false
 install:
@@ -28,9 +30,13 @@ after_success:
 matrix:
   exclude:
     - python: 3.3
-      env: DJANGO=django==1.9.2 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
+      env: DJANGO=django==1.9.7 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
     - python: 3.3
-      env: DJANGO=django==1.9.2 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
+      env: DJANGO=django==1.9.7 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
+    - python: 3.3
+      env: DJANGO=https://github.com/django/django/archive/stable/1.10.x.tar.gz DRF=3.3.3 DATABASE_URL=mysql://root@localhost/test
+    - python: 3.3
+      env: DJANGO=https://github.com/django/django/archive/stable/1.10.x.tar.gz DRF=3.3.3 DATABASE_URL=postgres://postgres@localhost/test
     - python: 3.5
       env: DJANGO=django==1.7.11 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
     - python: 3.5

hvad/admin.py

@@ -36,7 +36,7 @@ def get_language_name(language_code):
 class InlineModelForm(TranslatableModelForm):
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
                  initial=None, error_class=ErrorList, label_suffix=':',
-                 empty_permitted=False, instance=None):
+                 empty_permitted=False, instance=None, **kwargs):
         """
 
         """
@@ -56,7 +56,7 @@ def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
         super(TranslatableModelForm, self).__init__(data, files, auto_id,
                                                      prefix, object_data,
                                                      error_class, label_suffix,
-                                                     empty_permitted, instance)
+                                                     empty_permitted, instance, **kwargs)
 
 
 class TranslatableModelAdminMixin(object):

hvad/forms.py

@@ -104,7 +104,7 @@ class BaseTranslatableModelForm(BaseModelForm):
     '''
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
                  initial=None, error_class=ErrorList, label_suffix=':',
-                 empty_permitted=False, instance=None):
+                 empty_permitted=False, instance=None, **kwargs):
 
         # Insert values of instance's translated fields into 'initial' dict
         object_data = {}
@@ -123,7 +123,7 @@ def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
 
         super(BaseTranslatableModelForm, self).__init__(
             data, files, auto_id, prefix, object_data,
-            error_class, label_suffix, empty_permitted, instance
+            error_class, label_suffix, empty_permitted, instance, **kwargs
         )
 
     def clean(self):

hvad/manager.py

@@ -138,8 +138,8 @@ def __init__(self, sql, aliases):
         self.sql = sql
         self.aliases = aliases
 
-    def as_sql(self, qn, connection):
-        aliases = tuple(qn(alias) for alias in self.aliases)
+    def as_sql(self, compiler, connection):
+        aliases = tuple(compiler.quote_name_unless_alias(alias) for alias in self.aliases)
         return (self.sql % aliases, [])
 
 class BetterTranslationsField(object):
@@ -1026,6 +1026,7 @@ class TranslationManager(models.Manager):
     # API
     #===========================================================================
     use_for_related_fields = True
+    silence_use_for_related_fields_deprecation = True   # Django 1.10
 
     queryset_class = TranslationQueryset
     fallback_class = FallbackQueryset

hvad/models.py

@@ -231,9 +231,12 @@ class TranslatableModel(models.Model):
     """
     # change the default manager to the translation manager
     objects = TranslationManager()
+    _plain_manager = models.Manager()
 
     class Meta:
         abstract = True
+        if django.VERSION >= (1, 10):
+            base_manager_name = '_plain_manager'
 
     def __init__(self, *args, **kwargs):
         # Split arguments into shared/translatd
@@ -474,6 +477,7 @@ def prepare_translatable_model(sender, **kwargs):
     #    translation aware.
     base_mgr = getattr(model, '_base_manager', None)
     if base_mgr is None or isinstance(base_mgr, TranslationManager):
+        assert django.VERSION < (1, 10)
         model.add_to_class('_base_manager', Manager())
 
     # Replace get_field_by_name with one that warns for common mistakes

hvad/test_utils/cli.py

@@ -30,14 +30,22 @@ def configure(**extra):
         ADMIN_MEDIA_PREFIX = '/static/admin/',
         EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend',
         SECRET_KEY = 'key',
-        TEMPLATE_LOADERS = (
+        TEMPLATE_LOADERS = (    # Remove when dropping support for Django 1.7
             'django.template.loaders.filesystem.Loader',
             'django.template.loaders.app_directories.Loader',
-            'django.template.loaders.eggs.Loader',
         ),
-        TEMPLATE_DIRS = [
+        TEMPLATE_DIRS = [       # Remove when dropping support for Django 1.7
             os.path.abspath(os.path.join(os.path.dirname(__file__), 'project', 'templates'))
         ],
+        TEMPLATES = [
+            {
+                'BACKEND': 'django.template.backends.django.DjangoTemplates',
+                'DIRS': [
+                    os.path.abspath(os.path.join(os.path.dirname(__file__), 'project', 'templates'))
+                ],
+                'APP_DIRS': True,
+            },
+        ],
         MIDDLEWARE_CLASSES = [
             'django.contrib.sessions.middleware.SessionMiddleware',
             'django.contrib.auth.middleware.AuthenticationMiddleware',

hvad/tests/basic.py

@@ -639,12 +639,15 @@ def test_translated_foreignkey_set(self):
         self.assertEqual(getattr(related, cache).__dict__['translated_id'], 4242)
 
     def test_translated_attribute_delete(self):    
-        # Its not possible to delete the charfield, which should result in an AttributeError
+        # Accessing a deleted translated attribute reloads the translation
         obj = Normal.objects.language("en").create(shared_field="test", translated_field="en")
         obj.save()
         self.assertEqual(obj.translated_field, "en")
         delattr(obj, 'translated_field')
-        self.assertRaises(AttributeError, getattr, obj, 'translated_field')
+        if django.VERSION >= (1, 10):   # on version 1.10 and newer, this refreshes from db
+            self.assertEqual(obj.translated_field, "en")
+        else:
+            self.assertRaises(AttributeError, getattr, obj, 'translated_field')
 
     def test_languagecodeattribute(self):
         # Its not possible to set/delete a language code

hvad/tests/related.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 import django
 from django.core.exceptions import FieldError
-from django.db import connection, models, IntegrityError
+from django.db import connection, models, IntegrityError, transaction
 from django.db.models.query_utils import Q
+from django.test.testcases import TransactionTestCase
 from django.utils import translation
 from hvad.exceptions import WrongManager
 from hvad.models import (TranslatedFields, TranslatableModel)
@@ -32,22 +33,33 @@ def test_relation(self):
         self.assertEqual(related.normal.translated_field, normal.translated_field)
         self.assertTrue(related in normal.rel1.all())
 
-    def test_failed_relation(self):
-        related = Related.objects.create()
-        related.normal_id = 999
-        if connection.features.supports_forward_references:
-            related.save()
-            self.assertRaises(Normal.DoesNotExist, getattr, related, 'normal')
-        else:
-            self.assertRaises(IntegrityError, related.save)
-
     def test_reverse_relation(self):
         normal = Normal.objects.language('en').get(pk=self.normal_id[1])
         related = Related.objects.language('en').create(normal=normal)
 
         self.assertEqual(normal.rel1.language('en').get().pk, related.pk)
 
 
+class NormalToNormalFKTest2(TransactionTestCase, NormalFixture):
+    normal_count = 1
+
+    def test_failed_relation(self):
+        related = Related.objects.create()
+        related.normal_id = 999
+        if connection.features.supports_foreign_keys:
+            if connection.features.supports_forward_references:
+                try:
+                    transaction.set_autocommit(False)
+                    related.save()
+                    self.assertRaises(Normal.DoesNotExist, getattr, related, 'normal')
+                    self.assertRaises(IntegrityError, transaction.commit)
+                finally:
+                    transaction.rollback()
+                    transaction.set_autocommit(True)
+            else:
+                self.assertRaises(IntegrityError, related.save)
+
+
 class StandardToTransFKTest(HvadTestCase, StandardFixture, NormalFixture):
     normal_count = 2
     standard_count = 2

hvad/tests/views.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import django
 from django import forms
 from django.http import Http404
 from django.utils import translation
@@ -15,12 +16,12 @@
 
 class TestCreateView(TranslatableCreateView):
     model = Normal
-    success_url = '%(id)s'
+    success_url = '{id}' if django.VERSION >= (1, 8) else '%(id)s'
 
 class TestUpdateView(TranslatableUpdateView):
     model = Normal
     slug_field = 'shared_field'
-    success_url = '%(id)s'
+    success_url = '{id}' if django.VERSION >= (1, 8) else '%(id)s'
 
 class TestDeleteView(TranslatableDeleteView):
     model = Normal