Pywikibot-commits March 2017

pywikibot-commits@lists.wikimedia.org

2 participants
115 discussions

Errored: wikimedia/pywikibot-core#3907 (master - 1ef3d74)
by Travis CI 12 Mar '17

12 Mar '17

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3907 Status: Errored Duration: 2 hours, 5 minutes, and 33 seconds Commit: 1ef3d74 (master) Author: dalba Message: interwikidata_tests.py: Do not change config while performing tests Calling interwikidata.main with `lang` and `family` arguments changes config values. Instead of calling `main`, call `interwikidata.IWBot` directly. This way we will skip over `pywikibot.handle_args`. Also use assertRaisesRegex instead of assertRaises. Bug: T160272 Bug: T154281 Change-Id: I68d9fbbc027416a99c2b9cc777127e35c868d7a8 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/1e2d869332fe...1ef3d741… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/210222905 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

[Gerrit] pywikibot/core[master]: site_detect_tests.py: Skip tests on ServerError and Timeout
by jenkins-bot (Code Review) 12 Mar '17

12 Mar '17

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342319 ) Change subject: site_detect_tests.py: Skip tests on ServerError and Timeout ...................................................................... site_detect_tests.py: Skip tests on ServerError and Timeout These two error types used to be skipped before 917c7e115e9a8749386ad. This change brings back that behaviour and removes _retry_few_times logic which seems unnecessary. We have 13 builds which run these tests which can be considered some form of _retry_few_times. Bug: T160268 Change-Id: Ifb3592d565013b9998265993ebe3ae92f0cd78fe --- M tests/site_detect_tests.py 1 file changed, 2 insertions(+), 32 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index c808b0a..15616ea 100644 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -19,34 +19,6 @@ __version__ = '$Id$' -def _retry_few_times(retry_limit): - """ - Decorator to retry test on failure. - - Swallow AssertionError retry_limit times before failing test. - - @param retry_limit: Retry limit before failing test - @type retry_limit: int - @return: a decorator to retry test on failure - @rtype: function - @raises AssertionError: all retries of test failed - """ - def actual_decorator(wrapped_func): - def wrapper_func(*args, **kwargs): - for retry_no in range(1, retry_limit + 1): - try: - wrapped_func(*args, **kwargs) - except AssertionError: - if retry_no == retry_limit: - raise - except: - raise - else: - return - return wrapper_func - return actual_decorator - - class SiteDetectionTestCase(TestCase): """Testcase for MediaWiki detection and site object creation.""" @@ -63,9 +35,8 @@ """ try: self.assertIsInstance(MWSite(url), MWSite) - except (AttributeError, ConnectionError, RuntimeError, ServerError, - Timeout): - raise AssertionError + except (ServerError, Timeout) as e: + self.skipTest(e) def assertNoSite(self, url): """ @@ -100,7 +71,6 @@ """Test detection of MediaWiki sites for en.citizendium.org.""" self.assertSite('http://en.citizendium.org/wiki/$1') - @_retry_few_times(10) def test_wikichristian(self): """Test detection of MediaWiki sites for www.wikichristian.org. -- To view, visit https://gerrit.wikimedia.org/r/342319 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifb3592d565013b9998265993ebe3ae92f0cd78fe Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: interwikidata_tests.py: Do not change config while performin...
by jenkins-bot (Code Review) 12 Mar '17

12 Mar '17

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342325 ) Change subject: interwikidata_tests.py: Do not change config while performing tests ...................................................................... interwikidata_tests.py: Do not change config while performing tests Calling interwikidata.main with `lang` and `family` arguments changes config values. Instead of calling `main`, call `interwikidata.IWBot` directly. This way we will skip over `pywikibot.handle_args`. Also use assertRaisesRegex instead of assertRaises. Bug: T160272 Bug: T154281 Change-Id: I68d9fbbc027416a99c2b9cc777127e35c868d7a8 --- M tests/interwikidata_tests.py 1 file changed, 9 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/interwikidata_tests.py b/tests/interwikidata_tests.py index 2f75a9b..708acd3 100644 --- a/tests/interwikidata_tests.py +++ b/tests/interwikidata_tests.py @@ -93,9 +93,15 @@ wt_page = pywikibot.Page(self.wt, 'User:Ladsgroup') self.assertRaises(ValueError, DummyBot, generator=[wt_page], site=self.wt) - self.assertRaises(ValueError, interwikidata.main, - '-page:User:Ladsgroup', '-lang:fa', - '-family:wiktionary') + fa_wiktionary = pywikibot.Site('fa', 'wiktionary') + self.assertRaisesRegex( + ValueError, + r'wiktionary:fa does not have a data repository, ' + r'use interwiki\.py instead.', + interwikidata.IWBot, + generator=[pywikibot.Page(fa_wiktionary, 'User:Dalba')], + site=fa_wiktionary, + ) if __name__ == '__main__': # pragma: no cover -- To view, visit https://gerrit.wikimedia.org/r/342325 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I68d9fbbc027416a99c2b9cc777127e35c868d7a8 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Errored: wikimedia/pywikibot-core#3906 (master - 1e2d869)
by Travis CI 11 Mar '17

11 Mar '17

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3906 Status: Errored Duration: 1 hour, 47 minutes, and 59 seconds Commit: 1e2d869 (master) Author: jenkins-bot Message: Merge "Remove 'invalid escape sequence' DeprecationWarning in py3" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/4c9c030417ce...1e2d8693… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/210180323 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

[Gerrit] pywikibot/core[master]: Remove 'invalid escape sequence' DeprecationWarning in py3
by jenkins-bot (Code Review) 11 Mar '17

11 Mar '17

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342316 ) Change subject: Remove 'invalid escape sequence' DeprecationWarning in py3 ...................................................................... Remove 'invalid escape sequence' DeprecationWarning in py3 Change-Id: I1720647aa27abb9880bb591431c0ddddc74c6003 --- M pywikibot/site.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/site.py b/pywikibot/site.py index 28643e1..4758cec 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -1402,8 +1402,8 @@ All values of the siteinfo property 'general' are directly available. """ - WARNING_REGEX = re.compile('^Unrecognized values? for parameter ' - '["\']siprop["\']: (.+?)\.?$') + WARNING_REGEX = re.compile(r'^Unrecognized values? for parameter ' + r'["\']siprop["\']: (.+?)\.?$') # Until we get formatversion=2, we have to convert empty-string properties # into booleans so they are easier to use. -- To view, visit https://gerrit.wikimedia.org/r/342316 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1720647aa27abb9880bb591431c0ddddc74c6003 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Errored: wikimedia/pywikibot-core#3905 (master - 4c9c030)
by Travis CI 11 Mar '17

11 Mar '17

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3905 Status: Errored Duration: 1 hour, 54 minutes, and 48 seconds Commit: 4c9c030 (master) Author: jenkins-bot Message: Merge "[IMPROV] Don't use carriage returns" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/b72e97760be9...4c9c0304… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/210150733 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

Errored: wikimedia/pywikibot-core#3904 (master - b72e977)
by Travis CI 11 Mar '17

11 Mar '17

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3904 Status: Errored Duration: 1 hour, 50 minutes, and 2 seconds Commit: b72e977 (master) Author: Fabian Neundorf Message: IMPROV] Page: Renamed isImage and isCategory After ImagePage was renamed to FilePage, is Page.isImage() doing the same. As suggested in the comments there also already rename Page.isCategory. Change-Id: I81e3c078296eab2447d22dffaa05598b7f5552a0 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/abec2c8f115c...b72e9776… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/210134203 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

[Gerrit] pywikibot/core[master]: [IMPROV] Don't use carriage returns
by jenkins-bot (Code Review) 11 Mar '17

11 Mar '17

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342309 ) Change subject: [IMPROV] Don't use carriage returns ...................................................................... [IMPROV] Don't use carriage returns Change-Id: I1b7013b8996a49bd8dc0348bcaed0ac2e22cce0c --- M scripts/maintenance/wikimedia_sites.py 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/maintenance/wikimedia_sites.py b/scripts/maintenance/wikimedia_sites.py index cca9164..7a6ea23 100755 --- a/scripts/maintenance/wikimedia_sites.py +++ b/scripts/maintenance/wikimedia_sites.py @@ -2,8 +2,8 @@ # -*- coding: utf-8 -*- """Script that updates the language lists in Wikimedia family files.""" # -# (C) xqt, 2009-2016 -# (C) Pywikibot team, 2008-2016 +# (C) xqt, 2009-2017 +# (C) Pywikibot team, 2008-2017 # # Distributed under the terms of the MIT license. # @@ -71,16 +71,16 @@ pywikibot.output(u'The lists match!') else: pywikibot.output(u"The lists don't match, the new list is:") - text = u' self.languages_by_size = [\r\n' + text = ' self.languages_by_size = [\n' line = ' ' * 11 for code in new: if len(line) + len(code) <= 76: line += u" '%s'," % code else: - text += u'%s\r\n' % line + text += '%s\n' % line line = ' ' * 11 line += u" '%s'," % code - text += u'%s\r\n' % line + text += '%s\n' % line text += u' ]' pywikibot.output(text) family_file_name = 'pywikibot/families/%s_family.py' % family -- To view, visit https://gerrit.wikimedia.org/r/342309 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1b7013b8996a49bd8dc0348bcaed0ac2e22cce0c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: IMPROV] Page: Renamed isImage and isCategory
by jenkins-bot (Code Review) 11 Mar '17

11 Mar '17

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/182639 ) Change subject: IMPROV] Page: Renamed isImage and isCategory ...................................................................... IMPROV] Page: Renamed isImage and isCategory After ImagePage was renamed to FilePage, is Page.isImage() doing the same. As suggested in the comments there also already rename Page.isCategory. Change-Id: I81e3c078296eab2447d22dffaa05598b7f5552a0 --- M pywikibot/page.py M scripts/casechecker.py M scripts/category.py M scripts/category_redirect.py M scripts/imagetransfer.py M scripts/interwiki.py M tests/page_tests.py 7 files changed, 35 insertions(+), 25 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified Xqt: Looks good to me, but someone else must approve diff --git a/pywikibot/page.py b/pywikibot/page.py index 0299b5c..2f525b8 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -313,7 +313,7 @@ # use this form for sites like commons, where the # code is the same as the family name title = u'%s:%s' % (self.site.code, title) - elif textlink and (self.isImage() or self.isCategory()): + elif textlink and (self.is_filepage() or self.is_categorypage()): title = u':%s' % title elif self.namespace() == 0 and not section: withNamespace = True @@ -799,7 +799,7 @@ @rtype: bool """ - if not self.isCategory(): + if not self.is_categorypage(): return False if not hasattr(self, "_catredirect"): catredirs = self.site._category_redirects() @@ -882,13 +882,23 @@ "%s:%s" % (self.site.namespace(ns + 1), self.title(withNamespace=False))) - def isCategory(self): + def is_categorypage(self): """Return True if the page is a Category, False otherwise.""" return self.namespace() == 14 - def isImage(self): - """Return True if this is an image description page, False otherwise.""" + @deprecated('is_categorypage') + def isCategory(self): + """DEPRECATED: use is_categorypage instead.""" + return self.is_categorypage() + + def is_filepage(self): + """Return True if this is an file description page, False otherwise.""" return self.namespace() == 6 + + @deprecated('is_filepage') + def isImage(self): + """DEPRECATED: use is_filepage instead.""" + return self.is_filepage() @remove_last_args(('get_Index', )) def isDisambig(self): @@ -1068,7 +1078,7 @@ return set(['create']) if 'create' in p_types else set() else: p_types.remove('create') # no existing page allows that - if not self.isImage(): # only file pages allow upload + if not self.is_filepage(): # only file pages allow upload p_types.remove('upload') return p_types diff --git a/scripts/casechecker.py b/scripts/casechecker.py index 80e206f..9faa1cb 100755 --- a/scripts/casechecker.py +++ b/scripts/casechecker.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- """Bot to find all pages on the wiki with mixed latin and cyrilic alphabets.""" # -# (C) Pywikibot team, 2006-2016 +# (C) Pywikibot team, 2006-2017 # # Distributed under the terms of the MIT license. # @@ -469,7 +469,7 @@ if i not in self.knownWords and self.romanNumSfxPtrn.match(i) is not None) - if len(badWords) == 0 or self.Page(title).isImage(): + if len(badWords) == 0 or self.Page(title).is_filepage(): return count = 0 ambigBadWords = set() diff --git a/scripts/category.py b/scripts/category.py index fce3c7b..7e7bd69 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -110,7 +110,7 @@ # (C) Ben McIlwain (CydeWeys), 2006-2015 # (C) Anreas J Schwab, 2007 # (C) xqt, 2009-2016 -# (C) Pywikibot team, 2008-2016 +# (C) Pywikibot team, 2008-2017 # # Distributed under the terms of the MIT license. # @@ -814,8 +814,8 @@ listString = "" for article in setOfArticles: - if (not article.isImage() or - self.showImages) and not article.isCategory(): + if (not article.is_filepage() or + self.showImages) and not article.is_categorypage(): if self.talkPages and not article.isTalkPage(): listString += "*[[%s]] -- [[%s|talk]]\n" \ % (article.title(), diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 5f87ab7..8bb645a 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -23,7 +23,7 @@ """ # -# (C) Pywikibot team, 2008-2016 +# (C) Pywikibot team, 2008-2017 # # Distributed under the terms of the MIT license. # @@ -242,7 +242,7 @@ # race condition: someone else removed the redirect while we # were checking for it continue - if target.isCategory(): + if target.is_categorypage(): # this is a hard-redirect to a category page newtext = (u"{{%(template)s|%(cat)s}}" % {'cat': target.title(withNamespace=False), diff --git a/scripts/imagetransfer.py b/scripts/imagetransfer.py index 36f49a2..1d5c9d0 100755 --- a/scripts/imagetransfer.py +++ b/scripts/imagetransfer.py @@ -27,7 +27,7 @@ """ # # (C) Andre Engels, 2004 -# (C) Pywikibot team, 2004-2016 +# (C) Pywikibot team, 2004-2017 # # Distributed under the terms of the MIT license. # @@ -244,7 +244,7 @@ imagelist.extend( linkedPage.imagelinks( followRedirects=True)) - elif page.isImage(): + elif page.is_filepage(): imagePage = pywikibot.FilePage(page.site, page.title()) imagelist = [imagePage] else: diff --git a/scripts/interwiki.py b/scripts/interwiki.py index 513dd5b..0f45e60 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -2429,7 +2429,7 @@ # Check if the page contains at least 50 characters return len(page.text) < 50 else: - if not page.isCategory(): + if not page.is_categorypage(): txt = page.get() txt = textlib.removeLanguageLinks(txt, site=page.site) txt = textlib.removeCategoryLinks(txt, site=page.site) diff --git a/tests/page_tests.py b/tests/page_tests.py index fd7b63f..762bbfa 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -398,24 +398,24 @@ self.assertEqual(p4.isTalkPage(), True) def testIsCategory(self): - """Test isCategory method.""" + """Test is_categorypage method.""" site = self.get_site() p1 = pywikibot.Page(site, u"First page") p2 = pywikibot.Page(site, u"Category:Second page") p3 = pywikibot.Page(site, u"Category talk:Second page") - self.assertEqual(p1.isCategory(), False) - self.assertEqual(p2.isCategory(), True) - self.assertEqual(p3.isCategory(), False) + self.assertEqual(p1.is_categorypage(), False) + self.assertEqual(p2.is_categorypage(), True) + self.assertEqual(p3.is_categorypage(), False) - def testIsImage(self): - """Test C{Page.isImage} check.""" + def testIsFile(self): + """Test C{Page.is_filepage} check.""" site = self.get_site() p1 = pywikibot.Page(site, u"First page") p2 = pywikibot.Page(site, u"File:Second page") p3 = pywikibot.Page(site, u"Image talk:Second page") - self.assertEqual(p1.isImage(), False) - self.assertEqual(p2.isImage(), True) - self.assertEqual(p3.isImage(), False) + self.assertEqual(p1.is_filepage(), False) + self.assertEqual(p2.is_filepage(), True) + self.assertEqual(p3.is_filepage(), False) def testApiMethods(self): """Test various methods that rely on API.""" -- To view, visit https://gerrit.wikimedia.org/r/182639 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I81e3c078296eab2447d22dffaa05598b7f5552a0 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm(a)member.fsf.org> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Errored: wikimedia/pywikibot-core#3903 (master - abec2c8)
by Travis CI 11 Mar '17

11 Mar '17

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3903 Status: Errored Duration: 1 hour, 52 minutes, and 4 seconds Commit: abec2c8 (master) Author: jenkins-bot Message: Merge "Add -property option to pagegenerators.py" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/f91f2fbb0215...abec2c8f… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/210110722 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
12
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits March 2017