From 741c25fd678a130fddeccf5be10d5e168575ab07 Mon Sep 17 00:00:00 2001 From: Andrew Browning Date: Tue, 14 Feb 2017 01:01:48 -0500 Subject: [PATCH] Fix #5500 UnicodeEncodeError in atom feed This simple fix allows unicode strings in the atom feed thumb and description fields by forcing the entire atom content string to unicode. --- mediagoblin/listings/views.py | 2 +- mediagoblin/user_pages/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py index fa6b5ba7..6e1528ca 100644 --- a/mediagoblin/listings/views.py +++ b/mediagoblin/listings/views.py @@ -109,7 +109,7 @@ def atom_feed(request): # Include a thumbnail image in content. file_urls = get_media_file_paths(entry.media_files, request.urlgen) if 'thumb' in file_urls: - content = ' {desc}'.format( + content = u' {desc}'.format( thumb=file_urls['thumb'], desc=entry.description_html) else: content = entry.description_html diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index eaae1bd7..484d27cd 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -574,7 +574,7 @@ def atom_feed(request): # Include a thumbnail image in content. file_urls = get_media_file_paths(entry.media_files, request.urlgen) if 'thumb' in file_urls: - content = ' {desc}'.format( + content = u' {desc}'.format( thumb=file_urls['thumb'], desc=entry.description_html) else: content = entry.description_html -- 2.25.1