jenkins-bot has submitted this change and it was merged. Change subject: (Bug: 57796) Added support for specifying a site in ReplaceRobot ...................................................................... (Bug: 57796) Added support for specifying a site in ReplaceRobot so that this value can be passed to textlib.replaceExcept() Change-Id: I460cf154e0110c8339312ba5499e3b75a11c083d --- M scripts/replace.py 1 file changed, 12 insertions(+), 8 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/replace.py b/scripts/replace.py index 0be0be8..acc6da0 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -225,7 +225,7 @@ """ def __init__(self, generator, replacements, exceptions={}, acceptall=False, allowoverlap=False, recursive=False, - addedCat=None, sleep=None, summary=''): + addedCat=None, sleep=None, summary='', site=None): """ Arguments: * generator - A generator that yields Page objects. @@ -266,10 +266,12 @@ self.acceptall = acceptall self.allowoverlap = allowoverlap self.recursive = recursive + self.site = site + if self.site is None: + self.site = pywikibot.getSite() if addedCat: - site = pywikibot.getSite() cat_ns = site.category_namespaces()[0] - self.addedCat = pywikibot.Page(site, + self.addedCat = pywikibot.Page(self.site, cat_ns + ':' + addedCat) self.sleep = sleep self.summary = summary @@ -314,7 +316,8 @@ if self.sleep is not None: time.sleep(self.sleep) new_text = pywikibot.replaceExcept(new_text, old, new, exceptions, - allowoverlap=self.allowoverlap) + allowoverlap=self.allowoverlap, + site=self.site) return new_text def run(self): @@ -342,9 +345,9 @@ new_text = original_text while True: if self.isTextExcepted(new_text): - pywikibot.output( - u'Skipping %s because it contains text that is on the exceptions list.' - % page.title(asLink=True)) + pywikibot.output(u'Skipping %s because it contains text ' + u'that is on the exceptions list.' + % page.title(asLink=True)) break new_text = self.doReplacements(new_text) if new_text == original_text: @@ -570,7 +573,8 @@ {'description': replacementsDescription}) else: - raise pywikibot.Error('Specifying -fix with replacements is undefined') + raise pywikibot.Error( + 'Specifying -fix with replacements is undefined') elif fix is None: old = pywikibot.input(u'Please enter the text that should be replaced:') new = pywikibot.input(u'Please enter the new text:') -- To view, visit https://gerrit.wikimedia.org/r/98472 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I460cf154e0110c8339312ba5499e3b75a11c083d Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot