nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

handle errors

Browse source
This commit is contained in:
Romain Bignon 2011-07-19 12:53:45 +02:00
commit 4336da6224
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
weboob/backends/mediawiki/browser.py
View file

@ -34,6 +34,9 @@ except ImportError:
__all__ = ['MediawikiBrowser'] __all__ = ['MediawikiBrowser']
class APIError(Exception):
pass
# Browser # Browser
class MediawikiBrowser(BaseBrowser): class MediawikiBrowser(BaseBrowser):
ENCODING = 'utf-8' ENCODING = 'utf-8'
@ -45,7 +48,7 @@ class MediawikiBrowser(BaseBrowser):
self.BASEPATH = url_parsed.path self.BASEPATH = url_parsed.path
if self.BASEPATH.endswith('/'): if self.BASEPATH.endswith('/'):
self.BASEPATH = self.BASEPATH[:-1] self.BASEPATH = self.BASEPATH[:-1]
self.apiurl = apiurl self.apiurl = apiurl
BaseBrowser.__init__(self, *args, **kwargs) BaseBrowser.__init__(self, *args, **kwargs)
@ -148,7 +151,7 @@ class MediawikiBrowser(BaseBrowser):
result = self.API_get(data) result = self.API_get(data)
pageid = str(result['query']['pages'].keys()[0]) pageid = str(result['query']['pages'].keys()[0])
if pageid != "-1": if pageid != "-1":
for rev in result['query']['pages'][pageid]['revisions']: for rev in result['query']['pages'][pageid]['revisions']:
rev_content = Revision(str(rev['revid'])) rev_content = Revision(str(rev['revid']))
rev_content.comment = rev['comment'] rev_content.comment = rev['comment']
@ -165,15 +168,23 @@ class MediawikiBrowser(BaseBrowser):
'''We don't need to change location, we're using the JSON API here.''' '''We don't need to change location, we're using the JSON API here.'''
pass pass
def check_result(self, result):
if 'error' in result:
raise APIError('%s' % result['error']['info'])
def API_get(self, data): def API_get(self, data):
'''Submit a GET request to the website '''Submit a GET request to the website
The JSON data is parsed and returned as a dictionary''' The JSON data is parsed and returned as a dictionary'''
data['format'] = 'json' data['format'] = 'json'
return simplejson.loads(self.readurl(self.buildurl(self.apiurl, **data)), 'utf-8') result = simplejson.loads(self.readurl(self.buildurl(self.apiurl, **data)), 'utf-8')
self.check_result(result)
return result
def API_post(self, data): def API_post(self, data):
'''Submit a POST request to the website '''Submit a POST request to the website
The JSON data is parsed and returned as a dictionary''' The JSON data is parsed and returned as a dictionary'''
data['format'] = 'json' data['format'] = 'json'
return simplejson.loads(self.readurl(self.apiurl, urllib.urlencode(data)), 'utf-8') result = simplejson.loads(self.readurl(self.apiurl, urllib.urlencode(data)), 'utf-8')
self.check_result(result)
return result