Merge pull request django-cms#3570 from yakky/feature/remove_deprecations

Remove deprecated methods / function

Author: yakky

cms/admin/placeholderadmin.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
+import json
+
 from cms.models.placeholderpluginmodel import PlaceholderReference
 from cms.utils.urlutils import admin_reverse
 from django.contrib.admin.helpers import AdminForm
 from django.utils.decorators import method_decorator
-import json
 
 from django.views.decorators.clickjacking import xframe_options_sameorigin
 from cms.constants import PLUGIN_COPY_ACTION, PLUGIN_MOVE_ACTION
@@ -14,15 +15,13 @@
 from cms.utils import get_cms_setting
 from cms.utils.compat.dj import force_unicode
 from cms.utils.plugins import requires_reload, has_reached_plugin_limit
-from django.contrib.admin import ModelAdmin
 from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseForbidden
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.template.defaultfilters import force_escape, escapejs
 from django.utils.translation import ugettext as _
 from django.conf import settings
 from django.views.decorators.http import require_POST
-import warnings
 from django.template.response import TemplateResponse
 
 from django.contrib.admin.util import get_deleted_objects
@@ -559,16 +558,3 @@ def clear_placeholder(self, request, placeholder_id):
         return TemplateResponse(request, "admin/cms/page/plugin/delete_confirmation.html", context,
                                 current_app=self.admin_site.name)
 
-
-class PlaceholderAdmin(PlaceholderAdminMixin, ModelAdmin):
-    def __init__(self, *args, **kwargs):
-        warnings.warn("Class PlaceholderAdmin is deprecated and will be removed in 3.1. "
-            "Instead, combine PlaceholderAdminMixin with admin.ModelAdmin.", DeprecationWarning)
-        super(PlaceholderAdmin, self).__init__(*args, **kwargs)
-
-
-class FrontendEditableAdmin(FrontendEditableAdminMixin):
-    def __init__(self, *args, **kwargs):
-        warnings.warn("Class FrontendEditableAdmin is deprecated and will be removed in 3.1. "
-            "Instead, use FrontendEditableAdminMixin.", DeprecationWarning)
-        super(FrontendEditableAdmin, self).__init__(*args, **kwargs)

cms/context_processors.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from cms.utils.conf import get_cms_setting
 from cms.utils import get_template_from_request
-import warnings
+
 
 def cms_settings(request):
     """
@@ -12,10 +12,3 @@ def cms_settings(request):
         'CMS_MEDIA_URL': get_cms_setting('MEDIA_URL'),
         'CMS_TEMPLATE': lambda: get_template_from_request(request),
     }
-
-
-def media(request):
-    warnings.warn('cms.context_processors.media has been deprecated in favor of '
-                  'cms.context_processors.cms_settings. Please update your '
-                  'configuration', DeprecationWarning)
-    return cms_settings(request)

cms/plugin_pool.py

@@ -1,13 +1,8 @@
 # -*- coding: utf-8 -*-
-import warnings
-
 from django.core.exceptions import ImproperlyConfigured
 from django.conf.urls import url, patterns, include
 from django.contrib.formtools.wizard.views import normalize_name
-from django.db import connection
 from django.db.models import signals
-from django.db.models.fields.related import ManyToManyField
-from django.db.models.fields.related import ReverseManyRelatedObjectsDescriptor
 from django.template.defaultfilters import slugify
 from django.utils import six
 from django.utils.translation import get_language, deactivate_all, activate
@@ -16,7 +11,7 @@
 from cms.exceptions import PluginAlreadyRegistered, PluginNotRegistered
 from cms.plugin_base import CMSPluginBase
 from cms.models import CMSPlugin
-from cms.utils.django_load import load, get_subclasses
+from cms.utils.django_load import load
 from cms.utils.helpers import reversion_register
 from cms.utils.placeholder import get_placeholder_conf
 from cms.utils.compat.dj import force_unicode, is_installed
@@ -151,66 +146,6 @@ def set_plugin_meta(self):
         """
         if self.patched:
             return
-        table_names = connection.introspection.table_names()
-        subs = get_subclasses(CMSPlugin)
-        for model in subs:
-            if not model._meta.abstract:
-
-                splitter = '%s_' % model._meta.app_label
-                table_name = model._meta.db_table
-
-                #
-                # Checks to see if this plugin's model's table's name is
-                # properly named with the app_label as the prefix (not
-                # 'cmsplugin')
-                #
-                if (table_name not in table_names and splitter in table_name):
-                    proper_table_name = table_name
-                    splitted = table_name.split(splitter, 1)
-                    bad_table_name = 'cmsplugin_%s' % splitted[1]
-                    if bad_table_name in table_names:
-                        model._meta.db_table = bad_table_name
-                        warnings.warn(
-                            'please rename the table "%s" to "%s" in %s\nThe compatibility code will be removed in 3.1' % (
-                                bad_table_name, proper_table_name, model._meta.app_label), DeprecationWarning)
-
-                for att_name in model.__dict__.keys():
-                    att = model.__dict__[att_name]
-
-                    #
-                    # Checks to see if this plugin's model contains an M2M
-                    # field, whose 'through' table is properly named with the
-                    # app_label as the prefix (and not 'cmsplugin')
-                    #
-                    if isinstance(att, ManyToManyField):
-                        table_name = att.rel.through._meta.db_table
-                        if (table_name not in table_names and splitter in table_name):
-                            proper_table_name = table_name
-                            splitted = proper_table_name.split(splitter, 1)
-                            bad_table_name = 'cmsplugin_%s' % splitted[1]
-                            if bad_table_name in table_names:
-                                att.rel.through._meta.db_table = bad_table_name
-                                warnings.warn(
-                                    'please rename the table "%s" to "%s" in %s\nThe compatibility code will be removed in 3.1' % (
-                                        bad_table_name, proper_table_name, model._meta.app_label), DeprecationWarning)
-
-                    #
-                    # Checks to see if this plugin's model contains an M2M
-                    # field, whose 'through' table is properly named with the
-                    # app_label as the prefix (and not 'cmsplugin')
-                    #
-                    elif isinstance(att, ReverseManyRelatedObjectsDescriptor):
-                        table_name = att.through._meta.db_table
-                        if (table_name not in table_names and splitter in table_name):
-                            proper_table_name = table_name
-                            splitted = proper_table_name.split(splitter, 1)
-                            bad_table_name = 'cmsplugin_%s' % splitted[1]
-                            if bad_table_name in table_names:
-                                att.through._meta.db_table = bad_table_name
-                                warnings.warn(
-                                    'please rename the table "%s" to "%s" in %s\nThe compatibility code will be removed in 3.1' % (
-                                        bad_table_name, proper_table_name, model._meta.app_label), DeprecationWarning)
-
         self.patched = True
 
     def get_all_plugins(self, placeholder=None, page=None, setting_key="plugins", include_page_only=True):

cms/templatetags/placeholder_tags.py

@@ -3,7 +3,7 @@
 import os
 import unittest
 
-from djangocms_text_ckeditor.cms_plugins import TextPlugin
+from django.core.exceptions import ImproperlyConfigured
 from django.template import TemplateSyntaxError, base
 from django.test import TestCase
 
@@ -15,6 +15,7 @@
 from cms.test_utils.util.context_managers import SettingsOverride
 from cms.utils.check import FileOutputWrapper, check, FileSectionWrapper
 from cms.utils.compat import DJANGO_1_6
+from djangocms_text_ckeditor.cms_plugins import TextPlugin
 
 
 class TestOutput(FileOutputWrapper):
@@ -90,7 +91,7 @@ def test_no_sekizai_template_context_processor(self):
 
     def test_old_style_i18n_settings(self):
         with SettingsOverride(CMS_LANGUAGES=[('en', 'English')]):
-            self.assertCheck(True, warnings=1, errors=0)
+            self.assertRaises(ImproperlyConfigured, self.assertCheck, True, warnings=1, errors=0)
 
     def test_cms_hide_untranslated_deprecated(self):
         with SettingsOverride(CMS_HIDE_UNTRANSLATED=True):

cms/tests/check.py

@@ -3,8 +3,7 @@
 from cms.test_utils.testcases import CMSTestCase
 from cms.test_utils.util.mock import AttributeObject
 from menus.templatetags.menu_tags import PageLanguageUrl
-from menus.utils import (simple_language_changer, find_selected,
-                         language_changer_decorator)
+from menus.utils import find_selected, language_changer_decorator
 
 
 class DumbPageLanguageUrl(PageLanguageUrl):
@@ -27,23 +26,6 @@ def test_reverse_in_changer(self):
         response = self.client.get('/en/sample/login3/')
         self.assertContains(response, '<h1>/fr/sample/login3/</h1>')
 
-    def test_simple_language_changer(self):
-        func = self.get_simple_view()
-        decorated_view = simple_language_changer(func)
-        # check we maintain the view name
-        self.assertEqual(func.__name__, decorated_view.__name__)
-        request = self.get_request('/', 'en')
-        response = decorated_view(request)
-        self.assertEqual(response.content, b'')
-        fake_context = {'request': request}
-        tag = DumbPageLanguageUrl()
-        output = tag.get_context(fake_context, 'en')
-        url = output['content']
-        self.assertEqual(url, '/en/')
-        output = tag.get_context(fake_context, 'ja')
-        url = output['content']
-        self.assertEqual(url, '/ja/')
-
     def test_default_language_changer(self):
         view = self.get_simple_view()
         # check we maintain the view name

cms/tests/menu_utils.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import with_statement
 import itertools
-import warnings
 
 from django.conf import settings
 from django.contrib import admin
@@ -23,7 +22,6 @@
 from sekizai.context import SekizaiContext
 
 from cms import constants
-from cms.admin.placeholderadmin import PlaceholderAdmin, PlaceholderAdminMixin
 from cms.api import add_plugin, create_page, create_title
 from cms.exceptions import DuplicatePlaceholderWarning
 from cms.models.fields import PlaceholderField
@@ -654,17 +652,6 @@ def test_placeholder_languages_page(self):
         langs = [lang['code'] for lang in placeholder.get_filled_languages()]
         self.assertEqual(avail_langs, set(langs))
 
-    def test_deprecated_PlaceholderAdmin(self):
-        admin_site = admin.sites.AdminSite()
-        with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always")
-            pa = PlaceholderAdmin(Placeholder, admin_site)
-            self.assertEqual(len(w), 1)
-            self.assertTrue(issubclass(w[-1].category, DeprecationWarning))
-            self.assertTrue("PlaceholderAdminMixin with admin.ModelAdmin" in str(w[-1].message))
-            self.assertIsInstance(pa, admin.ModelAdmin, 'PlaceholderAdmin not admin.ModelAdmin')
-            self.assertIsInstance(pa, PlaceholderAdminMixin, 'PlaceholderAdmin not PlaceholderAdminMixin')
-
     @override_settings(TEMPLATE_LOADERS=(
         ('django.template.loaders.cached.Loader', (
             'django.template.loaders.filesystem.Loader',

cms/tests/placeholder.py

@@ -1,23 +1,20 @@
 # -*- coding: utf-8 -*-
 from functools import update_wrapper
 import os
-import pprint
-import warnings
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 
 from cms import constants
-from cms.exceptions import CMSDeprecationWarning
 from cms.utils.compat.urls import urljoin
 
 
 __all__ = ['get_cms_setting']
 
 
-class VERIFIED: pass # need a unique identifier for CMS_LANGUAGES
+class VERIFIED: pass  # need a unique identifier for CMS_LANGUAGES
 
 
 def default(name):
@@ -140,11 +137,16 @@ def get_templates():
     return templates
 
 
-def _ensure_languages_settings_new(languages):
+def _ensure_languages_settings(languages):
     valid_language_keys = ['code', 'name', 'fallbacks', 'hide_untranslated', 'redirect_on_fallback', 'public']
     required_language_keys = ['code', 'name']
     simple_defaults = ['public', 'redirect_on_fallback', 'hide_untranslated']
 
+    if not isinstance(languages, dict):
+        raise ImproperlyConfigured(
+            "CMS_LANGUAGES must be a dictionary with site IDs and 'default'"
+            " as keys. Please check the format.")
+
     defaults = languages.pop('default', {})
     default_fallbacks = defaults.get('fallbacks')
     needs_fallbacks = []
@@ -192,61 +194,11 @@ def _ensure_languages_settings_new(languages):
             lang_code != language_object['code']]
 
     languages['default'] = defaults
+    languages[VERIFIED] = True  # this will be busted by SettingsOverride and cause a re-check
 
     return languages
 
 
-def _get_old_language_conf(code, name, template): # pragma: no cover
-    language = template.copy()
-    language['code'] = code
-    language['name'] = name
-    default_fallbacks = dict(settings.CMS_LANGUAGES).keys()
-    if hasattr(settings, 'CMS_LANGUAGE_FALLBACK'):
-        if settings.CMS_LANGUAGE_FALLBACK:
-            if hasattr(settings, 'CMS_LANGUAGE_CONF'):
-                language['fallbacks'] = settings.CMS_LANGUAGE_CONF.get(code, default_fallbacks)
-            else:
-                language['fallbacks'] = default_fallbacks
-        else:
-            language['fallbacks'] = []
-    else:
-        if hasattr(settings, 'CMS_LANGUAGE_CONF'):
-            language['fallbacks'] = settings.CMS_LANGUAGE_CONF.get(code, default_fallbacks)
-        else:
-            language['fallbacks'] = default_fallbacks
-    if hasattr(settings, 'CMS_FRONTEND_LANGUAGES'):
-        language['public'] = code in settings.CMS_FRONTEND_LANGUAGES
-    return language
-
-
-def _translate_legacy_languages_settings(languages):
-    new_languages = {}
-    lang_template = {'fallbacks': [], 'public': True, 'redirect_on_fallback': True,
-        'hide_untranslated': getattr(settings, 'CMS_HIDE_UNTRANSLATED', False)}
-    codes = dict(languages)
-    for site, site_languages in getattr(settings, 'CMS_SITE_LANGUAGES', {1: languages}).items():
-        new_languages[site] = []
-        for site_language in site_languages:
-            if site_language in codes:
-                new_languages[site].append(_get_old_language_conf(site_language, codes[site_language], lang_template))
-
-    pp = pprint.PrettyPrinter(indent=4)
-    warnings.warn("CMS_LANGUAGES has changed in django-cms 2.4\n"
-                  "You may replace CMS_LANGUAGES with the following:\n%s" % pp.pformat(new_languages),
-                  CMSDeprecationWarning)
-    new_languages['default'] = lang_template.copy()
-    return new_languages
-
-
-def _ensure_languages_settings(languages):
-    if isinstance(languages, dict):
-        verified_languages = _ensure_languages_settings_new(languages)
-    else:
-        verified_languages = _translate_legacy_languages_settings(languages)
-    verified_languages[VERIFIED] = True # this will be busted by SettingsOverride and cause a re-check
-    return verified_languages
-
-
 def get_languages():
     if not isinstance(settings.SITE_ID, six.integer_types):
         raise ImproperlyConfigured(
@@ -255,10 +207,10 @@ def get_languages():
     if not settings.USE_I18N:
         return _ensure_languages_settings(
             {settings.SITE_ID: [{'code': settings.LANGUAGE_CODE, 'name': settings.LANGUAGE_CODE}]})
-    if not settings.LANGUAGE_CODE in dict(settings.LANGUAGES):
+    if settings.LANGUAGE_CODE not in dict(settings.LANGUAGES):
         raise ImproperlyConfigured(
-                        'LANGUAGE_CODE "%s" must have a matching entry in LANGUAGES' % settings.LANGUAGE_CODE
-                    )
+            'LANGUAGE_CODE "%s" must have a matching entry in LANGUAGES' % settings.LANGUAGE_CODE
+        )
     languages = getattr(settings, 'CMS_LANGUAGES', {
         settings.SITE_ID: [{'code': code, 'name': _(name)} for code, name in settings.LANGUAGES]
     })