[Pywikibot-commits] [Gerrit] pywikibot/core[master]: [IMPR] try/except is far away from raising point

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/508003 ) Change subject: [IMPR] try/except is far away from raising point ...................................................................... [IMPR] try/except is far away from raising point - put the except statement immediately after the page creating statement where the exception can be raised Change-Id: I813e1e8018e9648c799dd88c160c5d7da1df9024 --- M scripts/commonscat.py 1 file changed, 49 insertions(+), 48 deletions(-) Approvals: Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/commonscat.py b/scripts/commonscat.py index 9f59c0a..78313ed 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -428,61 +428,62 @@ """ pywikibot.log('getCommonscat: ' + name) + commonsSite = self.site.image_repository() + try: - commonsSite = self.site.image_repository() # This can throw a pywikibot.BadTitle commonsPage = pywikibot.Page(commonsSite, 'Category:' + name) - - if not commonsPage.exists(): - pywikibot.output('Commons category does not exist. ' - 'Examining deletion log...') - logpages = commonsSite.logevents(logtype='delete', - page=commonsPage) - for logitem in logpages: - loguser = logitem.user() - logcomment = logitem.comment() - # Some logic to extract the target page. - regex = ( - r'moved to \[\[\:?Category:' - r'(?P<newcat1>[^\|\}]+)(\|[^\}]+)?\]\]|' - r'Robot: Changing Category:(.+) ' - r'to Category:(?P<newcat2>.+)') - m = re.search(regex, logcomment, flags=re.I) - if m: - if m.group('newcat1'): - return self.checkCommonscatLink(m.group('newcat1')) - elif m.group('newcat2'): - return self.checkCommonscatLink(m.group('newcat2')) - else: - pywikibot.output( - "getCommonscat: {} deleted by {}. Couldn't find " - 'move target in "{}"' - .format(commonsPage, loguser, logcomment)) - return '' - return '' - elif commonsPage.isRedirectPage(): - pywikibot.log('getCommonscat: The category is a redirect') - return self.checkCommonscatLink( - commonsPage.getRedirectTarget().title(with_ns=False)) - elif (pywikibot.Page(commonsPage.site, - 'Template:Category redirect') in commonsPage.templates()): - pywikibot.log( - 'getCommonscat: The category is a category redirect') - for template in commonsPage.templatesWithParams(): - if ( - template[0].title(with_ns=False) == 'Category redirect' - and len(template[1]) > 0 - ): - return self.checkCommonscatLink(template[1][0]) - elif commonsPage.isDisambig(): - pywikibot.log('getCommonscat: The category is disambiguation') - return '' - else: - return commonsPage.title(with_ns=False) except pywikibot.BadTitle: # Funky title so not correct return '' + if not commonsPage.exists(): + pywikibot.output('Commons category does not exist. ' + 'Examining deletion log...') + logpages = commonsSite.logevents(logtype='delete', + page=commonsPage) + for logitem in logpages: + loguser = logitem.user() + logcomment = logitem.comment() + # Some logic to extract the target page. + regex = ( + r'moved to \[\[\:?Category:' + r'(?P<newcat1>[^\|\}]+)(\|[^\}]+)?\]\]|' + r'Robot: Changing Category:(.+) ' + r'to Category:(?P<newcat2>.+)') + m = re.search(regex, logcomment, flags=re.I) + if m: + if m.group('newcat1'): + return self.checkCommonscatLink(m.group('newcat1')) + elif m.group('newcat2'): + return self.checkCommonscatLink(m.group('newcat2')) + else: + pywikibot.output( + "getCommonscat: {} deleted by {}. Couldn't find " + 'move target in "{}"' + .format(commonsPage, loguser, logcomment)) + return '' + return '' + elif commonsPage.isRedirectPage(): + pywikibot.log('getCommonscat: The category is a redirect') + return self.checkCommonscatLink( + commonsPage.getRedirectTarget().title(with_ns=False)) + elif (pywikibot.Page(commonsPage.site, + 'Template:Category redirect') in commonsPage.templates()): + pywikibot.log( + 'getCommonscat: The category is a category redirect') + for template in commonsPage.templatesWithParams(): + if ( + template[0].title(with_ns=False) == 'Category redirect' + and len(template[1]) > 0 + ): + return self.checkCommonscatLink(template[1][0]) + elif commonsPage.isDisambig(): + pywikibot.log('getCommonscat: The category is disambiguation') + return '' + + return commonsPage.title(with_ns=False) + def main(*args): """ -- To view, visit https://gerrit.wikimedia.org/r/508003 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I813e1e8018e9648c799dd88c160c5d7da1df9024 Gerrit-Change-Number: 508003 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: D3r1ck01 &lt;xsavitar.wiki(a)aol.com&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Zhuyifei1999 &lt;zhuyifei1999(a)gmail.com&gt; Gerrit-Reviewer: jenkins-bot (75)