From 5e89b0a417828403a9392c92a846e141069ff64b Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Wed, 25 May 2016 11:08:32 -0400 Subject: [PATCH] NarrativeWebReport: media_ref handles need not be binary --- gramps/plugins/webreport/narrativeweb.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gramps/plugins/webreport/narrativeweb.py b/gramps/plugins/webreport/narrativeweb.py index a26ad9eac..040302938 100644 --- a/gramps/plugins/webreport/narrativeweb.py +++ b/gramps/plugins/webreport/narrativeweb.py @@ -5108,7 +5108,10 @@ class MediaPages(BasePage): # add unused media media_list = self.dbase_.get_media_handles() for media_ref in media_list: - media_handle = media_ref.decode("utf-8") + if isinstance(media_ref, bytes): + media_handle = media_ref.decode("utf-8") + else: + media_handle = media_ref if media_handle not in self.report.obj_dict[Media]: unused_media_handles.append(media_handle) unused_media_handles = sorted(unused_media_handles, @@ -5542,7 +5545,10 @@ class ThumbnailPreviewPage(BasePage): media_list = self.dbase_.get_media_handles() unused_media_handles = [] for media_ref in media_list: - media_handle = media_ref.decode("utf-8") + if isinstance(media_ref, bytes): + media_handle = media_ref.decode("utf-8") + else: + media_handle = media_ref if media_handle not in self.report.obj_dict[Media]: self.photo_keys.append(media_handle)