From: W. Trevor King <wking@tremily.us>
Date: Mon, 10 Dec 2012 23:21:34 +0000 (-0500)
Subject: feed: fix Feed._get_entry_content unpacking in Feed._get_entry_id
X-Git-Tag: v3.0~39
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eb37e1be28fb9b3b0f34e741e251ed7a5de71b4a;p=rss2email.git

feed: fix Feed._get_entry_content unpacking in Feed._get_entry_id

_get_entry_content returns a single dict, but _get_entry_id had been
unpacking it as if it was a length-two tuple.

Signed-off-by: W. Trevor King <wking@tremily.us>
---

diff --git a/rss2email/feed.py b/rss2email/feed.py
index 2ec3e7d..d7bd74f 100644
--- a/rss2email/feed.py
+++ b/rss2email/feed.py
@@ -433,8 +433,8 @@ class Feed (object):
                 if isinstance(entry.id, dict):
                     return entry.id.values()[0]
                 return entry.id
-        content_type,content_value = self._get_entry_content(entry)
-        content_value = content_value.strip()
+        content = self._get_entry_content(entry)
+        content_value = content['value'].strip()
         if content_value:
             return hash(content_value.encode('unicode-escape')).hexdigest()
         elif getattr(entry, 'link', None):