Revision: 7772 Author: shizhao Date: 2009-12-14 13:30:09 +0000 (Mon, 14 Dec 2009)
Log Message: ----------- fix _loadInfo() KeyError
Modified Paths: -------------- trunk/pywikipedia/wikipedia.py
Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-12-14 10:17:49 UTC (rev 7771) +++ trunk/pywikipedia/wikipedia.py 2009-12-14 13:30:09 UTC (rev 7772) @@ -3543,21 +3543,23 @@ infos = []
while True: - for info in data['query']['pages'].values()[0]['imageinfo']: - count += 1 - if count == 1 and 'iistart' not in params: + try: + for info in data['query']['pages'].values()[0]['imageinfo']: + count += 1 + if count == 1 and 'iistart' not in params: # count 1 and no iicontinue mean first image revision is latest. - self._latestInfo = info - infos.append(info) - if limit == 1: - break + self._latestInfo = info + infos.append(info) + if limit == 1: + break
- if 'query-continue' in data and limit != 1: - params['iistart'] = data['query-continue']['imageinfo']['iistart'] - else: - break - + if 'query-continue' in data and limit != 1: + params['iistart'] = data['query-continue']['imageinfo']['iistart'] + else: + break + except KeyError: + output("Not image in imagepage") self._infoLoaded = True if limit > 1: return infos
pywikipedia-svn@lists.wikimedia.org