jenkins-bot has submitted this change and it was merged.
Change subject: [bugfix] Fix argument parsing for logevents
......................................................................
[bugfix] Fix argument parsing for logevents
- arg must not end with ':'
- additional parameters of old <mode>log option is fetched by preparsed value
Change-Id: Iaf0621567af9ab874f6311864d90362d9a2c438a
---
M pywikibot/pagegenerators.py
1 file changed, 12 insertions(+), 13 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 521dd98..498d00e 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -823,34 +823,33 @@
'Maximum subpage depth:')
self.subpage_max_depth = int(value)
return True
- elif arg == '-logevents:':
+ elif arg == '-logevents':
gen = self._parse_log_events(*value.split(','))
elif arg.startswith('-'):
- mode, log, user = arg.partition('log')
+ mode, log, tail = arg.partition('log')
# exclude -log, -nolog
- if log == 'log' and mode not in ['-', '-no']:
+ if log == 'log' and mode not in ['-', '-no'] and not
tail:
mode = mode[1:]
- user = user[1:]
total = 500
- if user:
+ if value:
try:
- total = int(user)
+ total = int(value)
except:
- params = user.split(';')
+ params = value.split(';')
if len(params) == 2:
- user, total = params
+ value, total = params
else:
- user = params[0]
+ value = params[0]
else:
- user = None
+ value = None
else:
- user = None
+ value = None
issue_deprecation_warning(
'The usage of "{0}"'.format(arg),
'-logevents:"{0}"'.format(
- ','.join((mode, user or '', str(total)))),
+ ','.join((mode, value or '', str(total)))),
2, ArgumentDeprecationWarning)
- gen = self._parse_log_events(mode, user, total)
+ gen = self._parse_log_events(mode, value, total)
if gen:
self.gens.append(gen)
--
To view, visit
https://gerrit.wikimedia.org/r/269858
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf0621567af9ab874f6311864d90362d9a2c438a
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Russell Blau <russblau(a)imapmail.org>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: jenkins-bot <>