Revision: 7025 Author: alexsh Date: 2009-07-07 02:34:52 +0000 (Tue, 07 Jul 2009)
Log Message: ----------- Fix API disable exception: if site doesn't support API and API login is enable, change login mode to webpage
Modified Paths: -------------- trunk/pywikipedia/login.py
Modified: trunk/pywikipedia/login.py =================================================================== --- trunk/pywikipedia/login.py 2009-07-06 17:28:04 UTC (rev 7024) +++ trunk/pywikipedia/login.py 2009-07-07 02:34:52 UTC (rev 7025) @@ -245,7 +245,12 @@ self.password = self.password.encode(self.site.encoding())
wikipedia.output(u"Logging in to %s as %s" % (self.site, self.username)) - cookiedata = self.getCookie(api = api) + try: + cookiedata = self.getCookie(api = api) + except NotImplementedError: + wikipedia.output('API disabled because this site does not support.') + config.use_api_login = api = False + cookiedata = self.getCookie(api = api) if cookiedata: self.storecookiedata(cookiedata) wikipedia.output(u"Should be logged in now")