Pywikipedia-svn November 2009

pywikipedia-svn@lists.wikimedia.org

9 participants
146 discussions

SVN: [7682] trunk/pywikipedia/query.py
by xqt＠svn.wikimedia.org 23 Nov '09

23 Nov '09

Revision: 7682 Author: xqt Date: 2009-11-23 11:35:55 +0000 (Mon, 23 Nov 2009) Log Message: ----------- double verbose required to display login password Modified Paths: -------------- trunk/pywikipedia/query.py Modified: trunk/pywikipedia/query.py =================================================================== --- trunk/pywikipedia/query.py 2009-11-23 08:35:56 UTC (rev 7681) +++ trunk/pywikipedia/query.py 2009-11-23 11:35:55 UTC (rev 7682) @@ -75,7 +75,9 @@ for k, v in params.iteritems(): if k not in ['action', 'format', 'file', 'xml']: - if not isinstance(v, unicode): + if k == 'lgpassword' and wikipedia.verbose == 1: + v = u'XXXXX' + elif not isinstance(v, unicode): v = v.decode('utf-8') wikipedia.output(u"%s: %s" % (k, v) ) wikipedia.output(u'-' * 16 )

1 0

SVN: [7681] trunk/pywikipedia/cosmetic_changes.py
by xqt＠svn.wikimedia.org 23 Nov '09

23 Nov '09

Revision: 7681 Author: xqt Date: 2009-11-23 08:35:56 +0000 (Mon, 23 Nov 2009) Log Message: ----------- ignore putSpacesInLists within <source /> Modified Paths: -------------- trunk/pywikipedia/cosmetic_changes.py Modified: trunk/pywikipedia/cosmetic_changes.py =================================================================== --- trunk/pywikipedia/cosmetic_changes.py 2009-11-22 22:33:38 UTC (rev 7680) +++ trunk/pywikipedia/cosmetic_changes.py 2009-11-23 08:35:56 UTC (rev 7681) @@ -444,7 +444,7 @@ If there are any complaints, please file a bug report. """ if not self.redirect: - text = pywikibot.replaceExcept(text, r'(?m)^(?P<bullet>[:;]*(\*+|#+)[:;\*#]*)(?P<char>[^\s\*#:;].+?)', '\g<bullet> \g<char>', ['comment', 'math', 'nowiki', 'pre']) + text = pywikibot.replaceExcept(text, r'(?m)^(?P<bullet>[:;]*(\*+|#+)[:;\*#]*)(?P<char>[^\s\*#:;].+?)', '\g<bullet> \g<char>', ['comment', 'math', 'nowiki', 'pre', 'source']) return text #from fixes.py

1 0

SVN: [7680] trunk/pywikipedia/welcome.py
by alexsh＠svn.wikimedia.org 23 Nov '09

23 Nov '09

Revision: 7680 Author: alexsh Date: 2009-11-22 22:33:38 +0000 (Sun, 22 Nov 2009) Log Message: ----------- Fix: welcomed users not log if KeyboardInterrupt Modified Paths: -------------- trunk/pywikipedia/welcome.py Modified: trunk/pywikipedia/welcome.py =================================================================== --- trunk/pywikipedia/welcome.py 2009-11-22 22:17:54 UTC (rev 7679) +++ trunk/pywikipedia/welcome.py 2009-11-22 22:33:38 UTC (rev 7680) @@ -1042,7 +1042,14 @@ wikipedia.output('WARING: both -offset and -timeoffset were provided, ignoring -offset') globalvar.offset = 0 bot = WelcomeBot() - bot.run() + try: + bot.run() + except KeyboardInterrupt: + if bot.welcomed_users: + showStatus() + wikipedia.output("Put welcomed users before quit...") + bot.makelogpage(bot.welcomed_users) + wikipedia.output("Quitting...") finally: # If there is the savedata, the script must save the number_user. if globalvar.randomSign and globalvar.saveSignIndex and bot.welcomed_users:

1 0

SVN: [7679] trunk/pywikipedia/welcome.py
by alexsh＠svn.wikimedia.org 23 Nov '09

23 Nov '09

Revision: 7679 Author: alexsh Date: 2009-11-22 22:17:54 +0000 (Sun, 22 Nov 2009) Log Message: ----------- welcome: add quick option to batch load user datas by API Modified Paths: -------------- trunk/pywikipedia/welcome.py Modified: trunk/pywikipedia/welcome.py =================================================================== --- trunk/pywikipedia/welcome.py 2009-11-22 20:56:47 UTC (rev 7678) +++ trunk/pywikipedia/welcome.py 2009-11-22 22:17:54 UTC (rev 7679) @@ -468,6 +468,7 @@ defaultSign = '--~~~~' # default signature queryLimit = 50 # number of users that the bot load to check quiet = False # Prevents users without contributions are displayed + quick = False # Provide quick check by API bulk-retrieve user datas #fileOption = False # check if the user wants to use a file or the wikipage @@ -697,6 +698,7 @@ params['lestart'] = globalvar.offset count = 0 + count_auto = 0 wikipedia.output("Querying new user log from API....") while True: lev = query.GetData(params, self.site) @@ -709,8 +711,10 @@ if not globalvar.welcomeAuto and x['action'] == 'create2': continue if not globalvar.welcomeAuto and x['action'] == 'autocreate': - showStatus(3) - wikipedia.output(u'%s has been created automatically.' % x['user']) + if not globalvar.quick: + showStatus(3) + wikipedia.output(u'%s has been created automatically.' % x['user']) + count_auto += 1 continue yield userlib.User(self.site, x['user']) @@ -720,6 +724,10 @@ else: break if someone_found: + if globalvar.quick and count_auto > 0: + showStatus() + wikipedia.output(u'Ignored %d user(s) by auto-create' % count_auto) + showStatus(5) wikipedia.output(u'There is nobody left to be welcomed...') else: @@ -805,7 +813,18 @@ def run(self): while True: welcomed_count = 0 - for users in self.parseNewUserLog(): + if globalvar.quick and config.use_api: + us = [x for x in self.parseNewUserLog()] + showStatus() + try: + userlib.getall(self.site, us) + except NotImplementedError: + globalvar.quick = False + us = self._parseNewUserLogOld() + else: + us = self.parseNewUserLog() + + for users in us: if users.isBlocked(): showStatus(3) wikipedia.output(u'%s has been blocked!' % users.name() ) @@ -1013,6 +1032,9 @@ globalvar.dumpToLog = int(arg[11:]) elif arg == '-quiet': globalvar.quiet = True + elif arg == '-quick': + globalvar.quick = True + # Filename and pywikipedia path # file where is stored the random signature index filename = wikipedia.config.datafilepath('welcome-%s-%s.data' % (wikipedia.default_family, wikipedia.default_code))

1 0

SVN: [7678] trunk/pywikipedia/userlib.py
by alexsh＠svn.wikimedia.org 23 Nov '09

23 Nov '09

Revision: 7678 Author: alexsh Date: 2009-11-22 20:56:47 +0000 (Sun, 22 Nov 2009) Log Message: ----------- userlib: add batch dump userinfo data by API Modified Paths: -------------- trunk/pywikipedia/userlib.py Modified: trunk/pywikipedia/userlib.py =================================================================== --- trunk/pywikipedia/userlib.py 2009-11-22 15:30:28 UTC (rev 7677) +++ trunk/pywikipedia/userlib.py 2009-11-22 20:56:47 UTC (rev 7678) @@ -42,7 +42,7 @@ site - a wikipedia.Site object name - name of the user, without the trailing User: """ - if type(site) == str: + if type(site) in [str, unicode]: self._site = wikipedia.getSite(site) else: self._site = site @@ -73,27 +73,8 @@ return self.__str__() def _load(self): - data = batchLoadUI(self.name(), self.site()).values()[0] - if 'missing' in data or 'invalid' in data: - raise wikipedia.Error('No such user or invaild username') - - self._editcount = data['editcount'] - - if 'groups' in data: - self._groups = data['groups'] - else: - self._groups = [] - - if data['registration']: - self._registrationTime = wikipedia.parsetime2stamp(data['registration']) - else: - self._registrationTime = 0 - - self._mailable = ("emailable" in data) - - self._blocked = ('blockedby' in data) - #if self._blocked: #Get block ID - + getall(self.site(), [self]) + return def registrationTime(self, force = False): if not hasattr(self, '_registrationTime') or force: @@ -553,40 +534,70 @@ raise UnblockError, data return True -def batchLoadUI(names = [], site = None): - # - # batch load users information by API. - # result info: http://www.mediawiki.org/wiki/API:Query_-_Lists#users_.2F_us - # - if not site: - site = wikipedia.getSite() - elif type(site) in [str, unicode]: - site = wikipedia.getSite(site) - - result = {} - params = { - 'action': 'query', - 'list': 'users', - 'usprop': ['blockinfo', 'groups', 'editcount', 'registration', 'emailable', 'gender'], - 'ususers': names, - } - #if site.versionnumber() >= 16: - # params['ustoken'] = 'userrights' +def getall(site, users, throttle=True, force=False): + """Bulk-retrieve users data from site + + Arguments: site = Site object + users = iterable that yields User objects - result = dict([(sig['name'].lower(), sig) for sig in query.GetData(params, site)['query']['users'] ]) + """ + users = list(users) # if pages is an iterator, we need to make it a list + if len(users) > 1: wikipedia.output(u'Getting %d users data from %s...' % (len(users), site)) + _GetAllUI(site, users, throttle, force).run() + +class _GetAllUI(object): + def __init__(self, site, users, throttle, force): + self.site = site + self.users = [] + self.throttle = throttle + self.force = force + self.sleeptime = 15 - - return result + for user in users: + if not hasattr(user, '_editcount') or force: + self.users.append(user) + elif wikipedia.verbose: + wikipedia.output(u"BUGWARNING: %s already done!" % user.name()) + + def run(self): + if self.users: + while True: + try: + data = self.getData() + except Exception, e: + # Print the traceback of the caught exception + print e + raise + else: + break + + for uj in self.users: + x = data[uj.name()] + uj._editcount = x['editcount'] + if 'groups' in x: + uj._groups = x['groups'] + else: + uj._groups = [] + if x['registration']: + uj._registrationTime = wikipedia.parsetime2stamp(x['registration']) + else: + uj._registrationTime = 0 + uj._mailable = ("emailable" in x) + uj._blocked = ('blockedby' in x) + #if self._blocked: #Get block ID + + def getData(self): + datas = {} + params = { + 'action': 'query', + 'list': 'users', + 'usprop': ['blockinfo', 'groups', 'editcount', 'registration', 'emailable', 'gender'], + 'ususers': u'|'.join([n.name() for n in self.users]), + } + for n in query.GetData(params, self.site)['query']['users']: + datas[n['name']] = n + return datas -def batchDumpInfo(user): - totals = batchLoadUI([x.name() for x in user]) - for oj in user: - data = totals[oj.name().lower()] - oj._editcount = data['editcount'] - if 'groups' in data: - oj._groups = data['groups'] - oj._blocked = ('blockedby' in data) - if __name__ == '__main__': """ Simple testing code for the [[User:Example]] on the English Wikipedia.

1 0

SVN: [7677] trunk/pywikipedia/interwiki.py
by a_engels＠svn.wikimedia.org 22 Nov '09

22 Nov '09

Revision: 7677 Author: a_engels Date: 2009-11-22 15:30:28 +0000 (Sun, 22 Nov 2009) Log Message: ----------- typo Modified Paths: -------------- trunk/pywikipedia/interwiki.py Modified: trunk/pywikipedia/interwiki.py =================================================================== --- trunk/pywikipedia/interwiki.py 2009-11-22 11:10:40 UTC (rev 7676) +++ trunk/pywikipedia/interwiki.py 2009-11-22 15:30:28 UTC (rev 7677) @@ -451,7 +451,7 @@ 'mzn': (u'Rebot ', u'Biyeshten', u'Bayten', u'Hekărden'), 'nah': (u'Tepozcuayollotl', u'Tlamahxiltilli', u'Tlaquixtilli', u'Tlapatlalli'), 'nds': (u'IW-Bot: ', u'dorto', u'rut', u'ännert'), - 'nds-nl': (u'bot', u'derbie', u'derof', u'aanders'), + 'nds-nl': (u'bot ', u'derbie', u'derof', u'aanders'), 'nl': (u'robot ', u'Erbij', u'Eraf', u'Anders'), 'nn': (u'robot ', u'la til', u'fjerna', u'endra'), 'no': (u'robot ', u'legger til', u'fjerner', u'endrer'),

1 0

SVN: [7676] trunk/pywikipedia/families
by alexsh＠svn.wikimedia.org 22 Nov '09

22 Nov '09

Revision: 7676 Author: alexsh Date: 2009-11-22 11:10:40 +0000 (Sun, 22 Nov 2009) Log Message: ----------- ns update Modified Paths: -------------- trunk/pywikipedia/families/commons_family.py trunk/pywikipedia/families/mediawiki_family.py Modified: trunk/pywikipedia/families/commons_family.py =================================================================== --- trunk/pywikipedia/families/commons_family.py 2009-11-20 21:40:12 UTC (rev 7675) +++ trunk/pywikipedia/families/commons_family.py 2009-11-22 11:10:40 UTC (rev 7676) @@ -23,17 +23,15 @@ '_default': [u'Commons talk', 'Project talk'], } self.namespaces[100] = { - '_default': [u'Creator', 'Project'], - 'commons': u'Creator', + '_default': u'Creator', } self.namespaces[101] = { - '_default': [u'Creator talk', 'Project talk'], - 'commons': u'Creator talk', + '_default': u'Creator talk', } - self.namespaces[100] = { + self.namespaces[102] = { '_default': [u'TimedText'], } - self.namespaces[101] = { + self.namespaces[103] = { '_default': [u'TimedText talk'], } Modified: trunk/pywikipedia/families/mediawiki_family.py =================================================================== --- trunk/pywikipedia/families/mediawiki_family.py 2009-11-20 21:40:12 UTC (rev 7675) +++ trunk/pywikipedia/families/mediawiki_family.py 2009-11-22 11:10:40 UTC (rev 7676) @@ -24,6 +24,18 @@ self.namespaces[5] = { '_default': [u'Project talk', self.namespaces[5]['_default']], } + self.namespaces[90] = { + '_default': u'Thread', + } + self.namespaces[91] = { + '_default': u'Thread talk', + } + self.namespaces[92] = { + '_default': u'Summary', + } + self.namespaces[93] = { + '_default': u'Summary talk', + } self.namespaces[100] = { '_default': u'Manual', }

1 0

SVN: [7675] trunk/pywikipedia/welcome.py
by filnik＠svn.wikimedia.org 21 Nov '09

21 Nov '09

Revision: 7675 Author: filnik Date: 2009-11-20 21:40:12 +0000 (Fri, 20 Nov 2009) Log Message: ----------- Bugfix -> wrong badname written in output Modified Paths: -------------- trunk/pywikipedia/welcome.py Modified: trunk/pywikipedia/welcome.py =================================================================== --- trunk/pywikipedia/welcome.py 2009-11-20 20:58:54 UTC (rev 7674) +++ trunk/pywikipedia/welcome.py 2009-11-20 21:40:12 UTC (rev 7675) @@ -562,13 +562,13 @@ self.bname = bname return True except UnicodeEncodeError: - pass - + pass try: for wname in self._whitelist: if wname.lower() in str(name.lower()): name = name.replace(wname.lower(), '') for bname in self._blacklist: + self.bname = bname return bname.lower() in name.lower() except UnicodeEncodeError: pass

1 0

SVN: [7674] trunk/pywikipedia/checkimages.py
by filnik＠svn.wikimedia.org 21 Nov '09

21 Nov '09

Revision: 7674 Author: filnik Date: 2009-11-20 20:58:54 +0000 (Fri, 20 Nov 2009) Log Message: ----------- Bugfix, no reporting on commons Modified Paths: -------------- trunk/pywikipedia/checkimages.py Modified: trunk/pywikipedia/checkimages.py =================================================================== --- trunk/pywikipedia/checkimages.py 2009-11-20 16:09:04 UTC (rev 7673) +++ trunk/pywikipedia/checkimages.py 2009-11-20 20:58:54 UTC (rev 7674) @@ -605,8 +605,7 @@ else: if not resPutMex: break - - if self.notification and self.head: + if self.notification: try: self.put_mex_in_talk() except wikipedia.EditConflict: @@ -702,14 +701,11 @@ testoattuale = self.talk_page.get() except wikipedia.NoPage: second_text = False - ti_es_ti = wikipedia.translate(self.site, empty) - testoattuale = ti_es_ti + testoattuale = wikipedia.translate(self.site, empty) except wikipedia.NoPage: wikipedia.output(u'The user page is blank') second_text = False - ti_es_ti = wikipedia.translate(self.site, empty) - testoattuale = ti_es_ti - + testoattuale = wikipedia.translate(self.site, empty) if self.commTalk: commentox = self.commTalk else:

1 0

SVN: [7673] branches/rewrite/scripts/category_redirect.py
by russblau＠svn.wikimedia.org 21 Nov '09

21 Nov '09

Revision: 7673 Author: russblau Date: 2009-11-20 16:09:04 +0000 (Fri, 20 Nov 2009) Log Message: ----------- Replace redundant list of templates Modified Paths: -------------- branches/rewrite/scripts/category_redirect.py Modified: branches/rewrite/scripts/category_redirect.py =================================================================== --- branches/rewrite/scripts/category_redirect.py 2009-11-20 16:08:37 UTC (rev 7672) +++ branches/rewrite/scripts/category_redirect.py 2009-11-20 16:09:04 UTC (rev 7673) @@ -62,56 +62,6 @@ } } - # List of all templates that are used to mark category redirects - # (put the most preferred form first) - self.redir_templates = { - 'wikipedia': { - 'ar': (u"تحويل تصنيف", - u"Category redirect", - u"تحويلة تصنيف"), - 'cs': (u"Zastaralá kategorie"), - 'da': ("Kategoriomdirigering",), - 'en': ("Category redirect", - "Category redirect3", - "Categoryredirect", - "Empty category", - "CR", - "Catredirect", - "Cat redirect", - "Emptycat", - "Emptycategory", - "Empty cat", - "Seecat"), - 'fr': ("Catégorie redirigée", - "Redirection de catégorie"), - 'hu': ("Kat-redir", - "Katredir"), - 'ja': ("Category redirect",), - 'no': ("Kategoriomdirigering",), - 'simple': ("Category redirect", - "Categoryredirect", - "Catredirect"), - 'zh': (u"分类重定向", - u"Cat-redirect", - u"重定向分类", - u"重定向分类", - u"Cr", - u"CR"), - }, - 'commons': { - 'commons': (u'Category redirect', - u'Categoryredirect', - u'See cat', - u'Seecat', - u'Catredirect', - u'Cat redirect', - u'CatRed', - u'Cat-red', - u'Catredir', - u'Redirect category',), - } - } - self.move_comment = { 'ar': u"روبوت: نقل الصفحات من تصنيف محول", 'cs': u'Robot přesunul stránku ze zastaralé kategorie', @@ -344,7 +294,7 @@ def run(self): """Run the bot""" global destmap, catlist, catmap - + user = self.site.user() redirect_magicwords = ["redirect"] other_words = self.site.redirect() @@ -369,8 +319,7 @@ cPickle.dump(record, open(datafile + ".bak", "wb"), -1) try: - template_list = self.redir_templates[self.site.family.name - ][self.site.code] + template_list = self.site.family.category_redirect_templates[self.site.code] except KeyError: pywikibot.output(u"No redirect templates defined for %s" % self.site.sitename())

1 0

← Newer
1
2
3
4
5
6
7
8
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn November 2009