Pywikibot-commits January 2014

pywikibot-commits@lists.wikimedia.org

1 participants
130 discussions

[Gerrit] pyflakes for login.py and generate_family_file.py - change (pywikibot/compat)
by Xqt (Code Review) 30 Jan '14

30 Jan '14

Xqt has submitted this change and it was merged. Change subject: pyflakes for login.py and generate_family_file.py ...................................................................... pyflakes for login.py and generate_family_file.py I change login too, to accept username as an argumant Change-Id: I47b92bf0667cba035ae215a7aa3d697f07b9c6c2 --- M generate_family_file.py M login.py 2 files changed, 2 insertions(+), 7 deletions(-) Approvals: Xqt: Looks good to me, approved diff --git a/generate_family_file.py b/generate_family_file.py index 8a01e1f..190a866 100644 --- a/generate_family_file.py +++ b/generate_family_file.py @@ -21,7 +21,7 @@ from distutils.version import LooseVersion as V # creating urls -from urlparse import urlparse, urljoin, ParseResult +from urlparse import urlparse, urljoin # retrieving urls import urllib2 diff --git a/login.py b/login.py index 44aef3b..ebeccc7 100644 --- a/login.py +++ b/login.py @@ -56,9 +56,7 @@ __version__ = '$Id$' import re -import os import query -import urllib2 import wikipedia as pywikibot import config @@ -354,9 +352,6 @@ api = False return self.login(False, retry) if cookiedata: - fn = '%s-%s-%s-login.data' % (self.site.family.name, - self.site.lang, self.username) - #self.storecookiedata(fn,cookiedata) pywikibot.output(u"Should be logged in now") # Show a warning according to the local bot policy if not self.botAllowed(): @@ -401,7 +396,7 @@ def main(): - username = password = None + password = None sysop = False logall = False forceLogin = False -- To view, visit https://gerrit.wikimedia.org/r/108675 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I47b92bf0667cba035ae215a7aa3d697f07b9c6c2 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] (bug 60582) czech localization for noreferences.py - change (pywikibot/core)
by Xqt (Code Review) 30 Jan '14

30 Jan '14

Xqt has submitted this change and it was merged. Change subject: (bug 60582) czech localization for noreferences.py ...................................................................... (bug 60582) czech localization for noreferences.py update from compat Change-Id: Iac3bb334fee8d0baa1b4312a9a2da51b103eb484 --- M scripts/noreferences.py 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/scripts/noreferences.py b/scripts/noreferences.py index 14b01ad..4c9f2de 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -65,7 +65,7 @@ u'ملاحظات' ], 'cs': [ - u'Reference', + u'Externí odkazy', u'Poznámky', ], 'da': [ # no explicit policy on where to put the references @@ -200,6 +200,10 @@ 'ar': [ # not sure about which ones are preferred. u'مراجع', u'ملاحظات', + ], + 'cs': [ + u'Reference', + u'Poznámky', ], 'da': [ u'Noter', @@ -392,6 +396,7 @@ maintenance_category = { 'wikipedia': { 'be-x-old': u'Вікіпэдыя:Старонкі з адсутным сьпісам зносак', + 'cs': u'Údržba:Články s chybějící značkou REFERENCES', 'de': u'Wikipedia:Seite mit fehlendem References-Tag', 'en': u'Pages with missing references list', 'fa': u'صفحه‌های با یادکرد خراب (فقدان پانویس)', -- To view, visit https://gerrit.wikimedia.org/r/110362 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac3bb334fee8d0baa1b4312a9a2da51b103eb484 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JAn Dudík <jan.dudik(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Pyfisch <pyfisch(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] (bug 60582) czech localization for noreferences.py - change (pywikibot/compat)
by Xqt (Code Review) 30 Jan '14

30 Jan '14

Xqt has submitted this change and it was merged. Change subject: (bug 60582) czech localization for noreferences.py ...................................................................... (bug 60582) czech localization for noreferences.py Change-Id: I247715a053640e35295db7559e4083099fd3cd5e --- M noreferences.py 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved JAn Dudík: Looks good to me, but someone else must approve diff --git a/noreferences.py b/noreferences.py index 00b6e36..8e32ea2 100644 --- a/noreferences.py +++ b/noreferences.py @@ -66,7 +66,7 @@ u'ملاحظات' ], 'cs': [ - u'Reference', + u'Externí odkazy', u'Poznámky', ], 'da': [ # no explicit policy on where to put the references @@ -201,6 +201,10 @@ 'ar': [ # not sure about which ones are preferred. u'مراجع', u'ملاحظات', + ], + 'cs': [ + u'Reference', + u'Poznámky', ], 'da': [ u'Noter', @@ -393,6 +397,7 @@ maintenance_category = { 'wikipedia': { 'be-x-old': u'Вікіпэдыя:Старонкі з адсутным сьпісам зносак', + 'cs': u'Údržba:Články s chybějící značkou REFERENCES', 'de': u'Wikipedia:Seite mit fehlendem References-Tag', 'en': u'Pages with missing references list', 'fa': u'صفحه‌های با یادکرد خراب (فقدان پانویس)', -- To view, visit https://gerrit.wikimedia.org/r/110361 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I247715a053640e35295db7559e4083099fd3cd5e Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: JAn Dudík <jan.dudik(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Siebrand <siebrand(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pyflakes catlib.py - change (pywikibot/compat)
by jenkins-bot (Code Review) 30 Jan '14

30 Jan '14

jenkins-bot has submitted this change and it was merged. Change subject: pyflakes catlib.py ...................................................................... pyflakes catlib.py Change-Id: I549a4f56e607a730607f556adde57a65204dd7e5 --- M catlib.py 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/catlib.py b/catlib.py index f1cde8b..67f1dcc 100644 --- a/catlib.py +++ b/catlib.py @@ -16,7 +16,6 @@ __version__ = '$Id$' # import re -import time import urllib import wikipedia as pywikibot import query @@ -322,7 +321,6 @@ '<div class\s?=\s?\"thumb\"\sstyle=\"[^\"]*\">' '(?:<div style=\"[^\"]*\">)?<a href=\".*?\"' '(?:\sclass="image")?\stitle\s?=\s?\"([^\"]*)\"') - ns = self.site().category_namespaces() # regular expression matching the "(next 200)" link RLinkToNextPage = re.compile('&from=(.*?)" title="') @@ -733,7 +731,6 @@ results = list() for subcat in members: ns = subcat['ns'] - pageid = subcat['pageid'] title = subcat['title'] if ns == 14: if title not in categories_parsed: @@ -743,9 +740,6 @@ categories_parsed) allmembers.extend(results_part) for member in allmembers: - ns = member['ns'] - pageid = member['pageid'] - title = member['title'] results.append(member) return (results, categories_parsed) -- To view, visit https://gerrit.wikimedia.org/r/108671 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I549a4f56e607a730607f556adde57a65204dd7e5 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] archivebot.py: fix template name comparison + loop refactoring - change (pywikibot/core)
by Xqt (Code Review) 30 Jan '14

30 Jan '14

Xqt has submitted this change and it was merged. Change subject: archivebot.py: fix template name comparison + loop refactoring ...................................................................... archivebot.py: fix template name comparison + loop refactoring Change-Id: I9b6c156f63300269226b54f21107fd9050d72350 --- M scripts/archivebot.py 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 8c29557..345c727 100644 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -532,15 +532,13 @@ def loadConfig(self): pywikibot.output(u'Looking for: {{%s}} in %s' % (self.tpl, self.Page)) - found = False for tpl in self.Page.templatesWithParams(): - if tpl[0].title() == self.tpl: + if tpl[0] == pywikibot.Page(Site, self.tpl, ns=10): for param in tpl[1]: item, value = param.split('=', 1) self.set(item.strip(), value.strip()) - found = True break - if not found: + else: raise MissingConfigError(u'Missing or malformed template') if not self.get('algo', ''): raise MissingConfigError(u'Missing algo') -- To view, visit https://gerrit.wikimedia.org/r/110255 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b6c156f63300269226b54f21107fd9050d72350 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] (bug 58943) Archivebot: create unit tests for Timestripper - change (pywikibot/core)
by Xqt (Code Review) 30 Jan '14

30 Jan '14

Xqt has submitted this change and it was merged. Change subject: (bug 58943) Archivebot: create unit tests for Timestripper ...................................................................... (bug 58943) Archivebot: create unit tests for Timestripper Unit tests for Timestripper. (after removal of Month() class) Change-Id: I875116dc68d5247da762c7d064dce978217ece9c See-also-Change-Id: I58cbf7130434245d018fedc173cb1b0da3401d78 --- A tests/timestripper_tests.py 1 file changed, 72 insertions(+), 0 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved Pyfisch: Verified; Looks good to me, approved diff --git a/tests/timestripper_tests.py b/tests/timestripper_tests.py new file mode 100644 index 0000000..2cf56d8 --- /dev/null +++ b/tests/timestripper_tests.py @@ -0,0 +1,72 @@ +# -*- coding: utf-8 -*- +""" +Tests for archivebot.py/Timestripper. +""" +# +# (C) Pywikipedia bot team, 2014 +# +# Distributed under the terms of the MIT license. +# +__version__ = '$Id$' + +import datetime +import re + +import pywikibot + +from utils import PywikibotTestCase, unittest + +from scripts.archivebot import TimeStripper, tzoneFixedOffset + + +class TestTimeStripper(unittest.TestCase): + """Test cases for Link objects""" + + def setUp(self): + site = pywikibot.Site('fr', 'wikipedia') + self.ts = TimeStripper(site) + + def test_findmarker(self): + """Test that string which is not part of text is found""" + + txt = u'this is a string with a maker is @@@@already present' + self.assertEqual(self.ts.findmarker(txt, base=u'@@', delta='@@'), + '@@@@@@') + + def test_last_match_and_replace(self): + """Test that pattern matches the righmost item""" + + txtWithMatch = u'this string has one 1998, 1999 and 3000 in it' + txtWithNoMatch = u'this string has no match' + pat = self.ts.yearR + + self.assertEqual(self.ts.last_match_and_replace(txtWithMatch, pat), + (u'this string has one @@, @@ and 3000 in it', + {'year': u'1999'}) + ) + self.assertEqual(self.ts.last_match_and_replace(txtWithNoMatch, pat), + (txtWithNoMatch, + None) + ) + + def test_timestripper(self): + """Test that correct date is matched""" + + txtMatch = u'3 février 2010 à 19:48 (CET) 7 février 2010 à 19:48 (CET)' + txtNoMatch = u'3 March 2010 19:48 (CET) 7 March 2010 19:48 (CET)' + + res = datetime.datetime(2010, 2, 7, 19, 48, + tzinfo=tzoneFixedOffset(60, 'Europe/Paris')) + + self.assertEqual(self.ts.timestripper(txtMatch), res) + self.assertEqual(self.ts.timestripper(txtNoMatch), None) + + +if __name__ == '__main__': + try: + try: + unittest.main() + except SystemExit: + pass + finally: + pywikibot.stopme() -- To view, visit https://gerrit.wikimedia.org/r/109633 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I875116dc68d5247da762c7d064dce978217ece9c Gerrit-PatchSet: 8 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Pyfisch <pyfisch(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] remove unused variable "newtext" - change (pywikibot/core)
by jenkins-bot (Code Review) 29 Jan '14

29 Jan '14

jenkins-bot has submitted this change and it was merged. Change subject: remove unused variable "newtext" ...................................................................... remove unused variable "newtext" Change-Id: I70dfc63563b03f8e1e426a03e7afa367bd4ba426 --- M scripts/catall.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Pyfisch: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/catall.py b/scripts/catall.py index c99ac4d..20d5ded 100755 --- a/scripts/catall.py +++ b/scripts/catall.py @@ -9,7 +9,7 @@ """ # # (C) Rob W.W. Hooft, Andre Engels, 2004 -# (C) Pywikibot team, 2004-2013 +# (C) Pywikibot team, 2004-2014 # # Distributed under the terms of the MIT license. # @@ -42,7 +42,7 @@ elif choice == "?": from pywikibot import editor as editarticle editor = editarticle.TextEditor() - newtext = editor.edit(pagetext) + editor.edit(pagetext) elif choice == "??": pywikibot.output(pagetext[0:length]) length = length + 500 -- To view, visit https://gerrit.wikimedia.org/r/110201 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I70dfc63563b03f8e1e426a03e7afa367bd4ba426 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Andre Engels <andreengels(a)gmail.com> Gerrit-Reviewer: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Pyfisch <pyfisch(a)gmail.com> Gerrit-Reviewer: Siebrand <siebrand(a)wikimedia.org> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] archivebot.py: remove Month() class and rely on Site methods... - change (pywikibot/core)
by jenkins-bot (Code Review) 29 Jan '14

29 Jan '14

jenkins-bot has submitted this change and it was merged. Change subject: archivebot.py: remove Month() class and rely on Site methods instead ...................................................................... archivebot.py: remove Month() class and rely on Site methods instead Change-Id: Ifc62c5043c71fa25fc89f89c30f8596ab6bb44bb --- M scripts/archivebot.py 1 file changed, 18 insertions(+), 61 deletions(-) Approvals: Pyfisch: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 8c29557..1344599 100644 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -161,58 +161,6 @@ yield page -class Months(object): - """ - Generation of look-up dictionaries for months, used by Timestripper() and PageArchiver - """ - - def __init__(self, site=None): - if site is None: - self.site = pywikibot.getSite() - else: - self.site = site - - @classmethod - def queryMonths(self): - months_long = ['january', 'february', 'march', 'april', 'may_long', 'june', - 'july', 'august', 'september', 'october', 'november', 'december'] - months_short = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', - 'jul', 'aug', 'sep', 'oct', 'nov', 'dec'] - - #d[1:12] = {'short': 'orig_short', 'long': 'orig_long} - monthNum2origNames = dict((i, {'short': '', 'long': ''}) for i in range(1, 13)) - origNames2monthNum = dict() - - # site.mediawiki_message() does not support preloading multiple messages in one go - qg = pywikibot.data.api.QueryGenerator( - site=self.site, - meta="allmessages", - ammessages='|'.join(months_long + months_short) - ) - - for el in qg: - orig = el["*"] - eng = el["name"] - try: - month_num = months_long.index(eng) + 1 - monthNum2origNames[month_num]['long'] = orig - except ValueError: - month_num = months_short.index(eng) + 1 - monthNum2origNames[month_num]['short'] = orig - - origNames2monthNum[orig] = month_num - - return monthNum2origNames, origNames2monthNum - - @classmethod - def updateMonths(self, site=None): - if site is None: - self.site = pywikibot.getSite() - else: - self.site = site - self.monthsDicts = self.queryMonths() - - class tzoneUTC(datetime.tzinfo): """ Class building a UTC tzinfo object @@ -264,9 +212,16 @@ Find timetstamp in page text and returns it as timezone aware datetime object """ - def __init__(self): - self.monthNum2origNames, self.origNames2monthNum = Months.monthsDicts - self.site = Months.site + def __init__(self, site=None): + if site is None: + self.site = pywikibot.getSite() + else: + self.site = site + + self.origNames2monthNum = {} + for n, (_long, _short) in enumerate(self.site.months_names): + self.origNames2monthNum[_long] = n + 1 + self.origNames2monthNum[_short] = n + 1 self.groups = [u'year', u'month', u'hour', u'time', u'day', u'minute', u'tzinfo'] @@ -314,7 +269,10 @@ def timestripper(self, line): """ - Find timestamp in line and convert it to time zone aware datetime + Find timestamp in line and convert it to time zone aware datetime. + All the following items must be matched, otherwise None is returned: + -. year, month, hour, time, day, minute, tzinfo + """ _line = line #match date fields @@ -367,7 +325,7 @@ self.title = title self.now = now self.content = "" - self.ts = TimeStripper() + self.ts = TimeStripper(site=Site) self.timestamp = None def __repr__(self): @@ -504,7 +462,9 @@ } self.archives = {} self.archivedThreads = 0 - self.monthNum2origNames, self.origNames2monthNum = Months.monthsDicts + self.monthNum2origNames = {} + for n, (_long, _short) in enumerate(Site.months_names): + self.monthNum2origNames[n + 1] = {"long": _long, "short": _short} def get(self, attr, default=''): return self.attributes.get(attr, [default])[0] @@ -693,9 +653,6 @@ pywikibot.output(u'NOTE: you must specify a template to run the bot') pywikibot.showHelp('archivebot') return - - #query site for original months name and create convenience look-up dictionaries - Months.updateMonths(site=Site) for a in args[1:]: pagelist = [] -- To view, visit https://gerrit.wikimedia.org/r/109596 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc62c5043c71fa25fc89f89c30f8596ab6bb44bb Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(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: Pyfisch <pyfisch(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Bug 60206 - site.preloadpages does not preload all links and... - change (pywikibot/core)
by jenkins-bot (Code Review) 29 Jan '14

29 Jan '14

jenkins-bot has submitted this change and it was merged. Change subject: Bug 60206 - site.preloadpages does not preload all links and templates ...................................................................... Bug 60206 - site.preloadpages does not preload all links and templates page._langlinks and page._templates are extended in case chucks are returned by query due to query-continue Change-Id: Ib87ff56c18d17dbc189f57215e3cfa14a323b3e2 --- M pywikibot/data/api.py 1 file changed, 11 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 1dbd5ac..a502d35 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -984,8 +984,12 @@ page._catinfo = pagedict["categoryinfo"] if "templates" in pagedict: - page._templates = [pywikibot.Page(page.site, tl['title']) - for tl in pagedict['templates']] + templates = [pywikibot.Page(page.site, tl['title']) + for tl in pagedict['templates']] + if hasattr(page, "_templates"): + page._templates.extend(templates) + else: + page._templates = templates if "langlinks" in pagedict: links = [] @@ -994,7 +998,11 @@ ll['*'], source=page.site) links.append(link) - page._langlinks = links + + if hasattr(page, "_langlinks"): + page._langlinks.extend(links) + else: + page._langlinks = links if "coordinates" in pagedict: coords = [] -- To view, visit https://gerrit.wikimedia.org/r/110067 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib87ff56c18d17dbc189f57215e3cfa14a323b3e2 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] (bug 55160) Page._getVersionHistory returns only a part of a... - change (pywikibot/compat)
by jenkins-bot (Code Review) 29 Jan '14

29 Jan '14

jenkins-bot has submitted this change and it was merged. Change subject: (bug 55160) Page._getVersionHistory returns only a part of a history ...................................................................... (bug 55160) Page._getVersionHistory returns only a part of a history https://bugzilla.wikimedia.org/show_bug.cgi?id=55160 Change-Id: I27db336c1853fe5ac9a9c0d8097b870fca2be1ca --- M wikipedia.py 1 file changed, 11 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia.py b/wikipedia.py index e14e825..86d4f23 100644 --- a/wikipedia.py +++ b/wikipedia.py @@ -3249,9 +3249,18 @@ elif 'invalid' in pageInfo: raise BadTitle('BadTitle: %s' % self) - if 'query-continue' in result and getAll: + if 'query-continue' in result: params.update(result['query-continue']['revisions']) else: + thisHistoryDone = True + + if revCount > 0: + avail_revs = len(pageInfo['revisions']) + pageInfo['revisions'] = pageInfo['revisions'][:min(revCount, avail_revs)] + if not getAll: + revCount = revCount - avail_revs + else: + pageInfo['revisions'] = [] thisHistoryDone = True if skipFirst: @@ -3277,9 +3286,7 @@ elements = params['rvprop'].split('|') row = [values[e] for e in elements] dataQ.append(tuple(row)) - if len(result['query']['pages'].values()[0]['revisions'] - ) < revCount: - thisHistoryDone = True + return dataQ def _getVersionHistoryOld(self, getAll=False, skipFirst=False, -- To view, visit https://gerrit.wikimedia.org/r/105619 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I27db336c1853fe5ac9a9c0d8097b870fca2be1ca Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2014