jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/400090 ) Change subject: Allow category-add script to categorize inside /doc subpages of templates ...................................................................... Allow category-add script to categorize inside /doc subpages of templates Allow `category add` to add category in <includeonly> section of /doc subpages of templates, or the <noinclude> section of the template page if the subpage does not exist. Bug: T135339 Change-Id: Ic787c50d3a8a55794b6a8ecee5b6c4c0ef189c62 --- M scripts/category.py 1 file changed, 40 insertions(+), 6 deletions(-) Approvals: Dvorapa: Looks good to me, but someone else must approve Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/category.py b/scripts/category.py index 6d09ada..ea53852 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -110,7 +110,7 @@ # (C) Ben McIlwain (CydeWeys), 2006-2015 # (C) Anreas J Schwab, 2007 # (C) xqt, 2009-2016 -# (C) Pywikibot team, 2008-2017 +# (C) Pywikibot team, 2008-2018 # # Distributed under the terms of the MIT license. # @@ -336,6 +336,7 @@ def treat(self, page): """Process one page.""" + includeonly = [] if page.isRedirectPage(): # if it's a redirect use the redirect target instead redirTarget = page.getRedirectTarget() @@ -348,7 +349,17 @@ # loading it will throw an error if we don't jump out before return else: - self.current_page = page + if page.namespace() == page.site.namespaces.TEMPLATE: + docs = page.site.doc_subpage # return tuple + for doc in docs: + doc_page = pywikibot.Page( + page.site, page.title() + doc) + if doc_page.exists(): + self.current_page = doc_page + includeonly = ['includeonly'] + break + if not self.current_page: + self.current_page = page if self.current_page.exists(): # Load the page text = self.current_page.text @@ -362,7 +373,8 @@ return # store old text, so we don't have reload it every time old_text = text - cats = textlib.getCategoryLinks(text, self.current_page.site) + cats = textlib.getCategoryLinks( + text, self.current_page.site, include=includeonly) pywikibot.output(u"Current categories:") for cat in cats: pywikibot.output(u"* %s" % cat.title()) @@ -374,9 +386,31 @@ if self.sort: catpl = self.sorted_by_last_name(catpl, self.current_page) pywikibot.output(u'Adding %s' % catpl.title(asLink=True)) - cats.append(catpl) - text = textlib.replaceCategoryLinks(text, cats, - site=self.current_page.site) + if page.namespace() == page.site.namespaces.TEMPLATE: + tagname = 'noinclude' + if includeonly == ['includeonly']: + tagname = 'includeonly' + tagnameregexp = re.compile(r'(.*)(<\/{0}>)'.format(tagname), + re.I | re.DOTALL) + categorytitle = catpl.title(asLink=True, allowInterwiki=False) + if tagnameregexp.search(text): + # add category into the <includeonly> tag in the + # template document page or the <noinclude> tag + # in the template page + text = textlib.replaceExcept( + text, tagnameregexp, + r'\1{0}\n\2'.format(categorytitle), + ['nowiki', 'comment', 'math', 'pre', 'source'], + site=self.current_page.site) + else: + if includeonly == ['includeonly']: + text += '\n\n' + text += '<{0}>\n{1}\n</{0}>'.format( + tagname, categorytitle) + else: + cats.append(catpl) + text = textlib.replaceCategoryLinks( + text, cats, site=self.current_page.site) comment = self.comment if not comment: comment = i18n.twtranslate(self.current_page.site, -- To view, visit https://gerrit.wikimedia.org/r/400090 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic787c50d3a8a55794b6a8ecee5b6c4c0ef189c62 Gerrit-PatchSet: 15 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Eflyjason &lt;eflyjason(a)gmail.com&gt; Gerrit-Reviewer: Dvorapa &lt;dvorapa(a)seznam.cz&gt; Gerrit-Reviewer: Eflyjason &lt;eflyjason(a)gmail.com&gt; Gerrit-Reviewer: Framawiki &lt;framawiki(a)tools.wmflabs.org&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Magul &lt;tomasz.magulski(a)gmail.com&gt; Gerrit-Reviewer: Siebrand &lt;siebrand(a)kitano.nl&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: Zoranzoki21 &lt;zorandori4444(a)gmail.com&gt; Gerrit-Reviewer: jenkins-bot <>