Prepare version 1.3 for release: compile release notes, get rid of pending removals, switch deprecations to assertions.

Author: spectras

docs/internal/manager.rst

@@ -501,11 +501,6 @@ TranslationManager
         will filter by language, returning only objects that have a translation
         in the specified language. Translated fields will be available on the
         objects, in the specified language.
-
-    .. method:: using_translations(self)
-
-        Functionally equivalent to calling :meth:`language` with no argument. This
-        method is deprecated and will be removed in the future.
 
     .. method:: untranslated(self)
 

docs/internal/models.rst

@@ -57,20 +57,6 @@ BaseTranslationModel
     class is abstract.
 
 
-**********************
-TranslatableModelBase        
-**********************
-
-.. class:: TranslatableModelBase
-
-    .. deprecated:: 0.5
-
-    Metaclass of :class:`TranslatableModel`. It is no longer used and should be
-    removed from metaclass inheritance tree in projects.
-
-    .. method:: __new__(cls, name, bases, attrs)
-
-
 ******************
 TranslatableModel        
 ******************

docs/public/models.rst

@@ -20,8 +20,11 @@ regular Django, with the following additional features:
   :term:`translations <Translations Model>` of your model directly. Behind the
   scenes, it will be a reversed ForeignKey from the
   :term:`Translations Model` to your :term:`Shared Model`.
-- Custom settings can be set on the :term:`Translations Model` by passing them
-  as a ``meta`` dictionnary to :class:`~hvad.models.TranslatedFields`.
+- Translatable fields can be used in the model options. For options that take
+  groupings of fields (``unique_together`` and ``index_together``), each grouping
+  may have either translatable or non-translatable fields, but not both.
+- Special field ``language_code`` may be used for defining ``unique_together``
+  constraints that are only unique per language.
 
 A full example of a model with translations::
 
@@ -35,8 +38,9 @@ A full example of a model with translations::
             title = models.CharField(max_length=100),
             subtitle = models.CharField(max_length=255),
             released = models.DateTimeField(),
-            meta={'unique_together': [('title', 'subtitle')]},
         )
+        class Meta:
+            unique_together = [('title', 'subtitle')]
 
 .. note:: The :djterm:`Meta <meta-options>` class of the model may not use the
           translatable fields in :attr:`~django.db.models.Options.order_with_respect_to`.

docs/public/release_notes.rst

@@ -2,6 +2,51 @@
 Release Notes
 #############
 
+.. release 1.3.0
+
+*****************************
+1.3.0 - upcoming release
+*****************************
+
+This release is a collection of fixes and improvements, some of which may
+introduce minor compatibility issues. Please make sure you fix any deprecation
+warnings before upgrading to avoid those issues.
+
+Python and Django versions supported:
+
+- Django 1.5 is no longer officially supported.
+- Django 1.6 has reached its end of life, and support will be dropped in hvad 1.4.
+- As a reminder, Django 1.4 is still supported, so supported versions for this
+  release are: 1.4, 1.6, 1.7, 1.8.
+
+New Features:
+
+- Russian and Latvian translations are now included, thanks to Juris Malinens — :issue:`248`.
+
+Compatibility Warnings: deprecated features pending removal in 1.3 have been
+removed. Most notably:
+
+- Calling ``save()`` on an invalid form now raises an assertion exception.
+- Classes ``TranslatableModelBase``, ``TranslationFallbackManager``,
+  ``TranslatableBaseView`` and method ``TranslationManager.using_translations()``
+  no longer exist.
+- Deprecated view methods and context modifiers now raise an assertion exception.
+
+Fixes:
+
+- Lift Django restrictions on translated fields in ``Meta.unique_together`` and
+  ``Meta.index_together`` — :issue:`252`.
+- Properly forward model validation methods to translation validation methods, so
+  that model validation detects constraint violations on the translation as well.
+  Fixes duplicate detection in admin for unique constraints on translations — :issue:`251`.
+- Detect name clash between translated and non-translated fields — :issue:`240`.
+- Validate that at least one translation is provided when deserializing objects in
+  :class:`~hvad.contrib.restframework.TranslationsMixin` — :issue:`256`.
+- Fix handling of model edition from an admin popup in Django 1.7 and newer — :issue:`253`.
+- Generate proper ORM structures for fallbacks. Avoids table relabeling breaking
+  queries, for instance when using ``update()`` or feeding a queryset to another
+  queryset — :issue:`250`.
+
 .. release 1.2.2
 
 *****************************

hvad/forms.py

@@ -176,17 +176,9 @@ def save(self, commit=True):
             If no language is specified in self.cleaned_data, assume the instance
             is preloaded with correct language.
         '''
-        if not self.is_valid():
-            # raise in 1.3, remove in 1.5
-            warnings.warn('Calling save() on an invalid form is deprecated and '
-                          'will fail in the future. Check the result of .is_valid() '
-                          'before calling save().', DeprecationWarning, stacklevel=2)
-            raise ValueError((
-                _("The %s could not be created because the data didn't validate.")
-                if self.instance.pk is None else
-                _("The %s could not be changed because the data didn't validate.")
-                ) % self.instance._meta.object_name
-            )
+        assert self.is_valid(), ('Method save() must not be called on an invalid '
+                                 'form. Check the result of .is_valid() before '
+                                 'calling save().')
 
         # Get the right translation for object and language
         # It should have been done in _post_clean, but instance may have been

hvad/manager.py

@@ -976,17 +976,6 @@ def iterator(self):
 FallbackQueryset = LegacyFallbackQueryset if LEGACY_FALLBACKS else SelfJoinFallbackQueryset
 
 
-class TranslationFallbackManager(models.Manager): # pragma: no cover
-    """
-    Manager class for the shared model, without specific translations. Allows
-    using `use_fallbacks()` to enable per object language fallback.
-    """
-    def __init__(self, *args, **kwargs):
-        # remove in 1.3
-        raise RuntimeError('TranslationFallbackManager is no longer used. Please use '
-                           'TranslationManager\'s untranslated() method.')
-
-
 #===============================================================================
 # TranslationManager
 #===============================================================================
@@ -1011,10 +1000,6 @@ def __init__(self, *args, **kwargs):
         self.default_class = kwargs.pop('default_class', self.default_class)
         super(TranslationManager, self).__init__(*args, **kwargs)
 
-    def using_translations(self): #pragma: no cover
-        # remove in 1.3
-        raise RuntimeError('using_translations() has been removed, use language() instead')
-
     def _make_queryset(self, klass, core_filters):
         ''' Builds a queryset of given class.
             core_filters tells whether the queryset will bypass RelatedManager

hvad/models.py

@@ -27,19 +27,12 @@ def update_settings(*args, **kwargs):
     FALLBACK_LANGUAGES = tuple( code for code, name in settings.LANGUAGES )
     TABLE_NAME_SEPARATOR = getattr(settings, 'HVAD_TABLE_NAME_SEPARATOR', '_')
 
-    if hasattr(settings, 'NANI_TABLE_NAME_SEPARATOR'):
-        # remove in 1.3
-        raise ImproperlyConfigured(
-            'NANI_TABLE_NAME_SEPARATOR setting is obsolete and has been '
-            'removed. Please rename it to HVAD_TABLE_NAME_SEPARATOR.')
-
-
 #===============================================================================
 
 def _split_together(constraints, fields, meta, name):
     sconst, tconst = [], []
     if name in meta:
-        # raise in 1.3, remove in 1.5
+        # raise in 1.4, remove in 1.6
         warnings.warn('Passing \'%s\' to TranslatedFields is deprecated. Please use '
                       'Please Meta.%s instead.' % (name, name), DeprecationWarning)
         tconst.extend(meta[name])
@@ -205,16 +198,6 @@ class Meta:
         abstract = True
 
 
-class TranslatableModelBase(ModelBase):
-    def __new__(cls, *args, **kwargs):
-        # remove in 1.3
-        raise RuntimeError(
-            'TranslatableModelBase metaclass is no longer used and has been '
-            'removed. Hvad no longer uses a custom metaclass so conflict '
-            'resolution is no longer required, TranslatableModelBase can be '
-            'dropped.')
-
-
 class NoTranslation(object):
     pass
 

hvad/tests/basic.py

@@ -8,7 +8,7 @@
 from django.utils import translation
 from hvad.compat import with_metaclass
 from hvad.manager import TranslationQueryset, TranslationManager
-from hvad.models import TranslatableModel, TranslatableModelBase, TranslatedFields
+from hvad.models import TranslatableModel, TranslatedFields
 from hvad.test_utils.data import NORMAL
 from hvad.test_utils.fixtures import NormalFixture
 from hvad.test_utils.testcase import HvadTestCase, minimumDjangoVersion
@@ -174,15 +174,6 @@ class Meta:
         model = type('MyBaseModel', (TranslatableModel,), attrs)
         self.assertTrue(model._meta.abstract)
 
-    def test_metaclass_override(self):
-        class CustomMetaclass(TranslatableModelBase):
-            def __new__(*args, **kwargs):
-                return TranslatableModelBase.__new__(*args, **kwargs)
-
-        with self.assertRaises(RuntimeError):
-            class CustomMetaclassModel(with_metaclass(CustomMetaclass, TranslatableModel)):
-                translations = TranslatedFields()
-
     def test_internal_properties(self):
         self.assertCountEqual(Normal()._translated_field_names,
                               ['id', 'master', 'master_id', 'language_code', 'translated_field'])
@@ -586,12 +577,6 @@ class MyOtherTableNameTestModel(TranslatableModel):
                 )
             self.assertTrue(MyOtherTableNameTestModel._meta.translations_model._meta.db_table.endswith('_myothertablenametestmodelO_Otranslation'))
 
-    def test_table_name_override_rename(self):
-        override = self.settings(NANI_TABLE_NAME_SEPARATOR='O_O')
-        with self.assertRaises(ImproperlyConfigured):
-            override.enable()
-        override.disable()
-
     def test_table_name_from_meta(self):
         from hvad.models import TranslatedFields
         from django.db import models

hvad/tests/forms.py

@@ -154,8 +154,7 @@ def test_empty(self):
         form = NormalForm()
         self.assertCountEqual(form.fields, ['shared_field', 'translated_field'])
         self.assertFalse(form.is_valid())
-        with self.assertThrowsWarning(DeprecationWarning):
-            self.assertRaises(ValueError, form.save)
+        self.assertRaises(AssertionError, form.save)
 
         form = NormalMediaForm()
         self.assertCountEqual(form.fields, ['shared_field', 'translated_field'])

hvad/tests/views.py

@@ -339,69 +339,37 @@ def test__get_object_deprecation(self):
         with translation.override('en'):
             request = self.request_factory.get('/url/')
             request.user = self.user
-
-            with self.assertThrowsWarning(DeprecationWarning):
+            with self.assertRaises(AssertionError):
                 response = DeprecatedObjectUpdateView.as_view()(request, pk=self.normal_id[1])
 
-            self.assertEqual(response.status_code, 200)
-            data = response.context_data['form'].initial
-            self.assertEqual(data['id'], self.normal_id[1])
-            self.assertEqual(data['shared_field'], NORMAL[1].shared_field)
-            self.assertEqual(data['translated_field'], NORMAL[1].translated_field['en'])
-
     def test_filter_kwargs_deprecation(self):
         with translation.override('en'):
             request = self.request_factory.get('/url/')
             request.user = self.user
-
-            with self.assertThrowsWarning(DeprecationWarning):
+            with self.assertRaises(AssertionError):
                 response = DeprecatedFilterUpdateView.as_view()(request, custom=NORMAL[1].shared_field)
 
-            self.assertEqual(response.status_code, 200)
-            data = response.context_data['form'].initial
-            self.assertEqual(data['id'], self.normal_id[1])
-            self.assertEqual(data['shared_field'], NORMAL[1].shared_field)
-            self.assertEqual(data['translated_field'], NORMAL[1].translated_field['en'])
-
     def test_object_id_deprecation(self):
         with translation.override('en'):
             request = self.request_factory.get('/url/')
             request.user = self.user
-
-            with self.assertThrowsWarning(DeprecationWarning):
+            with self.assertRaises(AssertionError):
                 response = TestUpdateView.as_view()(request, object_id=self.normal_id[1])
 
-            self.assertEqual(response.status_code, 200)
-            data = response.context_data['form'].initial
-            self.assertEqual(data['id'], self.normal_id[1])
-            self.assertEqual(data['shared_field'], NORMAL[1].shared_field)
-            self.assertEqual(data['translated_field'], NORMAL[1].translated_field['en'])
-
     def test__language_deprecation(self):
         request = self.request_factory.get('/url/?lang=ja')
         request.user = self.user
-
-        with self.assertThrowsWarning(DeprecationWarning):
+        with self.assertRaises(AssertionError):
             response = DeprecatedLanguageUpdateView.as_view()(request, pk=self.normal_id[1])
 
-        self.assertEqual(response.status_code, 200)
-        data = response.context_data['form'].initial
-        self.assertEqual(data['id'], self.normal_id[1])
-        self.assertEqual(data['shared_field'], NORMAL[1].shared_field)
-        self.assertEqual(data['translated_field'], NORMAL[1].translated_field['ja'])
-
     def test_context_modifiers_deprecation(self):
         with translation.override('en'):
             request = self.request_factory.get('/url/')
             request.user = self.user
-
-            with self.assertThrowsWarning(DeprecationWarning):
+            with self.assertRaises(AssertionError):
                 response = DeprecatedContextUpdateView.as_view()(request, pk=self.normal_id[1])
 
-            self.assertEqual(response.status_code, 200)
-            self.assertEqual(response.context_data['modifier'], 'foo')
-
     def test_translatable_base_deprecation(self):
         from hvad.views import TranslatableBaseView
-        with self.assertThrowsWarning(DeprecationWarning):
+        with self.assertRaises(AssertionError):
             TranslatableBaseView()