ungleich-public/djangocms_blog
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix PY3 unicode error

Browse source
This commit is contained in:
Marco Federighi 2015-10-20 18:03:46 +02:00 committed by Iacopo Spalletti
parent cdb309bb59
commit 4424b3b971
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
djangocms_blog/search_indexes.py
View file

@ -1,6 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.utils.encoding import force_text from django.utils.encoding import force_text
from django.utils.text import force_unicode try:
from django.utils.encoding import force_text as force_unicode_or_text
except ImportError:
from django.utils.encoding import force_unicode as force_unicode_or_text
from aldryn_search.helpers import get_plugin_index_data from aldryn_search.helpers import get_plugin_index_data
from aldryn_search.utils import get_index_base, strip_tags from aldryn_search.utils import get_index_base, strip_tags
@ -60,16 +63,16 @@ class PostIndex(get_index_base()):
#text_bits.append(' '.join(post.get_keywords())) #text_bits.append(' '.join(post.get_keywords()))
for category in post.categories.all(): for category in post.categories.all():
text_bits.append( text_bits.append(
force_text(category.safe_translation_getter('name'))) force_unicode_or_text(category.safe_translation_getter('name')))
for tag in post.tags.all(): for tag in post.tags.all():
text_bits.append(force_text(tag.name)) text_bits.append(force_unicode_or_text(tag.name))
if post.content: if post.content:
plugins = post.content.cmsplugin_set.filter(language=language) plugins = post.content.cmsplugin_set.filter(language=language)
for base_plugin in plugins: for base_plugin in plugins:
content = get_plugin_index_data(base_plugin, request) content = get_plugin_index_data(base_plugin, request)
text_bits.append(content) text_bits.append(content)
for attribute in optional_attributes: for attribute in optional_attributes:
value = force_unicode(getattr(post, attribute)) value = force_unicode_or_text(getattr(post, attribute))
if value and value not in text_bits: if value and value not in text_bits:
text_bits.append(value) text_bits.append(value)
return ' '.join(text_bits) return ' '.join(text_bits)