From c0d87ae5b9ea140b5774053175718e935e23804a Mon Sep 17 00:00:00 2001 From: Erik Stein Date: Mon, 12 Feb 2018 15:00:41 +0100 Subject: [PATCH] Basic cleanup. --- content_plugins/__init__.py | 46 ------------------------------------ content_plugins/admin.py | 1 - content_plugins/fields.py | 2 -- content_plugins/mixins.py | 2 -- content_plugins/models.py | 1 + content_plugins/renderer.py | 5 +--- content_plugins/shortcuts.py | 1 - 7 files changed, 2 insertions(+), 56 deletions(-) diff --git a/content_plugins/__init__.py b/content_plugins/__init__.py index 84b64cf..e69de29 100644 --- a/content_plugins/__init__.py +++ b/content_plugins/__init__.py @@ -1,46 +0,0 @@ -""" -Abstract models for common content editor plugins. - - -admin.py --------- - -ContentInlineBase - RichTextInlineBase - -RichTextarea - - - -fields.py ---------- - -TranslatableCleansedRichTextField - - - -plugins.py ----------- - -BasePlugin - StringRendererPlugin - RichTextBase - SectionBase - ImageBase - DownloadBase - FootnoteBase - -StyleMixin -RichTextFootnoteMixin - - -renderer.py ------------ - -PluginRenderer - -@register_with_renderer - - - -""" diff --git a/content_plugins/admin.py b/content_plugins/admin.py index bbfcbf5..4a1f1dc 100644 --- a/content_plugins/admin.py +++ b/content_plugins/admin.py @@ -1,4 +1,3 @@ -# Erik Stein , 2017 """ Abstract base classes and mixins. """ diff --git a/content_plugins/fields.py b/content_plugins/fields.py index a988a32..40cad40 100644 --- a/content_plugins/fields.py +++ b/content_plugins/fields.py @@ -1,5 +1,3 @@ -# Erik Stein , 2017 - from feincms3.cleanse import CleansedRichTextField from shared.multilingual.utils.fields import TranslatableFieldMixin diff --git a/content_plugins/mixins.py b/content_plugins/mixins.py index 8afe968..e57e1dd 100644 --- a/content_plugins/mixins.py +++ b/content_plugins/mixins.py @@ -1,5 +1,3 @@ -# Erik Stein , 2017 - from functools import reduce, partial from django.conf import settings from django.db import models diff --git a/content_plugins/models.py b/content_plugins/models.py index e69de29..cfa2d96 100644 --- a/content_plugins/models.py +++ b/content_plugins/models.py @@ -0,0 +1 @@ +# Intentionally left blank \ No newline at end of file diff --git a/content_plugins/renderer.py b/content_plugins/renderer.py index 2d2ec18..6e2be84 100644 --- a/content_plugins/renderer.py +++ b/content_plugins/renderer.py @@ -1,12 +1,9 @@ -# Erik Stein , 2017 - -from django.db.models import Model from django.utils.translation import get_language from feincms3.renderer import Regions, TemplatePluginRenderer -class MultilingualRegions(Regions): +class MultilingualRegions(Regions): def cache_key(self, region): return '%s-%s' % (get_language(), super().cache_key(region)) diff --git a/content_plugins/shortcuts.py b/content_plugins/shortcuts.py index f7a4ef1..03b5851 100644 --- a/content_plugins/shortcuts.py +++ b/content_plugins/shortcuts.py @@ -5,7 +5,6 @@ from django.utils.html import strip_tags from content_editor.contents import contents_for_item from shared.utils.text import html_entities_to_unicode -from shared.utils.translation import get_language_order def render_page_as_text(page, renderer, template, language):