X-Git-Url: https://git.sommitrealweird.co.uk/rss2maildir.git/blobdiff_plain/b22a8446e1882b310b9eed73b0346c09a0eeb181..a53f1589ffaa52371e9eed15ff1a6ffd54997d89:/rss2maildir.py

diff --git a/rss2maildir.py b/rss2maildir.py
index bbd9b1b..563da50 100755
--- a/rss2maildir.py
+++ b/rss2maildir.py
@@ -683,7 +683,10 @@ def parse_and_deliver(maildir, url, statedir):
         if item.has_key("content"):
             content = item["content"][0]["value"]
         else:
-            content = item["description"]
+            if item.has_key("description"):
+                content = item["description"]
+            else:
+                content = u''
 
         md5sum = md5.md5(content.encode("utf-8")).hexdigest()
 
@@ -736,10 +739,10 @@ def parse_and_deliver(maildir, url, statedir):
             pass
         msg.add_header("Date", createddate)
         subj_gen = HTML2Text()
-        title = item["title"].encode("utf-8")
+        title = item["title"]
         title = re.sub(u'<', u'&lt;', title)
         title = re.sub(u'>', u'&gt;', title)
-        subj_gen.feed(title)
+        subj_gen.feed(title.encode("utf-8"))
         msg.add_header("Subject", subj_gen.gettext())
         msg.set_default_type("text/plain")