jenkins-bot has submitted this change and it was merged.
Change subject: Synchronize handleArgs with core
......................................................................
Synchronize handleArgs with core
- remove -dir option which is handled in wikipediatools.py
- reorder options and documentation and synchronize it with core
- remove deprecated doc string for -debug option
- remove deprecated -dry option from help text
Change-Id: Ia3ef3cd76cea508fe57dbfa38c87e1005c01b94e
---
M wikipedia.py
1 file changed, 19 insertions(+), 26 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia.py b/wikipedia.py
index bddc1d7..c9bc07e 100644
--- a/wikipedia.py
+++ b/wikipedia.py
@@ -9534,14 +9534,10 @@
arg = _decodeArg(arg)
if arg == '-help':
do_help = True
- elif arg.startswith('-dir:'):
- # currently handled in wikipediatools.py - possibly before this
- # routine is called.
- pass # config_dir = arg[5:]
elif arg.startswith('-family:'):
- default_family = arg[8:]
+ default_family = arg[len("-family:"):]
elif arg.startswith('-lang:'):
- default_code = arg[6:]
+ default_code = arg[len("-lang:"):]
elif arg.startswith("-user:"):
username = arg[len("-user:"):]
elif arg.startswith('-putthrottle:'):
@@ -9555,20 +9551,12 @@
elif arg == '-log':
setLogfileStatus(True)
elif arg.startswith('-log:'):
- setLogfileStatus(True, arg[5:])
+ setLogfileStatus(True, arg[len("-log:"):])
elif arg.startswith('-loghandler:'):
- config.loghandler = arg[12:]
+ config.loghandler = arg[len('-loghandler:'):]
elif arg == '-nolog':
setLogfileStatus(False)
- elif arg in ['-verbose', '-v']:
- verbose += 1
- elif arg == '-daemonize':
- import daemonize
- daemonize.daemonize()
- elif arg.startswith('-daemonize:'):
- import daemonize
- daemonize.daemonize(redirect_std=arg[11:])
- elif arg in ['-cosmeticchanges', '-cc']:
+ elif arg in ('-cosmeticchanges', '-cc'):
config.cosmetic_changes = not config.cosmetic_changes
output(u'NOTE: option cosmetic_changes is %s\n'
% config.cosmetic_changes)
@@ -9577,15 +9565,21 @@
elif arg == '-dry':
output(u"Usage of -dry is deprecated; use -simulate instead.")
simulate = True
- # global debug option for development purposes. Normally does nothing.
elif arg == '-debug':
if not logger:
init_handlers()
logger.setLevel(DEBUG)
config.special_page_limit = 500
+ elif arg in ('-verbose', '-v'):
+ verbose += 1
+ elif arg == '-daemonize':
+ import daemonize
+ daemonize.daemonize()
+ elif arg.startswith('-daemonize:'):
+ import daemonize
+ daemonize.daemonize(redirect_std=arg[len('-daemonize:'):])
else:
- # the argument is not global. Let the specific bot script care
- # about it.
+ # argument not global -> specific bot script will take care
nonGlobalArgs.append(arg)
if username:
@@ -9645,10 +9639,6 @@
-help Show this help text.
--loghandler:xyz Choose a value for 'xyz' from 'TRFH' (TimedRotatingFile-
- Handler) or 'RFH' (RotatingFileHandler). Has to be defined
- before '-log' on command line.
-
-log Enable the logfile, using the default filename
"%s.log"
Logs will be stored in the logs subdirectory.
@@ -9656,6 +9646,10 @@
-log:xyz Enable the logfile, using 'xyz' as the filename.
-nolog Disable the logfile (if it is enabled by default).
+
+-loghandler:xyz Choose a value for 'xyz' from 'TRFH' (TimedRotatingFile-
+ Handler) or 'RFH' (RotatingFileHandler). Has to be defined
+ before '-log' on command line.
-maxlag Sets a new maxlag parameter to a number of seconds. Defer bot
edits during periods of database server lag. Default is set
by
@@ -9672,9 +9666,8 @@
settings and restrictions are untouched.
-simulate Disables writing to the server. Useful for testing and
-(-dry) debugging of new code (if given, doesn't do any real
+ debugging of new code (if given, doesn't do any real
changes, but only shows what would have been changed).
- DEPRECATED: please use -simulate instead of -dry
''' % moduleName
output(globalHelp, toStdout=True)
try:
--
To view, visit https://gerrit.wikimedia.org/r/90863
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3ef3cd76cea508fe57dbfa38c87e1005c01b94e
Gerrit-PatchSet: 8
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
