public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

smart_unicode instead of unicode

Browse source
This commit is contained in:
Slavik Svyrydiuk 2015-12-02 07:46:25 +01:00
parent 48a493bf86
commit e9504d2e42
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/rss_feeds/models.py
View file

@ -24,7 +24,7 @@ from django.core.urlresolvers import reverse
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.sites.models import Site from django.contrib.sites.models import Site
from django.template.defaultfilters import slugify from django.template.defaultfilters import slugify
from django.utils.encoding import smart_str from django.utils.encoding import smart_str, smart_unicode
from mongoengine.queryset import OperationError, Q, NotUniqueError from mongoengine.queryset import OperationError, Q, NotUniqueError
from mongoengine.base import ValidationError from mongoengine.base import ValidationError
from vendor.timezones.utilities import localtime_for_timezone from vendor.timezones.utilities import localtime_for_timezone
@ -1484,11 +1484,11 @@ class Feed(models.Model):
continue continue
if 'story_latest_content_z' in existing_story: if 'story_latest_content_z' in existing_story:
existing_story_content = unicode(zlib.decompress(existing_story.story_latest_content_z)) existing_story_content = smart_unicode(zlib.decompress(existing_story.story_latest_content_z))
elif 'story_latest_content' in existing_story: elif 'story_latest_content' in existing_story:
existing_story_content = existing_story.story_latest_content existing_story_content = existing_story.story_latest_content
elif 'story_content_z' in existing_story: elif 'story_content_z' in existing_story:
existing_story_content = unicode(zlib.decompress(existing_story.story_content_z)) existing_story_content = smart_unicode(zlib.decompress(existing_story.story_content_z))
elif 'story_content' in existing_story: elif 'story_content' in existing_story:
existing_story_content = existing_story.story_content existing_story_content = existing_story.story_content
else: else: