diff --git a/djangocms_blog/__init__.py b/djangocms_blog/__init__.py index 335edb1..7472c18 100644 --- a/djangocms_blog/__init__.py +++ b/djangocms_blog/__init__.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- __author__ = 'Iacopo Spalletti' __email__ = 'i.spalletti@nephila.it' diff --git a/djangocms_blog/cms_appconfig.py b/djangocms_blog/cms_appconfig.py index 34c39f4..5c4cdc8 100644 --- a/djangocms_blog/cms_appconfig.py +++ b/djangocms_blog/cms_appconfig.py @@ -1,15 +1,13 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals +from __future__ import absolute_import, print_function, unicode_literals +from aldryn_apphooks_config.models import AppHookConfig +from aldryn_apphooks_config.utils import setup_config +from app_data import AppDataForm from django import forms from django.db import models from django.utils.translation import ugettext_lazy as _ - -from aldryn_apphooks_config.utils import setup_config -from aldryn_apphooks_config.models import AppHookConfig -from app_data import AppDataForm -from parler.models import TranslatableModel -from parler.models import TranslatedFields +from parler.models import TranslatableModel, TranslatedFields from .settings import get_setting diff --git a/djangocms_blog/cms_plugins.py b/djangocms_blog/cms_plugins.py index 8445731..ea8b522 100644 --- a/djangocms_blog/cms_plugins.py +++ b/djangocms_blog/cms_plugins.py @@ -6,7 +6,7 @@ from cms.plugin_pool import plugin_pool from django.utils.translation import ugettext_lazy as _ from .forms import LatestEntriesForm -from .models import AuthorEntriesPlugin, BlogCategory, LatestPostsPlugin, Post, GenericBlogPlugin +from .models import AuthorEntriesPlugin, BlogCategory, GenericBlogPlugin, LatestPostsPlugin, Post from .settings import get_setting diff --git a/djangocms_blog/feeds.py b/djangocms_blog/feeds.py index 481e0eb..7583018 100644 --- a/djangocms_blog/feeds.py +++ b/djangocms_blog/feeds.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import, print_function, unicode_literals -from aldryn_apphooks_config.utils import get_app_instance +from aldryn_apphooks_config.utils import get_app_instance from django.contrib.sites.models import Site from django.contrib.syndication.views import Feed from django.core.urlresolvers import reverse diff --git a/djangocms_blog/forms.py b/djangocms_blog/forms.py index 01de6a2..f2d4543 100644 --- a/djangocms_blog/forms.py +++ b/djangocms_blog/forms.py @@ -6,7 +6,7 @@ from django.conf import settings from parler.forms import TranslatableModelForm from taggit_autosuggest.widgets import TagAutoSuggest -from .models import Post, BlogCategory +from .models import BlogCategory, Post class LatestEntriesForm(forms.ModelForm): diff --git a/djangocms_blog/managers.py b/djangocms_blog/managers.py index 9fce9dd..f70a59d 100644 --- a/djangocms_blog/managers.py +++ b/djangocms_blog/managers.py @@ -2,9 +2,8 @@ from __future__ import absolute_import, print_function, unicode_literals import django - from aldryn_apphooks_config.managers.parler import ( - AppHookConfigTranslatableManager, AppHookConfigTranslatableQueryset + AppHookConfigTranslatableManager, AppHookConfigTranslatableQueryset, ) from django.contrib.sites.models import Site from django.db import models diff --git a/djangocms_blog/menu.py b/djangocms_blog/menu.py index 10031b2..319aa7a 100644 --- a/djangocms_blog/menu.py +++ b/djangocms_blog/menu.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, print_function, unicode_literals from cms.menu_bases import CMSAttachMenu from django.db.models.signals import post_delete, post_save -from django.utils.translation import ugettext_lazy as _, get_language_from_request +from django.utils.translation import get_language_from_request, ugettext_lazy as _ from menus.base import NavigationNode from menus.menu_pool import menu_pool diff --git a/djangocms_blog/models.py b/djangocms_blog/models.py index 8a90879..af0ee36 100644 --- a/djangocms_blog/models.py +++ b/djangocms_blog/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import, print_function, unicode_literals -from aldryn_apphooks_config.managers.parler import AppHookConfigTranslatableManager from aldryn_apphooks_config.fields import AppHookConfigField +from aldryn_apphooks_config.managers.parler import AppHookConfigTranslatableManager from cms.models import CMSPlugin, PlaceholderField from django.conf import settings as dj_settings from django.core.urlresolvers import reverse diff --git a/tests/test_menu.py b/tests/test_menu.py index 26119d5..8830468 100644 --- a/tests/test_menu.py +++ b/tests/test_menu.py @@ -2,10 +2,9 @@ from __future__ import absolute_import, print_function, unicode_literals from aldryn_apphooks_config.utils import get_app_instance - from django.utils.translation import activate from menus.menu_pool import menu_pool -from parler.utils.context import switch_language, smart_override +from parler.utils.context import smart_override, switch_language from djangocms_blog.views import CategoryEntriesView, PostDetailView