Handle more KeyErrors in common weather segment

This commit is contained in:
Kim Silkebækken 2013-01-27 17:42:11 +01:00
parent d6da2c8d98
commit 98269a4bb5

View File

@ -138,12 +138,12 @@ def weather(unit='c', location_query=None):
'select * from we where location="{0}" and unit="{1}"'.format(location_query, unit),
'format': 'json'
}
url = 'http://query.yahooapis.com/v1/public/yql?' + _urllib_urlencode(query_data)
response = json.loads(_urllib_read(url))
try:
url = 'http://query.yahooapis.com/v1/public/yql?' + _urllib_urlencode(query_data)
response = json.loads(_urllib_read(url))
condition = response['query']['results']['weather']['rss']['channel']['item']['condition']
condition_code = int(condition['code'])
except KeyError:
except (KeyError, ValueError):
return None
icon = u''
for icon, codes in weather_conditions_codes.items():