[Pywikipedia-l] SVN: [6009] branches/rewrite/pywikibot/login.py

[russblau at svn.wikimedia.org]

Revision: 6009
Author:   russblau
Date:     2008-10-21 15:10:05 +0000 (Tue, 21 Oct 2008)

Log Message:
-----------
oops

Modified Paths:
--------------
    branches/rewrite/pywikibot/login.py

Modified: branches/rewrite/pywikibot/login.py
===================================================================
--- branches/rewrite/pywikibot/login.py	2008-10-21 14:51:23 UTC (rev 6008)
+++ branches/rewrite/pywikibot/login.py	2008-10-21 15:10:05 UTC (rev 6009)
@@ -282,7 +282,7 @@
     sysop = False
     logall = False
     forceLogin = False
-    for arg in wikipedia.handleArgs():
+    for arg in wikipedia.handleArgs(): #FIXME
         if arg.startswith("-pass"):
             if len(arg) == 5:
                 password = pywikibot.input(u'Password for all accounts:',
@@ -296,7 +296,7 @@
         elif arg == "-force":
             forceLogin = True
         else:
-            wikipedia.showHelp('login')
+            wikipedia.showHelp('login') #FIXME
             return
     if logall:
         if sysop:
@@ -306,14 +306,16 @@
         for familyName in namedict.iterkeys():
             for lang in namedict[familyName].iterkeys():
                 try:
-                    site = wikipedia.getSite(code=lang, fam=familyName)
+                    site = pywikibot.getSite(code=lang, fam=familyName)
                     if not forceLogin and site.loggedInAs(sysop = sysop) != None:
-                        wikipedia.output(u'Already logged in on %s' % site)
+                        logger.info(u'Already logged in on %(site)s' % locals())
                     else:
-                        loginMan = LoginManager(password, sysop = sysop, site = site)
+                        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')
+                except pywikibot.NoSuchSite:
+                    pywikibot.output(
+                        lang + u'.' + familyName +
+u' is not a valid site, please remove it from your config')
 
     else:
         loginMan = LoginManager(password, sysop=sysop)