Pywikibot-commits August 2013

pywikibot-commits@lists.wikimedia.org

1 participants
172 discussions

[Gerrit] Use a new FatalServerError exception for SSL certificate fai... - change (pywikibot/core)
by jenkins-bot (Code Review) 24 Aug '13

24 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: Use a new FatalServerError exception for SSL certificate failures ...................................................................... Use a new FatalServerError exception for SSL certificate failures Failures in SSL certificate verification are unlikely to be fixed by just retrying the request. This commit introduces a new FatalServerError class for this (and maybe other) server error. Change-Id: I19bf597d967e753b944bd5e7ef6c21b06bc900d7 --- M pywikibot/comms/http.py M pywikibot/data/api.py M pywikibot/exceptions.py 3 files changed, 18 insertions(+), 1 deletion(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index a8dc98f..1dee9ec 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -27,8 +27,9 @@ import logging import atexit +from httplib2 import SSLHandshakeError from pywikibot import config -from pywikibot.exceptions import Server504Error +from pywikibot.exceptions import FatalServerError, Server504Error import pywikibot import cookielib import threadedhttp @@ -38,6 +39,11 @@ # global variables + +# The OpenSSL error code for +# certificate verify failed +# cf. `openssl errstr 14090086` +SSL_CERT_VERIFY_FAILED = ":14090086:" # the User-agent: header. The default is # '<script>/<revision> Pywikipediabot/2.0', where '<script>' is the currently @@ -112,6 +118,10 @@ request.lock.acquire() #TODO: do some error correcting stuff + if isinstance(request.data, SSLHandshakeError): + if SSL_CERT_VERIFY_FAILED in str(request.data): + raise FatalServerError(str(request.data)) + #if all else fails if isinstance(request.data, Exception): raise request.data diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 237d433..2b23fb4 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -289,6 +289,10 @@ pywikibot.log(u"Caught HTTP 504 error; retrying") self.wait() continue + except FatalServerError: + # This error is not going to be fixed by just waiting + pywikibot.error(traceback.format_exc()) + raise #TODO: what other exceptions can occur here? except Exception, e: # for any other error on the http request, wait and retry diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index c5a7b3f..8972fed 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -119,6 +119,9 @@ class ServerError(Error): """Got unexpected server response""" +class FatalServerError(ServerError): + """A fatal server error that's not going to be corrected by just sending + the request again.""" class Server504Error(Error): """Server timed out with http 504 code""" -- To view, visit https://gerrit.wikimedia.org/r/80348 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I19bf597d967e753b944bd5e7ef6c21b06bc900d7 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mineo <themineo(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mineo <themineo(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Make WikidataItemGenerator work if page is already on the repo - change (pywikibot/core)
by jenkins-bot (Code Review) 24 Aug '13

24 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: Make WikidataItemGenerator work if page is already on the repo ...................................................................... Make WikidataItemGenerator work if page is already on the repo Bug: https://sourceforge.net/p/pywikipediabot/bugs/1653/ Change-Id: Ia9916450a077f6604a3bc3649da4715a280e5b52 --- M pywikibot/pagegenerators.py 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, but someone else must approve Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 8318048..d07b9e0 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -816,13 +816,21 @@ # entry.title() returns a Page object yield entry.title() + def WikidataItemGenerator(gen): """ A wrapper generator used to take another generator and yield their relevant Wikidata items """ for page in gen: - yield pywikibot.ItemPage.fromPage(page) + if isinstance(page, pywikibot.ItemPage): + yield page + elif page.site.data_repository() == page.site: + # These are already items, just not item pages + # FIXME: If we've already fetched content, we should retain it + yield pywikibot.ItemPage(page.site, page.title()) + else: + yield pywikibot.ItemPage.fromPage(page) #TODO below -- To view, visit https://gerrit.wikimedia.org/r/80706 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia9916450a077f6604a3bc3649da4715a280e5b52 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Sk!d <swuensch(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] use i18n messages; pep8 changes, update from core (gerrit: 7... - change (pywikibot/compat)
by jenkins-bot (Code Review) 24 Aug '13

24 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: use i18n messages; pep8 changes, update from core (gerrit: 79582) ...................................................................... use i18n messages; pep8 changes, update from core (gerrit: 79582) Change-Id: Ib5a544ba0b7a123ca2cb4c15a5e0603ebdc9baea --- M blockpageschecker.py 1 file changed, 155 insertions(+), 119 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/blockpageschecker.py b/blockpageschecker.py index c6dd531..4329983 100644 --- a/blockpageschecker.py +++ b/blockpageschecker.py @@ -56,15 +56,17 @@ # (C) Monobi a.k.a. Wikihermit, 2007 # (C) Filnik, 2007-2011 # (C) NicDumZ, 2008-2009 -# (C) Pywikipedia bot team, 2007-2010 +# (C) Pywikipedia bot team, 2007-2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' # -import re, webbrowser +import re +import webbrowser import wikipedia as pywikibot +from pywikibot import i18n import pagegenerators import config import catlib @@ -80,78 +82,73 @@ ################### -- Edit below! -- ################# templateSemiProtection = { - 'en': None, - 'it':[r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccoparziale(?:|[ _]scad\|.*?|\|.*?)\}\}', - r'\{\{(?:[Tt]emplate:|)[Aa]bp(?:|[ _]scad\|(?:.*?))\}\}'], - 'fr': [ur'\{\{(?:[Tt]emplate:|[Mm]odèle:|)[Ss]emi[- ]?protection(|[^\}]*)\}\}'], - 'ja':[ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)半保護(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], - #'zh':[ur'\{\{(?:[Tt]emplate:|)Protected|(?:[Ss]|[Ss]emi|半)(?:\|.+|)\}\}(\n+?|)',ur'\{\{(?:[Tt]emplate:|)Mini-protected|(?:[Ss]|[Ss]emi|半)(?:\|.+|)\}\}(\n+?|)',ur'\{\{(?:[Tt]emplate:|)Protected-logo|(?:[Ss]|[Ss]emi|半)(?:\|.+|)\}\}(\n+?|)'], - } -# Regex to get the total-protection template -templateTotalProtection = { - 'en': None, - 'it':[r'\{\{(?:[Tt]emplate:|)[Aa]vvisoblocco(?:|[ _]scad\|(?:.*?)|minaccia|cancellata)\}\}', - r'\{\{(?:[Tt]emplate:|)(?:[Cc][Tt]|[Cc]anc fatte|[Cc][Ee])\}\}', r'<div class="toccolours[ _]itwiki[ _]template[ _]avviso">(?:\s|\n)*?[Qq]uesta pagina'], - 'fr':[ur'\{\{(?:[Tt]emplate:|[Mm]odèle:|)[Pp]rotection(|[^\}]*)\}\}', - ur'\{\{(?:[Tt]emplate:|[Mm]odèle:|)(?:[Pp]age|[Aa]rchive|[Mm]odèle) protégée?(|[^\}]*)\}\}'], - 'ja':[ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)保護(?:性急|)(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], - #'zh':[r'\{\{(?:[Tt]emplate:|)Protected|(?:[Nn]|[Nn]ormal)(?:\|.+|)\}\}(\n+?|)',r'\{\{(?:[Tt]emplate:|)Mini-protected|(?:[Nn]|[Nn]ormal)(?:\|.+|)\}\}(\n+?|)',r'\{\{(?:[Tt]emplate:|)Protected-logo|(?:[Nn]|[Nn]ormal)(?:\|.+|)\}\}(\n+?|)'], - } -# Regex to get the semi-protection move template -templateSemiMoveProtection = { - 'en': None, - 'it':[r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccospostamento(?:|[ _]scad\|.*?|\|.*?)\}\}'], - 'ja':[ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)移動半保護(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], - #'zh':[r'\{\{(?:[Tt]emplate:|)Protected|(?:MS|ms)(?:\|.+|)\}\}(\n+?|)',r'\{\{(?:[Tt]emplate:|)Mini-protected|(?:MS|ms)(?:\|.+|)\}\}(\n+?|)',r'\{\{(?:[Tt]emplate:|)Protected-logo|(?:MS|ms)(?:\|.+|)\}\}(\n+?|)'], - } -# Regex to get the total-protection move template -templateTotalMoveProtection = { - 'en': None, - 'it':[r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccospostamento(?:|[ _]scad\|.*?|\|.*?)\}\}'], - 'ja':[ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)移動保護(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], - #'zh':[ur'\{\{(?:[Tt]emplate:|)Protected|(?:[Mm]|[Mm]ove|移[動动])(?:\|.+|)\}\}(\n+?|)',ur'\{\{(?:[Tt]emplate:|)Mini-protected|(?:[Mm]|[Mm]ove|移[動动])(?:\|.+|)\}\}(\n+?|)',ur'\{\{(?:[Tt]emplate:|)Protected-logo|(?:[Mm]|[Mm]ove|移[動动])(?:\|.+|)\}\}(\n+?|)'], - } - -# If you use only one template for all the type of protection, put it here. -# You may use only one template or an unique template and some other "old" template that the -# script should still check (as on it.wikipedia) -templateUnique = { - 'en': None, - 'it': [r'\{\{(?:[Tt]emplate:|)[Pp]rotetta\}\}'], + 'en': None, + 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccoparziale(?:|[ _]scad\|.*?|\|.*?)\}\}', + r'\{\{(?:[Tt]emplate:|)[Aa]bp(?:|[ _]scad\|(?:.*?))\}\}'], + 'fr': [ur'\{\{(?:[Tt]emplate:|[Mm]odèle:|)[Ss]emi[- ]?protection(|[^\}]*)\}\}'], + 'ja': [ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)半保護(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], } -# Array: 0 => Semi-block, 1 => Total Block, 2 => Semi-Move, 3 => Total-Move, 4 => template-unique +# Regex to get the total-protection template +templateTotalProtection = { + 'en': None, + 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisoblocco(?:|[ _]scad\|(?:.*?)|minaccia|cancellata)\}\}', + r'\{\{(?:[Tt]emplate:|)(?:[Cc][Tt]|[Cc]anc fatte|[Cc][Ee])\}\}', + r'<div class="toccolours[ _]itwiki[ _]template[ _]avviso">(?:\s|\n)*?[Qq]uesta pagina'], + 'fr': [ur'\{\{(?:[Tt]emplate:|[Mm]odèle:|)[Pp]rotection(|[^\}]*)\}\}', + ur'\{\{(?:[Tt]emplate:|[Mm]odèle:|)(?:[Pp]age|[Aa]rchive|[Mm]odèle) protégée?(|[^\}]*)\}\}'], + 'ja': [ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)保護(?:性急|)(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], +} + +# Regex to get the semi-protection move template +templateSemiMoveProtection = { + 'en': None, + 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccospostamento(?:|[ _]scad\|.*?|\|.*?)\}\}'], + 'ja': [ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)移動半保護(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], +} + +# Regex to get the total-protection move template +templateTotalMoveProtection = { + 'en': None, + 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccospostamento(?:|[ _]scad\|.*?|\|.*?)\}\}'], + 'ja': [ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)移動保護(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], +} + +# If you use only one template for all the type of protection, put it here. +# You may use only one template or an unique template and some other "old" +# template that the script should still check (as on it.wikipedia) +templateUnique = { + 'en': None, + 'it': [r'\{\{(?:[Tt]emplate:|)[Pp]rotetta\}\}'], +} + +# Array: 0 => Semi-block, 1 => Total Block, 2 => Semi-Move, 3 => Total-Move, +# 4 => template-unique templateNoRegex = { - 'it':['{{Avvisobloccoparziale}}', '{{Avvisoblocco}}', None, None, '{{Protetta}}'], - 'fr':['{{Semi-protection}}', '{{Protection}}', None, None, None], - 'ja':[u'{{半保護}}', u'{{保護}}', u'{{移動半保護}}', u'{{移動保護}}', None], - #'zh':[u'{{Protected/semi}}',u'{{Protected}}',u'{{Protected/ms}}',u'{{Protected/move}}', None], - } + 'it': ['{{Avvisobloccoparziale}}', '{{Avvisoblocco}}', None, None, + '{{Protetta}}'], + 'fr': ['{{Semi-protection}}', '{{Protection}}', None, None, None], + 'ja': [u'{{半保護}}', u'{{保護}}', u'{{移動半保護}}', u'{{移動保護}}', None], +} # Category where the bot will check categoryToCheck = { - 'en':[u'Category:Protected'], - 'ar':[u'تصنيف:محتويات محمية'], - 'fr':[u'Category:Page semi-protégée', u'Category:Page protégée', u'Catégorie:Article protégé'], - 'he':[u'קטגוריה:ויקיפדיה: דפים מוגנים', u'קטגוריה:ויקיפדיה: דפים מוגנים חלקית'], - 'it':[u'Categoria:Pagine protette - scadute', u'Categoria:Pagine semiprotette', u'Categoria:Voci protette'], - 'ja':[u'Category:編集保護中の記事',u'Category:編集半保護中の記事', - u'Category:移動保護中の記事',], - 'pt':[u'Category:!Páginas protegidas', u'Category:!Páginas semiprotegidas'], - 'zh':[u'Category:被保护的页面',u'Category:被保護的模板',u'Category:暂时不能移动的页面', - u'Category:被半保护的页面',], - } -# Comment used when the Bot edits -comment = { - 'en':u'Bot: Deleting out-dated template', - 'ar':u'بوت: حذف قالب قديم', - 'fr':u'Robot: Mise à jour des bandeaux de protection', - 'he':u'בוט: מסיר תבנית שעבר זמנה', - 'it':u'Bot: Tolgo o sistemo template di avviso blocco', - 'ja':u'ロボットによる: 保護テンプレート除去', - 'pt':u'Bot: Retirando predefinição de proteção', - 'zh':u'機器人: 移除過期的保護模板', - } + 'en': [u'Category:Protected'], + 'ar': [u'تصنيف:محتويات محمية'], + 'fr': [u'Category:Page semi-protégée', u'Category:Page protégée', + u'Catégorie:Article protégé'], + 'he': [u'קטגוריה:ויקיפדיה: דפים מוגנים', + u'קטגוריה:ויקיפדיה: דפים מוגנים חלקית'], + 'it': [u'Categoria:Pagine protette - scadute', + u'Categoria:Pagine semiprotette', u'Categoria:Voci protette'], + 'ja': [u'Category:編集保護中の記事', u'Category:編集半保護中の記事', + u'Category:移動保護中の記事'], + 'pt': [u'Category:!Páginas protegidas', + u'Category:!Páginas semiprotegidas'], + 'zh': [u'Category:被保护的页面', u'Category:被保護的模板', + u'Category:暂时不能移动的页面', u'Category:被半保护的页面'], +} + # Check list to block the users that haven't set their preferences project_inserted = ['en', 'fr', 'it', 'ja', 'pt', 'zh'] @@ -159,24 +156,25 @@ #------------------ END PREFERENCES ------------------# ################## -- Edit above! -- ################## + def understandBlock(text, TTP, TSP, TSMP, TTMP, TU): """ Understand if the page is blocked and if it has the right template """ - if TTP != None: - for catchRegex in TTP: # TTP = templateTotalProtection + if TTP: + for catchRegex in TTP: # TTP = templateTotalProtection resultCatch = re.findall(catchRegex, text) if resultCatch: return ('sysop-total', catchRegex) - if TSP != None: + if TSP: for catchRegex in TSP: resultCatch = re.findall(catchRegex, text) if resultCatch: return ('autoconfirmed-total', catchRegex) - if TU != None: + if TU: for catchRegex in TU: resultCatch = re.findall(catchRegex, text) if resultCatch: return ('unique', catchRegex) - if TSMP != None and TTMP != None and TTP != TTMP and TSP != TSMP: + if TSMP and TTMP and TTP != TTMP and TSP != TSMP: for catchRegex in TTMP: resultCatch = re.findall(catchRegex, text) if resultCatch: @@ -188,6 +186,7 @@ # If editable means that we have no regex, won't change anything with this # regex return ('editable', r'\A\n') + def showQuest(site, page): quest = pywikibot.inputChoice(u'Do you want to open the page?', @@ -203,13 +202,16 @@ editor = editarticle.TextEditor() text = editor.edit(page.get()) + def main(): """ Main Function """ # Loading the comments - global categoryToCheck, comment, project_inserted + global categoryToCheck, project_inserted # always, define a generator to understand if the user sets one, # defining what's genFactory - always = False; generator = False; show = False + always = False + generator = False + show = False moveBlockCheck = False protectedpages = False protectType = 'edit' @@ -238,7 +240,8 @@ genFactory.handleArg(arg) if config.mylang not in project_inserted: - pywikibot.output(u"Your project is not supported by this script.\nYou have to edit the script and add it!") + pywikibot.output(u"Your project is not supported by this script.\n" + u"You have to edit the script and add it!") return site = pywikibot.getSite() if protectedpages: @@ -252,7 +255,7 @@ TU = pywikibot.translate(site, templateUnique) category = pywikibot.translate(site, categoryToCheck) - commentUsed = pywikibot.translate(site, comment) + commentUsed = i18n.twtranslate(site, 'blockpageschecker-summary') if not generator: generator = genFactory.getCombinedGenerator() if not generator: @@ -298,11 +301,13 @@ try: config.sysopnames[site.family.name][site.lang] except: - pywikibot.output("%s is sysop-protected : this account can't edit it! Skipping..." % pagename) + pywikibot.output(u"%s is sysop-protected: " + u"this account can't edit it! Skipping..." + % pagename) continue - # Understand, according to the template in the page, what should be the protection - # and compare it with what there really is. + # Understand, according to the template in the page, what should be the + # protection and compare it with what there really is. TemplateInThePage = understandBlock(text, TTP, TSP, TSMP, TTMP, TU) # Only to see if the text is the same or not... oldtext = text @@ -312,11 +317,12 @@ if not editRestr: # page is not edit-protected # Deleting the template because the page doesn't need it. - if TU != None: + if TU: replaceToPerform = u'|'.join(TTP + TSP + TU) else: replaceToPerform = u'|'.join(TTP + TSP) - text, changes = re.subn('<noinclude>(%s)</noinclude>' % replaceToPerform, '', text) + text, changes = re.subn('<noinclude>(%s)</noinclude>' + % replaceToPerform, '', text) if changes == 0: text, changes = re.subn('(%s)' % replaceToPerform, '', text) msg = u'The page is editable for all' @@ -326,28 +332,33 @@ elif editRestr[0] == 'sysop': # total edit protection - if (TemplateInThePage[0] == 'sysop-total' and TTP != None) or (TemplateInThePage[0] == 'unique' and TU != None): + if (TemplateInThePage[0] == 'sysop-total' and TTP) or \ + (TemplateInThePage[0] == 'unique' and TU): msg = 'The page is protected to the sysop' if not moveBlockCheck: msg += ', skipping...' pywikibot.output(msg) else: - pywikibot.output(u'The page is protected to the sysop, but the template seems not correct. Fixing...') - if TU != None: + pywikibot.output(u'The page is protected to the sysop, but the ' + u'template seems not correct. Fixing...') + if TU: text, changes = re.subn(TemplateInThePage[1], TNR[4], text) else: text, changes = re.subn(TemplateInThePage[1], TNR[1], text) - elif TSP != None or TU != None: + elif TSP or TU: # implicitely editRestr[0] = 'autoconfirmed', edit-Semi-protection - if TemplateInThePage[0] == 'autoconfirmed-total' or TemplateInThePage[0] == 'unique': + if TemplateInThePage[0] == 'autoconfirmed-total' or \ + TemplateInThePage[0] == 'unique': msg = 'The page is editable only for the autoconfirmed users' if not moveBlockCheck: msg += ', skipping...' pywikibot.output(msg) else: - pywikibot.output(u'The page is editable only for the autoconfirmed users, but the template seems not correct. Fixing...') - if TU != None: + pywikibot.output(u'The page is editable only for the ' + u'autoconfirmed users, but the template ' + u'seems not correct. Fixing...') + if TU: text, changes = re.subn(TemplateInThePage[1], TNR[4], text) else: text, changes = re.subn(TemplateInThePage[1], TNR[0], text) @@ -365,52 +376,72 @@ changes = -1 if not moveRestr: - pywikibot.output(u'The page is movable for all, deleting the template...') + pywikibot.output(u'The page is movable for all, deleting the ' + u'template...') # Deleting the template because the page doesn't need it. - if TU != None: + if TU: replaceToPerform = u'|'.join(TSMP + TTMP + TU) else: replaceToPerform = u'|'.join(TSMP + TTMP) - text, changes = re.subn('<noinclude>(%s)</noinclude>' % replaceToPerform, '', text) + text, changes = re.subn('<noinclude>(%s)</noinclude>' + % replaceToPerform, '', text) if changes == 0: text, changes = re.subn('(%s)' % replaceToPerform, '', text) elif moveRestr[0] == 'sysop': # move-total-protection - if (TemplateInThePage[0] == 'sysop-move' and TTMP != None) or (TemplateInThePage[0] == 'unique' and TU != None): - pywikibot.output(u'The page is protected from moving to the sysop, skipping...') - if TU != None: - text = oldtext # no changes needed, better to revert the old text. + if (TemplateInThePage[0] == 'sysop-move' and TTMP) or \ + (TemplateInThePage[0] == 'unique' and TU): + pywikibot.output(u'The page is protected from moving to ' + u'the sysop, skipping...') + if TU: + # no changes needed, better to revert the old text. + text = oldtext else: - pywikibot.output(u'The page is protected from moving to the sysop, but the template seems not correct. Fixing...') - if TU != None: - text, changes = re.subn(TemplateInThePage[1], TNR[4], text) + pywikibot.output(u'The page is protected from moving to ' + u'the sysop, but the template seems not ' + u'correct. Fixing...') + if TU: + text, changes = re.subn(TemplateInThePage[1], TNR[4], + text) else: - text, changes = re.subn(TemplateInThePage[1], TNR[3], text) + text, changes = re.subn(TemplateInThePage[1], TNR[3], + text) - elif TSMP != None or TU != None: - # implicitely moveRestr[0] = 'autoconfirmed', move-semi-protection - if TemplateInThePage[0] == 'autoconfirmed-move' or TemplateInThePage[0] == 'unique': - pywikibot.output(u'The page is movable only for the autoconfirmed users, skipping...') - if TU != None: - text = oldtext # no changes needed, better to revert the old text. + elif TSMP or TU: + # implicitely moveRestr[0] = 'autoconfirmed', + # move-semi-protection + if TemplateInThePage[0] == 'autoconfirmed-move' or \ + TemplateInThePage[0] == 'unique': + pywikibot.output(u'The page is movable only for the ' + u'autoconfirmed users, skipping...') + if TU: + # no changes needed, better to revert the old text. + text = oldtext else: - pywikibot.output(u'The page is movable only for the autoconfirmed users, but the template seems not correct. Fixing...') - if TU != None: - text, changes = re.subn(TemplateInThePage[1], TNR[4], text) + pywikibot.output(u'The page is movable only for the ' + u'autoconfirmed users, but the template ' + u'seems not correct. Fixing...') + if TU: + text, changes = re.subn(TemplateInThePage[1], TNR[4], + text) else: - text, changes = re.subn(TemplateInThePage[1], TNR[2], text) + text, changes = re.subn(TemplateInThePage[1], TNR[2], + text) if changes == 0: - # We tried to fix move-protection templates, but it did not work. + # We tried to fix move-protection templates, but it did not work pywikibot.warning('No move-protection template could be found') - if oldtext != text: # Ok, asking if the change has to be performed and do it if yes. - pywikibot.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" % page.title()) + pywikibot.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" + % page.title()) pywikibot.showDiff(oldtext, text) if not always: - choice = pywikibot.inputChoice(u'Do you want to accept these changes?', ['Yes', 'No', 'All'], ['y', 'N', 'a'], 'N') + choice = pywikibot.inputChoice(u'Do you want to accept these ' + u'changes?', + ['Yes', 'No', 'All'], + ['y', 'N', 'a'], 'N') if choice == 'a': always = True if always or choice == 'y': @@ -421,8 +452,8 @@ pywikibot.output(u'Edit conflict! skip!') break except pywikibot.ServerError: - # Sometimes there is this error that's quite annoying because - # can block the whole process for nothing. + # Sometimes there is this error that's quite annoying + # because can block the whole process for nothing. errorCount += 1 if errorCount < 5: pywikibot.output(u'Server Error! Wait..') @@ -432,19 +463,24 @@ # Prevent Infinite Loops raise pywikibot.ServerError(u'Fifth Server Error!') except pywikibot.SpamfilterError, e: - pywikibot.output(u'Cannot change %s because of blacklist entry %s' % (page.title(), e.url)) + pywikibot.output(u'Cannot change %s because of ' + u'blacklist entry %s' + % (page.title(), e.url)) break except pywikibot.PageNotSaved, error: - pywikibot.output(u'Error putting page: %s' % (error.args,)) + pywikibot.output(u'Error putting page: %s' + % (error.args,)) break except pywikibot.LockedPage: - pywikibot.output(u'The page is still protected. Skipping...') + pywikibot.output(u'The page is still protected. ' + u'Skipping...') break else: # Break only if the errors are one after the other errorCount = 0 break + if __name__ == "__main__": try: main() -- To view, visit https://gerrit.wikimedia.org/r/79583 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib5a544ba0b7a123ca2cb4c15a5e0603ebdc9baea Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] set Wikidata as "shared data repository" for Wikivoyage - change (pywikibot/core)
by jenkins-bot (Code Review) 24 Aug '13

24 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: set Wikidata as "shared data repository" for Wikivoyage ...................................................................... set Wikidata as "shared data repository" for Wikivoyage At the moment, only Wikipedia pages are allowed within the ItemPage.fromPage constructor however, Wikidata supports Wikivoyage sitelinks. Change-Id: I16f4c2721cfe3e369a18fdb7fffd73913bfb3193 --- M pywikibot/families/wikivoyage_family.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikivoyage_family.py b/pywikibot/families/wikivoyage_family.py index 25e9f67..49647d8 100644 --- a/pywikibot/families/wikivoyage_family.py +++ b/pywikibot/families/wikivoyage_family.py @@ -20,3 +20,6 @@ for lang in self.languages_by_size]) # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementa… self.cross_allowed = ['es', 'ru', ] + + def shared_data_repository(self, code, transcluded=False): + return ('wikidata', 'wikidata') -- To view, visit https://gerrit.wikimedia.org/r/80704 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I16f4c2721cfe3e369a18fdb7fffd73913bfb3193 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)live.it> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] update langage_by_size from compat #80549 - change (pywikibot/core)
by Xqt (Code Review) 24 Aug '13

24 Aug '13

Xqt has submitted this change and it was merged. Change subject: update langage_by_size from compat #80549 ...................................................................... update langage_by_size from compat #80549 Change-Id: I0218d392c5d20bb7c2b1ccbdd1ed4b3593853a57 --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wiktionary_family.py 4 files changed, 33 insertions(+), 33 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index c41d3ba..07e5cef 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -12,8 +12,8 @@ self.languages_by_size = [ 'en', 'de', 'fr', 'hu', 'ja', 'pt', 'it', 'nl', 'pl', 'es', 'he', - 'id', 'sq', 'ca', 'fi', 'ru', 'cs', 'zh', 'sv', 'tr', 'hr', 'da', - 'no', 'th', 'sr', 'vi', 'ko', 'gl', 'fa', 'ta', 'ar', 'mk', 'tl', + 'id', 'sq', 'ca', 'fi', 'ru', 'cs', 'zh', 'sv', 'tr', 'da', 'hr', + 'no', 'th', 'sr', 'vi', 'gl', 'ko', 'fa', 'ta', 'ar', 'mk', 'tl', 'ro', 'is', 'tt', 'lt', 'ka', 'az', 'eo', 'uk', 'sk', 'bg', 'el', 'hy', 'sl', 'si', 'ms', 'li', 'la', 'ml', 'ang', 'ia', 'ur', 'cv', 'et', 'mr', 'bn', 'hi', 'oc', 'kk', 'km', 'eu', 'fy', 'ie', 'ne', diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index cb2d1a4..8dfcd23 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -11,34 +11,34 @@ self.name = 'wikipedia' self.languages_by_size = [ - 'en', 'nl', 'de', 'fr', 'sv', 'it', 'es', 'ru', 'pl', 'ja', 'vi', + 'en', 'nl', 'de', 'sv', 'fr', 'it', 'es', 'ru', 'pl', 'ja', 'vi', 'pt', 'zh', 'war', 'ceb', 'uk', 'ca', 'no', 'fi', 'fa', 'cs', 'ko', 'hu', 'ar', 'ro', 'ms', 'sr', 'tr', 'id', 'kk', 'sk', 'eo', 'da', - 'lt', 'eu', 'bg', 'he', 'hr', 'sl', 'uz', 'vo', 'et', 'hi', 'nn', - 'gl', 'simple', 'az', 'la', 'el', 'sh', 'oc', 'th', 'ka', 'mk', - 'hy', 'new', 'pms', 'be', 'tl', 'ta', 'ht', 'te', 'tt', 'cy', + 'lt', 'eu', 'bg', 'he', 'hr', 'sl', 'uz', 'vo', 'et', 'hi', 'gl', + 'nn', 'simple', 'az', 'la', 'el', 'sh', 'oc', 'th', 'ka', 'hy', + 'mk', 'new', 'be', 'pms', 'tl', 'ta', 'ht', 'te', 'tt', 'cy', 'be-x-old', 'lv', 'sq', 'bs', 'br', 'jv', 'mg', 'mr', 'lb', 'is', 'ml', 'my', 'ba', 'yo', 'an', 'lmo', 'fy', 'af', 'bn', 'pnb', 'sw', - 'bpy', 'zh-yue', 'io', 'ky', 'ur', 'ne', 'scn', 'gu', 'ga', 'nds', - 'ku', 'cv', 'ast', 'qu', 'su', 'sco', 'als', 'bug', 'ia', 'nap', - 'kn', 'bat-smg', 'map-bms', 'wa', 'am', 'gd', 'ckb', 'hif', - 'zh-min-nan', 'tg', 'arz', 'mzn', 'yi', 'vec', 'mn', 'sah', 'nah', - 'sa', 'roa-tara', 'os', 'si', 'pam', 'bar', 'hsb', 'se', 'pa', 'li', - 'mi', 'co', 'fo', 'ilo', 'gan', 'bo', 'glk', 'rue', 'frr', 'bcl', + 'zh-yue', 'bpy', 'io', 'ur', 'ky', 'ne', 'scn', 'gu', 'ga', 'nds', + 'ku', 'cv', 'ast', 'qu', 'su', 'sco', 'als', 'ia', 'bug', 'nap', + 'kn', 'bat-smg', 'map-bms', 'wa', 'am', 'ckb', 'gd', 'tg', 'hif', + 'zh-min-nan', 'arz', 'mzn', 'yi', 'mn', 'vec', 'sah', 'nah', 'sa', + 'roa-tara', 'os', 'si', 'bar', 'pam', 'hsb', 'se', 'pa', 'li', 'mi', + 'co', 'fo', 'ilo', 'gan', 'bo', 'glk', 'frr', 'rue', 'bcl', 'nds-nl', 'fiu-vro', 'mrj', 'tk', 'ps', 'vls', 'xmf', 'gv', 'min', - 'diq', 'or', 'kv', 'pag', 'km', 'zea', 'mhr', 'dv', 'nrm', 'csb', - 'vep', 'rm', 'koi', 'ce', 'udm', 'lad', 'lij', 'wuu', 'fur', - 'zh-classical', 'sc', 'stq', 'ug', 'mt', 'ay', 'so', 'pi', 'hak', - 'bh', 'ksh', 'nov', 'kw', 'ang', 'gn', 'pcd', 'nv', 'as', 'ext', - 'eml', 'frp', 'gag', 'ace', 'szl', 'ie', 'ln', 'pfl', 'krc', 'xal', - 'haw', 'pdc', 'rw', 'crh', 'to', 'dsb', 'lez', 'arc', 'kl', 'myv', - 'kab', 'sn', 'bjn', 'pap', 'tpi', 'lbe', 'wo', 'mwl', 'jbo', 'mdf', - 'kbd', 'cbk-zam', 'av', 'srn', 'lo', 'ty', 'kg', 'ab', 'tet', 'ltg', - 'na', 'ig', 'bxr', 'nso', 'za', 'kaa', 'zu', 'chy', 'rmy', 'cu', - 'tn', 'chr', 'roa-rup', 'cdo', 'bi', 'got', 'sm', 'bm', 'iu', 'pih', - 'pnt', 'sd', 'ss', 'ki', 'ee', 'ha', 'om', 'fj', 'ti', 'ts', 'ks', - 'sg', 've', 'rn', 'st', 'cr', 'dz', 'ak', 'tum', 'ik', 'lg', 'ff', - 'ny', 'ch', 'tw', 'xh', + 'or', 'diq', 'kv', 'pag', 'km', 'zea', 'mhr', 'dv', 'csb', 'ce', + 'nrm', 'vep', 'rm', 'koi', 'udm', 'lad', 'lij', 'wuu', + 'zh-classical', 'fur', 'sc', 'hak', 'stq', 'mt', 'ug', 'ay', 'so', + 'pi', 'bh', 'ksh', 'nov', 'kw', 'gn', 'ang', 'pcd', 'nv', 'as', + 'ext', 'gag', 'eml', 'frp', 'ace', 'szl', 'ie', 'ln', 'pfl', 'krc', + 'xal', 'haw', 'pdc', 'rw', 'crh', 'lez', 'dsb', 'to', 'arc', 'kl', + 'myv', 'kab', 'sn', 'bjn', 'pap', 'tpi', 'lbe', 'wo', 'mwl', 'jbo', + 'mdf', 'lo', 'kbd', 'cbk-zam', 'av', 'srn', 'ty', 'kg', 'ab', 'tet', + 'ltg', 'ig', 'na', 'bxr', 'nso', 'za', 'kaa', 'zu', 'chy', 'rmy', + 'cu', 'tn', 'chr', 'cdo', 'roa-rup', 'bi', 'got', 'sm', 'bm', 'iu', + 'pih', 'pnt', 'sd', 'ss', 'ki', 'ee', 'ha', 'om', 'fj', 'ti', 'ts', + 'ks', 'sg', 've', 'rn', 'st', 'cr', 'dz', 'ak', 'tum', 'ik', 'lg', + 'ff', 'ny', 'ch', 'tw', 'xh', ] langs = self.languages_by_size + ['test', 'test2'] # Sites we want to edit but not count as real languages diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index 6bdb9ad..319541b 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -14,7 +14,7 @@ 'fr', 'en', 'de', 'ru', 'it', 'pl', 'zh', 'he', 'pt', 'es', 'sv', 'ca', 'fa', 'cs', 'hu', 'ar', 'ko', 'sl', 'fi', 'ro', 'vi', 'te', 'sa', 'el', 'sr', 'bn', 'hr', 'th', 'no', 'hy', 'nl', 'ml', 'la', - 'ja', 'vec', 'tr', 'is', 'eo', 'gu', 'br', 'uk', 'mk', 'yi', 'ta', + 'is', 'ja', 'vec', 'tr', 'eo', 'gu', 'br', 'uk', 'mk', 'yi', 'ta', 'id', 'be', 'da', 'li', 'et', 'bg', 'as', 'mr', 'bs', 'sah', 'az', 'gl', 'kn', 'lt', 'cy', 'sk', 'zh-min-nan', 'fo', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index d46258f..228437b 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -11,16 +11,16 @@ self.name = 'wiktionary' self.languages_by_size = [ - 'en', 'mg', 'fr', 'zh', 'lt', 'ru', 'el', 'pl', 'ko', 'sv', 'tr', - 'de', 'nl', 'ku', 'ta', 'kn', 'io', 'fi', 'vi', 'hu', 'pt', 'es', - 'ml', 'no', 'my', 'id', 'it', 'li', 'et', 'ja', 'te', 'fa', 'ro', - 'cs', 'ca', 'ar', 'eu', 'jv', 'gl', 'lo', 'uk', 'chr', 'fj', 'br', + 'en', 'mg', 'fr', 'zh', 'lt', 'ru', 'el', 'pl', 'ko', 'sv', 'de', + 'tr', 'nl', 'ku', 'ta', 'es', 'kn', 'io', 'fi', 'vi', 'hu', 'pt', + 'no', 'ml', 'my', 'id', 'it', 'chr', 'li', 'et', 'ja', 'te', 'fa', + 'ro', 'cs', 'ca', 'ar', 'eu', 'jv', 'gl', 'lo', 'uk', 'fj', 'br', 'bg', 'eo', 'hr', 'oc', 'is', 'vo', 'th', 'ps', 'zh-min-nan', - 'simple', 'cy', 'scn', 'sr', 'af', 'ast', 'sw', 'fy', 'tl', 'uz', + 'simple', 'cy', 'scn', 'sr', 'af', 'ast', 'sw', 'fy', 'uz', 'tl', 'da', 'he', 'nn', 'ur', 'wa', 'la', 'az', 'hy', 'sq', 'sm', 'sl', 'nah', 'pnb', 'hi', 'ka', 'bs', 'tt', 'lb', 'lv', 'tk', 'sk', 'hsb', - 'kk', 'ky', 'mk', 'km', 'nds', 'be', 'ga', 'wo', 'ms', 'ang', 'co', - 'gn', 'mr', 'sa', 'csb', 'st', 'ia', 'sd', 'sh', 'si', 'tg', 'ug', + 'kk', 'ky', 'mk', 'km', 'be', 'nds', 'ga', 'wo', 'ms', 'ang', 'co', + 'gn', 'mr', 'sa', 'csb', 'st', 'ia', 'sd', 'sh', 'si', 'ug', 'tg', 'mn', 'kl', 'or', 'jbo', 'an', 'ln', 'fo', 'zu', 'gu', 'kw', 'gv', 'rw', 'qu', 'vec', 'ss', 'ie', 'mt', 'om', 'bn', 'roa-rup', 'iu', 'pa', 'so', 'am', 'su', 'za', 'gd', 'mi', 'tpi', 'ne', 'yi', 'ti', -- To view, visit https://gerrit.wikimedia.org/r/80702 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0218d392c5d20bb7c2b1ccbdd1ed4b3593853a57 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] add url/link which points to more info about installation an... - change (pywikibot/compat)
by DrTrigon (Code Review) 23 Aug '13

23 Aug '13

DrTrigon has submitted this change and it was merged. Change subject: add url/link which points to more info about installation and patch ...................................................................... add url/link which points to more info about installation and patch Change-Id: I44550cc294d2762d1ea5285221cd23221ba80d75 --- M externals/__init__.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: DrTrigon: Verified; Looks good to me, approved diff --git a/externals/__init__.py b/externals/__init__.py index e7db1c4..3bb6677 100644 --- a/externals/__init__.py +++ b/externals/__init__.py @@ -203,7 +203,9 @@ " automatically install it." " If you say Yes, externals will need administrator" " privileges, and you might be asked for the administrator" - " password.") + " password. For more info, please confer:\n" + " http://www.mediawiki.org/wiki/Manual:Pywikipediabot/" + "Installation#Dependencies") lowlevel_warning("Give externals permission to try to install package?" " (y/N)") v = raw_input().upper() -- To view, visit https://gerrit.wikimedia.org/r/79989 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I44550cc294d2762d1ea5285221cd23221ba80d75 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: Bináris <wikiposta(a)gmail.com> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] update language_by_size - change (pywikibot/compat)
by Xqt (Code Review) 23 Aug '13

23 Aug '13

Xqt has submitted this change and it was merged. Change subject: update language_by_size ...................................................................... update language_by_size Change-Id: I51e87dcd9b76e089731184f8ed4e31fc17565119 --- M families/wikibooks_family.py M families/wikipedia_family.py M families/wikisource_family.py M families/wiktionary_family.py 4 files changed, 33 insertions(+), 33 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/families/wikibooks_family.py b/families/wikibooks_family.py index 8bebe10..e7dbe62 100644 --- a/families/wikibooks_family.py +++ b/families/wikibooks_family.py @@ -12,8 +12,8 @@ self.languages_by_size = [ 'en', 'de', 'fr', 'hu', 'ja', 'pt', 'it', 'nl', 'pl', 'es', 'he', - 'id', 'sq', 'ca', 'fi', 'ru', 'cs', 'zh', 'sv', 'tr', 'hr', 'da', - 'no', 'th', 'sr', 'vi', 'ko', 'gl', 'fa', 'ta', 'ar', 'mk', 'tl', + 'id', 'sq', 'ca', 'fi', 'ru', 'cs', 'zh', 'sv', 'tr', 'da', 'hr', + 'no', 'th', 'sr', 'vi', 'gl', 'ko', 'fa', 'ta', 'ar', 'mk', 'tl', 'ro', 'is', 'tt', 'lt', 'ka', 'az', 'eo', 'uk', 'sk', 'bg', 'el', 'hy', 'sl', 'si', 'ms', 'li', 'la', 'ml', 'ang', 'ia', 'ur', 'cv', 'et', 'mr', 'bn', 'hi', 'oc', 'kk', 'km', 'eu', 'fy', 'ie', 'ne', diff --git a/families/wikipedia_family.py b/families/wikipedia_family.py index 9ae6247..b777570 100644 --- a/families/wikipedia_family.py +++ b/families/wikipedia_family.py @@ -11,34 +11,34 @@ self.name = 'wikipedia' self.languages_by_size = [ - 'en', 'nl', 'de', 'fr', 'sv', 'it', 'es', 'ru', 'pl', 'ja', 'vi', + 'en', 'nl', 'de', 'sv', 'fr', 'it', 'es', 'ru', 'pl', 'ja', 'vi', 'pt', 'zh', 'war', 'ceb', 'uk', 'ca', 'no', 'fi', 'fa', 'cs', 'ko', 'hu', 'ar', 'ro', 'ms', 'sr', 'tr', 'id', 'kk', 'sk', 'eo', 'da', - 'lt', 'eu', 'bg', 'he', 'hr', 'sl', 'uz', 'vo', 'et', 'hi', 'nn', - 'gl', 'simple', 'az', 'la', 'el', 'sh', 'oc', 'th', 'ka', 'mk', - 'hy', 'new', 'pms', 'be', 'tl', 'ta', 'ht', 'te', 'tt', 'cy', + 'lt', 'eu', 'bg', 'he', 'hr', 'sl', 'uz', 'vo', 'et', 'hi', 'gl', + 'nn', 'simple', 'az', 'la', 'el', 'sh', 'oc', 'th', 'ka', 'hy', + 'mk', 'new', 'be', 'pms', 'tl', 'ta', 'ht', 'te', 'tt', 'cy', 'be-x-old', 'lv', 'sq', 'bs', 'br', 'jv', 'mg', 'mr', 'lb', 'is', 'ml', 'my', 'ba', 'yo', 'an', 'lmo', 'fy', 'af', 'bn', 'pnb', 'sw', - 'bpy', 'zh-yue', 'io', 'ky', 'ur', 'ne', 'scn', 'gu', 'ga', 'nds', - 'ku', 'cv', 'ast', 'qu', 'su', 'sco', 'als', 'bug', 'ia', 'nap', - 'kn', 'bat-smg', 'map-bms', 'wa', 'am', 'gd', 'ckb', 'hif', - 'zh-min-nan', 'tg', 'arz', 'mzn', 'yi', 'vec', 'mn', 'sah', 'nah', - 'sa', 'roa-tara', 'os', 'si', 'pam', 'bar', 'hsb', 'se', 'pa', 'li', - 'mi', 'co', 'fo', 'ilo', 'gan', 'bo', 'glk', 'rue', 'frr', 'bcl', + 'zh-yue', 'bpy', 'io', 'ur', 'ky', 'ne', 'scn', 'gu', 'ga', 'nds', + 'ku', 'cv', 'ast', 'qu', 'su', 'sco', 'als', 'ia', 'bug', 'nap', + 'kn', 'bat-smg', 'map-bms', 'wa', 'am', 'ckb', 'gd', 'tg', 'hif', + 'zh-min-nan', 'arz', 'mzn', 'yi', 'mn', 'vec', 'sah', 'nah', 'sa', + 'roa-tara', 'os', 'si', 'bar', 'pam', 'hsb', 'se', 'pa', 'li', 'mi', + 'co', 'fo', 'ilo', 'gan', 'bo', 'glk', 'frr', 'rue', 'bcl', 'nds-nl', 'fiu-vro', 'mrj', 'tk', 'ps', 'vls', 'xmf', 'gv', 'min', - 'diq', 'or', 'kv', 'pag', 'km', 'zea', 'mhr', 'dv', 'nrm', 'csb', - 'vep', 'rm', 'koi', 'ce', 'udm', 'lad', 'lij', 'wuu', 'fur', - 'zh-classical', 'sc', 'stq', 'ug', 'mt', 'ay', 'so', 'pi', 'hak', - 'bh', 'ksh', 'nov', 'kw', 'ang', 'gn', 'pcd', 'nv', 'as', 'ext', - 'eml', 'frp', 'gag', 'ace', 'szl', 'ie', 'ln', 'pfl', 'krc', 'xal', - 'haw', 'pdc', 'rw', 'crh', 'to', 'dsb', 'lez', 'arc', 'kl', 'myv', - 'kab', 'sn', 'bjn', 'pap', 'tpi', 'lbe', 'wo', 'mwl', 'jbo', 'mdf', - 'kbd', 'cbk-zam', 'av', 'srn', 'lo', 'ty', 'kg', 'ab', 'tet', 'ltg', - 'na', 'ig', 'bxr', 'nso', 'za', 'kaa', 'zu', 'chy', 'rmy', 'cu', - 'tn', 'chr', 'roa-rup', 'cdo', 'bi', 'got', 'sm', 'bm', 'iu', 'pih', - 'pnt', 'sd', 'ss', 'ki', 'ee', 'ha', 'om', 'fj', 'ti', 'ts', 'ks', - 'sg', 've', 'rn', 'st', 'cr', 'dz', 'ak', 'tum', 'ik', 'lg', 'ff', - 'ny', 'ch', 'tw', 'xh', + 'or', 'diq', 'kv', 'pag', 'km', 'zea', 'mhr', 'dv', 'csb', 'ce', + 'nrm', 'vep', 'rm', 'koi', 'udm', 'lad', 'lij', 'wuu', + 'zh-classical', 'fur', 'sc', 'hak', 'stq', 'mt', 'ug', 'ay', 'so', + 'pi', 'bh', 'ksh', 'nov', 'kw', 'gn', 'ang', 'pcd', 'nv', 'as', + 'ext', 'gag', 'eml', 'frp', 'ace', 'szl', 'ie', 'ln', 'pfl', 'krc', + 'xal', 'haw', 'pdc', 'rw', 'crh', 'lez', 'dsb', 'to', 'arc', 'kl', + 'myv', 'kab', 'sn', 'bjn', 'pap', 'tpi', 'lbe', 'wo', 'mwl', 'jbo', + 'mdf', 'lo', 'kbd', 'cbk-zam', 'av', 'srn', 'ty', 'kg', 'ab', 'tet', + 'ltg', 'ig', 'na', 'bxr', 'nso', 'za', 'kaa', 'zu', 'chy', 'rmy', + 'cu', 'tn', 'chr', 'cdo', 'roa-rup', 'bi', 'got', 'sm', 'bm', 'iu', + 'pih', 'pnt', 'sd', 'ss', 'ki', 'ee', 'ha', 'om', 'fj', 'ti', 'ts', + 'ks', 'sg', 've', 'rn', 'st', 'cr', 'dz', 'ak', 'tum', 'ik', 'lg', + 'ff', 'ny', 'ch', 'tw', 'xh', ] self.langs = dict([(lang, '%s.wikipedia.org' % lang) diff --git a/families/wikisource_family.py b/families/wikisource_family.py index 2cbf5ab..332188c 100644 --- a/families/wikisource_family.py +++ b/families/wikisource_family.py @@ -14,7 +14,7 @@ 'fr', 'en', 'de', 'ru', 'it', 'pl', 'zh', 'he', 'pt', 'es', 'sv', 'ca', 'fa', 'cs', 'hu', 'ar', 'ko', 'sl', 'fi', 'ro', 'vi', 'te', 'sa', 'el', 'sr', 'bn', 'hr', 'th', 'no', 'hy', 'nl', 'ml', 'la', - 'ja', 'vec', 'tr', 'is', 'eo', 'gu', 'br', 'uk', 'mk', 'yi', 'ta', + 'is', 'ja', 'vec', 'tr', 'eo', 'gu', 'br', 'uk', 'mk', 'yi', 'ta', 'id', 'be', 'da', 'li', 'et', 'bg', 'as', 'mr', 'bs', 'sah', 'az', 'gl', 'kn', 'lt', 'cy', 'sk', 'zh-min-nan', 'fo', ] diff --git a/families/wiktionary_family.py b/families/wiktionary_family.py index 80b296f..e003e8f 100644 --- a/families/wiktionary_family.py +++ b/families/wiktionary_family.py @@ -11,16 +11,16 @@ self.name = 'wiktionary' self.languages_by_size = [ - 'en', 'mg', 'fr', 'zh', 'lt', 'ru', 'el', 'pl', 'ko', 'sv', 'tr', - 'de', 'nl', 'ku', 'ta', 'kn', 'io', 'fi', 'vi', 'hu', 'pt', 'es', - 'ml', 'no', 'my', 'id', 'it', 'li', 'et', 'ja', 'te', 'fa', 'ro', - 'cs', 'ca', 'ar', 'eu', 'jv', 'gl', 'lo', 'uk', 'chr', 'fj', 'br', + 'en', 'mg', 'fr', 'zh', 'lt', 'ru', 'el', 'pl', 'ko', 'sv', 'de', + 'tr', 'nl', 'ku', 'ta', 'es', 'kn', 'io', 'fi', 'vi', 'hu', 'pt', + 'no', 'ml', 'my', 'id', 'it', 'chr', 'li', 'et', 'ja', 'te', 'fa', + 'ro', 'cs', 'ca', 'ar', 'eu', 'jv', 'gl', 'lo', 'uk', 'fj', 'br', 'bg', 'eo', 'hr', 'oc', 'is', 'vo', 'th', 'ps', 'zh-min-nan', - 'simple', 'cy', 'scn', 'sr', 'af', 'ast', 'sw', 'fy', 'tl', 'uz', + 'simple', 'cy', 'scn', 'sr', 'af', 'ast', 'sw', 'fy', 'uz', 'tl', 'da', 'he', 'nn', 'ur', 'wa', 'la', 'az', 'hy', 'sq', 'sm', 'sl', 'nah', 'pnb', 'hi', 'ka', 'bs', 'tt', 'lb', 'lv', 'tk', 'sk', 'hsb', - 'kk', 'ky', 'mk', 'km', 'nds', 'be', 'ga', 'wo', 'ms', 'ang', 'co', - 'gn', 'mr', 'sa', 'csb', 'st', 'ia', 'sd', 'sh', 'si', 'tg', 'ug', + 'kk', 'ky', 'mk', 'km', 'be', 'nds', 'ga', 'wo', 'ms', 'ang', 'co', + 'gn', 'mr', 'sa', 'csb', 'st', 'ia', 'sd', 'sh', 'si', 'ug', 'tg', 'mn', 'kl', 'or', 'jbo', 'an', 'ln', 'fo', 'zu', 'gu', 'kw', 'gv', 'rw', 'qu', 'vec', 'ss', 'ie', 'mt', 'om', 'bn', 'roa-rup', 'iu', 'pa', 'so', 'am', 'su', 'za', 'gd', 'mi', 'tpi', 'ne', 'yi', 'ti', -- To view, visit https://gerrit.wikimedia.org/r/80549 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I51e87dcd9b76e089731184f8ed4e31fc17565119 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] pep8 changes - change (pywikibot/core)
by jenkins-bot (Code Review) 23 Aug '13

23 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8 changes ...................................................................... pep8 changes Change-Id: I9e8477a8202299ef5b23a0fd99355bb545b3ad49 --- M scripts/clean_sandbox.py 1 file changed, 58 insertions(+), 41 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/clean_sandbox.py b/scripts/clean_sandbox.py index bf50926..54cbc85 100755 --- a/scripts/clean_sandbox.py +++ b/scripts/clean_sandbox.py @@ -48,10 +48,10 @@ content = { 'commons': u'{{Sandbox}}\n', - 'als':u'{{subst:/Vorlage}}', + 'als': u'{{subst:/Vorlage}}', 'ar': u'{{عنوان الملعب}}\n', 'az': u'\n{{Qaralama dəftəri}}\n', - 'bar':u'{{Bitte erst NACH dieser Zeile schreiben! (Begrüßungskasten)}}\r\n', + 'bar': u'{{Bitte erst NACH dieser Zeile schreiben! (Begrüßungskasten)}}\r\n', 'cs': u'{{subst:/uhrabat}}', 'da': u'{{subst:Sandkasse tekst}}', 'de': u'{{Bitte erst NACH dieser Zeile schreiben! (Begrüßungskasten)}}\r\n', @@ -63,9 +63,9 @@ 'it': u'{{sandbox}}', 'ja': u'{{subst:サンドボックス}}', 'ko': u'{{연습장 안내문}}', - 'ksh':u'{{subst:/Schablon}}', - 'mzn':u'{{ویکی‌پدیا:چنگ‌مویی صفحه/پیغوم}}\n', - 'nds':u'{{subst:/Vörlaag}}', + 'ksh': u'{{subst:/Schablon}}', + 'mzn': u'{{ویکی‌پدیا:چنگ‌مویی صفحه/پیغوم}}\n', + 'nds': u'{{subst:/Vörlaag}}', 'nl': u'{{subst:Wikipedia:Zandbak/schoon zand}}', 'nn': u'{{sandkasse}}\n', 'no': u'{{Sandkasse}}\n}}', @@ -79,14 +79,14 @@ 'th': u'{{กระบะทราย}}\n', 'tr': u'{{/Bu satırı değiştirmeden bırakın}}', 'zh': u'{{subst:User:Sz-iwbot/sandbox}}\r\n', - } +} sandboxTitle = { 'commons': u'Project:Sandbox', - 'als':u'Project:Sandchaschte', + 'als': u'Project:Sandchaschte', 'ar': u'Project:ملعب', 'az': u'Vikipediya:Qaralama dəftəri', - 'bar':u'Project:Spuiwiesn', + 'bar': u'Project:Spuiwiesn', 'cs': u'Project:Pískoviště', 'da': u'Project:Sandkassen', 'de': u'Project:Spielwiese', @@ -99,9 +99,9 @@ 'it': u'Project:Pagina delle prove', 'ja': u'Project:サンドボックス', 'ko': u'Project:연습장', - 'ksh':u'Project:Shpillplaz', - 'mzn':u'Project:چنگ‌مویی صفحه', - 'nds':u'Project:Speelwisch', + 'ksh': u'Project:Shpillplaz', + 'mzn': u'Project:چنگ‌مویی صفحه', + 'nds': u'Project:Speelwisch', 'nl': u'Project:Zandbak', 'no': u'Project:Sandkasse', 'pl': u'Project:Brudnopis', @@ -114,15 +114,16 @@ 'th': u'Project:ทดลองเขียน', 'tr': u'Vikipedi:Deneme tahtası', 'zh': u'Project:沙盒', - } +} user_content = { 'de': u'{{Benutzer:DrTrigonBot/Spielwiese}}', - } +} user_sandboxTemplate = { 'de': u'User:DrTrigonBot/Spielwiese', - } +} + class SandboxBot(pywikibot.Bot): availableOptions = { @@ -136,7 +137,7 @@ def __init__(self, **kwargs): super(SandboxBot, self).__init__(**kwargs) if self.getOption('delay') is None: - d = min(15, max(5, int(self.getOption('hours')*60))) + d = min(15, max(5, int(self.getOption('hours') * 60))) self.availableOptions['delay_td'] = datetime.timedelta(minutes=d) else: d = max(5, self.getOption('delay')) @@ -148,17 +149,19 @@ localSandboxTitle = pywikibot.translate(self.site, user_sandboxTemplate, fallback=False) - localSandbox = pywikibot.Page(self.site, localSandboxTitle) + localSandbox = pywikibot.Page(self.site, localSandboxTitle) content.update(user_content) - sandboxTitle[self.site.lang] = [item.title() \ - for item in localSandbox.getReferences(onlyTemplateInclusion=True)] + sandboxTitle[self.site.lang] = [item.title() for item in + localSandbox.getReferences( + onlyTemplateInclusion=True)] if self.site.lang not in user_sandboxTemplate: content[self.site.code] = None - pywikibot.output(u'Not properly set-up to run in user namespace!') - if sandboxTitle.get(self.site.code) is None or \ - content.get(self.site.code) is None: - pywikibot.output(u'This bot is not configured for the given site ' \ - u'(%s), exiting.' % self.site) + pywikibot.output( + u'Not properly set-up to run in user namespace!') + if sandboxTitle.get(self.site.code) is None or content.get( + self.site.code) is None: + pywikibot.output(u'This bot is not configured for the given site ' + u'(%s), exiting.' % self.site) sys.exit(0) def run(self): @@ -170,10 +173,11 @@ if type(localSandboxTitle) is list: titles = localSandboxTitle else: - titles = [localSandboxTitle,] + titles = [localSandboxTitle] for title in titles: sandboxPage = pywikibot.Page(self.site, title) - pywikibot.output(u'Preparing to process sandbox page %s' % sandboxPage.title(asLink=True)) + pywikibot.output(u'Preparing to process sandbox page %s' + % sandboxPage.title(asLink=True)) try: text = sandboxPage.get() translatedContent = pywikibot.translate(self.site, content, @@ -183,49 +187,62 @@ subst = 'subst:' in translatedContent pos = text.find(translatedContent.strip()) if text.strip() == translatedContent.strip(): - pywikibot.output(u'The sandbox is still clean, no change necessary.') + pywikibot.output( + u'The sandbox is still clean, no change necessary.') elif subst and sandboxPage.userName() == self.site.user(): - pywikibot.output(u'The sandbox might be clean, no change necessary.') - elif pos <> 0 and not subst: + pywikibot.output( + u'The sandbox might be clean, no change necessary.') + elif pos != 0 and not subst: if self.getOption('user'): endpos = pos + len(translatedContent.strip()) if (pos < 0) or (endpos == len(text)): - pywikibot.output(u'The user sandbox is still clean, no change necessary.') + pywikibot.output( + u'The user sandbox is still clean, no change necessary.') else: sandboxPage.put(text[:endpos], translatedMsg) pywikibot.showDiff(text, text[:endpos]) - pywikibot.output(u'Standard content was changed, user sandbox cleaned.') + pywikibot.output( + u'Standard content was changed, user sandbox cleaned.') else: sandboxPage.put(translatedContent, translatedMsg) pywikibot.showDiff(text, translatedContent) - pywikibot.output(u'Standard content was changed, sandbox cleaned.') + pywikibot.output( + u'Standard content was changed, sandbox cleaned.') else: edit_delta = datetime.datetime.utcnow() - \ - pywikibot.Timestamp.fromISOformat(sandboxPage.editTime()) + pywikibot.Timestamp.fromISOformat( + sandboxPage.editTime()) delta = self.getOption('delay_td') - edit_delta - #Is the last edit more than 'delay' minutes ago? + # Is the last edit more than 'delay' minutes ago? if delta <= datetime.timedelta(0): sandboxPage.put(translatedContent, translatedMsg) pywikibot.showDiff(text, translatedContent) - pywikibot.output(u'Standard content was changed, sandbox cleaned.') - else: #wait for the rest - pywikibot.output(u'Sandbox edited %.1f minutes ago...' % \ - (edit_delta.seconds / 60.0)) - pywikibot.output(u'Sleeping for %d minutes.' % (delta.seconds/60)) + pywikibot.output( + u'Standard content was changed, sandbox cleaned.') + else: # wait for the rest + pywikibot.output( + u'Sandbox edited %.1f minutes ago...' + % (edit_delta.seconds / 60.0)) + pywikibot.output(u'Sleeping for %d minutes.' + % (delta.seconds / 60)) time.sleep(delta.seconds) wait = True except pywikibot.EditConflict: - pywikibot.output(u'*** Loading again because of edit conflict.\n') + pywikibot.output( + u'*** Loading again because of edit conflict.\n') if self.getOption('no_repeat'): pywikibot.output(u'\nDone.') return elif not wait: if self.getOption('hours') < 1.0: - pywikibot.output('\nSleeping %s minutes, now %s' % ((self.getOption('hours')*60), now)) + pywikibot.output('\nSleeping %s minutes, now %s' + % ((self.getOption('hours') * 60), now)) else: - pywikibot.output('\nSleeping %s hours, now %s' % (self.getOption('hours'), now)) + pywikibot.output('\nSleeping %s hours, now %s' + % (self.getOption('hours'), now)) time.sleep(self.getOption('hours') * 60 * 60) + def main(): opts = {} for arg in pywikibot.handleArgs(): -- To view, visit https://gerrit.wikimedia.org/r/80547 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9e8477a8202299ef5b23a0fd99355bb545b3ad49 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] pep8 changes - change (pywikibot/core)
by jenkins-bot (Code Review) 23 Aug '13

23 Aug '13

1 0

[Gerrit] pep8 changes - change (pywikibot/core)
by jenkins-bot (Code Review) 23 Aug '13

23 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8 changes ...................................................................... pep8 changes Change-Id: If86c7613d3daeb0cbbafef5bad4e8a42633a7c2e --- M scripts/category_redirect.py 1 file changed, 71 insertions(+), 78 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 3a69274..17053ff 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -25,7 +25,8 @@ import cPickle import math import re -import sys, traceback +import sys +import traceback import time from datetime import datetime, timedelta import pywikibot @@ -34,16 +35,17 @@ class CategoryRedirectBot(object): + def __init__(self): - self.cooldown = 7 # days + self.cooldown = 7 # days self.site = pywikibot.getSite() self.site.login() - self.catprefix = self.site.namespace(14)+":" + self.catprefix = self.site.namespace(14) + ":" self.log_text = [] self.edit_requests = [] self.log_page = pywikibot.Page(self.site, - u"User:%(user)s/category redirect log" % - {'user': self.site.user()}) + u"User:%(user)s/category redirect log" + % {'user': self.site.user()}) # Localization: @@ -76,12 +78,9 @@ self.dbl_redir_comment = 'category_redirect-fix-double' self.maint_comment = 'category_redirect-comment' self.edit_request_text = i18n.twtranslate( - self.site.lang, - 'category_redirect-edit-request') + \ - u'\n~~~~' + self.site.lang, 'category_redirect-edit-request') + u'\n~~~~' self.edit_request_item = i18n.twtranslate( - self.site.lang, - 'category_redirect-edit-request-item') + self.site.lang, 'category_redirect-edit-request-item') def change_category(self, article, oldCat, newCat, comment=None, sortKey=None): @@ -122,11 +121,11 @@ except pywikibot.SpamfilterError, error: pywikibot.output( u'Changing page %s blocked by spam filter (URL=%s)' - % (article.title(asLink=True), error.url)) + % (article.title(asLink=True), error.url)) except pywikibot.NoUsername: pywikibot.output( u"Page %s not saved; sysop privileges required." - % article.title(asLink=True)) + % article.title(asLink=True)) self.edit_requests.append({ 'title': article.title(asLink=True, textlink=True), 'oldcat': oldCat.title(asLink=True, textlink=True), @@ -154,23 +153,24 @@ found += 1 changed = self.change_category(article, oldCat, newCat, comment=comment) - if changed: moved += 1 + if changed: + moved += 1 # pass 2: look for template doc pages for item in pywikibot.data.api.ListGenerator( - "categorymembers", cmtitle=oldCat.title(), - cmprop="title|sortkey", cmnamespace="10", - cmlimit="max"): - doc = pywikibot.Page( - pywikibot.Link(item['title']+"/doc", self.site) - ) + "categorymembers", cmtitle=oldCat.title(), + cmprop="title|sortkey", cmnamespace="10", + cmlimit="max"): + doc = pywikibot.Page(pywikibot.Link(item['title'] + + "/doc", self.site)) try: old_text = doc.get() except pywikibot.Error: continue changed = self.change_category(doc, oldCat, newCat, comment=comment) - if changed: moved += 1 + if changed: + moved += 1 if found: pywikibot.output(u"%s: %s found, %s moved" @@ -187,7 +187,7 @@ def readyToEdit(self, cat): """Return True if cat not edited during cooldown period, else False.""" - dateformat ="%Y-%m-%dT%H:%M:%SZ" + dateformat = "%Y-%m-%dT%H:%M:%SZ" today = datetime.now() deadline = today + timedelta(days=-self.cooldown) if cat.editTime() is None: @@ -213,16 +213,15 @@ return log_text # sort by keys and keep the first (LOG_SIZE-1) values keep = [text for (key, text) in - sorted(log_items.iteritems(), reverse=True)[:LOG_SIZE-1]] + sorted(log_items.iteritems(), reverse=True)[:LOG_SIZE - 1]] log_text = "\n".join("\n".join(line for line in text) for text in keep) # get permalink to older logs history = self.log_page.getVersionHistory(total=LOG_SIZE) # get the id of the newest log being archived - rotate_revid = history[LOG_SIZE-1][0] + rotate_revid = history[LOG_SIZE - 1][0] # append permalink - log_text = log_text + ( - "\n\n'''[%s Older logs]'''" - % self.log_page.permalink(oldid=rotate_revid)) + log_text = log_text + ("\n\n'''[%s Older logs]'''" + % self.log_page.permalink(oldid=rotate_revid)) return log_text def run(self): @@ -235,10 +234,10 @@ l = time.localtime() today = "%04d-%02d-%02d" % l[:3] - edit_request_page = pywikibot.Page(self.site, - u"User:%(user)s/category edit requests" % locals()) - datafile = pywikibot.config.datafilepath( - "%s-catmovebot-data" % self.site.dbName()) + edit_request_page = pywikibot.Page( + self.site, u"User:%(user)s/category edit requests" % locals()) + datafile = pywikibot.config.datafilepath("%s-catmovebot-data" + % self.site.dbName()) try: inp = open(datafile, "rb") record = cPickle.load(inp) @@ -252,7 +251,7 @@ 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()) + % self.site.sitename()) return # regex to match soft category redirects # note that any templates containing optional "category:" are @@ -267,15 +266,13 @@ 'template': "|".join(item.replace(" ", "[ _]+") for item in template_list), 'catns': self.site.namespace(14)}, - re.I|re.X) + re.I | re.X) # check for hard-redirected categories that are not already marked # with an appropriate template comment = i18n.twtranslate(self.site.lang, self.redir_comment) for page in pagegenerators.PreloadingGenerator( - self.site.allpages(namespace=14, filterredir=True), - step=250 - ): + self.site.allpages(namespace=14, filterredir=True), step=250): # generator yields all hard redirect pages in namespace 14 if page.isCategoryRedirect(): # this is already a soft-redirect, so skip it (for now) @@ -284,9 +281,8 @@ target = page.getRedirectTarget() except pywikibot.CircularRedirect: target = page - problems.append( - u"# %s is a self-linked redirect" - % page.title(asLink=True, textlink=True)) + problems.append(u"# %s is a self-linked redirect" + % page.title(asLink=True, textlink=True)) except RuntimeError: # race condition: someone else removed the redirect while we # were checking for it @@ -299,18 +295,18 @@ try: page.put(newtext, comment, minorEdit=True) self.log_text.append(u"* Added {{tl|%s}} to %s" - % (template_list[0], - page.title(asLink=True, textlink=True))) + % (template_list[0], + page.title(asLink=True, + textlink=True))) except pywikibot.Error, e: - self.log_text.append( - u"* Failed to add {{tl|%s}} to %s" - % (template_list[0], - page.title(asLink=True, textlink=True))) + self.log_text.append(u"* Failed to add {{tl|%s}} to %s" + % (template_list[0], + page.title(asLink=True, + textlink=True))) else: - problems.append( - u"# %s is a hard redirect to %s" - % (page.title(asLink=True, textlink=True), - target.title(asLink=True, textlink=True))) + problems.append(u"# %s is a hard redirect to %s" + % (page.title(asLink=True, textlink=True), + target.title(asLink=True, textlink=True))) pywikibot.output("Done checking hard-redirect category pages.") @@ -318,15 +314,13 @@ counts, destmap, catmap = {}, {}, {} catlist, nonemptypages = [], [] redircat = pywikibot.Category( - pywikibot.Link( - self.cat_redirect_cat[self.site.family.name] - [self.site.code], - self.site) - ) + pywikibot.Link(self.cat_redirect_cat + [self.site.family.name][self.site.code], self.site)) # get a list of all members of the category-redirect category - catpages = dict((c, None) for c in - self.site.categorymembers(redircat, namespaces=[14])) + catpages = dict((c, None) + for c in self.site.categorymembers(redircat, + namespaces=[14])) # check the category pages for redirected categories pywikibot.output(u"") @@ -336,7 +330,7 @@ cat_title = cat.title(withNamespace=False) if "category redirect" in cat_title: self.log_text.append(u"* Ignoring %s" - % cat.title(asLink=True, textlink=True)) + % cat.title(asLink=True, textlink=True)) continue if hasattr(cat, "_catinfo"): # skip empty categories that don't return a "categoryinfo" key @@ -349,8 +343,8 @@ record[cat_title] = {today: None} try: newredirs.append("*# %s -> %s" - % (cat.title(asLink=True, textlink=True), - cat.getCategoryRedirectTarget().title( + % (cat.title(asLink=True, textlink=True), + cat.getCategoryRedirectTarget().title( asLink=True, textlink=True))) except pywikibot.Error: pass @@ -362,8 +356,8 @@ # delete record entries for non-existent categories for cat_name in record.keys(): - if pywikibot.Category(self.site, self.catprefix + cat_name - ) not in catpages: + if pywikibot.Category(self.site, + self.catprefix + cat_name) not in catpages: del record[cat_name] pywikibot.output(u"") @@ -374,19 +368,18 @@ try: if not cat.isCategoryRedirect(): self.log_text.append(u"* False positive: %s" - % cat.title(asLink=True, - textlink=True)) + % cat.title(asLink=True, + textlink=True)) continue except pywikibot.Error: self.log_text.append(u"* Could not load %s; ignoring" - % cat.title(asLink=True, textlink=True)) + % cat.title(asLink=True, textlink=True)) continue cat_title = cat.title(withNamespace=False) if not self.readyToEdit(cat): counts[cat_title] = None - self.log_text.append( - u"* Skipping %s; in cooldown period." - % cat.title(asLink=True, textlink=True)) + self.log_text.append(u"* Skipping %s; in cooldown period." + % cat.title(asLink=True, textlink=True)) continue dest = cat.getCategoryRedirectTarget() if not dest.exists(): @@ -404,8 +397,8 @@ double = dest.getCategoryRedirectTarget() if double == dest or double == cat: self.log_text.append(u"* Redirect loop from %s" - % dest.title(asLink=True, - textlink=True)) + % dest.title(asLink=True, + textlink=True)) # do a null edit on cat try: cat.put(cat.get(get_redirect=True)) @@ -414,16 +407,16 @@ else: self.log_text.append( u"* Fixed double-redirect: %s -> %s -> %s" - % (cat.title(asLink=True, textlink=True), - dest.title(asLink=True, textlink=True), - double.title(asLink=True, textlink=True))) + % (cat.title(asLink=True, textlink=True), + dest.title(asLink=True, textlink=True), + double.title(asLink=True, textlink=True))) oldtext = cat.get(get_redirect=True) # remove the old redirect from the old text, # leaving behind any non-redirect text oldtext = template_regex.sub("", oldtext) newtext = (u"{{%(redirtemp)s|%(ncat)s}}" - % {'redirtemp': template_list[0], - 'ncat': double.title(withNamespace=False)}) + % {'redirtemp': template_list[0], + 'ncat': double.title(withNamespace=False)}) newtext = newtext + oldtext.strip() try: cat.put(newtext, @@ -462,7 +455,7 @@ problems.sort() newredirs.sort() self.log_page.put(u"\n==%i-%02i-%02iT%02i:%02i:%02iZ==\n" - % time.gmtime()[:6] + % time.gmtime()[:6] + u"\n".join(self.log_text) + u"\n* New redirects since last report:\n" + u"\n".join(newredirs) @@ -470,10 +463,10 @@ + u"\n" + self.get_log_text()) if self.edit_requests: edit_request_page.put(self.edit_request_text - % {'itemlist': - u"\n" + u"\n".join( - (self.edit_request_item % item) - for item in self.edit_requests)}) + % {'itemlist': u"\n" + u"\n".join( + (self.edit_request_item % item) + for item in self.edit_requests)}) + def main(*args): global bot -- To view, visit https://gerrit.wikimedia.org/r/80539 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If86c7613d3daeb0cbbafef5bad4e8a42633a7c2e Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
18
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits August 2013