Cleanup compatibility shims

nephila · Jan 9, 2018 · 497ec74 · 497ec74
1 parent bdfbfc4
commit 497ec74
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/djangocms_blog/admin.py b/djangocms_blog/admin.py
@@ -24,12 +24,6 @@
 from .models import BlogCategory, Post
 from .settings import get_setting
 
-try:
-    from admin_enhancer.admin import EnhancedModelAdminMixin
-except ImportError:
-    class EnhancedModelAdminMixin(object):
-        pass
-
 
 class SiteListFilter(admin.SimpleListFilter):
     title = _('site')
@@ -55,7 +49,7 @@ def queryset(self, request, queryset):
             raise admin.options.IncorrectLookupParameters(e)
 
 
-class BlogCategoryAdmin(EnhancedModelAdminMixin, ModelAppHookConfig, TranslatableAdmin):
+class BlogCategoryAdmin(ModelAppHookConfig, TranslatableAdmin):
     form = CategoryAdminForm
     list_display = [
         'name', 'parent', 'app_config', 'all_languages_column',

diff --git a/djangocms_blog/feeds.py b/djangocms_blog/feeds.py
@@ -24,10 +24,10 @@
     import HTMLParser
 
     h = HTMLParser.HTMLParser()
-except ImportError:
-    from html.parser import HTMLParser
+    unescape = h.unescape
 
-    h = HTMLParser()
+except ImportError:
+    from html import unescape
 
 
 class LatestEntriesFeed(Feed):
@@ -123,13 +123,13 @@ def add_item_elements(self, handler, item):
 
         handler.startElement('description', {})
         handler._write('<![CDATA[{0}]]>'.format(
-            h.unescape(normalize_newlines(force_text(item['abstract'])).replace('\n', ' ')))
+            unescape(normalize_newlines(force_text(item['abstract'])).replace('\n', ' ')))
         )
         handler.endElement('description')
         handler.startElement('content:encoded', {})
         handler._write('<![CDATA[')
         handler._write('<!doctype html>')
-        handler._write(h.unescape(force_text(item['content'])))
+        handler._write(unescape(force_text(item['content'])))
         handler._write(']]>')
         handler.endElement('content:encoded')
 

diff --git a/djangocms_blog/search_indexes.py b/djangocms_blog/search_indexes.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, print_function, unicode_literals
+
 from aldryn_search.helpers import get_plugin_index_data
 from aldryn_search.utils import get_index_base, strip_tags
 from django.utils.encoding import force_text

diff --git a/setup.py b/setup.py
@@ -60,6 +60,7 @@
         'Framework :: Django',
         'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',