jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398474 ) Change subject: [IMPR] Simplify isCategoryRedirect method ...................................................................... [IMPR] Simplify isCategoryRedirect method - test for args length instead of try/except IndexError construct - assign self._catredirect = False only once - use Namespace.CATEGORY constants - improve error messages Change-Id: Ib74d6215d4b57ccd6eb9d74fa46b09d71c6cb12c --- M pywikibot/page.py 1 file changed, 12 insertions(+), 14 deletions(-) Approvals: Framawiki: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 7d1babf..7a7ee82 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -849,28 +849,26 @@ if not self.is_categorypage(): return False if not hasattr(self, "_catredirect"): + self._catredirect = False catredirs = self.site.category_redirects() for template, args in self.templatesWithParams(): if template.title(withNamespace=False) in catredirs: - # Get target (first template argument) - try: - p = pywikibot.Page(self.site, args[0].strip(), ns=14) - if p.namespace() == 14: + if args: + # Get target (first template argument) + p = pywikibot.Page( + self.site, args[0].strip(), Namespace.CATEGORY) + if p.namespace() == Namespace.CATEGORY: self._catredirect = p.title() else: pywikibot.warning( - u"Target %s on %s is not a category" - % (p.title(asLink=True), - self.title(asLink=True))) - self._catredirect = False - except IndexError: + 'Category redirect target {0} on {1} is not a ' + 'category'.format(p.title(asLink=True), + self.title(asLink=True))) + else: pywikibot.warning( - u"No target for category redirect on %s" - % self.title(asLink=True)) - self._catredirect = False + 'No target found for category redirect on ' + + self.title(asLink=True)) break - else: - self._catredirect = False return bool(self._catredirect) def getCategoryRedirectTarget(self): -- To view, visit https://gerrit.wikimedia.org/r/398474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib74d6215d4b57ccd6eb9d74fa46b09d71c6cb12c Gerrit-Change-Number: 398474 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: Dvorapa &lt;dvorapa(a)seznam.cz&gt; Gerrit-Reviewer: Framawiki &lt;framawiki(a)tools.wmflabs.org&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Matěj Suchánek &lt;matejsuchanek97(a)gmail.com&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: Zoranzoki21 &lt;zorandori4444(a)gmail.com&gt; Gerrit-Reviewer: jenkins-bot <>