Revision: 7545
Author: alexsh
Date: 2009-10-26 15:41:20 +0000 (Mon, 26 Oct 2009)
Log Message:
-----------
Use config.use_api to define enable or disable API upload
Modified Paths:
--------------
trunk/pywikipedia/upload.py
Modified: trunk/pywikipedia/upload.py
===================================================================
--- trunk/pywikipedia/upload.py 2009-10-26 09:36:40 UTC (rev 7544)
+++ trunk/pywikipedia/upload.py 2009-10-26 15:41:20 UTC (rev 7545)
@@ -68,7 +68,7 @@
class UploadRobot:
def __init__(self, url, urlEncoding = None, description = u'', useFilename = None, keepFilename = False,
- verifyDescription = True, ignoreWarning = False, targetSite = None, uploadByUrl = False, useApi = False):
+ verifyDescription = True, ignoreWarning = False, targetSite = None, uploadByUrl = False):
"""
ignoreWarning - Set this to True if you want to upload even if another
file would be overwritten or another mistake would be
@@ -88,7 +88,6 @@
self.targetSite = targetSite or wikipedia.getSite()
self.targetSite.forceLogin()
self.uploadByUrl = uploadByUrl
- self.useApi = useApi
def urlOK(self):
'''
@@ -216,7 +215,7 @@
If the user chooses not to retry, returns null.
"""
try:
- if self.useApi and self.targetSite.versionnumber() >= 16:
+ if config.use_api and self.targetSite.versionnumber() >= 16:
x = self.targetSite.api_address()
del x
else:
Revision: 7543
Author: xqt
Date: 2009-10-26 07:35:10 +0000 (Mon, 26 Oct 2009)
Log Message:
-----------
test moved to archive
Added Paths:
-----------
trunk/pywikipedia/archive/test.py
Removed Paths:
-------------
trunk/pywikipedia/test.py
Copied: trunk/pywikipedia/archive/test.py (from rev 7542, trunk/pywikipedia/test.py)
===================================================================
--- trunk/pywikipedia/archive/test.py (rev 0)
+++ trunk/pywikipedia/archive/test.py 2009-10-26 07:35:10 UTC (rev 7543)
@@ -0,0 +1,61 @@
+#!/usr/bin/python
+"""
+##################################################
+This script with all its function has been merged
+to login.py. please use:
+
+ login.py -test
+
+xqt 2009-10-26
+##################################################
+
+Script to test whether you are logged-in
+
+Parameters:
+
+ -all Try to test on all sites where a username is defined in
+ user-config.py.
+ -sysop test your sysop account. (Works only with -all)
+"""
+#
+# (C) Rob W.W. Hooft, 2003
+#
+# Distributed under the terms of the MIT license.
+#
+__version__='$Id$'
+#
+import re,sys,wikipedia,config
+
+def show (mysite, sysop = False):
+ if mysite.loggedInAs(sysop = sysop):
+ wikipedia.output(u"You are logged in on %s as %s." % (repr(mysite), mysite.loggedInAs(sysop=sysop)))
+ else:
+ wikipedia.output(u"You are not logged in on %s." % repr(mysite))
+
+def main():
+ testall = False
+ sysop = False
+ for arg in wikipedia.handleArgs():
+ if arg == "-all":
+ testall = True
+ elif arg == "-sysop":
+ sysop = True
+ else:
+ wikipedia.showHelp()
+ return
+ if testall:
+ if sysop:
+ namedict = config.sysopnames
+ else:
+ namedict = config.usernames
+ for familyName in namedict.iterkeys():
+ for lang in namedict[familyName].iterkeys():
+ show(wikipedia.getSite(lang, familyName), sysop)
+ else:
+ show(wikipedia.getSite(), sysop)
+
+if __name__ == "__main__":
+ try:
+ main()
+ finally:
+ wikipedia.stopme()
Deleted: trunk/pywikipedia/test.py
===================================================================
--- trunk/pywikipedia/test.py 2009-10-26 07:30:54 UTC (rev 7542)
+++ trunk/pywikipedia/test.py 2009-10-26 07:35:10 UTC (rev 7543)
@@ -1,61 +0,0 @@
-#!/usr/bin/python
-"""
-##################################################
-This script with all its function has been merged
-to login.py. please use:
-
- login.py -test
-
-xqt 2009-10-26
-##################################################
-
-Script to test whether you are logged-in
-
-Parameters:
-
- -all Try to test on all sites where a username is defined in
- user-config.py.
- -sysop test your sysop account. (Works only with -all)
-"""
-#
-# (C) Rob W.W. Hooft, 2003
-#
-# Distributed under the terms of the MIT license.
-#
-__version__='$Id$'
-#
-import re,sys,wikipedia,config
-
-def show (mysite, sysop = False):
- if mysite.loggedInAs(sysop = sysop):
- wikipedia.output(u"You are logged in on %s as %s." % (repr(mysite), mysite.loggedInAs(sysop=sysop)))
- else:
- wikipedia.output(u"You are not logged in on %s." % repr(mysite))
-
-def main():
- testall = False
- sysop = False
- for arg in wikipedia.handleArgs():
- if arg == "-all":
- testall = True
- elif arg == "-sysop":
- sysop = True
- else:
- wikipedia.showHelp()
- return
- if testall:
- if sysop:
- namedict = config.sysopnames
- else:
- namedict = config.usernames
- for familyName in namedict.iterkeys():
- for lang in namedict[familyName].iterkeys():
- show(wikipedia.getSite(lang, familyName), sysop)
- else:
- show(wikipedia.getSite(), sysop)
-
-if __name__ == "__main__":
- try:
- main()
- finally:
- wikipedia.stopme()
Revision: 7541
Author: xqt
Date: 2009-10-26 07:20:46 +0000 (Mon, 26 Oct 2009)
Log Message:
-----------
merged with test.py
Modified Paths:
--------------
trunk/pywikipedia/login.py
Modified: trunk/pywikipedia/login.py
===================================================================
--- trunk/pywikipedia/login.py 2009-10-25 13:39:52 UTC (rev 7540)
+++ trunk/pywikipedia/login.py 2009-10-26 07:20:46 UTC (rev 7541)
@@ -27,9 +27,11 @@
-force Ignores if the user is already logged in, and tries to log in.
+ -test test whether you are logged-in
+
-v -v Shows http requests made when logging in. This might leak
- (doubly private data (password, session id), so make sure to check the
- verbose) output. Using -log is recommended: this will output a lot of
+ (doubly private data (password, session id), so make sure to check the
+ verbose) output. Using -log is recommended: this will output a lot of
data
If not given as parameter, the script will ask for your username and password
@@ -37,8 +39,8 @@
combination, and store the resulting cookies (containing your password hash,
so keep it secured!) in a file in the login-data subdirectory.
-All scripts in this library will be looking for this cookie file and will use the
-login information if it is present.
+All scripts in this library will be looking for this cookie file and will use
+the login information if it is present.
To log out, throw away the XX-login.data file that is created in the login-data
subdirectory.
@@ -68,6 +70,11 @@
}
}
+def show (mysite, sysop = False):
+ if mysite.loggedInAs(sysop = sysop):
+ wikipedia.output(u"You are logged in on %s as %s." % (repr(mysite), mysite.loggedInAs(sysop=sysop)))
+ else:
+ wikipedia.output(u"You are not logged in on %s." % repr(mysite))
class LoginManager:
def __init__(self, password = None, sysop = False, site = None, username=None, verbose=False):
@@ -316,6 +323,7 @@
forceLogin = False
verbose = False
cleanAll = clean = False
+ testonly = False
for arg in wikipedia.handleArgs():
if arg.startswith("-pass"):
@@ -331,13 +339,15 @@
logall = True
elif arg == "-force":
forceLogin = True
+ elif arg == "-test":
+ testonly = True
else:
wikipedia.showHelp('login')
return
if wikipedia.verbose > 1:
- wikipedia.output(u"WARNING: Using -v -v on login.py might leak private data. When sharing, please double check your password is not readable and log out your bots session.")
- verbose = True # only use this verbose when running from login.py
+ wikipedia.output(u"WARNING: Using -v -v on login.py might leak private data. When sharing, please double check your password is not readable and log out your bots session.")
+ verbose = True # only use this verbose when running from login.py
if logall:
if sysop:
namedict = config.sysopnames
@@ -346,32 +356,36 @@
for familyName in namedict.iterkeys():
for lang in namedict[familyName].iterkeys():
- try:
- site = wikipedia.getSite(lang, familyName)
- loginMan = LoginManager(password, sysop = sysop, site = site, verbose=verbose)
- if clean:
- if os.path.exists(wikipedia.config.datafilepath('login-data',
- '%s-%s-%s-login.data' % (familyName, lang, namedict[familyName][lang]))):
- loginMan.logout()
- else:
- if not forceLogin and site.loggedInAs(sysop = sysop):
- wikipedia.output(u'Already logged in on %s' % site)
+ if testonly:
+ show(wikipedia.getSite(lang, familyName), sysop)
+ else:
+ try:
+ site = wikipedia.getSite(lang, familyName)
+ loginMan = LoginManager(password, sysop = sysop, site = site, verbose=verbose)
+ if clean:
+ if os.path.exists(wikipedia.config.datafilepath('login-data',
+ '%s-%s-%s-login.data' % (familyName, lang, namedict[familyName][lang]))):
+ loginMan.logout()
else:
- loginMan.login()
- except wikipedia.NoSuchSite:
- wikipedia.output(lang+ u'.' + familyName + u' is not a valid site, please remove it from your config')
+ if not forceLogin and site.loggedInAs(sysop = sysop):
+ wikipedia.output(u'Already logged in on %s' % site)
+ else:
+ loginMan.login()
+ except wikipedia.NoSuchSite:
+ wikipedia.output(lang+ u'.' + familyName + u' is not a valid site, please remove it from your config')
+ elif testonly:
+ show(wikipedia.getSite(), sysop)
+ elif clean:
+ try:
+ site = wikipedia.getSite()
+ lgm = LoginManager(site = site)
+ lgm.logout()
+ except wikipedia.NoSuchSite:
+ pass
else:
- if clean:
- try:
- site = wikipedia.getSite()
- lgm = LoginManager(site = site)
- lgm.logout()
- except wikipedia.NoSuchSite:
- pass
- else:
- loginMan = LoginManager(password, sysop = sysop, verbose=verbose)
- loginMan.login()
+ loginMan = LoginManager(password, sysop = sysop, verbose=verbose)
+ loginMan.login()
if __name__ == "__main__":
try:
Revision: 7538
Author: purodha
Date: 2009-10-25 11:10:13 +0000 (Sun, 25 Oct 2009)
Log Message:
-----------
english grammar in help, +ksh
Modified Paths:
--------------
trunk/pywikipedia/featured.py
Modified: trunk/pywikipedia/featured.py
===================================================================
--- trunk/pywikipedia/featured.py 2009-10-23 17:13:00 UTC (rev 7537)
+++ trunk/pywikipedia/featured.py 2009-10-25 11:10:13 UTC (rev 7538)
@@ -16,7 +16,7 @@
-after:zzzz process pages after and including page zzzz
-top use -top if you want to move all {{Link FA|lang}} to the top
- of interwiki links. Default is placing {{Link FA|lang}} right
+ of the interwiki links. Default is placing {{Link FA|lang}}
next to the corresponding interwiki link.
-count Only counts how many featured/good articles exist
@@ -30,9 +30,9 @@
-good use this script for good articles.
--quiet prevents no corresponding pages are displayed.
+-quiet no corresponding pages are displayed.
--debug for debug purposes. No changes will be done.
+-debug for debug purposes. No changes will be made.
usage: featured.py [-interactive] [-nocache] [-top] [-after:zzzz] [-fromlang:xx,yy--zz|-fromall]
@@ -85,7 +85,7 @@
'ja': u'ロボットによる: 秀逸な項目へのリンク [[%s:%s]]',
'ka': u'ბოტი: რჩეული სტატიის ბმული გვერდისათვის [[%s:%s]]',
'ko': u'로봇: 알찬 글 [[%s:%s]] 를 가리키는 링크',#로봇이：?
- 'ksh':u'bot: [[%s:%s]] ess enen ußjezëijshneten Atikkel',
+ 'ksh':u'bot: [[%s:%s]] ess_enen ußjezëijshneten Atikkel',
'lb': u'Bot: Exzellenten Arikel Link op [[%s:%s]]',
'lt': u'Bot: Pavyzdinis straipsnis [[%s:%s]]',
'nl': u'Bot: verwijzing naar etalage-artikel voor [[%s:%s]]',
@@ -113,6 +113,7 @@
'eo': u'roboto: [[%s:%s]] estas artikolo leginda',
'es': u'Bot: Enlace a artículo bueno para: [[%s:%s]]',
'fr': u'Bot: Lien BA pour [[%s:%s]]',
+ 'ksh':u'bot: [[%s:%s]] ess_enen jooden Atikkel',
'no': u'bot: [[%s:%s]] er en anbefalt artikkel',
'nn': u'bot: [[%s:%s]] er ein god artikkel',
'pl': u'Bot: Link do dobrego artykułu: [[%s:%s]]',
@@ -126,6 +127,7 @@
'en': u'Bot: [[%s:%s]] is a featured list',
'es': u'Bot: Enlace a lista destacado para: [[%s:%s]]',
'fi': u'Botti: [[%s:%s]] on suositeltu luetteloon',
+ 'ksh':u'bot: [[%s:%s]] ess_en joode Leß',
'sv': u'Bot: [[%s:%s]] är en utmärkt list',
}
@@ -301,6 +303,7 @@
#'id': (CAT, u"Artikel bagus"),
'is': (CAT, u"Wikipedia:Gæðagreinar"),
'ja': (CAT, u"おすすめ記事"),
+ 'ksh':(CAT, u"Joode Aatikkel"),
'lt': (CAT, u"Vertingi straipsniai"),
'lv': (CAT, u"Labi raksti"),
'no': (CAT, u"Anbefalte artikler"),
@@ -324,6 +327,7 @@
'en': (BACK, u'Featured list'),
'id': (BACK, u'Featured list'),
'ja': (BACK, u'Featured List'),
+ 'ksh':(CAT, u"Joode Leß"),
'no': (BACK, u'God liste'),
'pl': (BACK, u'Medalista'),
'pt': (BACK, u'Anexo destacado'),