Revision: 5511
Author: multichill
Date: 2008-06-04 13:27:48 +0000 (Wed, 04 Jun 2008)
Log Message:
-----------
Skip invalid sites, don't stop.
Modified Paths:
--------------
trunk/pywikipedia/login.py
Modified: trunk/pywikipedia/login.py
===================================================================
--- trunk/pywikipedia/login.py 2008-06-04 11:49:24 UTC (rev 5510)
+++ trunk/pywikipedia/login.py 2008-06-04 13:27:48 UTC (rev 5511)
@@ -266,12 +266,16 @@
namedict = config.usernames
for familyName in namedict.iterkeys():
for lang in namedict[familyName].iterkeys():
- site = wikipedia.getSite(code=lang, fam=familyName)
- if not forceLogin and site.loggedInAs(sysop = sysop) != None:
- wikipedia.output(u'Already logged in on %s' % site)
- else:
- loginMan = LoginManager(password, sysop = sysop, site = site)
- loginMan.login()
+ try:
+ site = wikipedia.getSite(code=lang, fam=familyName)
+ if not forceLogin and site.loggedInAs(sysop = sysop) != None:
+ wikipedia.output(u'Already logged in on %s' % site)
+ else:
+ loginMan = LoginManager(password, sysop = sysop, site = site)
+ loginMan.login()
+ except wikipedia.NoSuchSite:
+ wikipedia.output(lang+ u'.' + familyName + u' is not a
valid site, please remove it from your config')
+
else:
loginMan = LoginManager(password, sysop = sysop)
loginMan.login()