From 9c08308166ddae404e0550dd73fcb8598f5647ff Mon Sep 17 00:00:00 2001 From: Sam Ruby Date: Sat, 22 May 2010 17:07:49 -0400 Subject: [PATCH] Check for the value of version, not merely for the presence of the attribute. Props: Mark Wielaard http://lists.planetplanet.org/archives/devel/2010-May/002101.html --- planet/spider.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/planet/spider.py b/planet/spider.py index 9034add..71de07b 100644 --- a/planet/spider.py +++ b/planet/spider.py @@ -125,7 +125,7 @@ def writeCache(feed_uri, feed_info, data): log.info("Updating feed %s", feed_uri) # if read failed, retain cached information - if not data.has_key('version') and feed_info.has_key('version'): + if not data.get('version') and feed_info.get('version'): data.feed = feed_info.feed data.bozo = feed_info.feed.get('planet_bozo','true') == 'true' data.version = feed_info.feed.get('planet_format') @@ -147,7 +147,7 @@ def writeCache(feed_uri, feed_info, data): data.feed['planet_content_hash'] = data.headers['-content-hash'] # capture feed and data from the planet configuration file - if data.has_key('version') and data.version: + if data.get('version'): if not data.feed.has_key('links'): data.feed['links'] = list() feedtype = 'application/atom+xml' if data.version.startswith('rss'): feedtype = 'application/rss+xml'