Pywikibot-commits June 2019

pywikibot-commits@lists.wikimedia.org

1 participants
59 discussions

[Gerrit] pywikibot/core[master]: [FIX] 'kewords' should be a list in setup.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/517171 ) Change subject: [FIX] 'kewords' should be a list in setup.py ...................................................................... [FIX] 'kewords' should be a list in setup.py Solve Python 3 "warning: 'keywords' should be a list, got type 'tuple' Bug: T225866 Change-Id: I85f6254fce0f18b685a4b4ff7ad90648102f997b --- M setup.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index 1708ea1..9f125f7 100644 --- a/setup.py +++ b/setup.py @@ -206,9 +206,9 @@ version=get_version(), description='Python MediaWiki Bot Framework', long_description=read_desc('README.rst'), - keywords=('API', 'bot', 'framework', 'mediawiki', 'pwb', 'python', + keywords=['API', 'bot', 'framework', 'mediawiki', 'pwb', 'python', 'pywikibot', 'pywikipedia', 'pywikipediabot', 'wiki', - 'wikimedia', 'wikipedia'), + 'wikimedia', 'wikipedia'], maintainer='The Pywikibot team', maintainer_email='pywikibot(a)lists.wikimedia.org', license='MIT License', -- To view, visit https://gerrit.wikimedia.org/r/517171 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I85f6254fce0f18b685a4b4ff7ad90648102f997b Gerrit-Change-Number: 517171 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 10 months

[Gerrit] pywikibot/core[master]: [bugfix] Refactor TestObsoleteSite

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/516333 ) Change subject: [bugfix] Refactor TestObsoleteSite ...................................................................... [bugfix] Refactor TestObsoleteSite - use DefaultSiteTestCase and instantiate a Site in each test method - use suppress_warnings if needed instead of mocking setUpClass - take into account that closed sites has a ClosedSite interface Bug: T225459 Change-Id: I97c2e4dabcacf74d5abfbf3bee84f8a0200b8fd8 --- M tests/site_tests.py 1 file changed, 8 insertions(+), 35 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index 6c177b5..e94296e 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -3349,48 +3349,19 @@ self.assertFalse(site.sametitle('Invalid:Foo', 'Invalid:foo')) -class TestObsoleteSite(TestCase): +class TestObsoleteSite(DefaultSiteTestCase): """Test 'closed' and obsolete code sites.""" - # hostname() fails, so it is provided here otherwise the - # test class fails with hostname not defined for mh.wikipedia.org - sites = { - 'mhwp': { - 'family': 'wikipedia', - 'code': 'mh', - 'hostname': 'mh.wikipedia.org', - }, - # pywikibot should never attempt to access jp.wikipedia.org, - # however this entry ensures that there is a change in the builds - # if jp.wikipedia.org goes offline. - 'jpwp': { - 'family': 'wikipedia', - 'code': 'jp', - 'hostname': 'jp.wikipedia.org', - }, - 'jawp': { - 'family': 'wikipedia', - 'code': 'ja', - }, - } - - @classmethod - def setUpClass(cls): - """Setup the class.""" - with patch.object(pywikibot, 'warn') as warn_mock: - super(TestObsoleteSite, cls).setUpClass() - warn_mock.assert_called_once_with( - 'Site wikipedia:ja instantiated using different code "jp"', - UserWarning, 2) - def test_locked_site(self): """Test Wikimedia closed/locked site.""" - site = self.get_site('mhwp') + with suppress_warnings('Interwiki removal mh is in wikipedia codes'): + site = pywikibot.Site('mh', 'wikipedia') + self.assertIsInstance(site, pywikibot.site.ClosedSite) self.assertEqual(site.code, 'mh') self.assertIsInstance(site.obsolete, bool) self.assertTrue(site.obsolete) - self.assertIsNotNone(site.hostname) + self.assertEqual(site.hostname(), 'mh.wikipedia.org') r = http.fetch(uri='http://mh.wikipedia.org/w/api.php', default_error_handling=False) self.assertEqual(r.status, 200) @@ -3408,7 +3379,9 @@ def test_alias_code_site(self): """Test Wikimedia site with an alias code.""" - site = self.get_site('jpwp') + with suppress_warnings( + 'Site wikipedia:ja instantiated using different code "jp"'): + site = pywikibot.Site('jp', 'wikipedia') self.assertIsInstance(site.obsolete, bool) self.assertEqual(site.code, 'ja') self.assertFalse(site.obsolete) -- To view, visit https://gerrit.wikimedia.org/r/516333 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I97c2e4dabcacf74d5abfbf3bee84f8a0200b8fd8 Gerrit-Change-Number: 516333 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Lokal Profil <andre.costa(a)wikimedia.se> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Whym <whym(a)whym.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 10 months

[Gerrit] pywikibot/core[master]: [bugfix] Remove several sites from wikipedia closed_wikis list

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/517169 ) Change subject: [bugfix] Remove several sites from wikipedia closed_wikis list ...................................................................... [bugfix] Remove several sites from wikipedia closed_wikis list Remove advisory, quality, strategy, usability from closed_wikis list; they where never part of the wikipedia family (wikipedia.org) but hat their own site in wikimedia.org domain. Change-Id: Iba75ef3cfa9c63ecaa6cb142325c75748d4eaa9d --- M pywikibot/families/wikipedia_family.py 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index a20e19a..536a434 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -18,13 +18,14 @@ name = 'wikipedia' closed_wikis = [ - # See https://noc.wikimedia.org/conf/highlight.php?file=dblists/closed.dblist # noqa - 'aa', 'advisory', 'cho', 'ho', 'hz', 'ii', 'kj', 'kr', 'mh', 'mus', - 'ng', 'quality', 'strategy', 'ten', 'usability' + # See: + # https://noc.wikimedia.org/conf/highlight.php?file=dblists/closed.dblist + 'aa', 'cho', 'ho', 'hz', 'ii', 'kj', 'kr', 'mh', 'mus', 'ng', 'ten', ] removed_wikis = [ - # See https://noc.wikimedia.org/conf/highlight.php?file=dblists/deleted.dblist # noqa + # See: + # https://noc.wikimedia.org/conf/highlight.php?file=dblists/deleted.dblist 'dk', 'ru-sib', 'tlh', 'tokipona', 'zh_cn', 'zh_tw', ] -- To view, visit https://gerrit.wikimedia.org/r/517169 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iba75ef3cfa9c63ecaa6cb142325c75748d4eaa9d Gerrit-Change-Number: 517169 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

4 years, 10 months

[Gerrit] pywikibot/core[master]: [cleanup] Remove strategy family

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/517165 ) Change subject: [cleanup] Remove strategy family ...................................................................... [cleanup] Remove strategy family Strategy wiki has been closed, we don't need to support it anymore officially. Change-Id: I59eda33043e33d402b13477137cec1ba715888f1 --- M docs/api_ref/pywikibot.families.rst D pywikibot/families/strategy_family.py M pywikibot/families/wikipedia_family.py M tox.ini 4 files changed, 0 insertions(+), 34 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/api_ref/pywikibot.families.rst b/docs/api_ref/pywikibot.families.rst index d53e52a..c8ba36e 100644 --- a/docs/api_ref/pywikibot.families.rst +++ b/docs/api_ref/pywikibot.families.rst @@ -89,14 +89,6 @@ :undoc-members: :show-inheritance: -pywikibot.families.strategy\_family module ------------------------------------------- - -.. automodule:: pywikibot.families.strategy_family - :members: - :undoc-members: - :show-inheritance: - pywikibot.families.test\_family module -------------------------------------- diff --git a/pywikibot/families/strategy_family.py b/pywikibot/families/strategy_family.py deleted file mode 100644 index ede4119..0000000 --- a/pywikibot/families/strategy_family.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -"""Family module for Wikimedia Strategy Wiki.""" -# -# (C) Pywikibot team, 2009-2018 -# -# Distributed under the terms of the MIT license. -# -from __future__ import absolute_import, division, unicode_literals - -from pywikibot import family - - -# The Wikimedia Strategy family -class Family(family.WikimediaOrgFamily): - - """Family class for Wikimedia Strategy Wiki.""" - - name = 'strategy' - - interwiki_forward = 'wikipedia' - - def dbName(self, code): - """Return the database name for this family.""" - return 'strategywiki_p' diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index daa61a5..8ad3fcb 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -116,7 +116,6 @@ 'incubator', 'meta', 'species', - 'strategy', 'test', 'wikimania' ] diff --git a/tox.ini b/tox.ini index 45afec0..8114a09 100644 --- a/tox.ini +++ b/tox.ini @@ -135,7 +135,6 @@ pywikibot/exceptions.py : H501, N802 # classproperties; most docs should go to family.py pywikibot/families/* : D102 - pywikibot/families/strategy_family.py: N802 pywikibot/families/wowwiki_family.py: N802 pywikibot/family.py : E241, N802, N803, N806, N815 pywikibot/fixes.py : E241 -- To view, visit https://gerrit.wikimedia.org/r/517165 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I59eda33043e33d402b13477137cec1ba715888f1 Gerrit-Change-Number: 517165 Gerrit-PatchSet: 3 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 10 months

[Gerrit] pywikibot/core[master]: Handle closed_wikis as read-only

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/517031 ) Change subject: Handle closed_wikis as read-only ...................................................................... Handle closed_wikis as read-only + complete closed_wikis network + fix wikimania subdomain site Detached from I68b5754d54f8 Bug: T74674 Change-Id: I78c538834555660becb2b304460c66d127bbbb9e --- M pywikibot/families/wikimania_family.py M pywikibot/family.py M pywikibot/site.py M tests/dry_site_tests.py M tests/family_tests.py M tests/site_tests.py 6 files changed, 94 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikimania_family.py b/pywikibot/families/wikimania_family.py index 53d4dac..881e57e 100644 --- a/pywikibot/families/wikimania_family.py +++ b/pywikibot/families/wikimania_family.py @@ -8,10 +8,11 @@ from __future__ import absolute_import, division, unicode_literals from pywikibot import family +from pywikibot.tools import classproperty # The Wikimania family -class Family(family.WikimediaOrgFamily): +class Family(family.SubdomainFamily, family.WikimediaFamily): """Family class for Wikimania wikis.""" @@ -19,7 +20,22 @@ closed_wikis = [ '2005', '2006', '2007', '2008', '2009', '2010', '2011', '2012', '2013', - '2014', '2015', '2016', '2017', '2018', + '2014', '2015', '2016', '2017', '2018' ] + codes = ['wikimania'] + + code_aliases = {'2019': 'wikimania'} + interwiki_forward = 'wikipedia' + + @classproperty + def langs(cls): + """Property listing family languages.""" + codes = cls.codes + cls.closed_wikis + + # shortcut this classproperty + cls.langs = {code: '{}{}.{}'.format(cls.name, code, cls.domain) + for code in codes if code != 'wikimania'} + cls.langs['wikimania'] = 'wikimania.{}'.format(cls.domain) + return cls.langs diff --git a/pywikibot/family.py b/pywikibot/family.py index fb9671a..7d7dd69 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -1258,7 +1258,10 @@ if code in self.codes: pywikibot.warn('Interwiki removal %s is in %s codes' % (code, self)) - return 'RemovedSite' + if code in self.closed_wikis: + return 'ClosedSite' + if code in self.removed_wikis: + return 'RemovedSite' return config.site_interface diff --git a/pywikibot/site.py b/pywikibot/site.py index de25366..d9b1cc3 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -66,6 +66,7 @@ UnknownExtension, UnknownSite, UserBlocked, + UserRightsError, ) from pywikibot.throttle import Throttle from pywikibot.tools import ( @@ -1307,10 +1308,11 @@ """ def decorator(fn): def callee(self, *args, **kwargs): - if self.obsolete: - raise UnknownSite('Language %s in family %s is obsolete' - % (self.code, self.family.name)) grp = kwargs.pop('as_group', group) + if self.obsolete and not self.has_group('steward'): + raise UserRightsError('Site {} has been closed. Only steward ' + 'can perform requested action.' + .format(self.sitename)) if grp == 'user': self.login(False) elif grp == 'sysop': @@ -7456,6 +7458,63 @@ class_name='APISite', since='20141218') +class ClosedSite(APISite): + """Site closed to read-only mode.""" + + def __init__(self, code, fam, user=None, sysop=None): + """Initializer.""" + super(ClosedSite, self).__init__(code, fam, user, sysop) + + def _closed_error(self, notice=''): + """An error instead of pointless API call.""" + pywikibot.error('Site {} has been closed. {}'.format(self.sitename, + notice)) + + def page_restrictions(self, page): + """Return a dictionary reflecting page protections.""" + if not self.page_exists(page): + raise NoPage(page) + if not hasattr(page, '_protection'): + page._protection = {'edit': ('steward', 'infinity'), + 'move': ('steward', 'infinity'), + 'delete': ('steward', 'infinity'), + 'upload': ('steward', 'infinity'), + 'create': ('steward', 'infinity')} + return page._protection + + def page_can_be_edited(self, page): + """Determine if the page can be edited.""" + rest = self.page_restrictions(page) + sysop_protected = 'edit' in rest and rest['edit'][0] == 'steward' + try: + api.LoginManager(site=self, sysop=sysop_protected) + except NoUsername: + return False + return True + + def recentchanges(self, **kwargs): + """An error instead of pointless API call.""" + self._closed_error('No recent changes can be returned.') + + def is_uploaddisabled(self): + """Return True if upload is disabled on site.""" + if not hasattr(self, '_uploaddisabled'): + self._uploaddisabled = True + return self._uploaddisabled + + def newpages(self, **kwargs): + """An error instead of pointless API call.""" + self._closed_error('No new pages can be returned.') + + def newfiles(self, **kwargs): + """An error instead of pointless API call.""" + self._closed_error('No new files can be returned.') + + def newimages(self, *args, **kwargs): + """An error instead of pointless API call.""" + self._closed_error('No new images can be returned.') + + class DataSite(APISite): """Wikibase data capable site.""" diff --git a/tests/dry_site_tests.py b/tests/dry_site_tests.py index b49aadc..95d0ffc 100644 --- a/tests/dry_site_tests.py +++ b/tests/dry_site_tests.py @@ -11,7 +11,7 @@ from pywikibot.tools import deprecated from pywikibot.site import must_be, need_version from pywikibot.comms.http import user_agent -from pywikibot.exceptions import UnknownSite +from pywikibot.exceptions import UserRightsError from tests.aspects import ( unittest, @@ -137,6 +137,7 @@ self.code = 'test' self.family = lambda: None self.family.name = 'test' + self.sitename = self.family.name + ':' + self.code self._logged_in_as = None self.obsolete = False super(TestMustBe, self).setUp() @@ -146,6 +147,10 @@ """Fake the log in and just store who logged in.""" self._logged_in_as = 'sysop' if sysop else 'user' + def has_group(self, group): + """Fake the groups user belongs to.""" + return False + def testMockInTest(self): """Test that setUp and login work.""" self.assertIsNone(self._logged_in_as) @@ -198,7 +203,7 @@ self.obsolete = True args = (1, 2, 'a', 'b') kwargs = {'i': 'j', 'k': 'l'} - self.assertRaises(UnknownSite, self.call_this_user_req_function, + self.assertRaises(UserRightsError, self.call_this_user_req_function, args, kwargs) diff --git a/tests/family_tests.py b/tests/family_tests.py index 43db8ed..8361090 100644 --- a/tests/family_tests.py +++ b/tests/family_tests.py @@ -53,7 +53,7 @@ self.assertIsInstance(f.languages_by_size, list) self.assertGreaterEqual(set(f.langs), set(f.languages_by_size)) if len(f.langs) > 2 and f.name not in { - 'wikimediachapter', 'vikidia', 'wikidata', + 'wikimediachapter', 'vikidia', 'wikidata', 'wikimania' }: self.assertNotEqual(f.languages_by_size, []) if isinstance(f, SingleSiteFamily): diff --git a/tests/site_tests.py b/tests/site_tests.py index 63d5cc2..6c177b5 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -3390,10 +3390,11 @@ self.assertEqual(site.code, 'mh') self.assertIsInstance(site.obsolete, bool) self.assertTrue(site.obsolete) - self.assertRaises(KeyError, site.hostname) + self.assertIsNotNone(site.hostname) r = http.fetch(uri='http://mh.wikipedia.org/w/api.php', default_error_handling=False) self.assertEqual(r.status, 200) + self.assertEqual(site.siteinfo['lang'], 'mh') def test_removed_site(self): """Test Wikimedia offline site.""" -- To view, visit https://gerrit.wikimedia.org/r/517031 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I78c538834555660becb2b304460c66d127bbbb9e Gerrit-Change-Number: 517031 Gerrit-PatchSet: 13 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Alex Monk <krenair(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: JAn Dudík <jan.dudik(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Kronf <wolpi.kronf(a)web.de> Gerrit-Reviewer: Liuxinyu970226 <541329866(a)qq.com> Gerrit-Reviewer: MZMcBride <w(a)mzmcbride.com> Gerrit-Reviewer: Masti <mastigm(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Nemo bis <federicoleva(a)tiscali.it> Gerrit-Reviewer: Octahedron80 <octahedron80(a)hotmail.com> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: Thibaut120094 <thibaut120094(a)outlook.fr> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: Zppix <Megadev44s.mail(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 10 months

[Gerrit] pywikibot/core[master]: test(test_login_logout): fix AssertionError

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/517030 ) Change subject: test(test_login_logout): fix AssertionError ...................................................................... test(test_login_logout): fix AssertionError Follow up to c4fbf0c, two consecutive logouts does not raise AssertionError anymore. It was somewhat wrong to rely on this error anyway, because assert statements are not reliable in Python (they are skipped when the -O is passed to the interpreter.) Change-Id: Ie4e99ef80b022c527865fd703b33dee4654b8ae9 --- M tests/site_tests.py 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index d4baea1..63d5cc2 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -3718,9 +3718,7 @@ self.assertEqual(site._loginstatus, loginstatus.NOT_LOGGED_IN) self.assertNotIn('_userinfo', site.__dict__.keys()) - self.assertRaisesRegexp(AssertionError, - 'User must login in this site', - site.logout) + self.assertIsNone(site.user()) if __name__ == '__main__': # pragma: no cover -- To view, visit https://gerrit.wikimedia.org/r/517030 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie4e99ef80b022c527865fd703b33dee4654b8ae9 Gerrit-Change-Number: 517030 Gerrit-PatchSet: 1 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 10 months

[Gerrit] pywikibot/core[master]: [IMPR] Fix interwiki_forwards pairs

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/517019 ) Change subject: [IMPR] Fix interwiki_forwards pairs ...................................................................... [IMPR] Fix interwiki_forwards pairs Detached from I68b5754d54 Change-Id: Icefa8619992644e1371e181e50a12d4efba6bcb6 --- M pywikibot/families/incubator_family.py M pywikibot/families/mediawiki_family.py M pywikibot/families/test_family.py M pywikibot/families/wikipedia_family.py 4 files changed, 13 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/incubator_family.py b/pywikibot/families/incubator_family.py index 5dc112c..3d26270 100644 --- a/pywikibot/families/incubator_family.py +++ b/pywikibot/families/incubator_family.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Family module for Incubator Wiki.""" # -# (C) Pywikibot team, 2006-2018 +# (C) Pywikibot team, 2006-2019 # # Distributed under the terms of the MIT license. # @@ -16,3 +16,5 @@ """Family class for Incubator Wiki.""" name = 'incubator' + + interwiki_forward = 'wikipedia' diff --git a/pywikibot/families/mediawiki_family.py b/pywikibot/families/mediawiki_family.py index a8c18fa..001a759 100644 --- a/pywikibot/families/mediawiki_family.py +++ b/pywikibot/families/mediawiki_family.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Family module for MediaWiki wiki.""" # -# (C) Pywikibot team, 2006-2018 +# (C) Pywikibot team, 2006-2019 # # Distributed under the terms of the MIT license. # @@ -13,7 +13,9 @@ # The MediaWiki family class Family(family.WikimediaFamily, family.SingleSiteFamily): - """Family module for MediaWiki wiki.""" + """Family class for MediaWiki wiki.""" name = 'mediawiki' domain = 'www.mediawiki.org' + + interwiki_forward = 'wikipedia' diff --git a/pywikibot/families/test_family.py b/pywikibot/families/test_family.py index 0d50669..c2cc2f4 100644 --- a/pywikibot/families/test_family.py +++ b/pywikibot/families/test_family.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Family module for test.wikipedia.org.""" # -# (C) Pywikibot team, 2007-2018 +# (C) Pywikibot team, 2007-2019 # # Distributed under the terms of the MIT license. # @@ -17,4 +17,7 @@ name = 'test' domain = 'test.wikipedia.org' + test_codes = ('test', ) + + interwiki_forward = 'wikipedia' diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index daa61a5..5094706 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -114,7 +114,9 @@ interwiki_forwarded_from = [ 'commons', 'incubator', + 'mediawiki', 'meta', + 'outreach', 'species', 'strategy', 'test', -- To view, visit https://gerrit.wikimedia.org/r/517019 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icefa8619992644e1371e181e50a12d4efba6bcb6 Gerrit-Change-Number: 517019 Gerrit-PatchSet: 2 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 10 months

[Gerrit] pywikibot/core[master]: Simplify option handling in welcome.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/517017 ) Change subject: Simplify option handling in welcome.py ...................................................................... Simplify option handling in welcome.py use a mapping to assign option values to globalvar attributes to simplify this complex logical expression. Change-Id: Id209ab7da84a8ebabecd227fa1a8aed22a77e17b --- M scripts/welcome.py 1 file changed, 14 insertions(+), 16 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/welcome.py b/scripts/welcome.py index 697ed32..f36beff 100755 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -956,6 +956,18 @@ @param args: command line arguments @type args: str """ + mapping = { + # option: (attribute, value), + '-break': ('recursive', False), + '-nlog': ('makeWelcomeLog', False), + '-ask': ('confirm', True), + '-filter': ('filtBadName', True), + '-savedata': ('saveSignIndex', True), + '-random': ('randomSign', True), + '-sul': ('welcomeAuto', True), + '-quiet': ('quiet', True), + } + for arg in pywikibot.handle_args(args): arg, _, val = arg.partition(':') if arg == '-edit': @@ -980,20 +992,6 @@ globalvar.defaultSign = val or pywikibot.input( 'Which signature to use?') globalvar.defaultSign += timeselected - elif arg == '-break': - globalvar.recursive = False - elif arg == '-nlog': - globalvar.makeWelcomeLog = False - elif arg == '-ask': - globalvar.confirm = True - elif arg == '-filter': - globalvar.filtBadName = True - elif arg == '-savedata': - globalvar.saveSignIndex = True - elif arg == '-random': - globalvar.randomSign = True - elif arg == '-sul': - globalvar.welcomeAuto = True elif arg == '-limit': globalvar.queryLimit = int(val or pywikibot.input( 'How many of the latest new users would you like to load?')) @@ -1001,8 +999,8 @@ globalvar.dumpToLog = int(val or pywikibot.input( 'After how many welcomed users would you like to update the ' 'welcome log?')) - elif arg == '-quiet': - globalvar.quiet = True + elif arg in mapping: + setattr(globalvar, *mapping[arg]) else: pywikibot.warning('Unknown option "{}"'.format(arg)) -- To view, visit https://gerrit.wikimedia.org/r/517017 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id209ab7da84a8ebabecd227fa1a8aed22a77e17b Gerrit-Change-Number: 517017 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

4 years, 10 months

[Gerrit] pywikibot/core[master]: [cleanup] Simplify TestLink.test_valid()

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/517012 ) Change subject: [cleanup] Simplify TestLink.test_valid() ...................................................................... [cleanup] Simplify TestLink.test_valid() - use a title_tests lists to be tested - calculate site only once Change-Id: I4eb94ac69fdc48912dd7aac86a9670667f161ee4 --- M tests/link_tests.py 1 file changed, 23 insertions(+), 33 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/link_tests.py b/tests/link_tests.py index 0de8f29..180dcf5 100644 --- a/tests/link_tests.py +++ b/tests/link_tests.py @@ -71,43 +71,33 @@ def test_valid(self): """Test that valid titles are correctly normalized.""" - self.assertEqual(Link('Sandbox', self.get_site()).title, 'Sandbox') - self.assertEqual(Link('A "B"', self.get_site()).title, 'A "B"') - self.assertEqual(Link("A 'B'", self.get_site()).title, "A 'B'") - self.assertEqual(Link('.com', self.get_site()).title, '.com') - self.assertEqual(Link('~', self.get_site()).title, '~') - self.assertEqual(Link('"', self.get_site()).title, '"') - self.assertEqual(Link("'", self.get_site()).title, "'") - self.assertEqual(Link('Talk:Sandbox', self.get_site()).title, - 'Sandbox') - self.assertEqual(Link('Talk:Foo:Sandbox', self.get_site()).title, - 'Foo:Sandbox') - self.assertEqual(Link('File:Example.svg', self.get_site()).title, - 'Example.svg') - self.assertEqual(Link('File_talk:Example.svg', self.get_site()).title, - 'Example.svg') - self.assertEqual(Link('Foo/.../Sandbox', self.get_site()).title, - 'Foo/.../Sandbox') - self.assertEqual(Link('Sandbox/...', self.get_site()).title, - 'Sandbox/...') - self.assertEqual(Link('A~~', self.get_site()).title, 'A~~') - self.assertEqual(Link(':A', self.get_site()).title, 'A') - # Length is 256 total, but only title part matters - self.assertEqual(Link('Category:' + 'X' * 248, self.get_site()).title, - 'X' * 248) - self.assertEqual(Link('X' * 252, self.get_site()).title, 'X' * 252) - self.assertEqual(Link('A%20B', self.get_site()).title, 'A B') - self.assertEqual(Link('A é B', self.get_site()).title, 'A é B') - self.assertEqual(Link('A é B', self.get_site()).title, 'A é B') - self.assertEqual(Link('A é B', self.get_site()).title, 'A é B') - self.assertEqual(Link('A   B', self.get_site()).title, 'A B') - self.assertEqual(Link('A   B', self.get_site()).title, 'A B') + site = self.get_site() + title_tests = ['Sandbox', 'A "B"', "A 'B'", '.com', '~', '"', "'", + 'Foo/.../Sandbox', 'Sandbox/...', 'A~~', 'X' * 252] + for title in title_tests: + with self.subTest(title=title): + self.assertEqual(Link(title, site).title, title) - anchor_link = Link('A | B', self.get_site()) + self.assertEqual(Link('Talk:Sandbox', site).title, 'Sandbox') + self.assertEqual(Link('Talk:Foo:Sandbox', site).title, 'Foo:Sandbox') + self.assertEqual(Link('File:Example.svg', site).title, 'Example.svg') + self.assertEqual(Link('File_talk:Example.svg', site).title, + 'Example.svg') + self.assertEqual(Link(':A', site).title, 'A') + # Length is 256 total, but only title part matters + self.assertEqual(Link('Category:' + 'X' * 248, site).title, 'X' * 248) + self.assertEqual(Link('A%20B', site).title, 'A B') + self.assertEqual(Link('A é B', site).title, 'A é B') + self.assertEqual(Link('A é B', site).title, 'A é B') + self.assertEqual(Link('A é B', site).title, 'A é B') + self.assertEqual(Link('A   B', site).title, 'A B') + self.assertEqual(Link('A   B', site).title, 'A B') + + anchor_link = Link('A | B', site) self.assertEqual(anchor_link.title, 'A') self.assertEqual(anchor_link.anchor, ' B') - section_link = Link('A%23B', self.get_site()) + section_link = Link('A%23B', site) self.assertEqual(section_link.title, 'A') self.assertEqual(section_link.section, 'B') -- To view, visit https://gerrit.wikimedia.org/r/517012 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4eb94ac69fdc48912dd7aac86a9670667f161ee4 Gerrit-Change-Number: 517012 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 10 months

[Gerrit] pywikibot/core[master]: [tests] Skip test gracefully if i18n package is missing

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/516638 ) Change subject: [tests] Skip test gracefully if i18n package is missing ...................................................................... [tests] Skip test gracefully if i18n package is missing Bug: T225632 Change-Id: I2f588752ae86a410203ff5b722a8e35b14523032 --- M tests/l10n_tests.py 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/l10n_tests.py b/tests/l10n_tests.py index 52bb522..d063f3a 100644 --- a/tests/l10n_tests.py +++ b/tests/l10n_tests.py @@ -61,10 +61,6 @@ return test_template # create test methods for package messages processed by unittest - if not i18n.messages_available(): - raise unittest.SkipTest("i18n messages package '{}' not available." - .format(i18n._messages_package_name)) - site = pywikibot.Site(dct['code'], dct['family']) codes = site.family.languages_by_size del site @@ -92,6 +88,14 @@ family = 'wikipedia' code = 'en' + @classmethod + def setUpClass(cls): + """Skip test gracefully if i18n package is missing.""" + super(TestValidTemplate, cls).setUpClass() + if not i18n.messages_available(): + raise unittest.SkipTest("i18n messages package '{}' not available." + .format(i18n._messages_package_name)) + class TestSites(TestCase): -- To view, visit https://gerrit.wikimedia.org/r/516638 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2f588752ae86a410203ff5b722a8e35b14523032 Gerrit-Change-Number: 516638 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 10 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits June 2019