Pywikipedia-svn December 2009

pywikipedia-svn@lists.wikimedia.org

6 participants
127 discussions

SVN: [7849] branches/rewrite/scripts/redirect.py
by russblau＠svn.wikimedia.org 31 Dec '09

31 Dec '09

Revision: 7849 Author: russblau Date: 2009-12-31 17:56:33 +0000 (Thu, 31 Dec 2009) Log Message: ----------- Port redirect.py to rewrite branch; to do this, some options had to be removed and some command-line arguments changed. Because this is a port rather than a newly-written script, it may contain some unused variables/methods and could benefit from refactoring. Added Paths: ----------- branches/rewrite/scripts/redirect.py Added: branches/rewrite/scripts/redirect.py =================================================================== --- branches/rewrite/scripts/redirect.py (rev 0) +++ branches/rewrite/scripts/redirect.py 2009-12-31 17:56:33 UTC (rev 7849) @@ -0,0 +1,792 @@ +# -*- coding: utf-8 -*- +""" +Script to resolve double redirects, and to delete broken redirects. Requires +access to MediaWiki's maintenance pages or to a XML dump file. Delete +function requires adminship. + +Syntax: + + python redirect.py action [-arguments ...] + +where action can be one of these: + +double Fix redirects which point to other redirects +broken Delete redirects where targets don\'t exist. Requires adminship. +both Both of the above. Permitted only with -api. Implies -api. + +and arguments can be: + +-moves Use the page move log to find double-redirect candidates. Only + works with action "double". + +-namespace:n Namespace to process. Can be given multiple times, for several + namespaces. If omitted, only the main (article) namespace is + treated. + +-offset:n With -moves, the number of hours ago to start scanning moved + pages. Otherwise, ignored. + +-start:title The starting page title in each namespace. Page need not exist. + +-until:title The possible last page title in each namespace. Page needs not + exist. + +-total:n The maximum count of redirects to work upon. If omitted, there + is no limit. + +-always Don't prompt you for each replacement. + +""" + +# XML not yet implemented: deleted help text follows +##-xml Retrieve information from a local XML dump +## (http://download.wikimedia.org). Argument can also be given as +## "-xml:filename.xml". Cannot be used with -api or -moves. +## If neither of -xml -api -moves is given, info will be loaded +## from a special page of the live wiki. + +# +# (C) Daniel Herding, 2004. +# Purodha Blissenbach, 2009. +# +# Distributed under the terms of the MIT license. +# +# +import pywikibot +from pywikibot import config +# import xmlreader +import re, sys + +__version__='$Id: redirect.py 7789 2009-12-17 19:20:12Z xqt $' + +# Summary message for fixing double redirects +msg_double={ + 'als':u'Bötli: Uflösig vun de doppleti Wyterleitig zue %s', + 'ar': u'روبوت: تصليح تحويلة مزدوجة → %s', + 'bat-smg': u'Robots: Taisuoms dvėgobs paradresavėms → %s', + 'be-x-old': u'Робат: выпраўленьне падвойнага перанакіраваньня → %s', + 'br': u'Kempennet adkas doubl gant robot → %s', + 'cs': u'Robot opravil dvojité přesměrování → %s', + 'de': u'Bot: Korrigiere doppelte Weiterleitung zu %s', + 'en': u'Robot: Fixing double redirect to %s', + 'es': u'Robot: Arreglando doble redirección → %s', + 'fa': u'ربات:اصلاح تغییر مسیر دوتایی → %s', + 'fi': u'Botti korjasi kaksinkertaisen ohjauksen → %s', + 'fr': u'Robot: répare double redirection à %s', + 'ga': u'Róbó: Ag socrú athsheolta dúbailte → %s', + 'he': u'בוט: מתקן הפניה כפולה → %s', + 'hr': u'Bot: Popravak dvostrukih preusmjeravanja → %s', + 'ia': u'Robot: reparation de duple redirection → %s', + 'is': u'Vélmenni: Lagfæri tvöfalda tilvísun → %s', + 'it': u'Bot: Sistemo i redirect doppi a %s', + 'ja': u'ロボットによる: 二重リダイレクト修正 → %s', + 'ka': u'რობოტი: ორმაგი გადამისამართების გასწორება → %s', + 'ko': u'로봇: 이중 넘겨주기 수정 → %s', + 'kk': u'Бот: Шынжырлы айдатуды түзетті → %s', + 'ksh':u'Bot: [[special:doubleredirects|Dubbel Ömlëijdong]] fottjemaat → %s', + 'lb': u'Bot: Duebel Viruleedung gefléckt → %s', + 'lt': u'robotas: Taisomas dvigubas peradresavimas → %s', + 'mk': u'Бот: Исправка на двојни пренасочувања → %s', + 'nds':u'Bot: Dubbelte Wiederleiden rutmakt → %s', + 'nl': u'Bot: dubbele doorverwijzing gecorrigeerd aan %s', + 'nn': u'robot: retta dobbel omdirigering → %s', + 'no': u'bot: Retter dobbel omdirigering → %s', + 'pl': u'Robot naprawia podwójne przekierowanie → %s', + 'pt': u'Bot: Corrigido duplo redirecionamento → %s', + 'ru': u'Робот: исправление двойного перенаправления → %s', + 'sr': u'Бот: Поправка дуплих преусмерења → %s', + 'sv': u'Robot: Rättar dubbel omdirigering → %s', + 'szl':u'Robot sprowjo tuplowane przekerowańa → %s', + 'th': u'โรบอต: แก้หน้าเปลี่ยนทางซ้ำซ้อน → %s', + 'tr': u'Bot değişikliği: Yönlendirmeye olan yönlendirme → %s', + 'uk': u'Робот: виправлення подвійного перенаправлення → %s', + 'war':u'Robot: Gin-ayad in nagduduha nga redirek → %s', + 'yi': u'באט: פארראכטן פארטאפלטע ווייטערפירונג → %s', + 'zh': u'機器人:修正雙重重定向 → %s', + 'zh-yue': u'機械人：拉直連串跳轉 → %s', + 'zh-classical': u'僕:復修渡口 → %s', +} + +# Reason for deleting broken redirects +reason_broken={ + 'ar': u'روبوت: هدف التحويلة غير موجود', + 'be-x-old': u'Робат: мэта перанакіраваньня не існуе', + 'cs': u'Přerušené přesměrování', + 'de': u'Bot: Weiterleitungsziel existiert nicht', + 'en': u'[[WP:CSD#G8|G8]]: [[Wikipedia:Redirect|Redirect]] to a deleted or non-existent page', + 'es': u'Robot: La página a la que redirige no existe', + 'fa': u'ربات:تغییرمسیر مقصد ندارد', + 'fi': u'Botti: Ohjauksen kohdesivua ei ole olemassa', + 'fr': u'Robot : Cible du redirect inexistante', + 'ga': u'Róbó : Targaid athsheoladh ar iarraidh', + 'he': u'בוט: יעד ההפניה אינו קיים', + 'it': u'Bot: Il redirect indirizza ad una pagina inesistente', + 'ja': u'ロボットによる:リダイレクトの目標は存在しませんでした', + 'ka': u'რობოტი: გადამისამართებული გვერდი არ არსებობს', + 'ko': u'로봇: 끊긴 넘겨주기', + 'kk': u'Бот: Айдату нысанасы жоқ болды', + 'ksh':u'Bot: Dė [[Special:BrokenRedirects|Ömlëijdong jingk ennet Liiere]]', + 'lt': u'robotas: Peradresavimas į niekur', + 'nds':u'Bot: Kaputte Wiederleiden rutmakt', + 'nl': u'Bot: doelpagina doorverwijzing bestaat niet', + 'nn': u'robot: målet for omdirigeringa eksisterer ikkje', + 'no': u'robot: målet for omdirigeringen eksisterer ikke', + 'pl': u'Robot: cel przekierowania nie istnieje', + 'pt': u'Bot: Redirecionamento não existe', + 'ru': u'Робот: перенаправление в никуда', + 'sr': u'Бот: Преусмерење не постоји', + 'th': u'โรบอต: หน้าเปลี่ยนทางเสีย', + 'tr': u'Bot değişikliği: Var olmayan sayfaya olan yönlendirme', + 'war':u'Robot: Waray dida an karadto-an han redirek', + 'yi': u'באט: ווײַטערפֿירן ציל עקזיסטירט נישט', + 'zh': u'機器人:該重定向的目標不存在', + 'zh-yue': u'機械人：跳轉目標唔存在', +} + +# Summary message for putting broken redirect to speedy delete +sd_tagging_sum = { + 'ar': u'روبوت: وسم للحذف السريع', + 'cs': u'Robot označil ke smazání', + 'en': u'Robot: Tagging for speedy deletion', + 'ga': u'Róbó: Ag maircáil le luas-scrios', + 'it': u'Bot: +Da cancellare subito', + 'ja': u'ロボットによる:迷子のリダイレクトを即時削除へ', + 'ksh':u'Bot: Di Ömlëijdong jeiht noh nörjendwoh.', + 'nds':u'Bot: Kaputte Wiederleiden ward nich brukt', + 'nl': u'Bot: gemarkeerd voor snelle verwijdering', + 'war':u'Robot: Nautod o nagbinalikbalik nga redirek', + 'zh': u'機器人: 將損壞的重定向提報快速刪除', +} + +# Insert deletion template into page with a broken redirect +sd_template = { + 'ar': u'{{شطب|تحويلة مكسورة}}', + 'cs': u'{{smazat|přerušené přesměrování}}', + 'en': u'{{db-r1}}', + 'ga': u'{{scrios|Athsheoladh briste}}', + 'it': u'{{Cancella subito|9}}', + 'ja': u'{{即時削除|壊れたリダイレクト}}', + 'ksh':u'{{Schmieß fott}}Di Ömlëijdong jeiht noh nörjendwoh hen.<br />--~~~~~\n\n', + 'nds':u'{{delete}}Kaputte Wiederleiden, wat nich brukt ward.<br />--~~~~\n\n', + 'war':u'{{delete}}Nautod o nagbinalikbalik nga redirek.--~~~~\n\n', + 'zh': u'{{delete|R1}}', +} + +class RedirectGenerator: + def __init__(self, xmlFilename=None, namespaces=[], offset=-1, + use_move_log=False, use_api=False, start=None, until=None, + number=None): + self.site = pywikibot.getSite() +## self.xmlFilename = xmlFilename + self.namespaces = namespaces + if use_api and self.namespaces == []: + self.namespaces = [ 0 ] + self.offset = offset + self.use_move_log = use_move_log + self.use_api = use_api + self.api_start = start + self.api_until = until + self.api_number = number + +## def get_redirects_from_dump(self, alsoGetPageTitles=False): +## ''' +## Load a local XML dump file, look at all pages which have the +## redirect flag set, and find out where they're pointing at. Return +## a dictionary where the redirect names are the keys and the redirect +## targets are the values. +## ''' +## xmlFilename = self.xmlFilename +## redict = {} +## # open xml dump and read page titles out of it +## dump = xmlreader.XmlDump(xmlFilename) +## redirR = self.site.redirectRegex() +## readPagesCount = 0 +## if alsoGetPageTitles: +## pageTitles = set() +## for entry in dump.parse(): +## readPagesCount += 1 +## # always print status message after 10000 pages +## if readPagesCount % 10000 == 0: +## pywikibot.output(u'%i pages read...' % readPagesCount) +## if len(self.namespaces) > 0: +## if pywikibot.Page(self.site, entry.title).namespace() \ +## not in self.namespaces: +## continue +## if alsoGetPageTitles: +## pageTitles.add(entry.title.replace(' ', '_')) +## +## m = redirR.match(entry.text) +## if m: +## target = m.group(1) +## # There might be redirects to another wiki. Ignore these. +## for code in self.site.family.langs.keys(): +## if target.startswith('%s:' % code) \ +## or target.startswith(':%s:' % code): +## if code == self.site.language(): +## # link to our wiki, but with the lang prefix +## target = target[(len(code)+1):] +## if target.startswith(':'): +## target = target[1:] +## else: +## pywikibot.output( +## u'NOTE: Ignoring %s which is a redirect to %s:' +## % (entry.title, code)) +## target = None +## break +## # if the redirect does not link to another wiki +## if target: +## source = entry.title.replace(' ', '_') +## target = target.replace(' ', '_') +## # remove leading and trailing whitespace +## target = target.strip('_') +## # capitalize the first letter +## if not pywikibot.getSite().nocapitalize: +## source = source[:1].upper() + source[1:] +## target = target[:1].upper() + target[1:] +## if '#' in target: +## target = target[:target.index('#')].rstrip("_") +## if '|' in target: +## pywikibot.output( +## u'HINT: %s is a redirect with a pipelink.' +## % entry.title) +## target = target[:target.index('|')].rstrip("_") +## if target: # in case preceding steps left nothing +## redict[source] = target +## if alsoGetPageTitles: +## return redict, pageTitles +## else: +## return redict +## + def get_redirect_pages_via_api(self): + """Return generator that yields Pages that are redirects.""" + for ns in self.namespaces: + done = False + gen = self.site.allpages(start=self.api_start, + namespace=ns, + filterredir=True) + if self.api_number: + gen.set_maximum_items(self.api_number) + for p in gen: + done = self.api_until \ + and p.title(withNamespace=False) >= self.api_until + if done: + return + yield p + + def _next_redirect_group(self): + """ + Return a generator that retrieves pageids from the API 500 at a time + and yields them as a list + """ + apiQ = [] + for page in self.get_redirect_pages_via_api(): + apiQ.append(str(page._pageid)) + if len(apiQ) >= 500: + yield apiQ + apiQ = [] + if apiQ: + yield apiQ + + def get_redirects_via_api(self, maxlen=8): + """ + Return a generator that yields tuples of data about redirect Pages: + 0 - page title of a redirect page + 1 - type of redirect: + 0 - broken redirect, target page title missing + 1 - normal redirect, target page exists and is not a + redirect + 2..maxlen - start of a redirect chain of that many redirects + (currently, the API seems not to return sufficient + data to make these return values possible, but + that may change) + maxlen+1 - start of an even longer chain, or a loop + (currently, the API seems not to return sufficient + data to allow this return values, but that may + change) + None - start of a redirect chain of unknown length, or loop + 2 - target page title of the redirect, or chain (may not exist) + 3 - target page of the redirect, or end of chain, or page title where + chain or loop detecton was halted, or None if unknown + """ + for apiQ in self._next_redirect_group(): + gen = pywikibot.data.api.Request(action="query", redirects="", + pageids=apiQ) + data = gen.submit() + if 'error' in data: + raise RuntimeError("API query error: %s" % data) + if data == [] or "query" not in data: + raise RuntimeError("No results given.") + redirects = {} + pages = {} + redirects = dict((x['from'], x['to']) + for x in data['query']['redirects']) + + for pagetitle in data['query']['pages'].values(): + if 'missing' in pagetitle and 'pageid' not in pagetitle: + pages[pagetitle['title']] = False + else: + pages[pagetitle['title']] = True + for redirect in redirects: + target = redirects[redirect] + result = 0 + final = None + try: + if pages[target]: + final = target + try: + while result <= maxlen: + result += 1 + final = redirects[final] + # result = None + except KeyError: + pass + except KeyError: + result = None + pass + yield (redirect, result, target, final) + + def retrieve_broken_redirects(self): + if self.use_api: + count = 0 + for (pagetitle, type, target, final) \ + in self.get_redirects_via_api(maxlen=2): + if type == 0: + yield pagetitle + if self.api_number: + count += 1 + if count >= self.api_number: + break + +## elif self.xmlFilename == None: +## # retrieve information from the live wiki's maintenance page +## # broken redirect maintenance page's URL +## path = self.site.broken_redirects_address(default_limit=False) +## pywikibot.output(u'Retrieving special page...') +## maintenance_txt = self.site.getUrl(path) +## +## # regular expression which finds redirects which point to a +## # non-existing page inside the HTML +## Rredir = re.compile('\<li\>\<a href=".+?" title="(.*?)"') +## +## redir_names = Rredir.findall(maintenance_txt) +## pywikibot.output(u'Retrieved %d redirects from special page.\n' +## % len(redir_names)) +## for redir_name in redir_names: +## yield redir_name +## else: +## # retrieve information from XML dump +## pywikibot.output( +## u'Getting a list of all redirects and of all page titles...') +## redirs, pageTitles = self.get_redirects_from_dump( +## alsoGetPageTitles=True) +## for (key, value) in redirs.iteritems(): +## if value not in pageTitles: +## yield key + + def retrieve_double_redirects(self): + if self.use_move_log: + for redir_page in self.get_moved_pages_redirects(): + yield redir_page.title() + return + else: + count = 0 + for (pagetitle, type, target, final) \ + in self.get_redirects_via_api(maxlen=2): + if type != 0 and type != 1: + yield pagetitle + if self.api_number: + count += 1 + if count >= self.api_number: + break + +## elif self.xmlFilename == None: +## # retrieve information from the live wiki's maintenance page +## # double redirect maintenance page's URL +### pywikibot.config.special_page_limit = 1000 +## path = self.site.double_redirects_address(default_limit = False) +## pywikibot.output(u'Retrieving special page...') +## maintenance_txt = self.site.getUrl(path) +## +## # regular expression which finds redirects which point to +## # another redirect inside the HTML +## Rredir = re.compile('\<li\>\<a href=".+?" title="(.*?)">') +## redir_names = Rredir.findall(maintenance_txt) +## pywikibot.output(u'Retrieved %i redirects from special page.\n' +## % len(redir_names)) +## for redir_name in redir_names: +## yield redir_name +## else: +## redict = self.get_redirects_from_dump() +## num = 0 +## for (key, value) in redict.iteritems(): +## num += 1 +## # check if the value - that is, the redirect target - is a +## # redirect as well +## if num > self.offset and value in redict: +## yield key +## pywikibot.output(u'\nChecking redirect %i of %i...' +## % (num + 1, len(redict))) + + def get_moved_pages_redirects(self): + '''generate redirects to recently-moved pages''' + # this will run forever, until user interrupts it + import datetime + + if self.offset <= 0: + self.offset = 1 + start = datetime.datetime.utcnow() \ + - datetime.timedelta(0, self.offset*3600) + # self.offset hours ago + offset_time = start.strftime("%Y%m%d%H%M%S") + + move_gen = self.site.logevents(logtype="move", start=offset_time) + if self.api_number: + move_gen.set_maximum_items(self.api_number) + for logentry in move_gen: + moved_page = logentry.title() + try: + if not moved_page.isRedirectPage(): + continue + except pywikibot.BadTitle: + continue + except pywikibot.ServerError: + continue + # moved_page is now a redirect, so any redirects pointing + # to it need to be changed + try: + for page in moved_page.getReferences(follow_redirects=True, + redirectsOnly=True): + yield page + except pywikibot.NoPage: + # original title must have been deleted after move + continue + + +class RedirectRobot: + def __init__(self, action, generator, always=False, number=None): + self.site = pywikibot.getSite() + self.action = action + self.generator = generator + self.always = always + self.number = number + self.exiting = False + + def prompt(self, question): + if not self.always: + choice = pywikibot.inputChoice(question, + ['Yes', 'No', 'All', 'Quit'], + ['y', 'N', 'a', 'q'], 'N') + if choice == 'n': + return False + elif choice == 'q': + self.exiting = True + return False + elif choice == 'a': + self.always = True + return True + + def delete_broken_redirects(self): + # get reason for deletion text + reason = pywikibot.translate(self.site, reason_broken) + for redir_name in self.generator.retrieve_broken_redirects(): + self.delete_1_broken_redirect( redir_name, reason) + if self.exiting: + break + + def delete_1_broken_redirect(self, redir_name, reason): + redir_page = pywikibot.Page(self.site, redir_name) + # Show the title of the page we're working on. + # Highlight the title in purple. + pywikibot.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" + % redir_page.title()) + try: + targetPage = redir_page.getRedirectTarget() + except pywikibot.IsNotRedirectPage: + pywikibot.output(u'%s is not a redirect.' % redir_page.title()) + except pywikibot.NoPage: + pywikibot.output(u'%s doesn\'t exist.' % redir_page.title()) + else: + try: + targetPage.get() + except pywikibot.NoPage: + if self.prompt( + u'Redirect target %s does not exist. Do you want to delete %s?' + % (targetPage.title(asLink=True), + redir_page.title(asLink=True))): + try: + redir_page.delete(reason, prompt = False) + except pywikibot.NoUsername: + if targetPage.site().lang in sd_template \ + and targetPage.site().lang in sd_tagging_sum: + pywikibot.output( + u"No sysop in user-config.py, put page to speedy deletion.") + content = redir_page.get(get_redirect=True) + content = pywikibot.translate( + targetPage.site().lang, + sd_template)+"\n"+content + summary = pywikibot.translate( + targetPage.site().lang, + sd_tagging_sum) + redir_page.put(content, summary) + + except pywikibot.IsRedirectPage: + pywikibot.output( + u'Redirect target %s is also a redirect! Won\'t delete anything.' + % targetPage.title(asLink=True)) + else: + #we successfully get the target page, meaning that + #it exists and is not a redirect: no reason to touch it. + pywikibot.output( + u'Redirect target %s does exist! Won\'t delete anything.' + % targetPage.title(asLink=True)) + pywikibot.output(u'') + + def fix_double_redirects(self): + for redir_name in self.generator.retrieve_double_redirects(): + self.fix_1_double_redirect(redir_name) + if self.exiting: + break + + def fix_1_double_redirect(self, redir_name): + redir = pywikibot.Page(self.site, redir_name) + # Show the title of the page we're working on. + # Highlight the title in purple. + pywikibot.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" + % redir.title()) + newRedir = redir + redirList = [] # bookkeeping to detect loops + while True: + redirList.append(u'%s:%s' % (newRedir.site().lang, + newRedir.title(withSection=False))) + try: + targetPage = newRedir.getRedirectTarget() + except pywikibot.IsNotRedirectPage: + if len(redirList) == 1: + pywikibot.output(u'Skipping: Page %s is not a redirect.' + % redir.title(asLink=True)) + break #do nothing + elif len(redirList) == 2: + pywikibot.output( + u'Skipping: Redirect target %s is not a redirect.' + % newRedir.title(asLink=True)) + break # do nothing + except pywikibot.SectionError: + pywikibot.output( + u'Warning: Redirect target section %s doesn\'t exist.' + % newRedir.title(asLink=True)) + except pywikibot.BadTitle, e: + # str(e) is in the format 'BadTitle: [[Foo]]' + pywikibot.output( + u'Warning: Redirect target %s is not a valid page title.' + % str(e)[10:]) + #sometimes this error occures. Invalid Title starting with a '#' + except pywikibot.InvalidTitle, err: + pywikibot.output(u'Warning: %s' % err) + break + except pywikibot.NoPage: + if len(redirList) == 1: + pywikibot.output(u'Skipping: Page %s does not exist.' + % redir.title(asLink=True)) + break + else: + if self.always: + pywikibot.output( + u"Skipping: Redirect target %s doesn't exist." + % newRedir.title(asLink=True)) + break # skip if automatic + else: + pywikibot.output( + u"Warning: Redirect target %s doesn't exist." + % newRedir.title(asLink=True)) + except pywikibot.ServerError: + pywikibot.output(u'Skipping: Server Error') + break + else: + pywikibot.output( + u' Links to: %s.' + % targetPage.title(asLink=True)) + if targetPage.site() != self.site: + pywikibot.output( + u'Warning: redirect target (%s) is on a different site.' + % (targetPage.title(asLink=True))) + if self.always: + break # skip if automatic + # watch out for redirect loops + if redirList.count(u'%s:%s' + % (targetPage.site().lang, + targetPage.title(withSection=False)) + ) > 0: + pywikibot.output( + u'Warning: Redirect target %s forms a redirect loop.' + % targetPage.title(asLink=True)) + break ###xqt doesn't work. edits twice! + try: + content = targetPage.get(get_redirect=True) + except pywikibot.SectionError: + content = pywikibot.Page( + targetPage.site(), + targetPage.title(withSection=False) + ).get(get_redirect=True) + if targetPage.site().lang in sd_template \ + and targetPage.site().lang in sd_tagging_sum: + pywikibot.output(u"Tagging redirect for deletion") + # Delete the two redirects + content = pywikibot.translate( + targetPage.site().lang, + sd_template)+"\n"+content + summ = pywikibot.translate(targetPage.site().lang, + sd_tagging_sum) + targetPage.put(content, summ) + redir.put(content, summ) + break # TODO Better implement loop redirect + else: + newRedir = targetPage + continue + try: + oldText = redir.get(get_redirect=True) + except pywikibot.BadTitle: + pywikibot.output(u"Bad Title Error") + break + text = self.site.redirectRegex().sub( + '#%s %s' % + (self.site.redirect( True ), + targetPage.title(asLink=True)), + oldText) + if text == oldText: + break + summary = pywikibot.translate(self.site, msg_double)\ + % targetPage.title(asLink=True) + pywikibot.showDiff(oldText, text) + if self.prompt(u'Do you want to accept the changes?'): + try: + redir.put(text, summary) + except pywikibot.LockedPage: + pywikibot.output(u'%s is locked.' % redir.title()) + except pywikibot.SpamfilterError, error: + pywikibot.output( + u"Saving page [[%s]] prevented by spam filter: %s" + % (redir.title(), error.url)) + except pywikibot.PageNotSaved, error: + pywikibot.output(u"Saving page [[%s]] failed: %s" + % (redir.title(), error)) + except pywikibot.NoUsername: + pywikibot.output( + u"Page [[%s]] not saved; sysop privileges required." + % redir.title()) + except pywikibot.Error, error: + pywikibot.output( + u"Unexpected error occurred trying to save [[%s]]: %s" + % (redir.title(), error)) + break + + def fix_double_or_delete_broken_redirects(self): + # TODO: part of this should be moved to generator, the rest merged into self.run() + # get reason for deletion text + delete_reason = pywikibot.translate(self.site, reason_broken) + count = 0 + for (redir_name, code, target, final)\ + in self.generator.get_redirects_via_api(maxlen=2): + if code == 1: + continue + elif code == 0: + self.delete_1_broken_redirect(redir_name, delete_reason) + count += 1 + else: + self.fix_1_double_redirect(redir_name) + count += 1 + if self.exiting or (self.number and count >= self.number): + break + + def run(self): + # TODO: make all generators return a redirect type indicator, + # thus make them usable with 'both' + if self.action == 'double': + self.fix_double_redirects() + elif self.action == 'broken': + self.delete_broken_redirects() + elif self.action == 'both': + self.fix_double_or_delete_broken_redirects() + +def main(*args): + # read command line parameters + # what the bot should do (either resolve double redirs, or delete broken + # redirs) + action = None + # where the bot should get his infos from (either None to load the + # maintenance special page from the live wiki, or the filename of a + # local XML dump file) + xmlFilename = None + # Which namespace should be processed when using a XML dump + # default to -1 which means all namespaces will be processed + namespaces = [] + # at which redirect shall we start searching double redirects again + # (only with dump); default to -1 which means all redirects are checked + offset = -1 + moved_pages = False + api = True # rewrite always uses api, probably should get rid of this + start = '' + until = '' + number = None + always = False + for arg in pywikibot.handleArgs(*args): + if arg == 'double' or arg == 'do': + action = 'double' + elif arg == 'broken' or arg == 'br': + action = 'broken' + elif arg == 'both': + action = 'both' + elif arg.startswith('-xml'): + if len(arg) == 4: + xmlFilename = pywikibot.input( + u'Please enter the XML dump\'s filename: ') + else: + xmlFilename = arg[5:] + elif arg.startswith('-moves'): + moved_pages = True + elif arg.startswith('-namespace:'): + ns = arg[11:] + if ns == '': + ## "-namespace:" does NOT yield -namespace:0 further down the road! + ns = pywikibot.input( + u'Please enter a namespace by its number: ') +# u'Please enter a namespace by its name or number: ') +# TODO! at least for some generators. + if ns == '': + ns = '0' + try: + ns = int(ns) + except ValueError: +#-namespace:all Process all namespaces. Works only with the API read interface. + pass + if not ns in namespaces: + namespaces.append(ns) + elif arg.startswith('-offset:'): + offset = int(arg[8:]) + elif arg.startswith('-start:'): + start = arg[7:] + elif arg.startswith('-until:'): + until = arg[7:] + elif arg.startswith('-total:'): + number = int(arg[8:]) + elif arg == '-always': + always = True + else: + pywikibot.output(u'Unknown argument: %s' % arg) + + if xmlFilename: + pywikibot.output("Sorry, xmlreader is not yet implemented in rewrite", + level=pywikibot.ERROR) + elif not action: # or (xmlFilename and moved_pages) + # or (api and xmlFilename): + pywikibot.showHelp('redirect') + else: + gen = RedirectGenerator(xmlFilename, namespaces, offset, moved_pages, + api, start, until, number) + bot = RedirectRobot(action, gen, always, number) + bot.run() + +if __name__ == '__main__': + try: + main() + finally: + pywikibot.stopme()

1 0

SVN: [7848] trunk/pywikipedia/family.py
by xqt＠svn.wikimedia.org 31 Dec '09

31 Dec '09

Revision: 7848 Author: xqt Date: 2009-12-31 10:09:36 +0000 (Thu, 31 Dec 2009) Log Message: ----------- some blanks deleted Modified Paths: -------------- trunk/pywikipedia/family.py Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2009-12-31 10:08:16 UTC (rev 7847) +++ trunk/pywikipedia/family.py 2009-12-31 10:09:36 UTC (rev 7848) @@ -3103,16 +3103,18 @@ self.disambiguationTemplates = { '_default': [] } - # A list with the projects could share cross-project sessions. + + # A list of projects that share cross-project sessions. self.cross_projects = [] + # A list with the name for cross-project cookies. # default for wikimedia centralAuth extensions. self.cross_projects_cookies = ['centralauth_Session', 'centralauth_Token', 'centralauth_User'] self.cross_projects_cookie_username = 'centralauth_User' - + # A list with the name in the cross-language flag permissions self.cross_allowed = [] - + # A list with the name of the category containing disambiguation # pages for the various languages. Only one category per language, # and without the namespace, so add things like:

1 0

SVN: [7847] branches/rewrite/pywikibot
by xqt＠svn.wikimedia.org 31 Dec '09

31 Dec '09

Revision: 7847 Author: xqt Date: 2009-12-31 10:08:16 +0000 (Thu, 31 Dec 2009) Log Message: ----------- update family files from trunk Modified Paths: -------------- branches/rewrite/pywikibot/families/wikibooks_family.py branches/rewrite/pywikibot/families/wikipedia_family.py branches/rewrite/pywikibot/families/wikiquote_family.py branches/rewrite/pywikibot/families/wikisource_family.py branches/rewrite/pywikibot/families/wiktionary_family.py branches/rewrite/pywikibot/family.py Modified: branches/rewrite/pywikibot/families/wikibooks_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikibooks_family.py 2009-12-31 09:44:51 UTC (rev 7846) +++ branches/rewrite/pywikibot/families/wikibooks_family.py 2009-12-31 10:08:16 UTC (rev 7847) @@ -14,8 +14,8 @@ 'en', 'de', 'fr', 'hu', 'pt', 'ja', 'es', 'nl', 'pl', 'it', 'he', 'sq', 'fi', 'ru', 'vi', 'cs', 'hr', 'zh', 'sv', 'da', 'ca', 'mk', 'tr', 'th', 'tl', 'sr', 'fa', 'id', 'is', 'ar', - 'ta', 'no', 'simple', 'ka', 'ko', 'eo', 'gl', 'bg', 'lt', 'ro', - 'sk', 'el', 'la', 'ia', 'ang', 'sl', 'et', 'cv', 'mr', 'ur', + 'ta', 'no', 'simple', 'ka', 'ko', 'gl', 'eo', 'bg', 'lt', 'ro', + 'sk', 'el', 'la', 'ia', 'ang', 'cv', 'et', 'sl', 'mr', 'ur', 'uk', 'oc', 'ml', 'ms', 'eu', 'fy', 'ie', 'hi', 'tg', 'bn', 'af', 'hy', 'bs', 'te', 'pa', 'ky', 'az', 'be', 'sa', 'ast', 'zh-min-nan', 'tt', 'cy', 'mg', 'si', 'ku', 'co', 'tk', 'sw', 'ne', Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2009-12-31 09:44:51 UTC (rev 7846) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2009-12-31 10:08:16 UTC (rev 7847) @@ -13,30 +13,31 @@ self.languages_by_size = [ 'en', 'de', 'fr', 'pl', 'it', 'ja', 'nl', 'es', 'pt', 'ru', 'sv', 'zh', 'no', 'fi', 'ca', 'uk', 'hu', 'cs', 'tr', 'ro', - 'eo', 'ko', 'da', 'vo', 'id', 'sk', 'ar', 'vi', 'sr', 'he', + 'ko', 'eo', 'da', 'vo', 'ar', 'id', 'sk', 'vi', 'sr', 'he', 'lt', 'fa', 'bg', 'sl', 'hr', 'et', 'new', 'ms', 'simple', 'gl', 'th', 'nn', 'hi', 'ht', 'eu', 'el', 'te', 'ceb', 'mk', 'ka', - 'la', 'br', 'az', 'bs', 'lb', 'is', 'sh', 'mr', 'cy', 'sq', - 'bpy', 'lv', 'tl', 'jv', 'be-x-old', 'pms', 'bn', 'oc', 'ta', 'be', - 'io', 'an', 'nds', 'scn', 'sw', 'su', 'fy', 'af', 'nap', 'ku', - 'zh-yue', 'ast', 'bat-smg', 'ur', 'gu', 'ml', 'wa', 'qu', 'war', 'cv', - 'ksh', 'ga', 'tg', 'roa-tara', 'vec', 'gd', 'kn', 'uz', 'pam', 'lmo', - 'yi', 'mi', 'zh-min-nan', 'nah', 'glk', 'hsb', 'hy', 'co', 'kk', 'als', - 'roa-rup', 'sah', 'li', 'ia', 'tt', 'bcl', 'gan', 'os', 'arz', 'nds-nl', - 'fiu-vro', 'tk', 'vls', 'sa', 'fo', 'mn', 'am', 'nrm', 'dv', 'pag', - 'rm', 'map-bms', 'wuu', 'gv', 'ne', 'yo', 'bar', 'my', 'sco', 'se', + 'la', 'br', 'az', 'lb', 'bs', 'is', 'sh', 'mr', 'cy', 'sq', + 'lv', 'bpy', 'tl', 'jv', 'be-x-old', 'pms', 'bn', 'oc', 'ta', 'io', + 'be', 'an', 'sw', 'nds', 'scn', 'su', 'fy', 'af', 'nap', 'zh-yue', + 'ku', 'ast', 'bat-smg', 'ur', 'gu', 'ml', 'wa', 'qu', 'war', 'cv', + 'ksh', 'ga', 'tg', 'roa-tara', 'vec', 'kn', 'gd', 'uz', 'pam', 'lmo', + 'yi', 'mi', 'zh-min-nan', 'nah', 'hy', 'glk', 'hsb', 'co', 'kk', 'als', + 'roa-rup', 'sah', 'li', 'ia', 'tt', 'bcl', 'gan', 'os', 'yo', 'arz', + 'fiu-vro', 'nds-nl', 'tk', 'vls', 'sa', 'fo', 'mn', 'am', 'nrm', 'dv', + 'pag', 'rm', 'map-bms', 'wuu', 'gv', 'bar', 'ne', 'my', 'sco', 'se', 'diq', 'fur', 'pnb', 'lij', 'nov', 'si', 'mt', 'bh', 'mzn', 'csb', - 'ilo', 'pi', 'zh-classical', 'km', 'lad', 'ug', 'frp', 'sc', 'ang', 'mg', - 'kw', 'haw', 'pdc', 'ps', 'szl', 'kv', 'pa', 'to', 'hak', 'ie', - 'hif', 'bo', 'myv', 'gn', 'crh', 'ln', 'stq', 'nv', 'arc', 'jbo', - 'wo', 'ace', 'ext', 'mhr', 'ky', 'tpi', 'ty', 'cbk-zam', 'so', 'eml', - 'zea', 'srn', 'ay', 'pap', 'ckb', 'ig', 'kab', 'kg', 'or', 'lo', - 'ba', 'udm', 'dsb', 'rmy', 'kaa', 'ce', 'cu', 'sm', 'ks', 'av', - 'tet', 'got', 'xal', 'sd', 'ab', 'mdf', 'na', 'pnt', 'iu', 'bm', + 'ilo', 'pi', 'zh-classical', 'lad', 'km', 'ug', 'frp', 'sc', 'mg', 'ang', + 'kw', 'haw', 'pdc', 'szl', 'ps', 'hif', 'kv', 'ie', 'pa', 'to', + 'hak', 'bo', 'myv', 'crh', 'gn', 'ln', 'stq', 'nv', 'jbo', 'arc', + 'mhr', 'wo', 'ext', 'ace', 'ky', 'tpi', 'ty', 'cbk-zam', 'so', 'eml', + 'zea', 'srn', 'ay', 'ckb', 'pap', 'ig', 'kab', 'kg', 'or', 'ba', + 'lo', 'udm', 'dsb', 'rmy', 'cu', 'kaa', 'ce', 'sm', 'ks', 'av', + 'tet', 'xal', 'got', 'ab', 'sd', 'mdf', 'na', 'pnt', 'iu', 'bm', 'kl', 'pih', 'as', 'cdo', 'mwl', 'chr', 'ee', 'om', 'zu', 'ti', 'ts', 'za', 'ss', 've', 'bi', 'ha', 'cr', 'dz', 'bxr', 'ch', - 'bug', 'xh', 'tn', 'ki', 'st', 'ik', 'rw', 'ny', 'tw', 'ak', - 'chy', 'fj', 'sn', 'ff', 'lg', 'lbe', 'rn', 'tum', 'sg', 'ng', + 'bug', 'xh', 'tn', 'ki', 'ik', 'rw', 'st', 'ny', 'tw', 'chy', + 'ak', 'fj', 'sn', 'ff', 'lg', 'lbe', 'rn', 'tum', 'sg', 'ng', + 'pcd', ] for lang in self.languages_by_size: @@ -397,9 +398,9 @@ 'mdf', 'mo', 'mn', 'mus', 'my', 'nah', 'fj', 'nl', 'nds-nl', 'cr', 'ne', 'new', 'ja', 'nap', 'ce', 'pih', 'no', 'nb', 'nn', 'nrm', 'nov', 'ii', 'oc', 'mhr', 'or', 'om', 'ng', 'hz', 'uz', 'pa', 'pi', - 'pag', 'pnb', 'pap', 'ps', 'km', 'pms', 'nds', 'pl', 'pnt', 'pt', - 'aa', 'kaa', 'crh', 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', 'ru', - 'sah', 'se', 'sa', 'sg', 'sc', 'sco', 'stq', 'st', 'tn', 'sq', + 'pag', 'pnb', 'pap', 'ps', 'km', 'pcd', 'pms', 'nds', 'pl', 'pnt', + 'pt', 'aa', 'kaa', 'crh', 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', + 'ru', 'sah', 'se', 'sa', 'sg', 'sc', 'sco', 'stq', 'st', 'tn', 'sq', 'scn', 'si', 'simple', 'sd', 'ss', 'sk', 'sl', 'cu', 'szl', 'so', 'ckb', 'srn', 'sr', 'sh', 'fi', 'sv', 'tl', 'ta', 'kab', 'roa-tara', 'tt', 'te', 'tet', 'th', 'vi', 'ti', 'tg', 'tpi', 'tokipona', 'tp', Modified: branches/rewrite/pywikibot/families/wikiquote_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikiquote_family.py 2009-12-31 09:44:51 UTC (rev 7846) +++ branches/rewrite/pywikibot/families/wikiquote_family.py 2009-12-31 10:08:16 UTC (rev 7847) @@ -13,7 +13,7 @@ self.languages_by_size = [ 'en', 'it', 'pl', 'de', 'pt', 'ru', 'sk', 'es', 'bg', 'bs', 'sl', 'tr', 'fr', 'he', 'lt', 'cs', 'zh', 'el', 'hu', 'fa', - 'uk', 'id', 'sv', 'nl', 'no', 'ja', 'fi', 'eo', 'simple', 'hy', + 'uk', 'id', 'sv', 'nl', 'no', 'ja', 'eo', 'fi', 'simple', 'hy', 'et', 'nn', 'ca', 'ka', 'ar', 'ko', 'ku', 'hr', 'gl', 'ro', 'sr', 'ml', 'li', 'is', 'th', 'te', 'af', 'da', 'sq', 'eu', 'az', 'vi', 'cy', 'la', 'br', 'hi', 'be', 'ast', 'uz', 'ta', Modified: branches/rewrite/pywikibot/families/wikisource_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikisource_family.py 2009-12-31 09:44:51 UTC (rev 7846) +++ branches/rewrite/pywikibot/families/wikisource_family.py 2009-12-31 10:08:16 UTC (rev 7847) @@ -11,10 +11,10 @@ self.name = 'wikisource' self.languages_by_size = [ - 'en', 'pt', 'ru', 'zh', 'fr', 'es', 'de', 'he', 'it', 'ar', + 'en', 'zh', 'pt', 'ru', 'fr', 'es', 'de', 'he', 'it', 'ar', 'fa', 'hu', 'pl', 'th', 'cs', 'ro', 'hr', 'te', 'fi', 'tr', - 'nl', 'sv', 'sl', 'sr', 'ko', 'uk', 'ja', 'el', 'la', 'li', - 'ml', 'yi', 'vi', 'az', 'is', 'bn', 'bs', 'ca', 'hy', 'id', + 'nl', 'sv', 'sl', 'ko', 'sr', 'uk', 'ja', 'el', 'la', 'li', + 'ml', 'vi', 'yi', 'az', 'bn', 'is', 'bs', 'ca', 'hy', 'id', 'mk', 'no', 'da', 'et', 'ta', 'bg', 'lt', 'kn', 'gl', 'cy', 'sk', 'zh-min-nan', 'fo', ] Modified: branches/rewrite/pywikibot/families/wiktionary_family.py =================================================================== --- branches/rewrite/pywikibot/families/wiktionary_family.py 2009-12-31 09:44:51 UTC (rev 7846) +++ branches/rewrite/pywikibot/families/wiktionary_family.py 2009-12-31 10:08:16 UTC (rev 7847) @@ -12,18 +12,18 @@ self.languages_by_size = [ 'fr', 'en', 'lt', 'tr', 'zh', 'ru', 'vi', 'io', 'pl', 'el', - 'fi', 'hu', 'no', 'it', 'ta', 'de', 'sv', 'ko', 'pt', 'nl', - 'lo', 'ku', 'ja', 'es', 'ro', 'et', 'id', 'te', 'kn', 'gl', - 'bg', 'uk', 'ca', 'ar', 'vo', 'ml', 'fa', 'is', 'sr', 'li', + 'fi', 'hu', 'no', 'it', 'ta', 'de', 'sv', 'pt', 'ko', 'nl', + 'lo', 'ku', 'ja', 'ar', 'es', 'ro', 'kn', 'et', 'id', 'te', + 'gl', 'bg', 'uk', 'ca', 'vo', 'ml', 'fa', 'is', 'li', 'sr', 'af', 'cs', 'sw', 'fy', 'scn', 'th', 'simple', 'br', 'oc', 'he', - 'sl', 'hy', 'sq', 'tt', 'la', 'zh-min-nan', 'hr', 'da', 'ast', 'tk', + 'sl', 'hy', 'sq', 'tt', 'la', 'hr', 'zh-min-nan', 'da', 'ast', 'tk', 'wa', 'ur', 'hsb', 'kk', 'ky', 'wo', 'eo', 'ang', 'hi', 'ga', - 'gn', 'az', 'ia', 'co', 'sk', 'csb', 'st', 'ms', 'mr', 'tl', - 'ka', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'an', 'my', 'sh', - 'gu', 'eu', 'mg', 'km', 'lv', 'cy', 'bn', 'ts', 'qu', 'bs', - 'fo', 'am', 'rw', 'chr', 'su', 'ne', 'mn', 'om', 'nah', 'ie', - 'yi', 'be', 'iu', 'gd', 'nn', 'tg', 'zu', 'si', 'pa', 'mt', - 'dv', 'tpi', 'kw', 'gv', 'roa-rup', 'mi', 'jv', 'uz', 'ps', 'ik', + 'gn', 'az', 'ia', 'co', 'sk', 'csb', 'st', 'ms', 'mr', 'ka', + 'tl', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'an', 'my', 'eu', + 'sh', 'gu', 'cy', 'ne', 'km', 'mg', 'lv', 'bn', 'ts', 'qu', + 'bs', 'fo', 'am', 'rw', 'chr', 'su', 'mn', 'om', 'nah', 'ie', + 'yi', 'be', 'iu', 'gd', 'tg', 'nn', 'zu', 'si', 'pa', 'dv', + 'mt', 'kw', 'gv', 'tpi', 'roa-rup', 'mi', 'jv', 'uz', 'ps', 'ik', 'so', 'sg', 'ha', 'ss', 'sa', 'ay', 'na', 'jbo', 'tn', 'sm', 'lb', 'ks', 'fj', 'ln', 'za', 'dz', 'als', ] Modified: branches/rewrite/pywikibot/family.py =================================================================== --- branches/rewrite/pywikibot/family.py 2009-12-31 09:44:51 UTC (rev 7846) +++ branches/rewrite/pywikibot/family.py 2009-12-31 10:08:16 UTC (rev 7847) @@ -41,11 +41,11 @@ 'nah', 'na', 'fj', 'nl', 'nds-nl', 'cr', 'ne', 'new', 'ja', 'nap', 'ce', 'pih', 'no', 'nb', 'nn', 'nrm', 'nov', 'ii', 'oc', 'mhr', 'or', 'om', 'ng', 'hz', 'uz', 'pa', 'pi', 'pag', 'pnb', 'pap', 'ps', - 'km', 'pms', 'tpi', 'nds', 'pl', 'tokipona', 'tp', 'pnt', 'pt', - 'aa', 'kaa', 'crh', 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', 'ru', - 'sah', 'se', 'sm', 'sa', 'sg', 'sc', 'sco', 'stq', 'st', 'tn', 'sq', - 'scn', 'si', 'simple', 'sd', 'ss', 'sk', 'cu', 'sl', 'szl', 'so', - 'ckb', 'srn', 'sr', 'sh', 'su', 'fi', 'sv', 'tl', 'ta', 'kab', + 'km', 'pcd', 'pms', 'tpi', 'nds', 'pl', 'tokipona', 'tp', 'pnt', + 'pt', 'aa', 'kaa', 'crh', 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', + 'ru', 'sah', 'se', 'sm', 'sa', 'sg', 'sc', 'sco', 'stq', 'st', 'tn', + 'sq', 'scn', 'si', 'simple', 'sd', 'ss', 'sk', 'cu', 'sl', 'szl', + 'so', 'ckb', 'srn', 'sr', 'sh', 'su', 'fi', 'sv', 'tl', 'ta', 'kab', 'roa-tara', 'tt', 'te', 'tet', 'th', 'ti', 'tg', 'to', 'chr', 'chy', 've', 'tr', 'tk', 'tw', 'udm', 'bug', 'uk', 'ur', 'ug', 'za', 'vec', 'vi', 'vo', 'fiu-vro', 'wa', 'zh-classical', 'vls', 'war', 'wo', @@ -373,6 +373,7 @@ 'sourceforge': 'sourceforge', 'sourcextreme': 'sourcextreme', 'squeak': 'squeak', + 'strategy': 'strategy', 'stockphotoss': 'stockphotoss', 'strikiwiki': 'strikiwiki', 'susning': 'susning', @@ -585,26 +586,27 @@ ], # languages that use the latin alphabet 'latin': [ - 'aa', 'ace', 'af', 'ak', 'als', 'an', 'ang', 'ast', 'ay', 'bar', 'bat-smg', - 'bcl', 'bi', 'bm', 'br', 'bs', 'ca', 'cbk-zam', 'cdo', 'ceb', 'ch', - 'cho', 'chy', 'co', 'crh', 'cs', 'csb', 'cy', 'da', 'de', 'diq', 'dsb', - 'ee', 'eml', 'en', 'eo', 'es', 'et', 'eu', 'ext', 'ff', 'fi', 'fiu-vro', - 'fj', 'fo', 'fr', 'frp', 'fur', 'fy', 'ga', 'gd', 'gl', 'gn', 'gv', - 'hak', 'haw', 'hif', 'ho', 'hr', 'hsb', 'ht', 'hu', 'hz', 'ia', 'id', - 'ie', 'ig', 'ik', 'ilo', 'io', 'is', 'it', 'jbo', 'jv', 'kaa', 'kab', - 'kg', 'ki', 'kj', 'kl', 'kr', 'ksh', 'kw', 'la', 'lad', 'lb', 'lg', - 'li', 'lij', 'lmo', 'ln', 'lt', 'lv', 'map-bms', 'mg', 'mh', 'mi', 'ms', - 'mt', 'mus', 'mwl', 'na', 'nah', 'nap', 'nds', 'nds-nl', 'ng', 'nl', 'nn', - 'no', 'nov', 'nrm', 'nv', 'ny', 'oc', 'om', 'pag', 'pam', 'pap', 'pdc', - 'pih', 'pl', 'pms', 'pt', 'qu', 'rm', 'rn', 'ro', 'roa-rup', 'roa-tara', - 'rw', 'sc', 'scn', 'sco', 'se', 'sg', 'simple', 'sk', 'sl', 'sm', 'sn', - 'so', 'sq', 'srn', 'ss', 'st', 'stq', 'su', 'sv', 'sw', 'szl', 'tet', - 'tl', 'tn', 'to', 'tpi', 'tr', 'ts', 'tum', 'tw', 'ty', 'uz', 've', - 'vec', 'vi', 'vls', 'vo', 'wa', 'war', 'wo', 'xh', 'yo', 'zea', - 'zh-min-nan', 'zu', + 'aa', 'ace', 'af', 'ak', 'als', 'an', 'ang', 'ast', 'ay', 'bar', + 'bat-smg', 'bcl', 'bi', 'bm', 'br', 'bs', 'ca', 'cbk-zam', 'cdo', 'ceb', + 'ch', 'cho', 'chy', 'co', 'crh', 'cs', 'csb', 'cy', 'da', 'de', + 'diq', 'dsb', 'ee', 'eml', 'en', 'eo', 'es', 'et', 'eu', 'ext', + 'ff', 'fi', 'fiu-vro', 'fj', 'fo', 'fr', 'frp', 'fur', 'fy', 'ga', + 'gd', 'gl', 'gn', 'gv', 'hak', 'haw', 'hif', 'ho', 'hr', 'hsb', + 'ht', 'hu', 'hz', 'ia', 'id', 'ie', 'ig', 'ik', 'ilo', 'io', + 'is', 'it', 'jbo', 'jv', 'kaa', 'kab', 'kg', 'ki', 'kj', 'kl', + 'kr', 'ksh', 'kw', 'la', 'lad', 'lb', 'lg', 'li', 'lij', 'lmo', + 'ln', 'lt', 'lv', 'map-bms', 'mg', 'mh', 'mi', 'ms', 'mt', 'mus', + 'mwl', 'na', 'nah', 'nap', 'nds', 'nds-nl', 'ng', 'nl', 'nn', 'no', + 'nov', 'nrm', 'nv', 'ny', 'oc', 'om', 'pag', 'pam', 'pap', 'pcd', + 'pdc', 'pih', 'pl', 'pms', 'pt', 'qu', 'rm', 'rn', 'ro', 'roa-rup', + 'roa-tara', 'rw', 'sc', 'scn', 'sco', 'se', 'sg', 'simple', 'sk', 'sl', + 'sm', 'sn', 'so', 'sq', 'srn', 'ss', 'st', 'stq', 'su', 'sv', + 'sw', 'szl', 'tet', 'tl', 'tn', 'to', 'tpi', 'tr', 'ts', 'tum', + 'tw', 'ty', 'uz', 've', 'vec', 'vi', 'vls', 'vo', 'wa', 'war', + 'wo', 'xh', 'yo', 'zea', 'zh-min-nan', 'zu', # languages using multiple scripts, including latin - 'az', 'chr', 'ckb', 'ha', 'iu', 'kk', 'ku', 'rmy', 'sh', 'sr', 'tt', - 'ug', 'za' + 'az', 'chr', 'ckb', 'ha', 'iu', 'kk', 'ku', 'rmy', 'sh', 'sr', + 'tt', 'ug', 'za' ], # Scandinavian languages 'scand': [

1 0

SVN: [7846] trunk/pywikipedia/followlive.py
by xqt＠svn.wikimedia.org 31 Dec '09

31 Dec '09

Revision: 7846 Author: xqt Date: 2009-12-31 09:44:51 +0000 (Thu, 31 Dec 2009) Log Message: ----------- allow multiple arguments (request #1503808) Modified Paths: -------------- trunk/pywikipedia/followlive.py Modified: trunk/pywikipedia/followlive.py =================================================================== --- trunk/pywikipedia/followlive.py 2009-12-30 17:02:05 UTC (rev 7845) +++ trunk/pywikipedia/followlive.py 2009-12-31 09:44:51 UTC (rev 7846) @@ -17,7 +17,8 @@ __metaclass__ = type # The question asked -question = u""" +question = u"""(multiple numbers delimited with ',') + b) blank page e) edit page d) delete page (need sysop right) @@ -421,38 +422,49 @@ if answer[0] == 'u': # Answer entered as an utf8 string try: - answer=int(answer[1:]) + choices=answer[1:].split(',') except ValueError: # User entered wrong value wikipedia.output(u'ERROR: "%s" is not valid' % answer) continue - answered=True else: try: - answer=int(answer) + choices=answer.split(',') except ValueError: # User entered wrong value wikipedia.output(u'ERROR: "%s" is not valid' % answer) continue - answered=True + #test input + for choice in choices: + try: + x=int(choice) + except ValueError: + break + else: + answered=x in range(1,len(questionlist)+1) + if not answered: + wikipedia.output(u'ERROR: "%s" is not valid' % answer) + continue + summary = u'' + for choice in choices: + answer = int(choice) + # grab the template parameters + tpl = wikipedia.translate(wikipedia.getSite(), templates)[questionlist[answer]] + if tpl['pos'] == 'top': + wikipedia.output(u'prepending %s...' % questionlist[answer]) + self.content = questionlist[answer] + '\n' + self.content + elif tpl['pos'] == 'bottom': + wikipedia.output(u'appending %s...' % questionlist[answer]) + self.content += '\n' + questionlist[answer] + else: + wikipedia.output(u'ERROR: "pos" should be "top" or "bottom" for template %s. Contact a developer.' % questionlist[answer]) + sys.exit("Exiting") + summary += tpl['msg']+' ' + wikipedia.output(u'Probably added %s' % questionlist[answer]) + wikipedia.output(newcontent) + self.page.put(newcontent, comment = summary) + wikipedia.output(u'with comment %s\n' % summary) - # grab the template parameters - tpl = wikipedia.translate(wikipedia.getSite(), templates)[questionlist[answer]] - if tpl['pos'] == 'top': - wikipedia.output(u'prepending %s...' % questionlist[answer]) - newcontent = questionlist[answer] + '\n' + self.content - self.page.put(newcontent, comment = tpl['msg']) - elif tpl['pos'] == 'bottom': - wikipedia.output(u'appending %s...' % questionlist[answer]) - newcontent = self.content + '\n' + questionlist[answer] - self.page.put(newcontent, comment = tpl['msg']) - else: - wikipedia.output(u'ERROR: "pos" should be "top" or "bottom" for template %s. Contact a developer.' % questionlist[answer]) - sys.exit("Exiting") - - wikipedia.output(u'Probably added %s with comment %s' % (questionlist[answer], tpl ['msg'])) - - def run(self): self.showpageinfo() if self.couldbebad():

1 0

SVN: [7845] trunk/pywikipedia/basic.py
by xqt＠svn.wikimedia.org 30 Dec '09

30 Dec '09

Revision: 7845 Author: xqt Date: 2009-12-30 17:02:05 +0000 (Wed, 30 Dec 2009) Log Message: ----------- pl-translations. Thanks masti! Modified Paths: -------------- trunk/pywikipedia/basic.py Modified: trunk/pywikipedia/basic.py =================================================================== --- trunk/pywikipedia/basic.py 2009-12-29 12:09:23 UTC (rev 7844) +++ trunk/pywikipedia/basic.py 2009-12-30 17:02:05 UTC (rev 7845) @@ -38,6 +38,7 @@ 'ksh': u'Bot: Ännern ...', 'nds': u'Bot: Änderung ...', 'nl': u'Bot: wijziging ...', + 'pl': u'Bot: zmienia ...', 'pt': u'Bot: alterando...', 'sv': u'Bot: Ändrar ...', 'zh': u'機器人：編輯.....',

1 0

SVN: [7844] trunk/pywikipedia/interwiki.py
by xqt＠svn.wikimedia.org 29 Dec '09

29 Dec '09

Revision: 7844 Author: xqt Date: 2009-12-29 12:09:23 +0000 (Tue, 29 Dec 2009) Log Message: ----------- Bugfix for #2616329 Modified Paths: -------------- trunk/pywikipedia/interwiki.py Modified: trunk/pywikipedia/interwiki.py =================================================================== --- trunk/pywikipedia/interwiki.py 2009-12-29 11:16:45 UTC (rev 7843) +++ trunk/pywikipedia/interwiki.py 2009-12-29 12:09:23 UTC (rev 7844) @@ -1941,7 +1941,10 @@ break if self.generateUntil: - if page.titleWithoutNamespace() > self.generateUntil: + until = self.generateUntil + if page.site().lang not in page.site().family.nocapitalize: + until = until[0].upper()+until[1:] + if page.titleWithoutNamespace() > until: raise StopIteration self.add(page, hints = globalvar.hints) self.generated += 1

1 0

SVN: [7843] trunk/pywikipedia/maintenance/wikimedia_sites.py
by xqt＠svn.wikimedia.org 29 Dec '09

29 Dec '09

Revision: 7843 Author: xqt Date: 2009-12-29 11:16:45 +0000 (Tue, 29 Dec 2009) Log Message: ----------- +page counter for future use Modified Paths: -------------- trunk/pywikipedia/maintenance/wikimedia_sites.py Modified: trunk/pywikipedia/maintenance/wikimedia_sites.py =================================================================== --- trunk/pywikipedia/maintenance/wikimedia_sites.py 2009-12-29 11:08:14 UTC (rev 7842) +++ trunk/pywikipedia/maintenance/wikimedia_sites.py 2009-12-29 11:16:45 UTC (rev 7843) @@ -30,17 +30,16 @@ text = f.read() if family == 'wikipedia': - p = re.compile(r'\[\[:([a-z\-]{2,}):\|\1\]\]') + p = re.compile(r"\[\[:([a-z\-]{2,}):\|\1\]\].*?'''([0-9,]{1,})'''</span>\]", re.DOTALL) else: - p = re.compile(r'\[http://([a-z\-]{2,}).%s.org/wiki/ \1]' % family) + p = re.compile(r"\[http://([a-z\-]{2,}).%s.org/wiki/ \1].*?'''([0-9,]{1,})'''\]" % family, re.DOTALL) new = [] - for lang in p.findall(text): + for lang, cnt in p.findall(text): if lang in obsolete or lang in exceptions: # Ignore this language continue new.append(lang) - if original == new: wikipedia.output(u'The lists match!') else:

1 0

SVN: [7842] trunk/pywikipedia/families
by xqt＠svn.wikimedia.org 29 Dec '09

29 Dec '09

Revision: 7842 Author: xqt Date: 2009-12-29 11:08:14 +0000 (Tue, 29 Dec 2009) Log Message: ----------- Update family files; new book namespace for en-wiki. Modified Paths: -------------- trunk/pywikipedia/families/wikibooks_family.py trunk/pywikipedia/families/wikipedia_family.py trunk/pywikipedia/families/wikiquote_family.py trunk/pywikipedia/families/wikisource_family.py trunk/pywikipedia/families/wiktionary_family.py Modified: trunk/pywikipedia/families/wikibooks_family.py =================================================================== --- trunk/pywikipedia/families/wikibooks_family.py 2009-12-29 07:40:06 UTC (rev 7841) +++ trunk/pywikipedia/families/wikibooks_family.py 2009-12-29 11:08:14 UTC (rev 7842) @@ -15,7 +15,7 @@ 'he', 'sq', 'fi', 'ru', 'vi', 'cs', 'hr', 'zh', 'sv', 'da', 'ca', 'mk', 'tr', 'th', 'tl', 'sr', 'fa', 'id', 'is', 'ar', 'ta', 'no', 'simple', 'ka', 'ko', 'gl', 'eo', 'bg', 'lt', 'ro', - 'sk', 'el', 'la', 'ia', 'ang', 'cv', 'sl', 'et', 'mr', 'ur', + 'sk', 'el', 'la', 'ia', 'ang', 'cv', 'et', 'sl', 'mr', 'ur', 'uk', 'oc', 'ml', 'ms', 'eu', 'fy', 'ie', 'hi', 'tg', 'bn', 'af', 'hy', 'bs', 'te', 'pa', 'ky', 'az', 'be', 'sa', 'ast', 'zh-min-nan', 'tt', 'cy', 'mg', 'si', 'ku', 'co', 'tk', 'sw', 'ne', Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2009-12-29 07:40:06 UTC (rev 7841) +++ trunk/pywikipedia/families/wikipedia_family.py 2009-12-29 11:08:14 UTC (rev 7842) @@ -13,25 +13,25 @@ self.languages_by_size = [ 'en', 'de', 'fr', 'pl', 'it', 'ja', 'nl', 'es', 'pt', 'ru', 'sv', 'zh', 'no', 'fi', 'ca', 'uk', 'hu', 'cs', 'tr', 'ro', - 'eo', 'ko', 'da', 'vo', 'ar', 'id', 'sk', 'vi', 'sr', 'he', - 'lt', 'fa', 'bg', 'sl', 'hr', 'et', 'ms', 'new', 'simple', 'gl', + 'ko', 'eo', 'da', 'vo', 'ar', 'id', 'sk', 'vi', 'sr', 'he', + 'lt', 'fa', 'bg', 'sl', 'hr', 'et', 'new', 'ms', 'simple', 'gl', 'th', 'nn', 'hi', 'ht', 'eu', 'el', 'te', 'ceb', 'mk', 'ka', 'la', 'br', 'az', 'lb', 'bs', 'is', 'sh', 'mr', 'cy', 'sq', - 'bpy', 'lv', 'tl', 'jv', 'be-x-old', 'pms', 'bn', 'oc', 'ta', 'be', - 'io', 'an', 'nds', 'scn', 'sw', 'su', 'fy', 'af', 'nap', 'zh-yue', + 'lv', 'bpy', 'tl', 'jv', 'be-x-old', 'pms', 'bn', 'oc', 'ta', 'io', + 'be', 'an', 'sw', 'nds', 'scn', 'su', 'fy', 'af', 'nap', 'zh-yue', 'ku', 'ast', 'bat-smg', 'ur', 'gu', 'ml', 'wa', 'qu', 'war', 'cv', 'ksh', 'ga', 'tg', 'roa-tara', 'vec', 'kn', 'gd', 'uz', 'pam', 'lmo', - 'yi', 'mi', 'zh-min-nan', 'nah', 'glk', 'hy', 'hsb', 'co', 'kk', 'als', - 'roa-rup', 'sah', 'li', 'ia', 'tt', 'bcl', 'gan', 'os', 'arz', 'fiu-vro', - 'nds-nl', 'tk', 'yo', 'vls', 'sa', 'fo', 'mn', 'am', 'nrm', 'dv', - 'pag', 'rm', 'map-bms', 'wuu', 'gv', 'ne', 'bar', 'my', 'sco', 'se', + 'yi', 'mi', 'zh-min-nan', 'nah', 'hy', 'glk', 'hsb', 'co', 'kk', 'als', + 'roa-rup', 'sah', 'li', 'ia', 'tt', 'bcl', 'gan', 'os', 'yo', 'arz', + 'fiu-vro', 'nds-nl', 'tk', 'vls', 'sa', 'fo', 'mn', 'am', 'nrm', 'dv', + 'pag', 'rm', 'map-bms', 'wuu', 'gv', 'bar', 'ne', 'my', 'sco', 'se', 'diq', 'fur', 'pnb', 'lij', 'nov', 'si', 'mt', 'bh', 'mzn', 'csb', - 'ilo', 'pi', 'zh-classical', 'lad', 'km', 'ug', 'frp', 'sc', 'ang', 'mg', + 'ilo', 'pi', 'zh-classical', 'lad', 'km', 'ug', 'frp', 'sc', 'mg', 'ang', 'kw', 'haw', 'pdc', 'szl', 'ps', 'hif', 'kv', 'ie', 'pa', 'to', 'hak', 'bo', 'myv', 'crh', 'gn', 'ln', 'stq', 'nv', 'jbo', 'arc', - 'wo', 'mhr', 'ext', 'ace', 'ky', 'tpi', 'ty', 'cbk-zam', 'so', 'eml', - 'zea', 'srn', 'ay', 'ckb', 'pap', 'ig', 'kab', 'kg', 'or', 'lo', - 'ba', 'udm', 'dsb', 'rmy', 'kaa', 'cu', 'ce', 'sm', 'ks', 'av', + 'mhr', 'wo', 'ext', 'ace', 'ky', 'tpi', 'ty', 'cbk-zam', 'so', 'eml', + 'zea', 'srn', 'ay', 'ckb', 'pap', 'ig', 'kab', 'kg', 'or', 'ba', + 'lo', 'udm', 'dsb', 'rmy', 'cu', 'kaa', 'ce', 'sm', 'ks', 'av', 'tet', 'xal', 'got', 'ab', 'sd', 'mdf', 'na', 'pnt', 'iu', 'bm', 'kl', 'pih', 'as', 'cdo', 'mwl', 'chr', 'ee', 'om', 'zu', 'ti', 'ts', 'za', 'ss', 've', 'bi', 'ha', 'cr', 'dz', 'bxr', 'ch', @@ -578,10 +578,12 @@ self.namespaces[108] = { 'als': u'Spruch', + 'en': u'Book', } self.namespaces[109] = { 'als': u'Spruch Diskussion', + 'en': u'Book talk', } self.namespaces[110] = { Modified: trunk/pywikipedia/families/wikiquote_family.py =================================================================== --- trunk/pywikipedia/families/wikiquote_family.py 2009-12-29 07:40:06 UTC (rev 7841) +++ trunk/pywikipedia/families/wikiquote_family.py 2009-12-29 11:08:14 UTC (rev 7842) @@ -13,7 +13,7 @@ self.languages_by_size = [ 'en', 'it', 'pl', 'de', 'pt', 'ru', 'sk', 'es', 'bg', 'bs', 'sl', 'tr', 'fr', 'he', 'lt', 'cs', 'zh', 'el', 'hu', 'fa', - 'uk', 'id', 'sv', 'nl', 'no', 'ja', 'fi', 'eo', 'simple', 'hy', + 'uk', 'id', 'sv', 'nl', 'no', 'ja', 'eo', 'fi', 'simple', 'hy', 'et', 'nn', 'ca', 'ka', 'ar', 'ko', 'ku', 'hr', 'gl', 'ro', 'sr', 'ml', 'li', 'is', 'th', 'te', 'af', 'da', 'sq', 'eu', 'az', 'vi', 'cy', 'la', 'br', 'hi', 'be', 'ast', 'uz', 'ta', Modified: trunk/pywikipedia/families/wikisource_family.py =================================================================== --- trunk/pywikipedia/families/wikisource_family.py 2009-12-29 07:40:06 UTC (rev 7841) +++ trunk/pywikipedia/families/wikisource_family.py 2009-12-29 11:08:14 UTC (rev 7842) @@ -13,7 +13,7 @@ self.languages_by_size = [ 'en', 'zh', 'pt', 'ru', 'fr', 'es', 'de', 'he', 'it', 'ar', 'fa', 'hu', 'pl', 'th', 'cs', 'ro', 'hr', 'te', 'fi', 'tr', - 'nl', 'sv', 'sl', 'sr', 'ko', 'uk', 'ja', 'el', 'la', 'li', + 'nl', 'sv', 'sl', 'ko', 'sr', 'uk', 'ja', 'el', 'la', 'li', 'ml', 'vi', 'yi', 'az', 'bn', 'is', 'bs', 'ca', 'hy', 'id', 'mk', 'no', 'da', 'et', 'ta', 'bg', 'lt', 'kn', 'gl', 'cy', 'sk', 'zh-min-nan', 'fo', Modified: trunk/pywikipedia/families/wiktionary_family.py =================================================================== --- trunk/pywikipedia/families/wiktionary_family.py 2009-12-29 07:40:06 UTC (rev 7841) +++ trunk/pywikipedia/families/wiktionary_family.py 2009-12-29 11:08:14 UTC (rev 7842) @@ -12,18 +12,18 @@ self.languages_by_size = [ 'fr', 'en', 'lt', 'tr', 'zh', 'ru', 'vi', 'io', 'pl', 'el', - 'fi', 'hu', 'no', 'it', 'ta', 'de', 'sv', 'ko', 'pt', 'nl', - 'lo', 'ku', 'ja', 'ar', 'es', 'ro', 'et', 'kn', 'id', 'te', + 'fi', 'hu', 'no', 'it', 'ta', 'de', 'sv', 'pt', 'ko', 'nl', + 'lo', 'ku', 'ja', 'ar', 'es', 'ro', 'kn', 'et', 'id', 'te', 'gl', 'bg', 'uk', 'ca', 'vo', 'ml', 'fa', 'is', 'li', 'sr', 'af', 'cs', 'sw', 'fy', 'scn', 'th', 'simple', 'br', 'oc', 'he', 'sl', 'hy', 'sq', 'tt', 'la', 'hr', 'zh-min-nan', 'da', 'ast', 'tk', 'wa', 'ur', 'hsb', 'kk', 'ky', 'wo', 'eo', 'ang', 'hi', 'ga', 'gn', 'az', 'ia', 'co', 'sk', 'csb', 'st', 'ms', 'mr', 'ka', 'tl', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'an', 'my', 'eu', - 'sh', 'gu', 'mg', 'km', 'cy', 'lv', 'bn', 'ts', 'qu', 'ne', + 'sh', 'gu', 'cy', 'ne', 'km', 'mg', 'lv', 'bn', 'ts', 'qu', 'bs', 'fo', 'am', 'rw', 'chr', 'su', 'mn', 'om', 'nah', 'ie', 'yi', 'be', 'iu', 'gd', 'tg', 'nn', 'zu', 'si', 'pa', 'dv', - 'mt', 'tpi', 'kw', 'gv', 'roa-rup', 'mi', 'jv', 'uz', 'ps', 'ik', + 'mt', 'kw', 'gv', 'tpi', 'roa-rup', 'mi', 'jv', 'uz', 'ps', 'ik', 'so', 'sg', 'ha', 'ss', 'sa', 'ay', 'na', 'jbo', 'tn', 'sm', 'lb', 'ks', 'fj', 'ln', 'za', 'dz', 'als', ]

1 0

SVN: [7841] trunk/pywikipedia/fixing_redirects.py
by xqt＠svn.wikimedia.org 29 Dec '09

29 Dec '09

Revision: 7841 Author: xqt Date: 2009-12-29 07:40:06 +0000 (Tue, 29 Dec 2009) Log Message: ----------- Polnish translations from patrol. Thanks. Modified Paths: -------------- trunk/pywikipedia/fixing_redirects.py Modified: trunk/pywikipedia/fixing_redirects.py =================================================================== --- trunk/pywikipedia/fixing_redirects.py 2009-12-28 21:39:41 UTC (rev 7840) +++ trunk/pywikipedia/fixing_redirects.py 2009-12-29 07:40:06 UTC (rev 7841) @@ -37,6 +37,7 @@ 'ja': u'ロボットによる:リダイレクト回避', 'nn': u'robot: retta omdirigeringar', 'no': u'Robot: Retter omdirigeringer', + 'pl': u'Bot: naprawa przekierowań', 'pt': u'Bot: Arrumando redirects', 'sv': u'Bot: Rättar omdirigeringar', 'vi': u'Robot: Sửa đổi hướng', @@ -56,6 +57,7 @@ 'nl': u'Wikipedia:Etalage', 'nn': u'Wikipedia:Gode artiklar', 'no': u'Wikipedia:Anbefalte artikler', + 'pl': u'Wikipedia:Artykuły_na_medal', 'pt': u'Wikipedia:Os_melhores_artigos', 'sv': u'Wikipedia:Utvalda_artiklar', 'vi': u'Wikipedia:Bài_viết_chọn_lọc',

1 0

SVN: [7840] branches/rewrite/pywikibot/site.py
by russblau＠svn.wikimedia.org 28 Dec '09

28 Dec '09

Revision: 7840 Author: russblau Date: 2009-12-28 21:39:41 +0000 (Mon, 28 Dec 2009) Log Message: ----------- Fix logic error: .getredirtarget() would bypass double-redirects and return the ultimate target, making it impossible to detect and fix double-redirects. Modified Paths: -------------- branches/rewrite/pywikibot/site.py Modified: branches/rewrite/pywikibot/site.py =================================================================== --- branches/rewrite/pywikibot/site.py 2009-12-28 17:30:12 UTC (rev 7839) +++ branches/rewrite/pywikibot/site.py 2009-12-28 21:39:41 UTC (rev 7840) @@ -1058,18 +1058,20 @@ raise RuntimeError( "getredirtarget: 'redirects' contains no key for page %s." % title) - if "pages" not in result['query']: + target_title = redirmap[title] + if target_title == title or "pages" not in result['query']: # no "pages" element indicates a circular redirect raise pywikibot.CircularRedirect(redirmap[title]) - for pagedata in result['query']['pages'].itervalues(): + pagedata = result['query']['pages'].values()[0] # there should be only one value in 'pages', and it is the target - if pagedata['title'] not in redirmap.itervalues(): - raise RuntimeError( - "getredirtarget: target page '%s' not found in 'redirects'" - % pagedata['title']) + if pagedata['title'] == target_title: target = pywikibot.Page(self, pagedata['title'], pagedata['ns']) api.update_page(target, pagedata) page._redirtarget = target + else: + # double redirect; target is an intermediate redirect + target = pywikibot.Page(self, target_title) + page._redirtarget = target return page._redirtarget def preloadpages(self, pagelist, groupsize=50, templates=False, @@ -1451,7 +1453,7 @@ u"loadrevisions: Query on %s returned data on '%s'" % (page, pagedata['title'])) if "missing" in pagedata: - raise NoPage(page) + raise NoPage(page) else: page = Page(self, pagedata['title']) api.update_page(page, pagedata) @@ -1475,7 +1477,7 @@ if 'langlinks' not in pageitem: continue for linkdata in pageitem['langlinks']: - yield pywikibot.Link.langlinkUnsafe(linkdata['lang'], + yield pywikibot.Link.langlinkUnsafe(linkdata['lang'], linkdata['*'], source=self) @@ -1710,7 +1712,7 @@ could be more than one) with this sha1 hash @param sha1base36: same as sha1 but in base 36 - """ + """ aigen = self._generator(api.ImagePageGenerator, type_arg="allimages", gaifrom=start, step=step, total=total) @@ -2205,7 +2207,7 @@ token = self.token(page, "edit") # getting token also updates the 'lastrevid' value, which allows us to # detect if page has been changed since last time text was retrieved. - + # note that the server can still return an 'editconflict' error # if the page is updated after the token is retrieved but # before the page is saved. @@ -2540,7 +2542,7 @@ filter the list returned. NOTE 2: it returns the image title WITHOUT the image namespace. - + """ if hash_found == None: # If the hash is none return None and not continue return None

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn December 2009