Ticket #3759: update_feeds.diff

update_feeds.py

@@ -14 +14 @@
     for feed in Feed.objects.filter(is_defunct=False):
         parsed_feed = feedparser.parse(feed.feed_url)
         for entry in parsed_feed.entries:
-            title = entry.title.encode(parsed_feed.encoding, "xmlcharrefreplace")
-            guid = entry.get("id", entry.link).encode(parsed_feed.encoding, "xmlcharrefreplace")
-            link = entry.link.encode(parsed_feed.encoding, "xmlcharrefreplace")
+            title = entry.title.encode("utf8", "xmlcharrefreplace")
+            guid = entry.get("id", entry.link).encode("utf8", "xmlcharrefreplace")
+            link = entry.link.encode("utf8", "xmlcharrefreplace")
 
             if hasattr(entry, "summary"):
                 content = entry.summary
@@ -26 +26 @@
                 content = entry.description
             else:
                 content = u""
-            content = content.encode(parsed_feed.encoding, "xmlcharrefreplace")
+            content = content.encode("utf8", "xmlcharrefreplace")
 
             if entry.has_key('modified_parsed'):
                 date_modified = datetime.datetime.fromtimestamp(time.mktime(entry.modified_parsed))