Browse files

Merge remote branch 'justinlilly/13288_double_escape' into community_…

…redux
  • Loading branch information...
2 parents 988d4d4 + ef33a0c commit 688eed5f5b994b1c8e3ba08be7bab730fefbade3 @jacobian jacobian committed Feb 1, 2011
Showing with 3 additions and 4 deletions.
  1. +3 −4 django_website/aggregator/management/commands/update_feeds.py
View
7 django_website/aggregator/management/commands/update_feeds.py
@@ -83,9 +83,9 @@ def update_feed(self, feed):
parsed_feed = feedparser.parse(feed.feed_url)
for entry in parsed_feed.entries:
# Parse out the entry, handling all the fun stuff that feeds can do.
- 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
+ guid = entry.get("id", entry.link)
+ link = entry.link
if not guid:
guid = link
@@ -98,7 +98,6 @@ def update_feed(self, feed):
content = entry.description
else:
content = u""
- content = content.encode(parsed_feed.encoding, "xmlcharrefreplace")
try:
if entry.has_key('modified_parsed'):

0 comments on commit 688eed5

Please sign in to comment.