Removed the translatable content get / set methods from CMSPlugin model

Author: czpython

CHANGELOG.txt

@@ -2,6 +2,7 @@
 
 * Removed the ``cms moderator`` command.
 * Dropped Django < 1.11 support.
+* Removed the translatable content get / set methods from ``CMSPlugin`` model.
 
 
 === 3.5.2 (2018-04-11) ===

cms/models/pluginmodel.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from datetime import date
 import json
-from operator import itemgetter
 import os
 import warnings
 
@@ -15,7 +14,6 @@
 from django.utils.six import text_type
 from django.utils.encoding import force_text, python_2_unicode_compatible
 from django.utils.safestring import mark_safe
-from django.utils.six.moves import filter
 from django.utils.translation import ugettext_lazy as _
 
 from cms.exceptions import DontUsePageAttributeWarning
@@ -113,7 +111,6 @@ class CMSPlugin(six.with_metaclass(PluginModelBase, MP_Node)):
     creation_date = models.DateTimeField(_("creation date"), editable=False, default=timezone.now)
     changed_date = models.DateTimeField(auto_now=True)
     child_plugin_instances = None
-    translatable_content_excluded_fields = []
 
     class Meta:
         app_label = 'cms'
@@ -469,25 +466,6 @@ def notify_on_autoadd_children(self, request, conf, children):
         """
         pass
 
-    def get_translatable_content(self):
-        """
-        Returns {field_name: field_contents} for translatable fields, where
-        field_contents > ''
-        """
-        fields = (f for f in self._meta.fields
-                  if isinstance(f, (models.CharField, models.TextField)) and
-                     f.editable and not f.choices and
-                     f.name not in self.translatable_content_excluded_fields)
-        return dict(filter(itemgetter(1),
-                           ((f.name, getattr(self, f.name)) for f in fields)))
-
-    def set_translatable_content(self, fields):
-        for field, value in fields.items():
-            setattr(self, field, value)
-        self.save()
-        return all(getattr(self, field) == value
-                   for field, value in fields.items())
-
     def delete(self, no_mp=False, *args, **kwargs):
         if no_mp:
             Model.delete(self, *args, **kwargs)

cms/tests/test_plugins.py

@@ -903,13 +903,6 @@ def get_page(plugin):
             self.assertEqual(1, len(w))
             self.assertIn('test_plugins.py', w[0].filename)
 
-    def test_set_translatable_content(self):
-        a = self.get_plugin_model('TextPlugin')(body="hello")
-        self.assertTrue(a.set_translatable_content({'body': 'world'}))
-        b = self.get_plugin_model('LinkPlugin')(name="hello")
-        self.assertTrue(b.set_translatable_content({'name': 'world'}))
-
-
     def test_editing_plugin_changes_page_modification_time_in_sitemap(self):
         now = timezone.now()
         one_day_ago = now - datetime.timedelta(days=1)
@@ -1112,33 +1105,6 @@ def test_plugin_require_parent_from_object(self):
             self.assertIn('ChildPlugin', child_classes)
             self.assertIn('ParentPlugin', child_classes)
 
-
-    def test_plugin_translatable_content_getter_setter(self):
-        """
-        Test that you can add a text plugin
-        """
-        # add a new text plugin
-        page_data = self.get_new_page_data()
-        self.client.post(URL_CMS_PAGE_ADD, page_data)
-        page = Page.objects.drafts().first()
-        created_plugin_id = self._create_text_plugin_on_page(page)
-
-        # now edit the plugin
-        plugin = self._edit_text_plugin(created_plugin_id, "Hello World")
-        self.assertEqual("Hello World", plugin.body)
-
-        # see if the getter works
-        self.assertEqual({'body': "Hello World"}, plugin.get_translatable_content())
-
-        # change the content
-        self.assertEqual(True, plugin.set_translatable_content({'body': "It works!"}))
-
-        # check if it changed
-        self.assertEqual("It works!", plugin.body)
-
-        # double check through the getter
-        self.assertEqual({'body': "It works!"}, plugin.get_translatable_content())
-
     def test_plugin_pool_register_returns_plugin_class(self):
         @plugin_pool.register_plugin
         class DecoratorTestPlugin(CMSPluginBase):