[Pywikibot-commits] [Gerrit] Fix TypeError in APIGenerator.set_maximum_items on Python3 - change (pywikibot/core)

jenkins-bot has submitted this change and it was merged. Change subject: Fix TypeError in APIGenerator.set_maximum_items on Python3 ...................................................................... Fix TypeError in APIGenerator.set_maximum_items on Python3 Also, improve logging. Bug: T68949 Change-Id: I17122aac2b0ee86bb131c1a905a0ca87cff0c402 --- M pywikibot/data/api.py 1 file changed, 12 insertions(+), 5 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index d5100ad..5d3b2ff 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -1502,10 +1502,11 @@ self.limit_name = limit_name self.data_name = data_name + self.query_increment = 50 self.limit = None self.starting_offset = kwargs.pop(self.continue_name, 0) self.request = Request(**kwargs) - self.request[self.limit_name] = 50 + self.request[self.limit_name] = self.query_increment def set_query_increment(self, value): """ @@ -1517,9 +1518,11 @@ per API request to set. @type value: int """ - self.request[self.limit_name] = int(value) - pywikibot.debug(u"%s: Set query_limit to %i." - % (self.__class__.__name__, int(value)), _logger) + self.query_increment = int(value) + self.request[self.limit_name] = self.query_increment + pywikibot.debug(u"%s: Set query_increment to %i." + % (self.__class__.__name__, self.query_increment), + _logger) def set_maximum_items(self, value): """ @@ -1533,8 +1536,12 @@ @type value: int """ self.limit = int(value) - if self.limit < self.request[self.limit_name]: + if self.limit < self.query_increment: self.request[self.limit_name] = self.limit + pywikibot.debug(u"%s: Set request item limit to %i" + % (self.__class__.__name__, self.limit), _logger) + pywikibot.debug(u"%s: Set limit (maximum_items) to %i." + % (self.__class__.__name__, self.limit), _logger) def __iter__(self): """Submit request and iterate the response. -- To view, visit https://gerrit.wikimedia.org/r/186176 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I17122aac2b0ee86bb131c1a905a0ca87cff0c402 Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: M4tx &lt;m4tx(a)m4tx.pl&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: XZise &lt;CommodoreFabianus(a)gmx.de&gt; Gerrit-Reviewer: jenkins-bot <>