Download as
Browse Code »

Commit 1d7c2fa461d65424b208f6722ca20e539fc9a62f

Authored by Sergio Oliveira
1 parent 226f9140
Exists in master and in 31 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_header, fixed_gitlab_import, go_to_profile_panel, mobile_user_scalable, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, split_screen, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd

Fixed flake8 checks

Showing 2 changed files with 4 additions and 6 deletions   Show diff stats
colab/plugins/noosfero/data_api.py
  Diff comments   View file @1d7c2fa
@@ -9,7 +9,7 @@ from django.conf import settings @@ -9,7 +9,7 @@ from django.conf import settings
9 from django.db.models.fields import DateTimeField 9 from django.db.models.fields import DateTimeField
10 10
11 from colab.plugins.noosfero.models import (NoosferoArticle, NoosferoCommunity, 11 from colab.plugins.noosfero.models import (NoosferoArticle, NoosferoCommunity,
12 - NoosferoCategory) 12 + NoosferoCategory)
13 from colab.plugins.utils.proxy_data_api import ProxyDataAPI 13 from colab.plugins.utils.proxy_data_api import ProxyDataAPI
14 14
15 LOGGER = logging.getLogger('colab.plugin.debug') 15 LOGGER = logging.getLogger('colab.plugin.debug')
@@ -76,7 +76,7 @@ class NoosferoDataAPI(ProxyDataAPI): @@ -76,7 +76,7 @@ class NoosferoDataAPI(ProxyDataAPI):
76 self.fill_object_data(element, community) 76 self.fill_object_data(element, community)
77 community.save() 77 community.save()
78 78
79 - if element.has_key('categories'): 79 + if 'categories' in element:
80 for category_json in element["categories"]: 80 for category_json in element["categories"]:
81 category = NoosferoCategory.objects.get_or_create( 81 category = NoosferoCategory.objects.get_or_create(
82 id=category_json["id"], name=category_json["name"])[0] 82 id=category_json["id"], name=category_json["name"])[0]
colab/plugins/noosfero/search_indexes.py
  Diff comments   View file @1d7c2fa
@@ -30,8 +30,7 @@ class NoosferoCommunityIndex(indexes.SearchIndex, indexes.Indexable): @@ -30,8 +30,7 @@ class NoosferoCommunityIndex(indexes.SearchIndex, indexes.Indexable):
30 category = indexes.MultiValueField() 30 category = indexes.MultiValueField()
31 31
32 def prepare_category(self, obj): 32 def prepare_category(self, obj):
33 - return [category.name for category in \  
34 - obj.categories.all()] 33 + return obj.categories.values_list('name', flat=True)
35 34
36 def prepare_icon_name(self, obj): 35 def prepare_icon_name(self, obj):
37 return u'file' 36 return u'file'
@@ -62,8 +61,7 @@ class NoosferoArticleIndex(indexes.SearchIndex, indexes.Indexable): @@ -62,8 +61,7 @@ class NoosferoArticleIndex(indexes.SearchIndex, indexes.Indexable):
62 return NoosferoArticle 61 return NoosferoArticle
63 62
64 def prepare_category(self, obj): 63 def prepare_category(self, obj):
65 - return [category.name for category in \  
66 - obj.categories.all()] 64 + return obj.categories.values_list('name', flat=True)
67 65
68 def prepare_icon_name(self, obj): 66 def prepare_icon_name(self, obj):
69 return u'file' 67 return u'file'