Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/274991
Change subject: [IMPR] Provide global step parameter via config2.py
......................................................................
[IMPR] Provide global step parameter via config2.py
step parameter is reimplemented as config setting used by api.
It could be set either in user_config.py or given as global
option -step:<value>.
As before, default is 50 and setting could be overwriten
by set_query_increment() during runtime.
Bug: T109208
Change-Id: I02c6ea9c1a8fc6c3cd4fdf1e39f7317b671ffa10
---
M pywikibot/bot.py
M pywikibot/config2.py
M pywikibot/data/api.py
M pywikibot/pagegenerators.py
4 files changed, 9 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/91/274991/1
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 6990c79..b9c546d 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -908,7 +908,7 @@
daemonize.daemonize(redirect_std=redirect_std)
else:
# the argument depends on numerical config settings
- # e.g. -maxlag:
+ # e.g. -maxlag and -step:
try:
_arg = option[1:]
# explicitly check for int (so bool doesn't match)
diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 5109452..ad08dcf 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -612,6 +612,10 @@
# at least 1 second.
maxlag = 5
+# Maximum of pages which can be retrieved at one time from wiki server.
+# If the parameter is 0 or less, 50 is used as default.
+step = -1
+
# Maximum number of times to retry an API request before quitting.
max_retries = 25
# Minimum time to wait before resubmitting a failed API request.
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index a42caf6..c0c26ae 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -2383,7 +2383,10 @@
self.limit_name = limit_name
self.data_name = data_name
- self.query_increment = 50
+ if config.step and config.step > 0:
+ self.query_increment = config.step
+ else
+ self.query_increment = 50
self.limit = None
self.starting_offset = kwargs['parameters'].pop(self.continue_name, 0)
self.request = self.request_class(**kwargs)
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 2f80a3b..9327fc5 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -654,10 +654,6 @@
u'What namespace are you filtering on?')
self._namespaces += value.split(",")
return True
- elif arg == '-step':
- issue_deprecation_warning(
- 'The usage of "{0}"'.format(arg), 2,
ArgumentDeprecationWarning)
- return False
elif arg == '-limit':
if not value:
value = pywikibot.input('What is the limit value?')
--
To view, visit https://gerrit.wikimedia.org/r/274991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02c6ea9c1a8fc6c3cd4fdf1e39f7317b671ffa10
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <i...@gno.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
