Small fix to title handling code to deal with unicode better

[rss2maildir.git] / rss2maildir.py

diff --git a/rss2maildir.py b/rss2maildir.py
index 84a9f0964408cd9f216d45be9b1921302f3312df..563da506da2d8f95307e44c38e6e0392882d3793 100755 (executable)
--- a/rss2maildir.py
+++ b/rss2maildir.py
@@ -562,7 +562,7 @@ class HTML2Text(HTMLParser):
         try:
             entity = unichr(int(name))
         except:
-            if entity[0] == 'x':
+            if name[0] == 'x':
                 try:
                     entity = unichr(int('0%s' %(name,), 16))
                 except:
@@ -683,7 +683,10 @@ def parse_and_deliver(maildir, url, statedir):
         if item.has_key("content"):
             content = item["content"][0]["value"]
         else:
-            content = item["summary"]
+            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")