Revision: 7628
Author: xqt
Date: 2009-11-11 11:10:13 +0000 (Wed, 11 Nov 2009)
Log Message:
-----------
Show the API error code instead making an index error
Modified Paths:
--------------
trunk/pywikipedia/query.py
trunk/pywikipedia/wikipedia.py
Modified: trunk/pywikipedia/query.py
===================================================================
--- trunk/pywikipedia/query.py 2009-11-11 10:03:44 UTC (rev 7627)
+++ trunk/pywikipedia/query.py 2009-11-11 11:10:13 UTC (rev 7628)
@@ -127,9 +127,6 @@
# decodedObj = eval( jsontext )
jsontext = json.loads( jsontext )
- #just for now to read the server output
- if wikipedia.verbose:
- print jsontext
if back_response:
return res, jsontext
Modified: trunk/pywikipedia/wikipedia.py
===================================================================
--- trunk/pywikipedia/wikipedia.py 2009-11-11 10:03:44 UTC (rev 7627)
+++ trunk/pywikipedia/wikipedia.py 2009-11-11 11:10:13 UTC (rev 7628)
@@ -6040,10 +6040,16 @@
if self.versionnumber() >= 14:
params['uiprop'].append('preferencestoken')
+ data = query.GetData(params, self, sysop=sysop)
+
+ # Show the API error code instead making an index error
+ if 'error' in data:
+ raise RuntimeError('%s' % data['error'])
+
if self.versionnumber() == 11:
- text = query.GetData(params, self, sysop=sysop)['userinfo']
+ text = data['userinfo']
else:
- text = query.GetData(params, self,
sysop=sysop)['query']['userinfo']
+ text = data['query']['userinfo']
self._getUserData(text, sysop = sysop, force = force)
else:
_______________________________________________
Pywikipedia-svn mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikipedia-svn
