From c6ae227adf78d879d3ed41dc88f302e94acfb908 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Sun, 13 Sep 2015 00:33:13 +0200 Subject: [PATCH] Fix code style --- cms_helper.py | 1 - djangocms_blog/cms_toolbar.py | 4 ++-- djangocms_blog/managers.py | 21 ++++++++++++++------- djangocms_blog/menu.py | 3 +-- djangocms_blog/models.py | 12 +++++++----- djangocms_blog/urls.py | 33 ++++++++++++++++++++++----------- djangocms_blog/views.py | 4 +++- setup.cfg | 11 ++++++++--- tests/test_menu.py | 3 ++- tests/test_models.py | 5 +++-- tests/test_plugins.py | 6 ++---- tests/test_toolbar.py | 1 + tests/test_views.py | 13 ++++++++----- tox.ini | 2 +- 14 files changed, 74 insertions(+), 45 deletions(-) diff --git a/cms_helper.py b/cms_helper.py index 30751a0..e8c7bf8 100755 --- a/cms_helper.py +++ b/cms_helper.py @@ -1,6 +1,5 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -import sys from tempfile import mkdtemp gettext = lambda s: s diff --git a/djangocms_blog/cms_toolbar.py b/djangocms_blog/cms_toolbar.py index ac79239..4ab5fce 100644 --- a/djangocms_blog/cms_toolbar.py +++ b/djangocms_blog/cms_toolbar.py @@ -21,14 +21,14 @@ class BlogToolbar(CMSToolbar): admin_menu.add_modal_item(_('Add post'), url=url) current_post = getattr(self.request, BLOG_CURRENT_POST_IDENTIFIER, None) - if current_post and self.request.user.has_perm('djangocms_blog.change_post'): # pragma: no cover + if current_post and self.request.user.has_perm('djangocms_blog.change_post'): # pragma: no cover # NOQA admin_menu.add_modal_item(_('Edit Post'), reverse( 'admin:djangocms_blog_post_change', args=(current_post.pk,)), active=True) def post_template_populate(self): current_post = getattr(self.request, BLOG_CURRENT_POST_IDENTIFIER, None) - if current_post and self.request.user.has_perm('djangocms_blog.change_post'): # pragma: no cover + if current_post and self.request.user.has_perm('djangocms_blog.change_post'): # pragma: no cover # NOQA # removing page meta menu, if present, to avoid confusion try: # pragma: no cover import djangocms_page_meta # NOQA diff --git a/djangocms_blog/managers.py b/djangocms_blog/managers.py index 0d8ae02..75d670a 100644 --- a/djangocms_blog/managers.py +++ b/djangocms_blog/managers.py @@ -1,8 +1,5 @@ # -*- coding: utf-8 -*- -try: - from collections import Counter -except ImportError: - from .compat import Counter +from __future__ import absolute_import, print_function, unicode_literals import django from django.contrib.sites.models import Site @@ -10,6 +7,11 @@ from django.db import models from django.utils.timezone import now from parler.managers import TranslatableQuerySet, TranslationManager +try: + from collections import Counter +except ImportError: + from .compat import Counter + class TaggedFilterItem(object): @@ -34,8 +36,12 @@ class TaggedFilterItem(object): filtro.update(item.tags.all()) filtro = set([tag.id for tag in filtro]) elif other_model is not None: - filtro = set(TaggedItem.objects.filter(content_type__model=other_model.__name__.lower()).values_list('tag_id', flat=True)) - tags = set(TaggedItem.objects.filter(content_type__model=self.model.__name__.lower()).values_list('tag_id', flat=True)) + filtro = set(TaggedItem.objects.filter( + content_type__model=other_model.__name__.lower() + ).values_list('tag_id', flat=True)) + tags = set(TaggedItem.objects.filter( + content_type__model=self.model.__name__.lower() + ).values_list('tag_id', flat=True)) if filtro is not None: tags = tags.intersection(filtro) return list(tags) @@ -144,7 +150,8 @@ class GenericDateTaggedManager(TaggedFilterItem, TranslationManager): def get_months(self, queryset=None): """ - Get months with aggregate count (how much posts is in the month). Results are ordered by date. + Get months with aggregate count (how much posts is in the month). + Results are ordered by date. """ if queryset is None: queryset = self.get_queryset() diff --git a/djangocms_blog/menu.py b/djangocms_blog/menu.py index aa14975..3de4175 100644 --- a/djangocms_blog/menu.py +++ b/djangocms_blog/menu.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- from cms.menu_bases import CMSAttachMenu from django.db.models.signals import post_delete, post_save -from django.utils.translation import ugettext_lazy as _ -from django.utils.translation import get_language +from django.utils.translation import get_language, ugettext_lazy as _ from menus.base import Modifier, NavigationNode from menus.menu_pool import menu_pool diff --git a/djangocms_blog/models.py b/djangocms_blog/models.py index 2b28aff..e7bd057 100644 --- a/djangocms_blog/models.py +++ b/djangocms_blog/models.py @@ -7,8 +7,7 @@ from django.utils import timezone from django.utils.encoding import force_text, python_2_unicode_compatible from django.utils.html import escape, strip_tags from django.utils.text import slugify -from django.utils.translation import ugettext_lazy as _ -from django.utils.translation import get_language +from django.utils.translation import get_language, ugettext_lazy as _ from djangocms_text_ckeditor.fields import HTMLField from filer.fields.image import FilerImageField from meta_mixin.models import ModelMeta @@ -241,12 +240,15 @@ class BasePostPlugin(CMSPlugin): class LatestPostsPlugin(BasePostPlugin): latest_posts = models.IntegerField(_(u'articles'), default=get_setting('LATEST_POSTS'), - help_text=_(u'The number of latests articles to be displayed.')) + help_text=_(u'The number of latests ' + u'articles to be displayed.')) tags = TaggableManager(_(u'filter by tag'), blank=True, help_text=_(u'Show only the blog articles tagged with chosen tags.'), related_name='djangocms_blog_latest_post') - categories = models.ManyToManyField('djangocms_blog.BlogCategory', blank=True, verbose_name=_(u'filter by category'), - help_text=_(u'Show only the blog articles tagged with chosen categories.')) + categories = models.ManyToManyField('djangocms_blog.BlogCategory', blank=True, + verbose_name=_(u'filter by category'), + help_text=_(u'Show only the blog articles tagged ' + u'with chosen categories.')) def __str__(self): return _(u'%s latest articles by tag') % self.latest_posts diff --git a/djangocms_blog/urls.py b/djangocms_blog/urls.py index 02ceb0b..9eb383a 100644 --- a/djangocms_blog/urls.py +++ b/djangocms_blog/urls.py @@ -2,18 +2,29 @@ from django.conf.urls import patterns, url from .feeds import LatestEntriesFeed, TagFeed -from .views import (AuthorEntriesView, CategoryEntriesView, PostArchiveView, PostDetailView, - PostListView, TaggedListView) +from .views import ( + AuthorEntriesView, CategoryEntriesView, PostArchiveView, PostDetailView, PostListView, + TaggedListView, +) urlpatterns = patterns( '', - url(r'^$', PostListView.as_view(), name='posts-latest'), - url(r'^feed/$', LatestEntriesFeed(), name='posts-latest-feed'), - url(r'^(?P\d{4})/$', PostArchiveView.as_view(), name='posts-archive'), - url(r'^(?P\d{4})/(?P\d{1,2})/$', PostArchiveView.as_view(), name='posts-archive'), - url(r'^(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/(?P\w[-\w]*)/$', PostDetailView.as_view(), name='post-detail'), - url(r'^author/(?P[\w\.@+-]+)/$', AuthorEntriesView.as_view(), name='posts-author'), - url(r'^category/(?P[\w\.@+-]+)/$', CategoryEntriesView.as_view(), name='posts-category'), - url(r'^tag/(?P[-\w]+)/$', TaggedListView.as_view(), name='posts-tagged'), - url(r'^tag/(?P[-\w]+)/feed/$', TagFeed(), name='posts-tagged-feed'), + url(r'^$', + PostListView.as_view(), name='posts-latest'), + url(r'^feed/$', + LatestEntriesFeed(), name='posts-latest-feed'), + url(r'^(?P\d{4})/$', + PostArchiveView.as_view(), name='posts-archive'), + url(r'^(?P\d{4})/(?P\d{1,2})/$', + PostArchiveView.as_view(), name='posts-archive'), + url(r'^(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/(?P\w[-\w]*)/$', + PostDetailView.as_view(), name='post-detail'), + url(r'^author/(?P[\w\.@+-]+)/$', + AuthorEntriesView.as_view(), name='posts-author'), + url(r'^category/(?P[\w\.@+-]+)/$', + CategoryEntriesView.as_view(), name='posts-category'), + url(r'^tag/(?P[-\w]+)/$', + TaggedListView.as_view(), name='posts-tagged'), + url(r'^tag/(?P[-\w]+)/feed/$', + TagFeed(), name='posts-tagged-feed'), ) diff --git a/djangocms_blog/views.py b/djangocms_blog/views.py index 85ffcda..a638a42 100644 --- a/djangocms_blog/views.py +++ b/djangocms_blog/views.py @@ -144,7 +144,9 @@ class CategoryEntriesView(BaseBlogView, ListView): @property def category(self): if not self._category: - self._category = BlogCategory.objects.active_translations(get_language(), slug=self.kwargs['category']).latest('pk') + self._category = BlogCategory.objects.active_translations( + get_language(), slug=self.kwargs['category'] + ).get() return self._category def get(self, *args, **kwargs): diff --git a/setup.cfg b/setup.cfg index d388d4d..2c8e921 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,5 @@ [flake8] -exclude = .git,*.egg-info,build,dist,.tox,djangocms_blog/migrations/*,djangocms_blog/south_migrations/* -ignore = E501 +exclude = *.egg-info,.git,.settings,.tox,build,dist,docs,requirements,tmp,*migrations*,*south_migrations*,tests,data max-line-length = 99 [metadata] @@ -11,4 +10,10 @@ universal = 1 [isort] line_length = 99 -skip = migrations, south_migrations \ No newline at end of file +skip = migrations, south_migrations +combine_as_imports = true +default_section = THIRDPARTY +include_trailing_comma = true +known_first_party = djangocms_blog +multi_line_output = 5 +not_skip = __init__.py \ No newline at end of file diff --git a/tests/test_menu.py b/tests/test_menu.py index 8f4b6ee..9d79c5b 100644 --- a/tests/test_menu.py +++ b/tests/test_menu.py @@ -2,10 +2,11 @@ import copy from django.utils.translation import activate -from djangocms_blog.views import CategoryEntriesView, PostDetailView from menus.menu_pool import menu_pool from parler.utils.context import switch_language +from djangocms_blog.views import CategoryEntriesView, PostDetailView + from . import BaseTest diff --git a/tests/test_models.py b/tests/test_models.py index 594af0b..1dcaa9f 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -12,11 +12,12 @@ from django.contrib.sites.models import Site from django.core.urlresolvers import reverse from django.utils.timezone import now from django.utils.translation import get_language, override -from djangocms_blog.models import Post -from djangocms_blog.settings import get_setting from djangocms_helper.utils import CMS_30 from taggit.models import Tag +from djangocms_blog.models import Post +from djangocms_blog.settings import get_setting + from . import BaseTest diff --git a/tests/test_plugins.py b/tests/test_plugins.py index 6b2a6df..2422931 100644 --- a/tests/test_plugins.py +++ b/tests/test_plugins.py @@ -2,14 +2,12 @@ import re from cms.api import add_plugin -from cms.plugin_rendering import PluginContext, render_placeholder from django.core.urlresolvers import reverse -from django.template import RequestContext -from django.template.loader import get_template from django.utils.timezone import now -from djangocms_blog.models import BlogCategory from taggit.models import Tag +from djangocms_blog.models import BlogCategory + from . import BaseTest diff --git a/tests/test_toolbar.py b/tests/test_toolbar.py index f29465c..534a224 100644 --- a/tests/test_toolbar.py +++ b/tests/test_toolbar.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from cms.toolbar.items import ModalItem from django.core.urlresolvers import reverse + from djangocms_blog.models import BLOG_CURRENT_POST_IDENTIFIER from . import BaseTest diff --git a/tests/test_views.py b/tests/test_views.py index e122b3d..eb95b70 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -2,13 +2,16 @@ from django.contrib.auth.models import AnonymousUser from django.http import Http404 from django.utils.timezone import now -from djangocms_blog.feeds import LatestEntriesFeed, TagFeed -from djangocms_blog.sitemaps import BlogSitemap -from djangocms_blog.views import (AuthorEntriesView, CategoryEntriesView, PostArchiveView, - PostDetailView, PostListView, TaggedListView) from parler.tests.utils import override_parler_settings from parler.utils.conf import add_default_language_settings -from parler.utils.context import switch_language, smart_override +from parler.utils.context import smart_override, switch_language + +from djangocms_blog.feeds import LatestEntriesFeed, TagFeed +from djangocms_blog.sitemaps import BlogSitemap +from djangocms_blog.views import ( + AuthorEntriesView, CategoryEntriesView, PostArchiveView, PostDetailView, PostListView, + TaggedListView, +) from . import BaseTest diff --git a/tox.ini b/tox.ini index ff18770..1b3859d 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,7 @@ deps = [testenv:isort] deps = isort -commands = isort -c -rc djangocms_blog tests +commands = isort -c -rc -df djangocms_blog tests skip_install = true [testenv:pep8]