jenkins-bot has submitted this change and it was merged.
Change subject: Rewritten handling of generic integer arguments
......................................................................
Rewritten handling of generic integer arguments
Change-Id: Ic45856cc7ec894da67d97f75a38638b0806e5db4
---
M pywikibot/bot.py
1 file changed, 11 insertions(+), 12 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 8aaa050..ba93c5b 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -622,17 +622,15 @@
import daemonize
daemonize.daemonize(redirect_std=arg[11:])
else:
- # the argument depends numerical config settings
- cmd = []
- if ':' in arg:
- cmd = arg[1:].split(':')
- if len(cmd) == 2 and len(cmd[1]) > 0 and \
- hasattr(config, cmd[0]) and \
- type(getattr(config, cmd[0])) == int:
- setattr(config, cmd[0], cmd[1])
- # the argument is not global. Let the specific bot script care
- # about it.
- else:
+ # the argument depends on numerical config settings
+ try:
+ _arg, _val = arg[1:].split(':')
+ # explicitly check for int (so bool doesn't match)
+ if type(getattr(config, _arg)) is not int:
+ raise TypeError
+ setattr(config, _arg, int(_val))
+ except (ValueError, TypeError) as exc:
+ # argument not global -> specific bot script will take care
nonGlobalArgs.append(arg)
if username:
@@ -647,7 +645,8 @@
# have to - some git versions (like 1.7.0.4) seem to treat lines
# containing just `$Id:` as if they were ident lines (see
# gitattributes(5)) leading to unwanted behaviour like automatic
- # replacement with `$Id$` or `$Id$`.
+ # replacement with `$Id$`
+ # or `$Id$`.
m = re.search(r"\$Id"
r": (\w+) \$", ver)
pywikibot.output(u'Pywikipediabot r%s' % m.group(1))
--
To view, visit
https://gerrit.wikimedia.org/r/87639
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic45856cc7ec894da67d97f75a38638b0806e5db4
Gerrit-PatchSet: 6
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot