Pywikibot-commits February 2021

pywikibot-commits@lists.wikimedia.org

1 participants
134 discussions

[Gerrit] ...core[master]: [IMPR] move ClosedSite and RemovedSite to _obsoletesites.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/661712 ) Change subject: [IMPR] move ClosedSite and RemovedSite to _obsoletesites.py ...................................................................... [IMPR] move ClosedSite and RemovedSite to _obsoletesites.py Change-Id: I0d284c1c1ecbac8e122f2682f68bea3bb74b9b1e --- M docs/api_ref/pywikibot.site.rst M pywikibot/CONTENT.rst M pywikibot/site/__init__.py M pywikibot/site/_apisite.py M pywikibot/site/_basesite.py A pywikibot/site/_obsoletesites.py 6 files changed, 79 insertions(+), 59 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/api_ref/pywikibot.site.rst b/docs/api_ref/pywikibot.site.rst index 8fe4299..16f44a2 100644 --- a/docs/api_ref/pywikibot.site.rst +++ b/docs/api_ref/pywikibot.site.rst @@ -31,6 +31,11 @@ .. automodule:: pywikibot._namespace +pywikibot.site.\_obsoletesites module +------------------------------------- + +.. automodule:: pywikibot.site._obsoletesites + pywikibot.site.\_siteinfo module -------------------------------- diff --git a/pywikibot/CONTENT.rst b/pywikibot/CONTENT.rst index d158d1d..4dd9fde 100644 --- a/pywikibot/CONTENT.rst +++ b/pywikibot/CONTENT.rst @@ -124,6 +124,8 @@ +----------------------------+------------------------------------------------------+ | _namespace.py | Objects representing Namespaces of MediaWiki site | +----------------------------+------------------------------------------------------+ + | _obsoletesites.py | Objects representing obsolete MediaWiki sites | + +----------------------------+------------------------------------------------------+ | _siteinfo.py | Objects representing site info data contents | +----------------------------+------------------------------------------------------+ | _tokenwallet.py | Objects representing api tokens | diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index 5a74082..101e26a 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -5,9 +5,10 @@ # # Distributed under the terms of the MIT license. # -from pywikibot.site._apisite import APISite, ClosedSite, DataSite -from pywikibot.site._basesite import BaseSite, PageInUse, RemovedSite +from pywikibot.site._apisite import APISite, DataSite +from pywikibot.site._basesite import BaseSite, PageInUse from pywikibot.site._namespace import Namespace, NamespacesDict +from pywikibot.site._obsoletesites import ClosedSite, RemovedSite from pywikibot.site._siteinfo import Siteinfo from pywikibot.site._tokenwallet import TokenWallet diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 0767a30..cc01484 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -79,7 +79,7 @@ ) -__all__ = ('APISite', 'ClosedSite', 'DataSite') +__all__ = ('APISite', 'DataSite') _logger = 'wiki.apisite' @@ -5741,54 +5741,6 @@ return data['shortenurl']['shorturl'] -class ClosedSite(APISite): - """Site closed to read-only mode.""" - - @remove_last_args(['sysop']) - def __init__(self, code, fam, user=None): - """Initializer.""" - super().__init__(code, fam, user) - - 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 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/pywikibot/site/_basesite.py b/pywikibot/site/_basesite.py index 7e88701..e866e06 100644 --- a/pywikibot/site/_basesite.py +++ b/pywikibot/site/_basesite.py @@ -1,6 +1,6 @@ """Objects with site methods independent of the communication interface.""" # -# (C) Pywikibot team, 2008-2020 +# (C) Pywikibot team, 2008-2021 # # Distributed under the terms of the MIT license. # @@ -476,10 +476,3 @@ def getSite(self, code): # noqa: N802 """Return Site object for language 'code' in this Family.""" return pywikibot.Site(code=code, fam=self.family, user=self.user()) - - -class RemovedSite(BaseSite): - - """Site removed from a family.""" - - pass diff --git a/pywikibot/site/_obsoletesites.py b/pywikibot/site/_obsoletesites.py new file mode 100644 index 0000000..e871def --- /dev/null +++ b/pywikibot/site/_obsoletesites.py @@ -0,0 +1,67 @@ +"""Objects representing obsolete MediaWiki sites.""" +# +# (C) Pywikibot team, 2019-2021 +# +# Distributed under the terms of the MIT license. +# +import pywikibot + +from pywikibot.exceptions import NoPage +from pywikibot.site._apisite import APISite +from pywikibot.site._basesite import BaseSite +from pywikibot.tools import remove_last_args + + +class RemovedSite(BaseSite): + + """Site removed from a family.""" + + pass + + +class ClosedSite(APISite): + """Site closed to read-only mode.""" + + @remove_last_args(['sysop']) + def __init__(self, code, fam, user=None): + """Initializer.""" + super().__init__(code, fam, user) + + 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 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.') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/661712 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I0d284c1c1ecbac8e122f2682f68bea3bb74b9b1e Gerrit-Change-Number: 661712 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: [cleanup] Remove deprecated Site.getToken() and Site.case

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/661724 ) Change subject: [cleanup] Remove deprecated Site.getToken() and Site.case ...................................................................... [cleanup] Remove deprecated Site.getToken() and Site.case update tests accordingly Change-Id: I0a2c762f68860c4ced0432dee16cb6025c5931bb --- M pywikibot/site/_apisite.py M tests/site_tests.py M tests/token_tests.py 3 files changed, 1 insertion(+), 50 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 0767a30..1879c5d 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -970,14 +970,6 @@ """Site information dict.""" return self._siteinfo - @deprecated('siteinfo or Namespace instance', since='20150830', - future_warning=True) - def case(self): # pragma: no cover - """Return this site's capitalization rule.""" - # This is the global setting via $wgCapitalLinks, it is used whenever - # the namespaces don't propagate the namespace specific value. - return self.siteinfo['case'] - def dbName(self): """Return this site's internal id.""" return self.siteinfo['wikiid'] @@ -1842,23 +1834,6 @@ @deprecated("the 'tokens' property", since='20150218', future_warning=True) @remove_last_args(['sysop']) - def getToken(self, getalways=True, getagain=False): # pragma: no cover - """DEPRECATED: Get edit token.""" - if self.username() != self.user(): - raise ValueError('The token for {0} was requested but only the ' - 'token for {1} can be retrieved.'.format( - self.username(), self.user())) - if not getalways: - raise ValueError('In pywikibot/core getToken does not support the ' - 'getalways parameter.') - token = self.validate_tokens(['edit'])[0] - if getagain and token in self.tokens: - # invalidate token - del self.tokens._tokens[self.user()][token] - return self.tokens[token] - - @deprecated("the 'tokens' property", since='20150218', future_warning=True) - @remove_last_args(['sysop']) def getPatrolToken(self): # pragma: no cover """DEPRECATED: Get patrol token.""" if self.username() != self.user(): diff --git a/tests/site_tests.py b/tests/site_tests.py index c00f5a3..a08cdad 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -42,12 +42,6 @@ cached = True - def test_capitalization(self): - """Test that the case method is mirroring the siteinfo.""" - self.assertEqual(self.site.case(), self.site.siteinfo['case']) - self.assertOneDeprecationParts('pywikibot.site.APISite.case', - 'siteinfo or Namespace instance') - def test_siteinfo_normal_call(self): """Test calling the Siteinfo without setting dump.""" old = self.site.siteinfo('general') diff --git a/tests/token_tests.py b/tests/token_tests.py index 80e4816..56181c4 100644 --- a/tests/token_tests.py +++ b/tests/token_tests.py @@ -1,6 +1,6 @@ """Tests for tokens.""" # -# (C) Pywikibot team, 2015-2020 +# (C) Pywikibot team, 2015-2021 # # Distributed under the terms of the MIT license. # @@ -184,24 +184,6 @@ self.assertTrue(raised, msg='pywikibot.Error not raised') -class TestDeprecatedEditTokenFunctions(TokenTestBase, - DefaultSiteTestCase, - DeprecationTestCase): - - """Test cases for Site edit token deprecated methods.""" - - cached = True - user = True - token_type = 'edit' - - def test_get_token(self): - """Test ability to get page tokens using site.getToken.""" - self.mysite = self.site - self.assertEqual(self.mysite.getToken(), self.mysite.tokens['edit']) - self.assertOneDeprecationParts('pywikibot.site.APISite.getToken', - "the 'tokens' property") - - class TestDeprecatedPatrolToken(DefaultSiteTestCase, DeprecationTestCase): """Test cases for Site patrol token deprecated methods.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/661724 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I0a2c762f68860c4ced0432dee16cb6025c5931bb Gerrit-Change-Number: 661724 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: [bugfix] Fix several assertRaises tests

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/661716 ) Change subject: [bugfix] Fix several assertRaises tests ...................................................................... [bugfix] Fix several assertRaises tests Change-Id: If81f0d3b1a8b097649d0b93d3c7d9483e00accc8 --- M tests/pagegenerators_tests.py M tests/site_tests.py 2 files changed, 7 insertions(+), 8 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 3332c68..0e6c92f 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -1004,8 +1004,8 @@ gf.handle_arg('-ns:3,1') # allpages only accepts a single namespace, and will raise a # TypeError if self.namespaces contains more than one namespace. - with self.assertRaises( - TypeError, + with self.assertRaisesRegex( + TypeError, 'allpages module does not support multiple namespaces'): gf.getCombinedGenerator() diff --git a/tests/site_tests.py b/tests/site_tests.py index 7f8af74..c00f5a3 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -982,9 +982,8 @@ p1 = pywikibot.Page(site, 'Foo') site.lock_page(page=p1, block=True) - with self.assertRaises(pywikibot.site.PageInUs): - site.lock_page(page=p1, - block=False) + with self.assertRaises(pywikibot.site.PageInUse): + site.lock_page(page=p1, block=False) site.unlock_page(page=p1) # verify it's unlocked site.lock_page(page=p1, block=False) @@ -3437,11 +3436,11 @@ with self.assertRaises(pywikibot.UnknownExtension): site._cache_proofreadinfo() with self.assertRaises(pywikibot.UnknownExtension): - lambda x: x.proofread_index_ns(site) + site.proofread_index_ns with self.assertRaises(pywikibot.UnknownExtension): - lambda x: x.proofread_page_ns(site) + site.proofread_page_ns with self.assertRaises(pywikibot.UnknownExtension): - lambda x: x.proofread_levels(site) + site.proofread_levels class TestPropertyNames(DefaultSiteTestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/661716 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: If81f0d3b1a8b097649d0b93d3c7d9483e00accc8 Gerrit-Change-Number: 661716 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: [IMPR] Move APISite to _apisite.py file (part 2)

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/656564 ) Change subject: [IMPR] Move APISite to _apisite.py file (part 2) ...................................................................... [IMPR] Move APISite to _apisite.py file (part 2) Re-add site/__init__.py Change-Id: Ic8cc3f0fe32a8ee28d4837bf7a12308d6dee4cb2 --- M docs/api_ref/pywikibot.site.rst M pywikibot/CONTENT.rst A pywikibot/site/__init__.py M pywikibot/site/_apisite.py M tox.ini 5 files changed, 32 insertions(+), 13 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/docs/api_ref/pywikibot.site.rst b/docs/api_ref/pywikibot.site.rst index d74f919..8fe4299 100644 --- a/docs/api_ref/pywikibot.site.rst +++ b/docs/api_ref/pywikibot.site.rst @@ -6,6 +6,11 @@ Submodules ---------- +pywikibot.site.\_apisite module +------------------------------- + +.. automodule:: pywikibot.site._apisite + pywikibot.site.\_basesite module -------------------------------- diff --git a/pywikibot/CONTENT.rst b/pywikibot/CONTENT.rst index a0f8036..d158d1d 100644 --- a/pywikibot/CONTENT.rst +++ b/pywikibot/CONTENT.rst @@ -113,7 +113,9 @@ +============================+======================================================+ | __init__.py | Objects representing MediaWiki sites (wikis) | +----------------------------+------------------------------------------------------+ - | _basesite.py | Objects representingsite methods independent of the | + | _apisite.py | Objects representing API interface to MediaWiki site | + +----------------------------+------------------------------------------------------+ + | _basesite.py | Objects representing site methods independent of the | | | communication interface | +----------------------------+------------------------------------------------------+ | _decorators.py | Decorators used by site models | diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py new file mode 100644 index 0000000..5a74082 --- /dev/null +++ b/pywikibot/site/__init__.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +"""Library module representing MediaWiki sites (wikis).""" +# +# (C) Pywikibot team, 2021 +# +# Distributed under the terms of the MIT license. +# +from pywikibot.site._apisite import APISite, ClosedSite, DataSite +from pywikibot.site._basesite import BaseSite, PageInUse, RemovedSite +from pywikibot.site._namespace import Namespace, NamespacesDict +from pywikibot.site._siteinfo import Siteinfo +from pywikibot.site._tokenwallet import TokenWallet + +__all__ = ('APISite', 'BaseSite', 'ClosedSite', 'DataSite', 'RemovedSite', + 'Namespace', 'NamespacesDict', 'PageInUse', 'Siteinfo', + 'TokenWallet') + +_logger = 'wiki.site' diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 5eb991e..0767a30 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -1,9 +1,4 @@ -""" -Objects representing MediaWiki sites (wikis). - -This module also includes functions to load families, which are -groups of wikis on the same topic in different languages. -""" +"""Objects representing API interface to MediaWiki site.""" # # (C) Pywikibot team, 2008-2021 # @@ -63,10 +58,10 @@ UserRightsError, UnknownExtension, ) -from pywikibot.site._basesite import BaseSite, PageInUse, RemovedSite +from pywikibot.site._basesite import BaseSite from pywikibot.site._decorators import need_extension, need_right, need_version from pywikibot.site._interwikimap import _InterwikiMap -from pywikibot.site._namespace import Namespace, NamespacesDict +from pywikibot.site._namespace import Namespace from pywikibot.site._siteinfo import Siteinfo from pywikibot.site._tokenwallet import TokenWallet from pywikibot.tools import ( @@ -84,10 +79,9 @@ ) -__all__ = ('APISite', 'DataSite', 'Namespace', 'NamespacesDict', 'PageInUse', - 'RemovedSite', 'Siteinfo', 'TokenWallet') +__all__ = ('APISite', 'ClosedSite', 'DataSite') -_logger = 'wiki.site' +_logger = 'wiki.apisite' _mw_msg_cache = defaultdict(dict) diff --git a/tox.ini b/tox.ini index 8352fab..c5b281d 100644 --- a/tox.ini +++ b/tox.ini @@ -149,7 +149,7 @@ pywikibot/login.py: N802, N816 pywikibot/page/__init__.py: N802 pywikibot/pagegenerators.py : N802, N803, N806, N816 - pywikibot/site/__init__.py: N802, N815 + pywikibot/site/_apisite.py: N802 pywikibot/specialbots/__init__.py : F401 pywikibot/textlib.py : N801, N802, N803, N806, N816 pywikibot/throttle.py: N802 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/656564 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ic8cc3f0fe32a8ee28d4837bf7a12308d6dee4cb2 Gerrit-Change-Number: 656564 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: [IMPR] Rename site/_apisite.py/__init__.py to _apisite.py

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/661705 ) Change subject: [IMPR] Rename site/_apisite.py/__init__.py to _apisite.py ...................................................................... [IMPR] Rename site/_apisite.py/__init__.py to _apisite.py Part 1 of 2 Change-Id: Idb6912cdc068cd30a84ed5a2cae1cc9b1f9afac3 --- R pywikibot/site/_apisite.py 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/pywikibot/site/__init__.py b/pywikibot/site/_apisite.py similarity index 100% rename from pywikibot/site/__init__.py rename to pywikibot/site/_apisite.py -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/661705 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Idb6912cdc068cd30a84ed5a2cae1cc9b1f9afac3 Gerrit-Change-Number: 661705 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: Used Context Manager call for assertRaises/assertRaisesRegex

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/661124 ) Change subject: Used Context Manager call for assertRaises/assertRaisesRegex ...................................................................... Used Context Manager call for assertRaises/assertRaisesRegex Bug: T267801 Change-Id: I633ec95525e2aadbd7350e7729df207b403ca960 --- M tests/mediawikiversion_tests.py M tests/page_tests.py M tests/pagegenerators_tests.py M tests/proofreadpage_tests.py M tests/site_decorators_tests.py M tests/site_tests.py 6 files changed, 304 insertions(+), 212 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/mediawikiversion_tests.py b/tests/mediawikiversion_tests.py index 07398cf..6803dfc 100644 --- a/tests/mediawikiversion_tests.py +++ b/tests/mediawikiversion_tests.py @@ -1,6 +1,6 @@ """Tests for the tools.MediaWikiVersion class.""" # -# (C) Pywikibot team, 2008-2020 +# (C) Pywikibot team, 2008-2021 # # Distributed under the terms of the MIT license. # @@ -71,23 +71,31 @@ def test_invalid_versions(self): """Verify that insufficient version fail creating.""" - self.assertRaisesRegex(ValueError, self.INVALID_VERSION_RE, - MediaWikiVersion, 'invalid') - self.assertRaisesRegex(ValueError, self.INVALID_VERSION_RE, - MediaWikiVersion, '1number') - self.assertRaisesRegex(ValueError, self.INVALID_VERSION_RE, - MediaWikiVersion, '1.missing') - - self.assertRaisesRegex(AssertionError, 'Found \"wmf\" in \"wmf-1\"', - MediaWikiVersion, '1.23wmf-1') + with self.assertRaisesRegex( + ValueError, + self.INVALID_VERSION_RE): + MediaWikiVersion('invalid') + with self.assertRaisesRegex( + ValueError, + self.INVALID_VERSION_RE): + MediaWikiVersion('1number') + with self.assertRaisesRegex( + ValueError, + self.INVALID_VERSION_RE): + MediaWikiVersion('1.missing') + with self.assertRaisesRegex( + AssertionError, + 'Found \"wmf\" in \"wmf-1\"'): + MediaWikiVersion('1.23wmf-1') def test_generator(self): """Test from_generator classmethod.""" self.assertEqual(MediaWikiVersion.from_generator('MediaWiki 1.2.3'), self._make('1.2.3')) - self.assertRaisesRegex(ValueError, self.GENERATOR_STRING_RE, - MediaWikiVersion.from_generator, - 'Invalid 1.2.3') + with self.assertRaisesRegex( + ValueError, + self.GENERATOR_STRING_RE): + MediaWikiVersion.from_generator('Invalid 1.2.3') if __name__ == '__main__': # pragma: no cover diff --git a/tests/page_tests.py b/tests/page_tests.py index b98782b..b7ae037 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -154,11 +154,11 @@ l3 = pywikibot.page.Link('Translation:Albert Einstein', source=self.enws) self.assertEqual(l3.ns_title(), 'Translation:Albert Einstein') - self.assertRaisesRegex(pywikibot.Error, - 'No corresponding namespace found for ' - 'namespace Translation: on wikisource:it.', - l3.ns_title, - onsite=self.itws) + with self.assertRaisesRegex( + pywikibot.Error, + 'No corresponding namespace found for ' + 'namespace Translation: on wikisource:it.'): + l3.ns_title(onsite=self.itws) class TestPageObjectEnglish(TestCase): @@ -313,11 +313,19 @@ # the site parameter. # Empty string or None as title raises error. page = pywikibot.page.BasePage(site) - self.assertRaisesRegex(InvalidTitle, INVALID_TITLE_RE, page.title) + with self.assertRaisesRegex( + InvalidTitle, + INVALID_TITLE_RE): + page.title() page = pywikibot.page.BasePage(site, title='') - self.assertRaisesRegex(InvalidTitle, INVALID_TITLE_RE, page.title) - self.assertRaisesRegex(ValueError, 'Title cannot be None.', - pywikibot.page.BasePage, site, title=None) + with self.assertRaisesRegex( + InvalidTitle, + INVALID_TITLE_RE): + page.title() + with self.assertRaisesRegex( + ValueError, + 'Title cannot be None.'): + pywikibot.page.BasePage(site, title=None) def testPageConstructor(self): """Test Page constructor.""" @@ -325,20 +333,25 @@ mainpage = self.get_mainpage() # Test that Page() needs a title when Site is used as source. - self.assertRaisesRegex(ValueError, EMPTY_TITLE_RE, - pywikibot.Page, site) - self.assertRaisesRegex(ValueError, EMPTY_TITLE_RE, - pywikibot.Page, site, '') + with self.assertRaisesRegex( + ValueError, + EMPTY_TITLE_RE): + pywikibot.Page(site) + with self.assertRaisesRegex( + ValueError, + EMPTY_TITLE_RE): + pywikibot.Page(site, '') # Test Page as source. p1 = pywikibot.Page(mainpage) self.assertEqual(p1, mainpage) # Test not valid source. - self.assertRaisesRegex(pywikibot.Error, - r"Invalid argument type '<\w* '\w*'>' in " - 'Page initializer: dummy', - pywikibot.Page, 'dummy') + with self.assertRaisesRegex( + pywikibot.Error, + r"Invalid argument type '<\w* '\w*'>' in " + 'Page initializer: dummy'): + pywikibot.Page('dummy') def testTitle(self): """Test title() method options in article namespace.""" @@ -465,7 +478,10 @@ def test_bad_page(self): """Test various methods that rely on API: bad page.""" badpage = self.get_missing_article() - self.assertRaisesRegex(pywikibot.NoPage, NO_PAGE_RE, badpage.get) + with self.assertRaisesRegex( + pywikibot.NoPage, + NO_PAGE_RE): + badpage.get() def testIsDisambig(self): """Test the integration with Extension:Disambiguator.""" @@ -578,7 +594,8 @@ image = pywikibot.FilePage(site, 'File:Jean-Léon Gérôme 003.jpg') if site.mw_version < '1.20': - self.assertRaises(NotImplementedError, mainpage.page_image) + with self.assertRaises(NotImplementedError): + mainpage.page_image() elif site.has_extension('PageImages'): mainpage_image = mainpage.page_image() if mainpage_image is not None: @@ -586,10 +603,11 @@ # for file pages, the API should return the file itself self.assertEqual(image.page_image(), image) else: - self.assertRaisesRegex(pywikibot.UnknownExtension, - 'Method "loadpageimage" is not implemented ' - 'without the extension PageImages', - mainpage.page_image) + with self.assertRaisesRegex( + pywikibot.UnknownExtension, + 'Method "loadpageimage" is not implemented ' + 'without the extension PageImages'): + mainpage.page_image() class TestPageCoordinates(TestCase): @@ -958,11 +976,15 @@ text = ('This page is used in the [[mw:Manual:Pywikipediabot]] ' 'testing suite.') self.assertEqual(p1.get(), text) - self.assertRaisesRegex(pywikibot.exceptions.IsRedirectPage, - r'{0} is a redirect page\.' - .format(re.escape(str(p2))), p2.get) - self.assertRaisesRegex( - pywikibot.exceptions.NoPage, NO_PAGE_RE, p3.get) + with self.assertRaisesRegex( + pywikibot.exceptions.IsRedirectPage, + r'{0} is a redirect page\.' + .format(re.escape(str(p2)))): + p2.get() + with self.assertRaisesRegex( + pywikibot.exceptions.NoPage, + NO_PAGE_RE): + p3.get() def test_set_redirect_target(self): """Test set_redirect_target method.""" @@ -973,12 +995,15 @@ p3 = pywikibot.Page(site, 'User:Legoktm/R3') text = p2.get(get_redirect=True) - self.assertRaisesRegex(pywikibot.exceptions.IsNotRedirectPage, - r'{0} is not a redirect page\.' - .format(re.escape(str(p1))), - p1.set_redirect_target, p2) - self.assertRaisesRegex(pywikibot.exceptions.NoPage, NO_PAGE_RE, - p3.set_redirect_target, p2) + with self.assertRaisesRegex( + pywikibot.exceptions.IsNotRedirectPage, + r'{0} is not a redirect page\.' + .format(re.escape(str(p1)))): + p1.set_redirect_target(p2) + with self.assertRaisesRegex( + pywikibot.exceptions.NoPage, + NO_PAGE_RE): + p3.set_redirect_target(p2) p2.set_redirect_target(p1, save=False) self.assertEqual(text, p2.get(get_redirect=True)) @@ -1031,15 +1056,19 @@ p.delete(reason='pywikibot unit test', prompt=False, mark=False) self.assertEqual(p._pageid, 0) self.assertEqual(p.isRedirectPage(), False) - self.assertRaisesRegex(pywikibot.NoPage, - NO_PAGE_RE, p.get, force=True) + with self.assertRaisesRegex( + pywikibot.NoPage, + NO_PAGE_RE): + p.get(force=True) # Test undeleting last two revisions del_revs = list(p.loadDeletedRevisions()) revid = p.getDeletedRevision(del_revs[-1])['revid'] p.markDeletedRevision(del_revs[-1]) p.markDeletedRevision(del_revs[-2]) - self.assertRaisesRegex(ValueError, 'is not a deleted revision', - p.markDeletedRevision, 123) + with self.assertRaisesRegex( + ValueError, + 'is not a deleted revision'): + p.markDeletedRevision(123) p.undelete(reason='pywikibot unit test') revs = list(p.revisions()) self.assertLength(revs, 2) diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index b88a87d..3332c68 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -535,11 +535,15 @@ def test_start_0(self): """Test for day page generator with startMonth 0.""" - self.assertRaises(calendar.IllegalMonthError, self._run_test, 0) + with self.assertRaises( + calendar.IllegalMonthError): + self._run_test(0) def test_end_13(self): """Test for day page generator with endMonth 13.""" - self.assertRaises(calendar.IllegalMonthError, self._run_test, 12, 13) + with self.assertRaises( + calendar.IllegalMonthError): + self._run_test(12, 13) class TestPreloadingGenerator(DefaultSiteTestCase): @@ -710,7 +714,8 @@ def test_unsupported_quality_level_filter(self): """Test unsupported option.""" gf = pagegenerators.GeneratorFactory(site=self.get_site()) - self.assertRaises(UnknownExtension, gf.handleArg, '-ql:2') + with self.assertRaises(UnknownExtension): + gf.handleArg('-ql:2') def test_one_excluded_namespaces(self): """Test one excluded namespaces.""" @@ -999,10 +1004,10 @@ gf.handle_arg('-ns:3,1') # allpages only accepts a single namespace, and will raise a # TypeError if self.namespaces contains more than one namespace. - self.assertRaises( - TypeError, - 'allpages module does not support multiple namespaces', - gf.getCombinedGenerator) + with self.assertRaises( + TypeError, + 'allpages module does not support multiple namespaces'): + gf.getCombinedGenerator() def test_prefixing_default(self): """Test prefixindex generator.""" @@ -1033,12 +1038,14 @@ gf.handle_arg('-recentchanges:120,70') gen = gf.getCombinedGenerator() self.assertIsNotNone(gen) - self.assertRaises(ValueError, gf.handleArg, '-recentchanges:3,2,1') - self.assertRaises(ValueError, gf.handleArg, '-recentchanges:12,-12') - self.assertRaises( - ValueError, gf.handleArg, '-recentchanges:visualeditor,3,2,1') - self.assertRaises( - ValueError, gf.handleArg, '-recentchanges:"mobile edit,-10,20"') + with self.assertRaises(ValueError): + gf.handleArg('-recentchanges:3,2,1') + with self.assertRaises(ValueError): + gf.handleArg('-recentchanges:12,-12') + with self.assertRaises(ValueError): + gf.handleArg('-recentchanges:visualeditor,3,2,1') + with self.assertRaises(ValueError): + gf.handleArg('-recentchanges:"mobile edit,-10,20"') def test_recentchanges_rctag(self): """Test recentchanges generator with recent changes tag.""" @@ -1246,7 +1253,8 @@ self.skipTest('The site {0} does not use Linter extension' .format(self.site)) gf = pagegenerators.GeneratorFactory(site=self.site) - self.assertRaises(AssertionError, gf.handleArg, '-linter:dummy') + with self.assertRaises(AssertionError): + gf.handleArg('-linter:dummy') def test_linter_generator_show(self): """Test generator of pages with lint errors.""" @@ -1256,7 +1264,8 @@ gf.handle_arg('-linter:show') self.assertEqual(cm.exception.code, 0) else: - self.assertRaises(UnknownExtension, gf.handleArg, '-linter:show') + with self.assertRaises(UnknownExtension): + gf.handleArg('-linter:show') def test_querypage_generator_with_valid_page(self): """Test generator of pages with lint errors.""" @@ -1273,7 +1282,8 @@ def test_querypage_generator_with_invalid_page(self): """Test generator of pages with lint errors.""" gf = pagegenerators.GeneratorFactory(site=self.site) - self.assertRaises(AssertionError, gf.handleArg, '-querypage:dummy') + with self.assertRaises(AssertionError): + gf.handleArg('-querypage:dummy') def test_querypage_generator_with_no_page(self): """Test generator of pages with lint errors.""" @@ -1498,8 +1508,8 @@ gf = factory() self.assertFalse(gf.handle_arg('-log')) self.assertFalse(gf.handle_arg('-log:text_here')) - self.assertRaises(NotImplementedError, - gf.handleArg, '-logevents:anyevent') + with self.assertRaises(NotImplementedError): + gf.handleArg('-logevents:anyevent') # test that old format log option is not handled by any handler method. gf_mock = mock.create_autospec(gf) self.assertFalse(factory.handle_arg(gf_mock, '-anotherlog')) @@ -1687,8 +1697,11 @@ def test_double_opposite_protocols(self): """Test LinksearchPageGenerator with two opposite protocols.""" - self.assertRaises(ValueError, pagegenerators.LinksearchPageGenerator, - 'http://w.wiki', protocol='https', site=self.site) + with self.assertRaises(ValueError): + pagegenerators.LinksearchPageGenerator( + 'http://w.wiki', + protocol='https', + site=self.site) def test_double_same_protocols(self): """Test LinksearchPageGenerator with two same protocols.""" diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py index fd402e8..78e38d3 100644 --- a/tests/proofreadpage_tests.py +++ b/tests/proofreadpage_tests.py @@ -1,6 +1,6 @@ """Tests for the proofreadpage module.""" # -# (C) Pywikibot team, 2015-2020 +# (C) Pywikibot team, 2015-2021 # # Distributed under the terms of the MIT license. # @@ -34,8 +34,8 @@ def test_invalid_site_source(self): """Test ProofreadPage from invalid Site as source.""" - self.assertRaises(pywikibot.UnknownExtension, - ProofreadPage, self.site, 'title') + with self.assertRaises(pywikibot.UnknownExtension): + ProofreadPage(self.site, 'title') class TestBasePageMethodsProofreadPage(BasePageMethodsTestBase): @@ -197,7 +197,8 @@ def test_invalid_existing_page_source(self): """Test ProofreadPage from invalid existing Page as source.""" source = pywikibot.Page(self.site, self.existing_invalid['title']) - self.assertRaises(ValueError, ProofreadPage, source) + with self.assertRaises(ValueError): + ProofreadPage(source) def test_invalid_not_existing_page_source(self): """Test ProofreadPage from invalid not existing Page as source.""" @@ -214,13 +215,15 @@ """Test ProofreadPage from Page not existing in non-Page ns.""" source = pywikibot.Page(self.site, self.not_existing_invalid['title1']) - self.assertRaises(ValueError, ProofreadPage, source) + with self.assertRaises(ValueError): + ProofreadPage(source) def test_invalid_link_source(self): """Test ProofreadPage from invalid Link as source.""" source = pywikibot.Link(self.not_existing_invalid['title'], source=self.site) - self.assertRaises(ValueError, ProofreadPage, source) + with self.assertRaises(ValueError): + ProofreadPage(source) def test_valid_link_source(self): """Test ProofreadPage from valid Link as source.""" @@ -313,7 +316,8 @@ page = ProofreadPage(self.site, self.existing_unlinked['title']) # test Exception in property. - self.assertRaises(ValueError, getattr, page, 'url_image') + with self.assertRaises(ValueError): + getattr(page, 'url_image') class TestPageQuality(TestCase): @@ -383,7 +387,8 @@ def test_ocr_exceptions(self): """Test page.ocr() exceptions.""" - self.assertRaises(TypeError, self.page.ocr, ocr_tool='dummy') + with self.assertRaises(TypeError): + self.page.ocr(ocr_tool='dummy') def test_do_hocr(self): """Test page._do_hocr().""" @@ -464,7 +469,8 @@ del page.index self.assertFalse(hasattr(page, '_index')) # Test setter with wrong type. - self.assertRaises(TypeError, setattr, page, 'index', 'invalid index') + with self.assertRaises(TypeError): + setattr(page, 'index', 'invalid index') # Test setter with correct type. page.index = index_page self.assertEqual(page.index, index_page) @@ -496,8 +502,8 @@ def test_invalid_site_source(self): """Test IndexPage from invalid Site as source.""" - self.assertRaises(pywikibot.UnknownExtension, - IndexPage, self.site, 'title') + with self.assertRaises(pywikibot.UnknownExtension): + IndexPage(self.site, 'title') class TestIndexPageValidSite(BS4TestCase): @@ -521,19 +527,22 @@ def test_invalid_existing_page_as_source(self): """Test IndexPage from invalid existing Page as source.""" source = pywikibot.Page(self.site, self.existing_invalid_title) - self.assertRaises(ValueError, IndexPage, source) + with self.assertRaises(ValueError): + IndexPage(source) def test_invalid_not_existing_page_as_source(self): """Test IndexPage from Page not existing in non-Page ns as source.""" source = pywikibot.Page(self.site, self.not_existing_invalid_title) - self.assertRaises(ValueError, IndexPage, source) + with self.assertRaises(ValueError): + IndexPage(source) def test_invalid_link_as_source(self): """Test IndexPage from invalid Link as source.""" source = pywikibot.Link(self.not_existing_invalid_title, source=self.site) - self.assertRaises(ValueError, IndexPage, source) + with self.assertRaises(ValueError): + IndexPage(source) def test_valid_link_as_source(self): """Test IndexPage from valid Link as source.""" @@ -687,12 +696,14 @@ # Get label from number. self.assertEqual(index_page.get_label_from_page_number(num), label) # Error if number does not exists. - self.assertRaises(KeyError, index_page.get_label_from_page_number, -1) + with self.assertRaises(KeyError): + index_page.get_label_from_page_number(-1) # Get label from page. self.assertEqual(index_page.get_label_from_page(proofread_page), label) # Error if page does not exists. - self.assertRaises(KeyError, index_page.get_label_from_page, None) + with self.assertRaises(KeyError): + index_page.get_label_from_page(None) def test_get_page_and_number(self, key): """Test IndexPage page get_page_number functions.""" @@ -709,8 +720,8 @@ # Error if label does not exists. label, num_set = 'dummy label', [] - self.assertRaises(KeyError, index_page.get_page_number_from_label, - 'dummy label') + with self.assertRaises(KeyError): + index_page.get_page_number_from_label('dummy label') # Test get_page_from_label. for label, page_set in data['get_page']: @@ -721,8 +732,8 @@ page_set) # Error if label does not exists. - self.assertRaises(KeyError, index_page.get_page_from_label, - 'dummy label') + with self.assertRaises(KeyError): + index_page.get_page_from_label('dummy label') # Test get_page. for n in num_set: @@ -744,9 +755,12 @@ proofread_page = ProofreadPage(self.site, page_title) # Check start/end limits. - self.assertRaises(ValueError, index_page.page_gen, -1, 2) - self.assertRaises(ValueError, index_page.page_gen, 1, -1) - self.assertRaises(ValueError, index_page.page_gen, 2, 1) + with self.assertRaises(ValueError): + index_page.page_gen(-1, 2) + with self.assertRaises(ValueError): + index_page.page_gen(1, -1) + with self.assertRaises(ValueError): + index_page.page_gen(2, 1) # Check quality filters. gen = index_page.page_gen(num, num, filter_ql=range(5)) @@ -792,9 +806,12 @@ def test_page_gen_redlink(self): """Test Index page generator with redlinks.""" # Check start/end limits. - self.assertRaises(ValueError, self.index.page_gen, -1, 2) - self.assertRaises(ValueError, self.index.page_gen, 1, -1) - self.assertRaises(ValueError, self.index.page_gen, 2, 1) + with self.assertRaises(ValueError): + self.index.page_gen(-1, 2) + with self.assertRaises(ValueError): + self.index.page_gen(1, -1) + with self.assertRaises(ValueError): + self.index.page_gen(2, 1) gen = self.index.page_gen(1, None, filter_ql=range(5)) self.assertEqual(list(gen), self.pages) diff --git a/tests/site_decorators_tests.py b/tests/site_decorators_tests.py index 1dae01a..55f3d72 100644 --- a/tests/site_decorators_tests.py +++ b/tests/site_decorators_tests.py @@ -87,8 +87,8 @@ retval = self.call_this_sysop_req_function(*args, **kwargs) self.assertEqual(retval[0], args) self.assertEqual(retval[1], kwargs) - self.assertRaises(UserRightsError, self.call_this_steward_req_function, - args, kwargs) + with self.assertRaises(UserRightsError): + self.call_this_steward_req_function(args, kwargs) def test_must_be_user(self): """Test a function which requires a user.""" @@ -98,8 +98,8 @@ retval = self.call_this_user_req_function(*args, **kwargs) self.assertEqual(retval[0], args) self.assertEqual(retval[1], kwargs) - self.assertRaises(UserRightsError, self.call_this_sysop_req_function, - args, kwargs) + with self.assertRaises(UserRightsError): + self.call_this_sysop_req_function(args, kwargs) def test_override_usertype(self): """Test overriding the required group.""" @@ -121,8 +121,8 @@ self.assertEqual(retval[0], args) self.assertEqual(retval[1], kwargs) self.login('user') - self.assertRaises(UserRightsError, self.call_this_user_req_function, - args, kwargs) + with self.assertRaises(UserRightsError): + self.call_this_user_req_function(args, kwargs) class TestNeedRight(DebugOnlyTestCase): @@ -185,8 +185,8 @@ retval = self.call_this_move_req_function(*args, **kwargs) self.assertEqual(retval[0], args) self.assertEqual(retval[1], kwargs) - self.assertRaises(UserRightsError, self.call_this_edit_req_function, - args, kwargs) + with self.assertRaises(UserRightsError): + self.call_this_edit_req_function(args, kwargs) class TestNeedVersion(DeprecationTestCase): @@ -243,7 +243,8 @@ def test_need_version(self): """Test need_version when the version is new, exact or old enough.""" - self.assertRaises(NotImplementedError, self.too_new) + with self.assertRaises(NotImplementedError): + self.too_new() self.assertTrue(self.old_enough()) self.assertTrue(self.older()) @@ -254,18 +255,18 @@ # The outermost decorator is the version check, so no # deprecation message. - self.assertRaisesRegex( - NotImplementedError, - 'deprecated_unavailable_method', - self.deprecated_unavailable_method) + with self.assertRaisesRegex( + NotImplementedError, + 'deprecated_unavailable_method'): + self.deprecated_unavailable_method() self.assertNoDeprecation() # The deprecator is first, but the version check still # raises exception. - self.assertRaisesRegex( - NotImplementedError, - 'deprecated_unavailable_method2', - self.deprecated_unavailable_method2) + with self.assertRaisesRegex( + NotImplementedError, + 'deprecated_unavailable_method2'): + self.deprecated_unavailable_method2() self.assertOneDeprecationParts( __name__ + '.TestNeedVersion.deprecated_unavailable_method2') diff --git a/tests/site_tests.py b/tests/site_tests.py index 4030e2e..7f8af74 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -237,8 +237,8 @@ with self.subTest(message='nosuchmessage'): self.assertFalse(mysite.has_mediawiki_message('nosuchmessage')) - self.assertRaises(KeyError, mysite.mediawiki_message, - 'nosuchmessage') + with self.assertRaises(KeyError): + mysite.mediawiki_message('nosuchmessage') msg = ('about', 'aboutpage') with self.subTest(messages=msg): @@ -267,12 +267,14 @@ # mediawiki_messages must be given a list; using a string will split it with self.subTest(messages='about'): - self.assertRaises(KeyError, self.site.mediawiki_messages, 'about') + with self.assertRaises(KeyError): + self.site.mediawiki_messages('about') msg = ('nosuchmessage1', 'about', 'aboutpage', 'nosuchmessage') with self.subTest(messages=msg): self.assertFalse(mysite.has_all_mediawiki_messages(msg)) - self.assertRaises(KeyError, mysite.mediawiki_messages, msg) + with self.assertRaises(KeyError): + mysite.mediawiki_messages(msg) with self.subTest(test='server_time'): self.assertIsInstance(mysite.server_time(), pywikibot.Timestamp) @@ -319,8 +321,8 @@ self.assertIsInstance(mysite.getredirtarget(mainpage), pywikibot.Page) else: - self.assertRaises(pywikibot.IsNotRedirectPage, - mysite.getredirtarget, mainpage) + with self.assertRaises(pywikibot.IsNotRedirectPage): + mysite.getredirtarget(mainpage) a = list(mysite.preloadpages([mainpage])) self.assertLength(a, int(mainpage.exists())) if a: @@ -613,7 +615,8 @@ self.assertGreaterEqual(page.title(with_ns=False), 'From') self.assertTrue(hasattr(page, '_fromid')) errgen = mysite.alllinks(unique=True, fromids=True) - self.assertRaises(pywikibot.Error, next, errgen) + with self.assertRaises(pywikibot.Error): + next(errgen) def test_all_categories(self): """Test the site.allcategories() method.""" @@ -684,7 +687,8 @@ pages = list(mysite.querypage('Longpages', total=10)) self.assertTrue(all(isinstance(p, pywikibot.Page) for p in pages)) - self.assertRaises(AssertionError, mysite.querypage, 'LongpageX') + with self.assertRaises(AssertionError): + mysite.querypage('LongpageX') def test_longpages(self): """Test the site.longpages() method.""" @@ -812,13 +816,18 @@ # starttime earlier than endtime with self.subTest(starttime=low, endtime=high, reverse=False): - self.assertRaises(AssertionError, mysite.blocks, total=5, - starttime=low, endtime=high) + with self.assertRaises(AssertionError): + mysite.blocks(total=5, + starttime=low, + endtime=high) # reverse: endtime earlier than starttime with self.subTest(starttime=high, endtime=low, reverse=True): - self.assertRaises(AssertionError, mysite.blocks, total=5, - starttime=high, endtime=low, reverse=True) + with self.assertRaises(AssertionError): + mysite.blocks(total=5, + starttime=high, + endtime=low, + reverse=True) def test_exturl_usage(self): """Test the site.exturlusage() method.""" @@ -916,19 +925,23 @@ # reverse=False, is_ts=False self.assertIsNone(func('m', 1, 2, False, False)) - self.assertRaises(AssertionError, func, 'm', 2, 1, False, False) + with self.assertRaises(AssertionError): + func('m', 2, 1, False, False) # reverse=False, is_ts=True self.assertIsNone(func('m', 2, 1, False, True)) - self.assertRaises(AssertionError, func, 'm', 1, 2, False, True) + with self.assertRaises(AssertionError): + func('m', 1, 2, False, True) # reverse=True, is_ts=False self.assertIsNone(func('m', 2, 1, True, False)) - self.assertRaises(AssertionError, func, 'm', 1, 2, True, False) + with self.assertRaises(AssertionError): + func('m', 1, 2, True, False) # reverse=True, is_ts=True self.assertIsNone(func('m', 1, 2, True, True)) - self.assertRaises(AssertionError, func, 'm', 2, 1, True, True) + with self.assertRaises(AssertionError): + func('m', 2, 1, True, True) class TestLockingPage(DefaultSiteTestCase): @@ -969,8 +982,9 @@ p1 = pywikibot.Page(site, 'Foo') site.lock_page(page=p1, block=True) - self.assertRaises(pywikibot.site.PageInUse, site.lock_page, page=p1, - block=False) + with self.assertRaises(pywikibot.site.PageInUs): + site.lock_page(page=p1, + block=False) site.unlock_page(page=p1) # verify it's unlocked site.lock_page(page=p1, block=False) @@ -1234,18 +1248,18 @@ '2008-02-03T00:00:01Z' <= str(entry.timestamp()) <= '2008-02-03T23:59:59Z') # starttime earlier than endtime - self.assertRaises(AssertionError, mysite.logevents, - start=pywikibot.Timestamp.fromISOformat( - '2008-02-03T00:00:01Z'), - end=pywikibot.Timestamp.fromISOformat( - '2008-02-03T23:59:59Z'), total=5) + with self.assertRaises(AssertionError): + mysite.logevents(start=pywikibot.Timestamp.fromISOformat( + '2008-02-03T00:00:01Z'), + end=pywikibot.Timestamp.fromISOformat( + '2008-02-03T23:59:59Z'), total=5) # reverse: endtime earlier than starttime - self.assertRaises(AssertionError, mysite.logevents, - start=pywikibot.Timestamp.fromISOformat( - '2008-02-03T23:59:59Z'), - end=pywikibot.Timestamp.fromISOformat( - '2008-02-03T00:00:01Z'), - reverse=True, total=5) + with self.assertRaises(AssertionError): + mysite.logevents(start=pywikibot.Timestamp.fromISOformat( + '2008-02-03T23:59:59Z'), + end=pywikibot.Timestamp.fromISOformat( + '2008-02-03T00:00:01Z'), + reverse=True, total=5) class TestRecentChanges(DefaultSiteTestCase): @@ -1319,16 +1333,16 @@ '2008-10-05T06:00:01Z' <= change['timestamp'] <= '2008-10-05T23:59:59Z') # start earlier than end - self.assertRaises(AssertionError, mysite.recentchanges, - start='2008-02-03T00:00:01Z', - end='2008-02-03T23:59:59Z', total=5) + with self.assertRaises(AssertionError): + mysite.recentchanges(start='2008-02-03T00:00:01Z', + end='2008-02-03T23:59:59Z', total=5) # reverse: end earlier than start - self.assertRaises(AssertionError, mysite.recentchanges, - start=pywikibot.Timestamp.fromISOformat( - '2008-02-03T23:59:59Z'), - end=pywikibot.Timestamp.fromISOformat( - '2008-02-03T00:00:01Z'), - reverse=True, total=5) + with self.assertRaises(AssertionError): + mysite.recentchanges(start=pywikibot.Timestamp.fromISOformat( + '2008-02-03T23:59:59Z'), + end=pywikibot.Timestamp.fromISOformat( + '2008-02-03T00:00:01Z'), + reverse=True, total=5) def test_ns_file(self): """Test the site.recentchanges() method with File: and File talk:.""" @@ -1620,15 +1634,16 @@ """Test the site.usercontribs() method with invalid parameters.""" mysite = self.get_site() # start earlier than end - self.assertRaises(AssertionError, mysite.usercontribs, - userprefix='Jim', - start='2008-10-03T00:00:01Z', - end='2008-10-03T23:59:59Z', total=5) + with self.assertRaises(AssertionError): + mysite.usercontribs(userprefix='Jim', + start='2008-10-03T00:00:01Z', + end='2008-10-03T23:59:59Z', total=5) # reverse: end earlier than start - self.assertRaises(AssertionError, mysite.usercontribs, - userprefix='Jim', - start='2008-10-03T23:59:59Z', - end='2008-10-03T00:00:01Z', reverse=True, total=5) + with self.assertRaises(AssertionError): + mysite.usercontribs(userprefix='Jim', + start='2008-10-03T23:59:59Z', + end='2008-10-03T00:00:01Z', + reverse=True, total=5) class TestAlldeletedrevisionsAsUser(DefaultSiteTestCase): @@ -1862,13 +1877,14 @@ '2008-10-15T06:00:01Z' <= rev['timestamp'] <= '2008-10-15T23:59:59Z') # start earlier than end - self.assertRaises(AssertionError, mysite.watchlist_revs, - start='2008-09-03T00:00:01Z', - end='2008-09-03T23:59:59Z', total=5) + with self.assertRaises(AssertionError): + mysite.watchlist_revs(start='2008-09-03T00:00:01Z', + end='2008-09-03T23:59:59Z', total=5) # reverse: end earlier than start - self.assertRaises(AssertionError, mysite.watchlist_revs, - start='2008-09-03T23:59:59Z', - end='2008-09-03T00:00:01Z', reverse=True, total=5) + with self.assertRaises(AssertionError): + mysite.watchlist_revs(start='2008-09-03T23:59:59Z', + end='2008-09-03T00:00:01Z', + reverse=True, total=5) for rev in mysite.watchlist_revs(namespaces=[6, 7], total=5): self.assertIsInstance(rev, dict) self.assertIn('title', rev) @@ -2148,12 +2164,12 @@ """Test that site.protect() throws an exception for invalid args.""" site = self.get_site() p1 = pywikibot.Page(site, 'User:Unicodesnowman/ProtectTest') - self.assertRaises(AssertionError, site.protect, - protections={'anInvalidValue': 'sysop'}, - page=p1, reason='Pywikibot unit test') - self.assertRaises(AssertionError, site.protect, - protections={'edit': 'anInvalidValue'}, - page=p1, reason='Pywikibot unit test') + with self.assertRaises(AssertionError): + site.protect(protections={'anInvalidValue': 'sysop'}, + page=p1, reason='Pywikibot unit test') + with self.assertRaises(AssertionError): + site.protect(protections={'edit': 'anInvalidValue'}, + page=p1, reason='Pywikibot unit test') def test_delete(self): """Test the site.deletepage() and site.undelete_page() methods.""" @@ -2164,7 +2180,8 @@ site.undelete_page(p, 'pywikibot unit tests') site.deletepage(p, reason='pywikibot unit tests') - self.assertRaises(pywikibot.NoPage, p.get, force=True) + with self.assertRaises(pywikibot.NoPage): + p.get(force=True) site.undelete_page(p, 'pywikibot unit tests', revisions=['2014-12-21T06:07:47Z', @@ -2400,8 +2417,9 @@ self.mysite.loadrevisions(self.mainpage, revids='140001') self.assertIn(140001, self.mainpage._revisions) # revids belonging to a different page raises Exception - self.assertRaises(pywikibot.Error, self.mysite.loadrevisions, - self.mainpage, revids=130000) + with self.assertRaises(pywikibot.Error): + self.mysite.loadrevisions(self.mainpage, + revids=130000) def test_loadrevisions_querycontinue(self): """Test the site.loadrevisions() method with query-continue.""" @@ -2423,17 +2441,17 @@ # Retrieve oldest revisions; listing based on timestamp. # Raises "loadrevisions: starttime > endtime with rvdir=True" - self.assertRaises(ValueError, self.mysite.loadrevisions, - self.mainpage, rvdir=True, - starttime='2002-02-01T00:00:00Z', - endtime='2002-01-01T00:00:00Z') + with self.assertRaises(ValueError): + self.mysite.loadrevisions(self.mainpage, rvdir=True, + starttime='2002-02-01T00:00:00Z', + endtime='2002-01-01T00:00:00Z') # Retrieve newest revisions; listing based on timestamp. # Raises "loadrevisions: endtime > starttime with rvdir=False" - self.assertRaises(ValueError, self.mysite.loadrevisions, - self.mainpage, rvdir=False, - starttime='2002-01-01T00:00:00Z', - endtime='2002-02-01T00:00:00Z') + with self.assertRaises(ValueError): + self.mysite.loadrevisions(self.mainpage, rvdir=False, + starttime='2002-01-01T00:00:00Z', + endtime='2002-02-01T00:00:00Z') def test_loadrevisions_rev_id(self): """Test the site.loadrevisions() method, listing based on rev_id.""" @@ -2444,15 +2462,15 @@ # Retrieve oldest revisions; listing based on revid. # Raises "loadrevisions: startid > endid with rvdir=True" - self.assertRaises(ValueError, self.mysite.loadrevisions, - self.mainpage, rvdir=True, - startid='200000', endid='100000') + with self.assertRaises(ValueError): + self.mysite.loadrevisions(self.mainpage, rvdir=True, + startid='200000', endid='100000') # Retrieve newest revisions; listing based on revid. # Raises "loadrevisions: endid > startid with rvdir=False - self.assertRaises(ValueError, self.mysite.loadrevisions, - self.mainpage, rvdir=False, - startid='100000', endid='200000') + with self.assertRaises(ValueError): + self.mysite.loadrevisions(self.mainpage, rvdir=False, + startid='100000', endid='200000') def test_loadrevisions_user(self): """Test the site.loadrevisions() method, filtering by user.""" @@ -3163,8 +3181,9 @@ def test_invalid_language(self): """Test behavior of search_entities with invalid language provided.""" datasite = self.get_repo() - self.assertRaises(ValueError, datasite.search_entities, 'abc', - 'invalidlanguage') + with self.assertRaises(ValueError): + datasite.search_entities('abc', + 'invalidlanguage') class TestSametitleSite(TestCase): @@ -3245,7 +3264,8 @@ self.assertEqual(site.code, 'ru-sib') self.assertIsInstance(site.obsolete, bool) self.assertTrue(site.obsolete) - self.assertRaises(KeyError, site.hostname) + with self.assertRaises(KeyError): + site.hostname() # See also http_tests, which tests that ru-sib.wikipedia.org is offline def test_alias_code_site(self): @@ -3301,12 +3321,14 @@ self.assertFalse(site.obsolete) self.assertEqual(site.family.hostname('en'), url) - self.assertRaises(KeyError, site.family.hostname, 'wow') - self.assertRaises(KeyError, site.family.hostname, 'wowwiki') - self.assertRaises(pywikibot.UnknownSite, pywikibot.Site, - 'wowwiki', 'wowwiki') - self.assertRaises(pywikibot.UnknownSite, pywikibot.Site, - 'ceb', 'wowwiki') + with self.assertRaises(KeyError): + site.family.hostname('wow') + with self.assertRaises(KeyError): + site.family.hostname('wowwiki') + with self.assertRaises(pywikibot.UnknownSite): + pywikibot.Site('wowwiki', 'wowwiki') + with self.assertRaises(pywikibot.UnknownSite): + pywikibot.Site('ceb', 'wowwiki') class TestProductionAndTestSite(AlteredDefaultSiteTestCase): @@ -3340,7 +3362,8 @@ self.assertIsInstance(site.namespaces, Mapping) self.assertFalse(site.obsolete) - self.assertRaises(KeyError, site.family.hostname, 'en') + with self.assertRaises(KeyError): + site.family.hostname('en') pywikibot.config.family = 'commons' pywikibot.config.mylang = 'de' @@ -3351,8 +3374,8 @@ self.assertEqual(site2.code, 'beta') self.assertFalse(site2.obsolete) - self.assertRaises(pywikibot.UnknownSite, - pywikibot.Site) + with self.assertRaises(pywikibot.UnknownSite): + pywikibot.Site() def test_wikidata(self): """Test Wikidata family, with sites for test and production.""" @@ -3362,7 +3385,8 @@ self.assertIsInstance(site.namespaces, Mapping) self.assertFalse(site.obsolete) - self.assertRaises(KeyError, site.family.hostname, 'en') + with self.assertRaises(KeyError): + site.family.hostname('en') pywikibot.config.family = 'wikidata' pywikibot.config.mylang = 'en' @@ -3372,8 +3396,8 @@ self.assertEqual(site2.code, 'test') # Languages can't be used due to T71255 - self.assertRaises(pywikibot.UnknownSite, - pywikibot.Site, 'en', 'wikidata') + with self.assertRaises(pywikibot.UnknownSite): + pywikibot.Site('en', 'wikidata') class TestSiteProofreadinfo(DefaultSiteTestCase): @@ -3410,14 +3434,14 @@ def test_cache_proofreadinfo_on_site_without_proofreadpage(self): """Test Site._cache_proofreadinfo().""" site = self.get_site('en-wp') - self.assertRaises(pywikibot.UnknownExtension, - site._cache_proofreadinfo) - self.assertRaises(pywikibot.UnknownExtension, - lambda x: x.proofread_index_ns, site) - self.assertRaises(pywikibot.UnknownExtension, - lambda x: x.proofread_page_ns, site) - self.assertRaises(pywikibot.UnknownExtension, - lambda x: x.proofread_levels, site) + with self.assertRaises(pywikibot.UnknownExtension): + site._cache_proofreadinfo() + with self.assertRaises(pywikibot.UnknownExtension): + lambda x: x.proofread_index_ns(site) + with self.assertRaises(pywikibot.UnknownExtension): + lambda x: x.proofread_page_ns(site) + with self.assertRaises(pywikibot.UnknownExtension): + lambda x: x.proofread_levels(site) class TestPropertyNames(DefaultSiteTestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/661124 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I633ec95525e2aadbd7350e7729df207b403ca960 Gerrit-Change-Number: 661124 Gerrit-PatchSet: 4 Gerrit-Owner: Homeboy 445 <akshitsan13(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: [doc] Update ROADMAP.rst

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/661340 ) Change subject: [doc] Update ROADMAP.rst ...................................................................... [doc] Update ROADMAP.rst Change-Id: I57cc3db3d98480d98833d068606ec11be65c986d --- M ROADMAP.rst 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index d2b9666..684b401 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -4,12 +4,20 @@ Breaking changes ^^^^^^^^^^^^^^^^ +* Support of MediaWiki < 1.23 has been dropped (T268979) +* APISite.loadimageinfo will no longer return any content * Return requests.Response with http.request() instead of plain text (T265206) * config.db_hostname has been renamed to db_hostname_format Other changes ^^^^^^^^^^^^^ +* Create a SiteLink with __getitem__ method and implement lazy load (T273386, T245809, T238471, T226157) +* Fix date.formats['MonthName'] behaviour (T273573) +* Deprecated Family.known_families dict was removed (T89451) +* Implement pagegenerators.handle_args() to process all options at once +* Deprecated DataSite.get_* methods was removed +* Deprecated LogEntryFactory.logtypes classproperty was removed * Add enabled_options, disabled_options to GeneratorFactory (T271320) * Move interwiki() interwiki_prefix() and local_interwiki() methods from BaseSite to APISite * Add requests.Response.headers to log when an API error occurs (T272325) @@ -23,10 +31,8 @@ * 5.5.0: Deprecated data attribute of http.fetch() result will be given up (T265206) * 5.5.0: Site.getuserinfo() method will be dropped in favour of userinfo property * 5.5.0: Site.getglobaluserinfo() method will be dropped in favour of globaluserinfo property -* 5.4.0: Support of MediaWiki < 1.23 will be dropped with release 6.0 (T268979) * 5.4.0: LoginManager.getCookie() is deprecated and will be removed * 5.4.0: tools.PY2 will be removed (T213287) -* 5.3.0: LogEntryFactory.logtypes property will be removed * 5.3.0: toStdout parameter of logging.output()/pywikibot.output() function will be desupported * 5.0.0: OptionHandler.options dict will be removed in favour of OptionHandler.opt * 5.0.0: Methods deprecated for 5 years or longer will be removed -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/661340 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I57cc3db3d98480d98833d068606ec11be65c986d Gerrit-Change-Number: 661340 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: [IMPR] Create a SiteLink with __getitem__ method

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/660809 ) Change subject: [IMPR] Create a SiteLink with __getitem__ method ...................................................................... [IMPR] Create a SiteLink with __getitem__ method SiteLinkCollection initializer updates data contents to self._data dict. The update method calls __setitem__ for each data entry; for each entry a SiteLink is created which needs a siteinfo content for every affected site and leads to a huge loading time. Now with this patch the SiteLink object is created when the link is fetched from self._data via __getitem__ or __iter__ method. This prevents siteinfo content for each site from loading even a link is currently not used and decrease loading time a lot. Bug: T245809 Bug: T226157 Bug: T238471 Bug: T273386 Change-Id: Icc92cfd5d200fde47eb127e2fe601f812427624a --- M pywikibot/page/__init__.py M tests/wikibase_tests.py 2 files changed, 20 insertions(+), 12 deletions(-) Approvals: Matěj Suchánek: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 912f619..be8b2ce 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -3528,23 +3528,33 @@ @rtype: pywikibot.page.SiteLink """ key = self.getdbName(key) - return self._data[key] + val = self._data[key] + if isinstance(val, str): + val = SiteLink(val, key) + elif isinstance(val, dict): + val = SiteLink.fromJSON(val, self.repo) + else: + return val + self._data[key] = val + return val def __setitem__(self, key, val): """ Set the SiteLink for a given key. + This only sets the value given as str, dict or SiteLink. If a + str or dict is given the SiteLink object is created later in + __getitem__ method. + @param key: site key as Site instance or db key @type key: pywikibot.Site or str - @param val: page name as a string or JSON containing SiteLink data - @type val: dict or str - @rtype: pywikibot.page.SiteLink + @param val: page name as a string or JSON containing SiteLink + data or a SiteLink object + @type val: Union[str, dict, SiteLink] """ - if isinstance(val, str): - val = SiteLink(val, key) - else: - val = SiteLink.fromJSON(val, self.repo) key = self.getdbName(key) + if isinstance(val, SiteLink): + assert val.site.dbName() == key self._data[key] = val def __delitem__(self, key): @@ -3851,8 +3861,8 @@ self.latest_revision_id = self._content.get('lastrevid') data = {} - # todo: this initializes all data, - # make use of lazy initialization (T245809) + + # This initializes all data, for key, cls in self.DATA_ATTRIBUTES.items(): value = cls.fromJSON(self._content.get(key, {}), self.repo) setattr(self, key, value) diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index f77af864..6a9740b 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -2352,8 +2352,6 @@ """Test cases to test toJSON() functions.""" - dry = True - def setUp(self): """Setup test.""" super().setUp() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/660809 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Icc92cfd5d200fde47eb127e2fe601f812427624a Gerrit-Change-Number: 660809 Gerrit-PatchSet: 8 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Bugreporter <bugreporter1(a)sina.com> Gerrit-Reviewer: JAn Dudík <jan.dudik(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: [bugfix] Fix date.formats['MonthName'] behaviour

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/661016 ) Change subject: [bugfix] Fix date.formats['MonthName'] behaviour ...................................................................... [bugfix] Fix date.formats['MonthName'] behaviour - use 'may_long' s key for mediawiki_message instead of 'may' - use an OrderedDict as mediawiki_messages result to respect the key order in Python 3.5 - additional date and mediawiki_messages tests Bug: T273573 Change-Id: I30b229c53ae3d2fa088ddd27165425d38f3c3007 --- M pywikibot/date.py M pywikibot/site/__init__.py M tests/date_tests.py M tests/site_tests.py 4 files changed, 24 insertions(+), 7 deletions(-) Approvals: Tacsipacsi: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/date.py b/pywikibot/date.py index 066a07d..68d9f37 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -1,6 +1,6 @@ """Date data and manipulation module.""" # -# (C) Pywikibot team, 2003-2020 +# (C) Pywikibot team, 2003-2021 # # Distributed under the terms of the MIT license. # @@ -526,8 +526,11 @@ def __getitem__(self, lang): if lang not in self.months: site = Site() - months = list(site.mediawiki_messages(enMonthNames, - lang=lang).values()) + # may_long differs + keys = ['january', 'february', 'march', 'april', 'may_long', + 'june', 'july', 'august', 'september', 'october', + 'november', 'december'] + months = list(site.mediawiki_messages(keys, lang=lang).values()) self.months[lang] = lambda v: slh(v, months) return self.months[lang] diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index 3f97f51..5eb991e 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -20,7 +20,7 @@ import typing import uuid -from collections import defaultdict, namedtuple +from collections import defaultdict, namedtuple, OrderedDict from collections.abc import Iterable from contextlib import suppress from itertools import zip_longest @@ -685,7 +685,7 @@ @param lang: a language code, default is self.lang @type lang: str or None - @rtype dict + @rtype OrderedDict """ amlang = lang or self.lang if not all(amlang in _mw_msg_cache @@ -701,7 +701,7 @@ _mw_msg_cache[amlang][msg['name']] = msg['*'] # Check requested keys - result = {} + result = OrderedDict() for key in keys: try: result[key] = _mw_msg_cache[amlang][key] @@ -711,7 +711,7 @@ else: return result - return {_key: _mw_msg_cache[amlang][_key] for _key in keys} + return OrderedDict((key, _mw_msg_cache[amlang][key]) for key in keys) @deprecated_args(forceReload=None) def mediawiki_message(self, key, lang=None) -> str: diff --git a/tests/date_tests.py b/tests/date_tests.py index 26d767b..98cf216 100644 --- a/tests/date_tests.py +++ b/tests/date_tests.py @@ -87,6 +87,12 @@ 'value {} does not match {}' .format(formatname, code, new_value, value)) + def test_month_name(self): + """Test some MonthName results.""" + # T273573 + self.assertEqual(date.formats['MonthName']['hu']('január'), 1) + self.assertEqual(date.formats['MonthName']['hu'](5), 'május') + class TestMonthDelta(TestCase): diff --git a/tests/site_tests.py b/tests/site_tests.py index 1b37e0d..4030e2e 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -257,6 +257,14 @@ self.assertNotEqual(mysite.mediawiki_messages(months, 'af'), mysite.mediawiki_messages(months, 'an')) + with self.subTest(messages='Test messages order'): + msg = mysite.mediawiki_messages(months, 'en') + self.assertIsInstance(msg, dict) + self.assertLength(msg, 12) + self.assertEqual([key.title() for key in msg][5:], + list(msg.values())[5:]) + self.assertEqual(list(msg), months) + # mediawiki_messages must be given a list; using a string will split it with self.subTest(messages='about'): self.assertRaises(KeyError, self.site.mediawiki_messages, 'about') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/661016 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I30b229c53ae3d2fa088ddd27165425d38f3c3007 Gerrit-Change-Number: 661016 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Tacsipacsi <tacsipacsi(a)jnet.hu> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: [IMPR] speed up preload_sites.py maintenance script

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/660758 ) Change subject: [IMPR] speed up preload_sites.py maintenance script ...................................................................... [IMPR] speed up preload_sites.py maintenance script Increase the number of parallel workers. For example siteinfo of all 750 sites can be preloaded in 20 seconds with 25 workers. Bug: T226157 Change-Id: I9e4f8810f4a969fb58a397f94add52ace293d25b --- M scripts/maintenance/preload_sites.py 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/maintenance/preload_sites.py b/scripts/maintenance/preload_sites.py index 5eb4f2a..f44aad3 100644 --- a/scripts/maintenance/preload_sites.py +++ b/scripts/maintenance/preload_sites.py @@ -43,7 +43,7 @@ } -def preload_family(family): +def preload_family(family, executor): """Preload all sites of a single family file.""" msg = 'Preloading sites of {} family{}' pywikibot.output(msg.format(family, '...')) @@ -54,11 +54,13 @@ codes.remove(code) obsolete = Family.load(family).obsolete + futures = set() for code in codes: if code not in obsolete: site = pywikibot.Site(code, family) - pywikibot.Page(site, 'Main page') # title does not care - + # page title does not care + futures.add(executor.submit(pywikibot.Page, site, 'Main page')) + wait(futures) pywikibot.output(msg.format(family, ' completed.')) @@ -66,8 +68,8 @@ """Preload all sites of all given family files.""" start = datetime.now() with ThreadPoolExecutor(worker) as executor: - futures = {executor.submit(preload_family, family): - family for family in families} + futures = {executor.submit(preload_family, family, executor) + for family in families} wait(futures) pywikibot.output('Loading time used: {}'.format(datetime.now() - start)) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/660758 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I9e4f8810f4a969fb58a397f94add52ace293d25b Gerrit-Change-Number: 660758 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits February 2021