jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/283407 ) Change subject: [IMPR] Improvements for reflinks.py ...................................................................... [IMPR] Improvements for reflinks.py - raise NotImplementedError if 404-links.txt isn't found. The old message might be overseen when exception raises. - simplify arg parsing - ask for the filename or start article if an empty xml/xmlstart option is given Change-Id: Ie1b2044ff25b7e46e8e2b2e38cb1fd3df1816534 --- M scripts/reflinks.py 1 file changed, 20 insertions(+), 26 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved Zoranzoki21: Looks good to me, but someone else must approve diff --git a/scripts/reflinks.py b/scripts/reflinks.py index fd3352f..26f7b95 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -38,7 +38,7 @@ one from i18n/reflinks.py """ # (C) Nicolas Dumazet (NicDumZ), 2008 -# (C) Pywikibot team, 2008-2016 +# (C) Pywikibot team, 2008-2017 # # Distributed under the terms of the MIT license. # @@ -487,11 +487,11 @@ try: deadLinks = codecs.open(listof404pages, 'r', 'latin_1').read() except IOError: - pywikibot.output( - 'You need to download ' - 'http://www.twoevils.org/files/wikipedia/404-links.txt.gz ' - 'and to ungzip it in the same directory') - raise + raise NotImplementedError( + '404-links.txt is required for reflinks.py\n' + 'You need to download\n' + 'http://www.twoevils.org/files/wikipedia/404-links.txt.gz\n' + 'and to unzip it in the same directory') editedpages = 0 for page in self.generator: @@ -755,26 +755,20 @@ genFactory = pagegenerators.GeneratorFactory() for arg in local_args: - if arg.startswith('-summary:'): - options['summary'] = arg[9:] - elif arg == '-always': - options['always'] = True - elif arg == '-ignorepdf': - options['ignorepdf'] = True - elif arg.startswith('-limit:'): - options['limit'] = int(arg[7:]) - elif arg.startswith('-xmlstart'): - if len(arg) == 9: - xmlStart = pywikibot.input( - u'Please enter the dumped article to start with:') - else: - xmlStart = arg[10:] - elif arg.startswith('-xml'): - if len(arg) == 4: - xmlFilename = pywikibot.input( - u'Please enter the XML dump\'s filename:') - else: - xmlFilename = arg[5:] + arg, sep, value = arg.partition(':') + option = arg.partition('-')[2] + if option == 'summary': + options[option] = value + elif option in ('always', 'ignorepdf'): + options[option] = True + elif option == 'limit': + options[option] = int(value) + elif option == 'xmlstart': + xmlStart = value or pywikibot.input( + 'Please enter the dumped article to start with:') + elif option == 'xml': + xmlFilename = value or pywikibot.input( + "Please enter the XML dump's filename:") else: genFactory.handleArg(arg) -- To view, visit https://gerrit.wikimedia.org/r/283407 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie1b2044ff25b7e46e8e2b2e38cb1fd3df1816534 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Magul &lt;tomasz.magulski(a)gmail.com&gt; Gerrit-Reviewer: Mpaa &lt;mpaa.wiki(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 <>