Pywikibot-commits February 2022

pywikibot-commits@lists.wikimedia.org

1 participants
99 discussions

[Gerrit] ...core[master]: [cleanup] Remove functions and methods deprecated since release 3.0

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/761395 ) Change subject: [cleanup] Remove functions and methods deprecated since release 3.0 ...................................................................... [cleanup] Remove functions and methods deprecated since release 3.0 - update tests - update archived scripts Change-Id: Ib4247ae2d9b302f26d2e7d08141ba789b5ad3a19 --- M pywikibot/page/__init__.py M pywikibot/pagegenerators.py M scripts/archive/imagecopy.py M scripts/archive/imagecopy_self.py M tests/pagegenerators_tests.py 5 files changed, 3 insertions(+), 374 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 91a74d2..e86ed10 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -1035,11 +1035,6 @@ """ return self.site.page_can_be_edited(self, action) - @deprecated("Page.has_permission('edit')", since='3.0.20200508') - def canBeEdited(self): # pragma: no cover - """DEPRECATED. Determine whether the page may be edited.""" - return self.has_permission() - def botMayEdit(self) -> bool: """ Determine whether the active bot is allowed to edit the page. @@ -2391,11 +2386,6 @@ url_param=url_param) return self.latest_file_info.thumburl - @deprecated('file_is_shared', since='3.0.20200703') - def fileIsShared(self) -> bool: # pragma: no cover - """DEPRECATED. Check if the image is stored on Wikimedia Commons.""" - return self.file_is_shared() - def file_is_shared(self) -> bool: """Check if the file is stored on any known shared repository.""" # as of now, the only known repositories are commons and wikitravel diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 0190518..7889c4f 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -61,7 +61,6 @@ from pywikibot.proofreadpage import ProofreadPage from pywikibot.tools import ( DequeGenerator, - deprecated, filter_unique, intersect_generators, itergroup, @@ -1446,26 +1445,6 @@ return gen -@deprecated('File.usingPages()', since='3.0.20200609') -def FileLinksGenerator(referredFilePage: 'pywikibot.page.FilePage', - total: Optional[int] = None, - content: bool = False - ) -> Iterable['pywikibot.page.Page']: - """DEPRECATED. Yield Pages on which referredFilePage file is displayed.""" - return referredFilePage.usingPages(total=total, - content=content) # pragma: no cover - - -@deprecated('Page.imagelinks()', since='3.0.20200609') -def ImagesPageGenerator(pageWithImages: 'pywikibot.page.Page', - total: Optional[int] = None, - content: bool = False - ) -> Iterable['pywikibot.page.Page']: - """DEPRECATED. Yield FilePages displayed on pageWithImages.""" - return pageWithImages.imagelinks(total=total, - content=content) # pragma: no cover - - def InterwikiPageGenerator(page: 'pywikibot.page.Page' ) -> Iterable['pywikibot.page.Page']: """Iterate over all interwiki (non-language) links on a page.""" @@ -1535,25 +1514,6 @@ yield s -@deprecated('Page.linkedPages()', since='3.0.20200609') -def LinkedPageGenerator(linkingPage: 'pywikibot.page.Page', - total: Optional[int] = None, - content: bool = False - ) -> Iterable['pywikibot.page.Page']: - """DEPRECATED. Yield all pages linked from a specific page. - - See :py:obj:`pywikibot.page.BasePage.linkedPages` for details. - - :param linkingPage: the page that links to the pages we want - :param total: the total number of pages to iterate - :param content: if True, retrieve the current content of each linked page - :return: a generator that yields Page objects of pages linked to - linkingPage - """ - return linkingPage.linkedPages(total=total, - content=content) # pragma: no cover - - def _yield_titles(f: Union[codecs.StreamReaderWriter, io.StringIO], site: pywikibot.site.BaseSite ) -> Iterable['pywikibot.page.Page']: @@ -1630,27 +1590,6 @@ yield pywikibot.Page(pywikibot.Link(title, site)) -@deprecated('site.load_pages_from_pageids()', since='3.0.20200609') -def PagesFromPageidGenerator(pageids: Iterable[str], - site: OPT_SITE_TYPE = None - ) -> Iterable['pywikibot.page.Page']: - """ - DEPRECATED. Return a page generator from pageids. - - Pages are iterated in the same order than in the underlying pageids. - Pageids are filtered and only one page is returned in case of - duplicate pageid. - - :param pageids: an iterable that returns pageids, or a comma-separated - string of pageids (e.g. '945097,1483753,956608') - :param site: Site for generator results. - """ - if site is None: - site = pywikibot.Site() - - return site.load_pages_from_pageids(pageids) - - def UserContributionsGenerator(username: str, namespaces: Optional[List[int]] = None, site: OPT_SITE_TYPE = None, @@ -2319,143 +2258,6 @@ yield page -@deprecated('Site.unusedfiles()', since='3.0.20200609') -def UnusedFilesGenerator(total: Optional[int] = None, # pragma: no cover - site: OPT_SITE_TYPE = None - ) -> Iterable['pywikibot.page.FilePage']: - """ - DEPRECATED. Unused files generator. - - :param total: Maximum number of pages to retrieve in total - :param site: Site for generator results. - """ - if site is None: - site = pywikibot.Site() - return site.unusedfiles(total=total) - - -@deprecated('Site.withoutinterwiki()', since='3.0.20200609') -def WithoutInterwikiPageGenerator(total: Optional[int] = None, - site: OPT_SITE_TYPE = None - ) -> Iterable['pywikibot.page.Page']: - """ - DEPRECATED. Page lacking interwikis generator. - - :param total: Maximum number of pages to retrieve in total - :param site: Site for generator results. - """ - if site is None: - site = pywikibot.Site() - return site.withoutinterwiki(total=total) - - -@deprecated('Site.uncategorizedcategories()', since='3.0.20200609') -def UnCategorizedCategoryGenerator(total: Optional[int] = 100, - site: OPT_SITE_TYPE = None - ) -> Iterable['pywikibot.Category']: - """ - DEPRECATED. Uncategorized category generator. - - :param total: Maximum number of pages to retrieve in total - :param site: Site for generator results. - """ - if site is None: - site = pywikibot.Site() - return site.uncategorizedcategories(total=total) - - -@deprecated('Site.uncategorizedimages()', since='3.0.20200609') -def UnCategorizedImageGenerator(total: int = 100, # pragma: no cover - site: OPT_SITE_TYPE = None - ) -> Iterable['pywikibot.page.FilePage']: - """ - DEPRECATED. Uncategorized file generator. - - :param total: Maximum number of pages to retrieve in total - :param site: Site for generator results. - """ - if site is None: - site = pywikibot.Site() - return site.uncategorizedimages(total=total) - - -@deprecated('Site.uncategorizedpages()', since='3.0.20200609') -def UnCategorizedPageGenerator(total: int = 100, # pragma: no cover - site: OPT_SITE_TYPE = None - ) -> Iterable['pywikibot.page.Page']: - """ - DEPRECATED. Uncategorized page generator. - - :param total: Maximum number of pages to retrieve in total - :param site: Site for generator results. - """ - if site is None: - site = pywikibot.Site() - return site.uncategorizedpages(total=total) - - -@deprecated('Site.uncategorizedtemplates()', since='3.0.20200609') -def UnCategorizedTemplateGenerator(total: int = 100, # pragma: no cover - site: OPT_SITE_TYPE = None - ) -> Iterable['pywikibot.page.Page']: - """ - DEPRECATED. Uncategorized template generator. - - :param total: Maximum number of pages to retrieve in total - :param site: Site for generator results. - """ - if site is None: - site = pywikibot.Site() - return site.uncategorizedtemplates(total=total) - - -@deprecated('Site.lonelypages()', since='3.0.20200609') -def LonelyPagesPageGenerator(total: Optional[int] = None, # pragma: no cover - site: OPT_SITE_TYPE = None - ) -> Iterable['pywikibot.page.Page']: - """ - DEPRECATED. Lonely page generator. - - :param total: Maximum number of pages to retrieve in total - :param site: Site for generator results. - """ - if site is None: - site = pywikibot.Site() - return site.lonelypages(total=total) - - -@deprecated('Site.unwatchedpages()', since='3.0.20200609') -def UnwatchedPagesPageGenerator(total: Optional[int] = None, - site: OPT_SITE_TYPE = None - ) -> Iterable['pywikibot.page.Page']: - """ - DEPRECATED. Unwatched page generator. - - :param total: Maximum number of pages to retrieve in total - :param site: Site for generator results. - """ - if site is None: - site = pywikibot.Site() - return site.unwatchedpages(total=total) - - -@deprecated('Site.pages_with_property()', since='3.0.20200609') -def page_with_property_generator(name: str, # pragma: no cover - total: Optional[int] = None, - site: OPT_SITE_TYPE = None - ) -> Iterable['pywikibot.page.Page']: - """ - Special:PagesWithProperty page generator. - - :param name: Property name of pages to be retrieved - :param total: Maximum number of pages to retrieve in total - :param site: Site for generator results. - """ - if site is None: - site = pywikibot.Site() - return site.pages_with_property(name, total=total) - - def AncientPagesPageGenerator(total: int = 100, # pragma: no cover site: OPT_SITE_TYPE = None ) -> Iterator['pywikibot.page.Page']: @@ -2470,21 +2272,6 @@ return (page for page, _ in site.ancientpages(total=total)) -@deprecated('Site.deadendpages()', since='3.0.20200609') -def DeadendPagesPageGenerator(total: int = 100, # pragma: no cover - site: OPT_SITE_TYPE = None - ) -> Iterable['pywikibot.page.Page']: - """ - DEPRECATED. Dead-end page generator. - - :param total: Maximum number of pages to retrieve in total - :param site: Site for generator results. - """ - if site is None: - site = pywikibot.Site() - return site.deadendpages(total=total) - - def LongPagesPageGenerator(total: int = 100, site: OPT_SITE_TYPE = None ) -> Iterator['pywikibot.page.Page']: @@ -2513,83 +2300,6 @@ return (page for page, _ in site.shortpages(total=total)) -@deprecated('Site.randompages()', since='3.0.20200609') -def RandomPageGenerator(total: Optional[int] = None, # pragma: no cover - site: OPT_SITE_TYPE = None, - namespaces: Optional[ - Sequence[NAMESPACE_OR_STR_TYPE]] = None - ) -> Iterable['pywikibot.page.Page']: - """ - DEPRECATED. Random page generator. - - :param total: Maximum number of pages to retrieve in total - :param site: Site for generator results. - """ - if site is None: - site = pywikibot.Site() - return site.randompages(total=total, namespaces=namespaces) - - -@deprecated('Site.randompages()', since='3.0.20200609') -def RandomRedirectPageGenerator(total: Optional[int] = None, - site: OPT_SITE_TYPE = None, - namespaces: Optional[ - Sequence[NAMESPACE_OR_STR_TYPE]] = None - ) -> Iterable['pywikibot.page.Page']: - """ - DEPRECATED. Random redirect generator. - - :param total: Maximum number of pages to retrieve in total - :param site: Site for generator results. - """ - if site is None: - site = pywikibot.Site() - return site.randompages(total=total, namespaces=namespaces, - redirects=True) - - -@deprecated('Site.exturlusage()', since='3.0.20200609') -def LinksearchPageGenerator(url: str, - namespaces: Optional[List[int]] = None, - total: Optional[int] = None, - site: OPT_SITE_TYPE = None, - protocol: Optional[str] = None - ) -> Iterable['pywikibot.page.Page']: - """DEPRECATED. Yield all pages that link to a certain URL. - - :param url: The URL to search for (with ot without the protocol prefix); - this may include a '*' as a wildcard, only at the start of the - hostname - :param namespaces: list of namespace numbers to fetch contribs from - :param total: Maximum number of pages to retrieve in total - :param site: Site for generator results - :param protocol: Protocol to search for, likely http or https, http by - default. Full list shown on Special:LinkSearch wikipage - """ - if site is None: - site = pywikibot.Site() - return site.exturlusage(url, namespaces=namespaces, protocol=protocol, - total=total, content=False) - - -@deprecated('Site.search()', since='3.0.20200609') -def SearchPageGenerator(query: str, # pragma: no cover - total: Optional[int] = None, - namespaces: Optional[ - Sequence[NAMESPACE_OR_STR_TYPE]] = None, - site: OPT_SITE_TYPE = None - ) -> Iterable['pywikibot.page.Page']: - """ - DEPRECATED. Yield pages from the MediaWiki internal search engine. - - :param total: Maximum number of pages to retrieve in total - :param site: Site for generator results. - """ - if site is None: - site = pywikibot.Site() - return site.search(query, total=total, namespaces=namespaces) - - def LiveRCPageGenerator(site: OPT_SITE_TYPE = None, total: Optional[int] = None ) -> Iterator['pywikibot.page.Page']: diff --git a/scripts/archive/imagecopy.py b/scripts/archive/imagecopy.py index d4646b4..7e35eec 100755 --- a/scripts/archive/imagecopy.py +++ b/scripts/archive/imagecopy.py @@ -312,7 +312,7 @@ pywikibot.showDiff(self.imagePage.get(), imtxt + addTemplate) self.imagePage.put(imtxt + addTemplate, comment=commentText) - self.gen = pagegenerators.FileLinksGenerator(self.imagePage) + self.gen = self.imagePage.usingPages() self.preloadingGen = pagegenerators.PreloadingGenerator(self.gen) moveSummary = i18n.twtranslate( diff --git a/scripts/archive/imagecopy_self.py b/scripts/archive/imagecopy_self.py index 44a9b5a..57d9f83 100755 --- a/scripts/archive/imagecopy_self.py +++ b/scripts/archive/imagecopy_self.py @@ -1001,7 +1001,7 @@ def replaceUsage(self, imagepage, filename): """Replace all usage if image is uploaded under a different name.""" if imagepage.title(with_ns=False) != filename: - gen = pagegenerators.FileLinksGenerator(imagepage) + gen = imagepage.usingPages() preloadingGen = pagegenerators.PreloadingGenerator(gen) moveSummary = i18n.twtranslate( diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 31d0f0f..f195ffe 100644 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -22,7 +22,7 @@ PreloadingGenerator, WikibaseItemFilterPageGenerator, ) -from pywikibot.tools import has_module, suppress_warnings +from pywikibot.tools import has_module from tests import join_data_path from tests.aspects import ( DefaultSiteTestCase, @@ -34,13 +34,6 @@ from tests.tools_tests import GeneratorIntersectTestCase -LINKSEARCH_MSG = (r'.*pywikibot\.pagegenerators\.LinksearchPageGenerator .*' - r'is deprecated for .*; use Site\.exturlusage') - -PAGES_ID_GEN_MSG = (r'.*pywikibot\.pagegenerators\.PagesFromPageidGenerator .*' - r'is deprecated for .*; use site\.load_pages_from_pageids') - - en_wp_page_titles = ( # just a bunch of randomly selected titles for English Wikipedia tests 'Eastern Sayan', @@ -209,21 +202,6 @@ self.titles = [self.base_title.format(i) for i in range(1, 11)] -class TestPagesFromPageidGenerator(BasetitleTestCase): - - """Test PagesFromPageidGenerator method.""" - - def test_PagesFromPageidGenerator(self): - """Test PagesFromPageidGenerator.""" - gen_pages = pagegenerators.PagesFromTitlesGenerator(self.titles, - self.site) - pageids = [page.pageid for page in gen_pages] - - with suppress_warnings(PAGES_ID_GEN_MSG, category=FutureWarning): - gen = pagegenerators.PagesFromPageidGenerator(pageids, self.site) - self.assertPageTitlesEqual(gen, self.titles) - - class TestCategoryFilterPageGenerator(BasetitleTestCase): """Test CategoryFilterPageGenerator method.""" @@ -1671,55 +1649,6 @@ self.assertIn(key, rcinfo.keys()) -class TestLinksearchPageGenerator(TestCase): - - """Tests for pagegenerators.LinksearchPageGenerator.""" - - family = 'wikipedia' - code = 'en' - - def test_weblink(self): - """Test -weblink.""" - cases = (('wikipedia.org', 'http://wikipedia.org'), - ('en.wikipedia.org', 'http://en.wikipedia.org'), - ('https://fr.wikipedia.org', 'https://fr.wikipedia.org'), - ('ftp://*', 'ftp://')) - - for search, expected in cases: - gf = pagegenerators.GeneratorFactory(site=self.site) - gf.handle_arg('-weblink:{}'.format(search)) - gf.handle_arg('-ns:2') - gf.handle_arg('-limit:1') - gen = gf.getCombinedGenerator() - genlist = list(gen) - self.assertLength(genlist, 1) - - page = genlist[0] - self.assertIsInstance(page, pywikibot.Page) - self.assertTrue(page.exists()) - self.assertEqual(page.namespace(), 2) - self.assertIn(expected, page.text) - - def test_double_opposite_protocols(self): - """Test LinksearchPageGenerator with two opposite protocols.""" - with suppress_warnings(LINKSEARCH_MSG, category=FutureWarning): - 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.""" - with suppress_warnings(LINKSEARCH_MSG, category=FutureWarning): - gen = pagegenerators.LinksearchPageGenerator('https://w.wiki', - protocol='https', - site=self.site, - total=1) - self.assertIsInstance(gen, pywikibot.data.api.PageGenerator) - self.assertLength(list(gen), 1) - - if __name__ == '__main__': # pragma: no cover with suppress(SystemExit): unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/761395 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: Ib4247ae2d9b302f26d2e7d08141ba789b5ad3a19 Gerrit-Change-Number: 761395 Gerrit-PatchSet: 5 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

2 years, 2 months

[Gerrit] ...core[master]: [py2] keep setup.py Python2 compatible

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/761601 ) Change subject: [py2] keep setup.py Python2 compatible ...................................................................... [py2] keep setup.py Python2 compatible Change-Id: I7978ef973c0b112d934aebfa3c16a087529905b2 --- M setup.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index 9bd1c89..a8c77f4 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,6 @@ import os import sys -from pkg_resources import parse_version, safe_version from setuptools import setup @@ -167,6 +166,7 @@ return version # validate version for sdist + from pkg_resources import parse_version, safe_version from contextlib import suppress from subprocess import PIPE, run try: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/761601 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: I7978ef973c0b112d934aebfa3c16a087529905b2 Gerrit-Change-Number: 761601 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 2 months

[Gerrit] ...core[master]: [cleanup] Drop timestamp as since parameter in deprecation warnings

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/761391 ) Change subject: [cleanup] Drop timestamp as since parameter in deprecation warnings ...................................................................... [cleanup] Drop timestamp as since parameter in deprecation warnings - deprecation warnings only accepts release numbers - change all remaining timestamps to version numbers Change-Id: I85644fae7864d284b6f908d891d6fc83694302e4 --- M pywikibot/config.py M pywikibot/exceptions.py M pywikibot/page/__init__.py M pywikibot/page/_revision.py M pywikibot/pagegenerators.py M pywikibot/site/_apisite.py M pywikibot/tools/_deprecate.py M scripts/solve_disambiguation.py 8 files changed, 64 insertions(+), 78 deletions(-) Approvals: D3r1ck01: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/config.py b/pywikibot/config.py index 09c185f..6600e28 100644 --- a/pywikibot/config.py +++ b/pywikibot/config.py @@ -385,7 +385,7 @@ family_files = {} -@deprecated('family_files[family_name] = file_path', since='20210305') +@deprecated('family_files[family_name] = file_path', since='6.0.0') def register_family_file(family_name: str, file_path: str) -> None: """Register a single family class file. diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index 211c6c1..de97765 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -162,7 +162,7 @@ removed. """ # -# (C) Pywikibot team, 2008-2021 +# (C) Pywikibot team, 2008-2022 # # Distributed under the terms of the MIT license. # @@ -303,7 +303,7 @@ elif re.search(r'%\(\w+\)s', self.message): issue_deprecation_warning("'%' style messages are deprecated, " 'please use str.format() style instead', - since='20210504') + since='6.2.0') msg = self.message % self.__dict__ elif '%s' in self.message: msg = self.message % page diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index afe7df4..91a74d2 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -1035,7 +1035,7 @@ """ return self.site.page_can_be_edited(self, action) - @deprecated("Page.has_permission('edit')", since='20200208') + @deprecated("Page.has_permission('edit')", since='3.0.20200508') def canBeEdited(self): # pragma: no cover """DEPRECATED. Determine whether the page may be edited.""" return self.has_permission() @@ -2391,7 +2391,7 @@ url_param=url_param) return self.latest_file_info.thumburl - @deprecated('file_is_shared', since='20200618') + @deprecated('file_is_shared', since='3.0.20200703') def fileIsShared(self) -> bool: # pragma: no cover """DEPRECATED. Check if the image is stored on Wikimedia Commons.""" return self.file_is_shared() diff --git a/pywikibot/page/_revision.py b/pywikibot/page/_revision.py index ab0056a..fcdc140 100644 --- a/pywikibot/page/_revision.py +++ b/pywikibot/page/_revision.py @@ -1,6 +1,6 @@ """Object representing page revision.""" # -# (C) Pywikibot team, 2008-2021 +# (C) Pywikibot team, 2008-2022 # # Distributed under the terms of the MIT license. # @@ -103,7 +103,7 @@ .format(self.__class__.__name__, key)) @property - @deprecated('parentid property', since='20200802') + @deprecated('parentid property', since='4.0.0') def parent_id(self) -> int: """DEPRECATED. Return id of parent/previous revision. @@ -115,7 +115,7 @@ return self.parentid @property - @deprecated('contentmodel', since='20200802') + @deprecated('contentmodel', since='4.0.0') def content_model(self) -> str: """DEPRECATED. Return content model of the revision. diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 53e6c6d..0190518 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -1446,7 +1446,7 @@ return gen -@deprecated('File.usingPages()', since='20200515') +@deprecated('File.usingPages()', since='3.0.20200609') def FileLinksGenerator(referredFilePage: 'pywikibot.page.FilePage', total: Optional[int] = None, content: bool = False @@ -1456,7 +1456,7 @@ content=content) # pragma: no cover -@deprecated('Page.imagelinks()', since='20200515') +@deprecated('Page.imagelinks()', since='3.0.20200609') def ImagesPageGenerator(pageWithImages: 'pywikibot.page.Page', total: Optional[int] = None, content: bool = False @@ -1535,7 +1535,7 @@ yield s -@deprecated('Page.linkedPages()', since='20200515') +@deprecated('Page.linkedPages()', since='3.0.20200609') def LinkedPageGenerator(linkingPage: 'pywikibot.page.Page', total: Optional[int] = None, content: bool = False @@ -1630,7 +1630,7 @@ yield pywikibot.Page(pywikibot.Link(title, site)) -@deprecated('site.load_pages_from_pageids()', since='20200515') +@deprecated('site.load_pages_from_pageids()', since='3.0.20200609') def PagesFromPageidGenerator(pageids: Iterable[str], site: OPT_SITE_TYPE = None ) -> Iterable['pywikibot.page.Page']: @@ -2319,7 +2319,7 @@ yield page -@deprecated('Site.unusedfiles()', since='20200515') +@deprecated('Site.unusedfiles()', since='3.0.20200609') def UnusedFilesGenerator(total: Optional[int] = None, # pragma: no cover site: OPT_SITE_TYPE = None ) -> Iterable['pywikibot.page.FilePage']: @@ -2334,7 +2334,7 @@ return site.unusedfiles(total=total) -@deprecated('Site.withoutinterwiki()', since='20200515') +@deprecated('Site.withoutinterwiki()', since='3.0.20200609') def WithoutInterwikiPageGenerator(total: Optional[int] = None, site: OPT_SITE_TYPE = None ) -> Iterable['pywikibot.page.Page']: @@ -2349,7 +2349,7 @@ return site.withoutinterwiki(total=total) -@deprecated('Site.uncategorizedcategories()', since='20200515') +@deprecated('Site.uncategorizedcategories()', since='3.0.20200609') def UnCategorizedCategoryGenerator(total: Optional[int] = 100, site: OPT_SITE_TYPE = None ) -> Iterable['pywikibot.Category']: @@ -2364,7 +2364,7 @@ return site.uncategorizedcategories(total=total) -@deprecated('Site.uncategorizedimages()', since='20200515') +@deprecated('Site.uncategorizedimages()', since='3.0.20200609') def UnCategorizedImageGenerator(total: int = 100, # pragma: no cover site: OPT_SITE_TYPE = None ) -> Iterable['pywikibot.page.FilePage']: @@ -2379,7 +2379,7 @@ return site.uncategorizedimages(total=total) -@deprecated('Site.uncategorizedpages()', since='20200515') +@deprecated('Site.uncategorizedpages()', since='3.0.20200609') def UnCategorizedPageGenerator(total: int = 100, # pragma: no cover site: OPT_SITE_TYPE = None ) -> Iterable['pywikibot.page.Page']: @@ -2394,7 +2394,7 @@ return site.uncategorizedpages(total=total) -@deprecated('Site.uncategorizedtemplates()', since='20200515') +@deprecated('Site.uncategorizedtemplates()', since='3.0.20200609') def UnCategorizedTemplateGenerator(total: int = 100, # pragma: no cover site: OPT_SITE_TYPE = None ) -> Iterable['pywikibot.page.Page']: @@ -2409,7 +2409,7 @@ return site.uncategorizedtemplates(total=total) -@deprecated('Site.lonelypages()', since='20200515') +@deprecated('Site.lonelypages()', since='3.0.20200609') def LonelyPagesPageGenerator(total: Optional[int] = None, # pragma: no cover site: OPT_SITE_TYPE = None ) -> Iterable['pywikibot.page.Page']: @@ -2424,7 +2424,7 @@ return site.lonelypages(total=total) -@deprecated('Site.unwatchedpages()', since='20200515') +@deprecated('Site.unwatchedpages()', since='3.0.20200609') def UnwatchedPagesPageGenerator(total: Optional[int] = None, site: OPT_SITE_TYPE = None ) -> Iterable['pywikibot.page.Page']: @@ -2439,7 +2439,7 @@ return site.unwatchedpages(total=total) -@deprecated('Site.pages_with_property()', since='20200515') +@deprecated('Site.pages_with_property()', since='3.0.20200609') def page_with_property_generator(name: str, # pragma: no cover total: Optional[int] = None, site: OPT_SITE_TYPE = None @@ -2470,7 +2470,7 @@ return (page for page, _ in site.ancientpages(total=total)) -@deprecated('Site.deadendpages()', since='20200515') +@deprecated('Site.deadendpages()', since='3.0.20200609') def DeadendPagesPageGenerator(total: int = 100, # pragma: no cover site: OPT_SITE_TYPE = None ) -> Iterable['pywikibot.page.Page']: @@ -2513,7 +2513,7 @@ return (page for page, _ in site.shortpages(total=total)) -@deprecated('Site.randompages()', since='20200515') +@deprecated('Site.randompages()', since='3.0.20200609') def RandomPageGenerator(total: Optional[int] = None, # pragma: no cover site: OPT_SITE_TYPE = None, namespaces: Optional[ @@ -2530,7 +2530,7 @@ return site.randompages(total=total, namespaces=namespaces) -@deprecated('Site.randompages()', since='20200515') +@deprecated('Site.randompages()', since='3.0.20200609') def RandomRedirectPageGenerator(total: Optional[int] = None, site: OPT_SITE_TYPE = None, namespaces: Optional[ @@ -2548,7 +2548,7 @@ redirects=True) -@deprecated('Site.exturlusage()', since='20200515') +@deprecated('Site.exturlusage()', since='3.0.20200609') def LinksearchPageGenerator(url: str, namespaces: Optional[List[int]] = None, total: Optional[int] = None, @@ -2572,7 +2572,7 @@ total=total, content=False) -@deprecated('Site.search()', since='20200515') +@deprecated('Site.search()', since='3.0.20200609') def SearchPageGenerator(query: str, # pragma: no cover total: Optional[int] = None, namespaces: Optional[ diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index cc8518a..305dc01 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -904,7 +904,7 @@ # return the magic word without the preceding '#' character return self.getmagicwords('redirect')[0].lstrip('#') - @deprecated('redirect_regex', since='20210103') + @deprecated('redirect_regex', since='5.5.0') def redirectRegex(self): # noqa: N802 """Return a compiled regular expression matching on redirect pages.""" return self.redirect_regex diff --git a/pywikibot/tools/_deprecate.py b/pywikibot/tools/_deprecate.py index 1c874af..cc36618 100644 --- a/pywikibot/tools/_deprecate.py +++ b/pywikibot/tools/_deprecate.py @@ -16,10 +16,10 @@ a deprecator without any arguments. .. versionchanged:: 6.4 - deprecation decorators moved to _deprecate module + deprecation decorators moved to _deprecate submodule """ # -# (C) Pywikibot team, 2008-2021 +# (C) Pywikibot team, 2008-2022 # # Distributed under the terms of the MIT license. # @@ -29,7 +29,6 @@ import sys import types from contextlib import suppress -from datetime import datetime from importlib import import_module from inspect import getfullargspec from typing import Any, Optional @@ -164,59 +163,41 @@ return outer_wrapper -def _build_msg_string(instead, since): +def _build_msg_string(instead: str, since: str) -> str: """Build a deprecation warning message format string. .. versionadded:: 3.0 + + .. versionchanged:: 7.0 + `since`parameter must be a release number, not a timestamp. + + :param instead: suggested replacement for the deprecated object + :param since: a version string string when the method was deprecated """ - if not since: - since = '' - elif '.' in since: - since = ' since release ' + since - else: - year_str = month_str = day_str = '' - days = (datetime.utcnow() - datetime.strptime(since, '%Y%m%d')).days - years = days // 365 - days = days % 365 - months = days // 30 - days = days % 30 - if years == 1: - years = 0 - months += 12 - if years: - year_str = '{} years'.format(years) - else: - day_str = '{} day{}'.format(days, 's' if days != 1 else '') - if months: - month_str = '{} month{}'.format( - months, 's' if months != 1 else '') - if year_str and month_str: - year_str += ' and ' - if month_str and day_str: - month_str += ' and ' - since = ' for {}{}{}'.format(year_str, month_str, day_str) + if since and '.' not in since: + raise ValueError('{} is not a valid release number'.format(since)) + if instead: msg = '{{0}} is deprecated{since}; use {{1}} instead.' else: msg = '{{0}} is deprecated{since}.' - return msg.format(since=since) + return msg.format(since=' since release ' + since if since else '') -def issue_deprecation_warning(name: str, instead=None, depth=2, - warning_class=None, since=None): +def issue_deprecation_warning(name: str, instead: str = '', depth: int = 2, + warning_class=None, since: str = ''): """Issue a deprecation warning. + .. versionchanged:: 7.0 + `since` parameter must be a release number, not a timestamp. + :param name: the name of the deprecated object :param instead: suggested replacement for the deprecated object - :type instead: str or None :param depth: depth + 1 will be used as stacklevel for the warnings - :type depth: int :param warning_class: a warning class (category) to be used, defaults to FutureWarning :type warning_class: type - :param since: a timestamp string of the date when the method was - deprecated (form 'YYYYMMDD') or a version string. - :type since: str or None + :param since: a version string string when the method was deprecated """ msg = _build_msg_string(instead, since) if warning_class is None: @@ -229,10 +210,12 @@ def deprecated(*args, **kwargs): """Decorator to output a deprecation warning. + .. versionchanged:: 7.0 + `since` keyword must be a release number, not a timestamp. + :keyword instead: if provided, will be used to specify the replacement :type instead: str - :keyword since: a timestamp string of the date when the method was - deprecated (form 'YYYYMMDD') or a version string. + :keyword since: a version string string when the method was deprecated :type since: str :keyword future_warning: if True a FutureWarning will be thrown, otherwise it provides a DeprecationWarning @@ -298,7 +281,7 @@ return wrapper - since = kwargs.pop('since', None) + since = kwargs.pop('since', '') future_warning = kwargs.pop('future_warning', True) without_parameters = len(args) == 1 and not kwargs and callable(args[0]) if 'instead' in kwargs: @@ -509,14 +492,17 @@ target_module: Optional[str] = None, old_name: Optional[str] = None, class_name: Optional[str] = None, - since: Optional[str] = None, - future_warning=True): + since: str = '', + future_warning: bool = True): """ Return a function which can be used to redirect to 'target'. It also acts like marking that function deprecated and copies all parameters. + .. versionchanged:: 7.0 + `since`parameter must be a release number, not a timestamp. + :param target: The targeted function which is to be executed. :type target: callable :param source_module: The module of the old function. If '.' defaults @@ -529,11 +515,9 @@ new function. :param class_name: The name of the class. It's added to the target and source module (separated by a '.'). - :param since: a timestamp string of the date when the method was - deprecated (form 'YYYYMMDD') or a version string. + :param since: a version string string when the method was deprecated :param future_warning: if True a FutureWarning will be thrown, otherwise it provides a DeprecationWarning - :type future_warning: bool :return: A new function which adds a warning prior to each execution. :rtype: callable """ @@ -590,11 +574,14 @@ def add_deprecated_attr(self, name: str, replacement: Any = None, *, replacement_name: Optional[str] = None, warning_message: Optional[str] = None, - since: Optional[str] = None, + since: str = '', future_warning: bool = True): """ Add the name to the local deprecated names dict. + .. versionchanged:: 7.0 + `since`parameter must be a release number, not a timestamp. + :param name: The name of the deprecated class or variable. It may not be already deprecated. :param replacement: The replacement value which should be returned @@ -606,8 +593,7 @@ object name, and evaluated when the deprecated object is needed. :param warning_message: The warning to display, with positional variables: {0} = module, {1} = attribute name, {2} = replacement. - :param since: a timestamp string of the date when the method was - deprecated (form 'YYYYMMDD') or a version string. + :param since: a version string string when the method was deprecated :param future_warning: if True a FutureWarning will be thrown, otherwise it provides a DeprecationWarning """ diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index 88abc43..81d59a6 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -665,7 +665,7 @@ issue_deprecation_warning( 'Positional argument {} ({})'.format(i + 1, arg), 'keyword argument "{}={}"'.format(key, arg), - since='20210303') + since='6.0.0') if key in kwargs: pywikibot.warning('{!r} is given as keyword argument {!r} ' 'already; ignoring {!r}' @@ -679,7 +679,7 @@ newkey = keymap[key] issue_deprecation_warning( '{!r} argument of {}'.format(key, self.__class__.__name__), - repr(newkey), since='20210303') + repr(newkey), since='6.0.0') kwargs[newkey] = kwargs.pop(key) # Expand available_options -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/761391 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: I85644fae7864d284b6f908d891d6fc83694302e4 Gerrit-Change-Number: 761391 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 2 months

[Gerrit] ...core[master]: [bugfix] detect range blocks with Page.is_blocked()

by Huji (Code Review)

Huji has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/761111 ) Change subject: [bugfix] detect range blocks with Page.is_blocked() ...................................................................... [bugfix] detect range blocks with Page.is_blocked() Bug: T301282 Change-Id: I135d7bc492bc5347041aaab8edeb830b6b5b0d8f --- M pywikibot/page/__init__.py 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Huji: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 3c5aca7..afe7df4 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -2919,7 +2919,7 @@ if not hasattr(self, '_userprops'): self._userprops = list(self.site.users([self.username, ]))[0] if self.isAnonymous(): - r = list(self.site.blocks(users=self.username)) + r = list(self.site.blocks(iprange=self.username, total=1)) if r: self._userprops['blockedby'] = r[0]['by'] self._userprops['blockreason'] = r[0]['reason'] @@ -2954,7 +2954,8 @@ """Determine whether the user is currently blocked. .. versionchanged:: 7.0 - renamed from :meth:`isBlocked` method + renamed from :meth:`isBlocked` method, + can also detect range blocks. :param force: if True, forces reloading the data from API """ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/761111 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: I135d7bc492bc5347041aaab8edeb830b6b5b0d8f Gerrit-Change-Number: 761111 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 2 months

[Gerrit] ...core[master]: Restore "[bugfix] Enable default -mysqlquery with replace.py""

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/760896 ) Change subject: Restore "[bugfix] Enable default -mysqlquery with replace.py"" ...................................................................... Restore "[bugfix] Enable default -mysqlquery with replace.py"" SHA-1: 15b2db3906276030b8b475c66c3d2ad4ce8eddc0 Default behaviour of -mysqlquery never worked with Pywikibot 3.0+ - use EXC_KEYS to handle exceptions - move exceptions parsing to handle_exceptions() - move pairsfile handling to handle_pairs() - move manual handling to handle_manual() - move sql handling to handle_sql() - remove replacement_file_arg_misplaced check which is not necessary if file_replacement is added after argument parsing - shorten -xmlstart, -xml and -pairsfile using parsed value - add local variable xmlStart to prevent NamingError - only use sql_query and remove useSql variable - disable parsing -mysqlquery with pagegenerators and enable local option handling to enable the default dehaviour - improvement for arg parsing - decrease cyclomatic complexity by 22% - update replacebot_tests.py This reverts commit dbdca300cc9354fc61c17e46e80ba695271a1cb8. Bug: T299306 Change-Id: I787b60b91ce72b766e4782942af214e1991b70af --- M scripts/replace.py M tests/replacebot_tests.py 2 files changed, 156 insertions(+), 129 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/replace.py b/scripts/replace.py index 9ad0f0f..2413c25 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -146,9 +146,11 @@ import re from collections.abc import Sequence from contextlib import suppress +from typing import Optional import pywikibot from pywikibot import editor, fixes, i18n, pagegenerators, textlib +from pywikibot.backports import Dict, Generator, List, Pattern, Tuple from pywikibot.bot import ExistingPageBot, SingleSiteBot from pywikibot.exceptions import InvalidPageError, NoPageError from pywikibot.tools import chars @@ -764,6 +766,113 @@ return pattern +EXC_KEYS = { + '-excepttitle': 'title', + '-requiretitle:': 'require-title', + '-excepttext': 'text-contains', + '-exceptinside': 'inside', + '-exceptinsidetag': 'inside-tags' +} +"""Dictionary to convert exceptions command line options to exceptions keys. + + .. versionadded:: 7.0 +""" + + +def handle_exceptions(*args: str) -> Tuple[List[str], Dict[str, str]]: + """Handle exceptions args to ignore pages which contain certain texts. + + .. versionadded:: 7.0 + """ + exceptions = {key: [] for key in EXC_KEYS.values()} + local_args = [] + for argument in args: + arg, _, value = argument.partition(':') + if arg in EXC_KEYS: + exceptions[EXC_KEYS[arg]].append(value) + else: + local_args.append(argument) + return local_args, exceptions + + +def handle_pairsfile(filename: str) -> List[str]: + """Handle -pairsfile argument. + + .. versionadded:: 7.0 + """ + if not filename: + filename = pywikibot.input( + 'Please enter the filename to read replacements from:') + + try: + with codecs.open(filename, 'r', 'utf-8') as f: + # strip newlines, but not other characters + replacements = f.read().splitlines() + if not replacements: + raise OSError('{} is empty.'.format(filename)) + except OSError as e: + pywikibot.error('Error loading {}: {}'.format(filename, e)) + return None + + if len(replacements) % 2: + pywikibot.error( + '{} contains an incomplete pattern replacement pair.'.format( + filename)) + return None + + # Strip BOM from first line + replacements[0].lstrip('\uFEFF') + return replacements + + +def handle_manual() -> List[str]: + """Handle manual input. + + .. versionadded:: 7.0 + """ + pairs = [] + old = pywikibot.input('Please enter the text that should be replaced:') + while old: + new = pywikibot.input('Please enter the new text:') + pairs += [old, new] + old = pywikibot.input( + 'Please enter another text that should be replaced,\n' + 'or press Enter to start:') + return pairs + + +def handle_sql(sql: str, + replacements: List[Pattern], + exceptions: List[Pattern]) -> Generator: + """Handle default sql query. + + .. versionadded:: 7.0 + """ + if not sql: + where_clause = 'WHERE ({})'.format(' OR '.join( + "old_text RLIKE '{}'" + .format(prepareRegexForMySQL(repl.old_regex.pattern)) + for repl in replacements)) + + if exceptions: + except_clause = 'AND NOT ({})'.format(' OR '.join( + "old_text RLIKE '{}'" + .format(prepareRegexForMySQL(exc.pattern)) + for exc in exceptions)) + else: + except_clause = '' + + sql = """ +SELECT page_namespace, page_title +FROM page +JOIN text ON (page_id = old_id) +{} +{} +LIMIT 200""".format(where_clause, except_clause) + + return pagegenerators.MySQLPageGenerator(sql) + + def main(*args: str) -> None: """ Process command line arguments and invoke bot. @@ -779,16 +888,9 @@ # Array which will collect commandline parameters. # First element is original text, second element is replacement text. commandline_replacements = [] + file_replacements = [] # A list of 2-tuples of original text and replacement text. replacements = [] - # Don't edit pages which contain certain texts. - exceptions = { - 'title': [], - 'text-contains': [], - 'inside': [], - 'inside-tags': [], - 'require-title': [], # using a separate requirements dict needs some - } # major refactoring of code. # Should the elements of 'replacements' and 'exceptions' be interpreted # as regular expressions? @@ -798,121 +900,69 @@ # the dump's path, either absolute or relative, which will be used # if -xml flag is present xmlFilename = None - useSql = False - sql_query = None + xmlStart = None + sql_query = None # type: Optional[str] # Set the default regular expression flags flags = 0 # Request manual replacements even if replacements are already defined manual_input = False - # Replacements loaded from a file - replacement_file = None - replacement_file_arg_misplaced = False # Read commandline parameters. + genFactory = pagegenerators.GeneratorFactory( + disabled_options=['mysqlquery']) local_args = pywikibot.handle_args(args) - genFactory = pagegenerators.GeneratorFactory() local_args = genFactory.handle_args(local_args) + local_args, exceptions = handle_exceptions(*local_args) for arg in local_args: - if arg == '-regex': + opt, _, value = arg.partition(':') + if opt == '-regex': regex = True - elif arg.startswith('-xmlstart'): - if len(arg) == 9: - xmlStart = pywikibot.input( - 'Please enter the dumped article to start with:') - else: - xmlStart = arg[10:] - elif arg.startswith('-xml'): - if len(arg) == 4: - xmlFilename = i18n.input('pywikibot-enter-xml-filename') - else: - xmlFilename = arg[5:] - elif arg.startswith('-mysqlquery'): - useSql = True - sql_query = arg.partition(':')[2] - elif arg.startswith('-excepttitle:'): - exceptions['title'].append(arg[13:]) - elif arg.startswith('-requiretitle:'): - exceptions['require-title'].append(arg[14:]) - elif arg.startswith('-excepttext:'): - exceptions['text-contains'].append(arg[12:]) - elif arg.startswith('-exceptinside:'): - exceptions['inside'].append(arg[14:]) - elif arg.startswith('-exceptinsidetag:'): - exceptions['inside-tags'].append(arg[17:]) - elif arg.startswith('-fix:'): - fixes_set += [arg[5:]] - elif arg.startswith('-sleep:'): - options['sleep'] = float(arg[7:]) - elif arg in ('-always', '-recursive', '-allowoverlap'): - options[arg[1:]] = True - elif arg == '-nocase': + elif opt == '-xmlstart': + xmlStart = value or pywikibot.input( + 'Please enter the dumped article to start with:') + elif opt == '-xml': + xmlFilename = value or i18n.input('pywikibot-enter-xml-filename') + elif opt == '-mysqlquery': + sql_query = value + elif opt == '-fix': + fixes_set.append(value) + elif opt == '-sleep': + options['sleep'] = float(value) + elif opt in ('-allowoverlap', '-always', '-recursive'): + options[opt[1:]] = True + elif opt == '-nocase': flags |= re.IGNORECASE - elif arg == '-dotall': + elif opt == '-dotall': flags |= re.DOTALL - elif arg == '-multiline': + elif opt == '-multiline': flags |= re.MULTILINE - elif arg.startswith('-addcat:'): - options['addcat'] = arg[8:] - elif arg.startswith('-summary:'): - edit_summary = arg[9:] - elif arg.startswith('-automaticsummary'): + elif opt == '-addcat': + options['addcat'] = value + elif opt == '-summary': + edit_summary = value + elif opt == '-automaticsummary': edit_summary = True - elif arg.startswith('-manualinput'): + elif opt == '-manualinput': manual_input = True - elif arg.startswith('-pairsfile'): - if len(commandline_replacements) % 2: - replacement_file_arg_misplaced = True - - if arg == '-pairsfile': - replacement_file = pywikibot.input( - 'Please enter the filename to read replacements from:') - else: - replacement_file = arg[len('-pairsfile:'):] + elif opt == '-pairsfile': + file_replacements = handle_pairsfile(value) else: commandline_replacements.append(arg) - site = pywikibot.Site() + if file_replacements is None: + return if len(commandline_replacements) % 2: pywikibot.error('Incomplete command line pattern replacement pair.') return - if replacement_file_arg_misplaced: - pywikibot.error( - '-pairsfile used between a pattern replacement pair.') - return - - if replacement_file: - try: - with codecs.open(replacement_file, 'r', 'utf-8') as f: - # strip newlines, but not other characters - file_replacements = f.read().splitlines() - except OSError as e: - pywikibot.error('Error loading {}: {}'.format( - replacement_file, e)) - return - - if len(file_replacements) % 2: - pywikibot.error( - '{} contains an incomplete pattern replacement pair.'.format( - replacement_file)) - return - - # Strip BOM from first line - file_replacements[0].lstrip('\uFEFF') - commandline_replacements.extend(file_replacements) - + commandline_replacements += file_replacements if not(commandline_replacements or fixes_set) or manual_input: - old = pywikibot.input('Please enter the text that should be replaced:') - while old: - new = pywikibot.input('Please enter the new text:') - commandline_replacements += [old, new] - old = pywikibot.input( - 'Please enter another text that should be replaced,' - '\nor press Enter to start:') + commandline_replacements += handle_manual() # The summary stored here won't be actually used but is only an example + site = pywikibot.Site() single_summary = None for i in range(0, len(commandline_replacements), 2): replacement = Replacement(commandline_replacements[i], @@ -1025,33 +1075,12 @@ precompile_exceptions(exceptions, regex, flags) if xmlFilename: - try: - xmlStart - except NameError: - xmlStart = None gen = XmlDumpReplacePageGenerator(xmlFilename, xmlStart, replacements, exceptions, site) - elif useSql: - if not sql_query: - whereClause = 'WHERE ({})'.format(' OR '.join( - "old_text RLIKE '{}'" - .format(prepareRegexForMySQL(old_regexp.pattern)) - for (old_regexp, new_text) in replacements)) - if exceptions: - exceptClause = 'AND NOT ({})'.format(' OR '.join( - "old_text RLIKE '{}'" - .format(prepareRegexForMySQL(exc.pattern)) - for exc in exceptions)) - else: - exceptClause = '' - query = sql_query or """ -SELECT page_namespace, page_title -FROM page -JOIN text ON (page_id = old_id) -{} -{} -LIMIT 200""".format(whereClause, exceptClause) - gen = pagegenerators.MySQLPageGenerator(query) + elif sql_query is not None: + # Only -excepttext option is considered by the query. Other + # exceptions are taken into account by the ReplaceRobot + gen = handle_sql(sql_query, replacements, exceptions['text-contains']) gen = genFactory.getCombinedGenerator(gen, preload=True) if pywikibot.bot.suggest_help(missing_generator=not gen): diff --git a/tests/replacebot_tests.py b/tests/replacebot_tests.py index 9ee153b..a4ac228 100644 --- a/tests/replacebot_tests.py +++ b/tests/replacebot_tests.py @@ -100,16 +100,14 @@ def test_invalid_replacements(self): """Test invalid command line replacement configurations.""" - # old and new need to be together - self.assertFalse(self._run('foo', '-pairsfile:/dev/null', 'bar')) - - self.assertEqual([ - '-pairsfile used between a pattern replacement pair.', - ], pywikibot.bot.ui.pop_output()) + # old and new no longer need to be together but pairsfile must exist + self._run('foo', '-pairsfile:/dev/null', 'bar') + self.assertIn('Error loading /dev/null:', + pywikibot.bot.ui.pop_output()[0]) # only old provided with empty_sites(): - self.assertFalse(self._run('foo')) + self._run('foo') self.assertEqual([ 'Incomplete command line pattern replacement pair.', ], pywikibot.bot.ui.pop_output()) @@ -146,7 +144,7 @@ def _get_bot(self, only_confirmation, *args): """Run with arguments, assert and return one bot.""" - self.assertIsNone(self._run(*args)) + self._run(*args) self.assertLength(self.bots, 1) bot = self.bots[0] if only_confirmation is not None: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/760896 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: I787b60b91ce72b766e4782942af214e1991b70af Gerrit-Change-Number: 760896 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 2 months

[Gerrit] ...core[master]: Revert "[bugfix] Enable default -mysqlquery with replace.py"

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/760553 ) Change subject: Revert "[bugfix] Enable default -mysqlquery with replace.py" ...................................................................... Revert "[bugfix] Enable default -mysqlquery with replace.py" This reverts commit 15b2db3906276030b8b475c66c3d2ad4ce8eddc0. Reason for revert: See T301185 Change-Id: I74d0e1345f70e33c7f0129e70e9c0c2a7366f6b1 --- M scripts/replace.py M tests/replacebot_tests.py 2 files changed, 125 insertions(+), 152 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/replace.py b/scripts/replace.py index 5552141..12cf5fe 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -146,11 +146,9 @@ import re from collections.abc import Sequence from contextlib import suppress -from typing import Optional import pywikibot from pywikibot import editor, fixes, i18n, pagegenerators, textlib -from pywikibot.backports import Dict, Generator, List, Pattern, Tuple from pywikibot.bot import ExistingPageBot, SingleSiteBot from pywikibot.exceptions import InvalidPageError, NoPageError from pywikibot.tools import chars @@ -770,113 +768,6 @@ return pattern -EXC_KEYS = { - '-excepttitle': 'title', - '-requiretitle:': 'require-title', - '-excepttext': 'text-contains', - '-exceptinside': 'inside', - '-exceptinsidetag': 'inside-tags' -} -"""Dictionary to convert exceptions command line options to exceptions keys. - - .. versionadded:: 7.0 -""" - - -def handle_exceptions(*args: str) -> Tuple[List[str], Dict[str, str]]: - """Handle exceptions args to ignore pages which contain certain texts. - - .. versionadded:: 7.0 - """ - exceptions = {key: [] for key in EXC_KEYS.values()} - local_args = [] - for argument in args: - arg, _, value = argument.partition(':') - if arg in EXC_KEYS: - exceptions[EXC_KEYS[arg]].append(value) - else: - local_args.append(argument) - return local_args, exceptions - - -def handle_pairsfile(filename: str) -> List[str]: - """Handle -pairsfile argument. - - .. versionadded:: 7.0 - """ - if not filename: - filename = pywikibot.input( - 'Please enter the filename to read replacements from:') - - try: - with codecs.open(filename, 'r', 'utf-8') as f: - # strip newlines, but not other characters - replacements = f.read().splitlines() - if not replacements: - raise OSError('{} is empty.'.format(filename)) - except OSError as e: - pywikibot.error('Error loading {}: {}'.format(filename, e)) - return None - - if len(replacements) % 2: - pywikibot.error( - '{} contains an incomplete pattern replacement pair.'.format( - filename)) - return None - - # Strip BOM from first line - replacements[0].lstrip('\uFEFF') - return replacements - - -def handle_manual() -> List[str]: - """Handle manual input. - - .. versionadded:: 7.0 - """ - pairs = [] - old = pywikibot.input('Please enter the text that should be replaced:') - while old: - new = pywikibot.input('Please enter the new text:') - pairs += [old, new] - old = pywikibot.input( - 'Please enter another text that should be replaced,\n' - 'or press Enter to start:') - return pairs - - -def handle_sql(sql: str, - replacements: List[Pattern], - exceptions: List[Pattern]) -> Generator: - """Handle default sql query. - - .. versionadded:: 7.0 - """ - if not sql: - where_clause = 'WHERE ({})'.format(' OR '.join( - "old_text RLIKE '{}'" - .format(prepareRegexForMySQL(repl.old_regex.pattern)) - for repl in replacements)) - - if exceptions: - except_clause = 'AND NOT ({})'.format(' OR '.join( - "old_text RLIKE '{}'" - .format(prepareRegexForMySQL(exc.pattern)) - for exc in exceptions)) - else: - except_clause = '' - - sql = """ -SELECT page_namespace, page_title -FROM page -JOIN text ON (page_id = old_id) -{} -{} -LIMIT 200""".format(where_clause, except_clause) - - return pagegenerators.MySQLPageGenerator(sql) - - def main(*args: str) -> None: """ Process command line arguments and invoke bot. @@ -892,9 +783,16 @@ # Array which will collect commandline parameters. # First element is original text, second element is replacement text. commandline_replacements = [] - file_replacements = [] # A list of 2-tuples of original text and replacement text. replacements = [] + # Don't edit pages which contain certain texts. + exceptions = { + 'title': [], + 'text-contains': [], + 'inside': [], + 'inside-tags': [], + 'require-title': [], # using a separate requirements dict needs some + } # major refactoring of code. # Should the elements of 'replacements' and 'exceptions' be interpreted # as regular expressions? @@ -904,36 +802,53 @@ # the dump's path, either absolute or relative, which will be used # if -xml flag is present xmlFilename = None - xmlStart = None - sql_query = None # type: Optional[str] + useSql = False + sql_query = None # Set the default regular expression flags flags = 0 # Request manual replacements even if replacements are already defined manual_input = False + # Replacements loaded from a file + replacement_file = None + replacement_file_arg_misplaced = False # Read commandline parameters. - genFactory = pagegenerators.GeneratorFactory( - disabled_options=['mysqlquery']) local_args = pywikibot.handle_args(args) + genFactory = pagegenerators.GeneratorFactory() local_args = genFactory.handle_args(local_args) - local_args, exceptions = handle_exceptions(*local_args) - for argument in local_args: - arg, _, value = argument.partition(':') + for arg in local_args: if arg == '-regex': regex = True - elif arg == '-xmlstart': - xmlStart = value or pywikibot.input( - 'Please enter the dumped article to start with:') - elif arg == '-xml': - xmlFilename = value or i18n.input('pywikibot-enter-xml-filename') - elif arg == '-mysqlquery': - sql_query = value - elif arg == '-fix': - fixes_set.append(value) - elif arg == '-sleep': - options['sleep'] = float(value) - elif arg in ('-allowoverlap', '-always', '-recursive'): + elif arg.startswith('-xmlstart'): + if len(arg) == 9: + xmlStart = pywikibot.input( + 'Please enter the dumped article to start with:') + else: + xmlStart = arg[10:] + elif arg.startswith('-xml'): + if len(arg) == 4: + xmlFilename = i18n.input('pywikibot-enter-xml-filename') + else: + xmlFilename = arg[5:] + elif arg.startswith('-mysqlquery'): + useSql = True + sql_query = arg.partition(':')[2] + elif arg.startswith('-excepttitle:'): + exceptions['title'].append(arg[13:]) + elif arg.startswith('-requiretitle:'): + exceptions['require-title'].append(arg[14:]) + elif arg.startswith('-excepttext:'): + exceptions['text-contains'].append(arg[12:]) + elif arg.startswith('-exceptinside:'): + exceptions['inside'].append(arg[14:]) + elif arg.startswith('-exceptinsidetag:'): + exceptions['inside-tags'].append(arg[17:]) + elif arg.startswith('-fix:'): + fixes_set += [arg[5:]] + elif arg.startswith('-sleep:'): + options['sleep'] = float(arg[7:]) + elif arg in ('-always', '-recursive', '-allowoverlap'): options[arg[1:]] = True elif arg == '-nocase': flags |= re.IGNORECASE @@ -941,32 +856,67 @@ flags |= re.DOTALL elif arg == '-multiline': flags |= re.MULTILINE - elif arg == '-addcat': - options['addcat'] = value - elif arg == '-summary': - edit_summary = value - elif arg == '-automaticsummary': + elif arg.startswith('-addcat:'): + options['addcat'] = arg[8:] + elif arg.startswith('-summary:'): + edit_summary = arg[9:] + elif arg.startswith('-automaticsummary'): edit_summary = True - elif arg == '-manualinput': + elif arg.startswith('-manualinput'): manual_input = True - elif arg == '-pairsfile': - file_replacements = handle_pairsfile(value) + elif arg.startswith('-pairsfile'): + if len(commandline_replacements) % 2: + replacement_file_arg_misplaced = True + + if arg == '-pairsfile': + replacement_file = pywikibot.input( + 'Please enter the filename to read replacements from:') + else: + replacement_file = arg[len('-pairsfile:'):] else: commandline_replacements.append(arg) - if file_replacements is None: - return + site = pywikibot.Site() if len(commandline_replacements) % 2: pywikibot.error('Incomplete command line pattern replacement pair.') return - commandline_replacements += file_replacements + if replacement_file_arg_misplaced: + pywikibot.error( + '-pairsfile used between a pattern replacement pair.') + return + + if replacement_file: + try: + with codecs.open(replacement_file, 'r', 'utf-8') as f: + # strip newlines, but not other characters + file_replacements = f.read().splitlines() + except OSError as e: + pywikibot.error('Error loading {}: {}'.format( + replacement_file, e)) + return + + if len(file_replacements) % 2: + pywikibot.error( + '{} contains an incomplete pattern replacement pair.'.format( + replacement_file)) + return + + # Strip BOM from first line + file_replacements[0].lstrip('\uFEFF') + commandline_replacements.extend(file_replacements) + if not(commandline_replacements or fixes_set) or manual_input: - commandline_replacements += handle_manual() + old = pywikibot.input('Please enter the text that should be replaced:') + while old: + new = pywikibot.input('Please enter the new text:') + commandline_replacements += [old, new] + old = pywikibot.input( + 'Please enter another text that should be replaced,' + '\nor press Enter to start:') # The summary stored here won't be actually used but is only an example - site = pywikibot.Site() single_summary = None for i in range(0, len(commandline_replacements), 2): replacement = Replacement(commandline_replacements[i], @@ -1079,12 +1029,33 @@ precompile_exceptions(exceptions, regex, flags) if xmlFilename: + try: + xmlStart + except NameError: + xmlStart = None gen = XmlDumpReplacePageGenerator(xmlFilename, xmlStart, replacements, exceptions, site) - elif sql_query is not None: - # Only -excepttext option is considered by the query. Other - # exceptions are taken into account by the ReplaceRobot - gen = handle_sql(sql_query, replacements, exceptions['text-contains']) + elif useSql: + if not sql_query: + whereClause = 'WHERE ({})'.format(' OR '.join( + "old_text RLIKE '{}'" + .format(prepareRegexForMySQL(old_regexp.pattern)) + for (old_regexp, new_text) in replacements)) + if exceptions: + exceptClause = 'AND NOT ({})'.format(' OR '.join( + "old_text RLIKE '{}'" + .format(prepareRegexForMySQL(exc.pattern)) + for exc in exceptions)) + else: + exceptClause = '' + query = sql_query or """ +SELECT page_namespace, page_title +FROM page +JOIN text ON (page_id = old_id) +{} +{} +LIMIT 200""".format(whereClause, exceptClause) + gen = pagegenerators.MySQLPageGenerator(query) gen = genFactory.getCombinedGenerator(gen, preload=True) if pywikibot.bot.suggest_help(missing_generator=not gen): diff --git a/tests/replacebot_tests.py b/tests/replacebot_tests.py index a4ac228..9ee153b 100644 --- a/tests/replacebot_tests.py +++ b/tests/replacebot_tests.py @@ -100,14 +100,16 @@ def test_invalid_replacements(self): """Test invalid command line replacement configurations.""" - # old and new no longer need to be together but pairsfile must exist - self._run('foo', '-pairsfile:/dev/null', 'bar') - self.assertIn('Error loading /dev/null:', - pywikibot.bot.ui.pop_output()[0]) + # old and new need to be together + self.assertFalse(self._run('foo', '-pairsfile:/dev/null', 'bar')) + + self.assertEqual([ + '-pairsfile used between a pattern replacement pair.', + ], pywikibot.bot.ui.pop_output()) # only old provided with empty_sites(): - self._run('foo') + self.assertFalse(self._run('foo')) self.assertEqual([ 'Incomplete command line pattern replacement pair.', ], pywikibot.bot.ui.pop_output()) @@ -144,7 +146,7 @@ def _get_bot(self, only_confirmation, *args): """Run with arguments, assert and return one bot.""" - self._run(*args) + self.assertIsNone(self._run(*args)) self.assertLength(self.bots, 1) bot = self.bots[0] if only_confirmation is not None: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/760553 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: I74d0e1345f70e33c7f0129e70e9c0c2a7366f6b1 Gerrit-Change-Number: 760553 Gerrit-PatchSet: 1 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 2 months

[Gerrit] ...core[master]: [doc] update ROADMAP.rst, HISTORY.rst and CHANGELOG.md

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/760636 ) Change subject: [doc] update ROADMAP.rst, HISTORY.rst and CHANGELOG.md ...................................................................... [doc] update ROADMAP.rst, HISTORY.rst and CHANGELOG.md Change-Id: I57582291053dc89273b6dd6379fec121a689f4b8 --- M HISTORY.rst M ROADMAP.rst M scripts/CHANGELOG.md 3 files changed, 13 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY.rst b/HISTORY.rst index 953d749..4c4b7f8 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,13 @@ Release history ^^^^^^^^^^^^^^^ +6.6.5 +----- +*07 February 2022* + +* L10N updates + + 6.6.4 ----- *27 January 2022* @@ -872,7 +879,6 @@ * Use API's retry-after value (T144023) * Provide startprefix parameter for Category.articles() (T74101, T143120) * Page.put_async() is marked as deprecated (T193494) -* pagegenerators.RepeatingGenerator is marked as deprecated (T192229) * Deprecate requests-requirements.txt (T193476) * Bugfixes and improvements * New mediawiki projects were provided diff --git a/ROADMAP.rst b/ROADMAP.rst index c3ed0ea..cbd48ab 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -4,6 +4,9 @@ Improvements ------------ +* to_latin_digits() function was added to textlib as counterpart of to_local_digits() function +* api.Request.submit now handles search-title-disabled and search-text-disabled API Errors +* A show_diff parameter was added to Page.put() and Page.change_category() * Allow categories when saving IndexPage (T299806) * Add a new function case_escape to textlib * Support inheritance of the __STATICREDIRECT__ @@ -69,6 +72,8 @@ Code cleanups ------------- +* BaseBot.stop() method were removed in favour of BaseBot.generator.close() +* showHelp() function was remove in favour of show_help * Remove AllpagesPageGenerator, UnconnectedPageGenerator, CombinedPageGenerator, WantedPagesPageGenerator pagegenerators * Remove deprecated echo.Notification.id * Remove APISite.newfiles() method (T168339) diff --git a/scripts/CHANGELOG.md b/scripts/CHANGELOG.md index a5bd8a2..a77684a 100644 --- a/scripts/CHANGELOG.md +++ b/scripts/CHANGELOG.md @@ -18,6 +18,7 @@ * Derive CheckerBot from CurrentPageBot (T196851, T171713) ### category +* CleanBot was added which can be invoked by clean action option * Recurse CategoryListifyRobot with depth * Show a warning if a pagegenerator option is not enabled (T298522) * Deprecated code parts were removed -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/760636 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: I57582291053dc89273b6dd6379fec121a689f4b8 Gerrit-Change-Number: 760636 Gerrit-PatchSet: 1 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

2 years, 2 months

[Gerrit] ...core[stable]: [L10N] Update linktrails, languages_by_size

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/760621 ) Change subject: [L10N] Update linktrails, languages_by_size ...................................................................... [L10N] Update linktrails, languages_by_size Change-Id: I996a8ef09ebff443720c3cc77d7799616fc28d74 --- M pywikibot/__metadata__.py M pywikibot/families/wikibooks_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wikiversity_family.py M pywikibot/families/wiktionary_family.py M pywikibot/family.py 8 files changed, 44 insertions(+), 42 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index bdb03e4..d8cb2a3 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -11,7 +11,7 @@ __name__ = 'pywikibot' -__version__ = '6.6.4' +__version__ = '6.6.5' __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot(a)lists.wikimedia.org' diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index 64df8dc..8374f59 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -33,7 +33,7 @@ 'he', 'fi', 'zh', 'sq', 'az', 'fa', 'ru', 'ca', 'eu', 'da', 'ko', 'ba', 'sv', 'th', 'gl', 'cs', 'sr', 'hi', 'uk', 'hr', 'no', 'tr', 'sa', 'ar', 'ta', 'eo', 'sk', 'is', 'bn', 'ro', 'si', 'bg', 'ms', 'mk', 'ka', 'tt', - 'lt', 'el', 'li', 'sl', 'tl', 'ur', 'km', 'la', 'et', 'kk', 'te', 'be', + 'lt', 'el', 'li', 'sl', 'tl', 'et', 'ur', 'km', 'la', 'kk', 'te', 'be', 'ia', 'mr', 'ml', 'oc', 'ne', 'hy', 'cv', 'pa', 'tg', 'ku', 'fy', 'af', 'bs', 'cy', 'mg', 'ky', ] diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index ddb16bb..7477236 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -30,35 +30,35 @@ languages_by_size = [ 'en', 'ceb', 'sv', 'de', 'fr', 'nl', 'ru', 'es', 'it', 'arz', 'pl', 'ja', 'vi', 'war', 'zh', 'ar', 'uk', 'pt', 'fa', 'ca', 'sr', 'id', - 'no', 'ko', 'fi', 'hu', 'cs', 'tr', 'sh', 'ce', 'zh-min-nan', 'ro', + 'no', 'ko', 'fi', 'hu', 'cs', 'tr', 'ce', 'sh', 'zh-min-nan', 'ro', 'tt', 'eu', 'ms', 'eo', 'he', 'hy', 'bg', 'da', 'azb', 'sk', 'kk', - 'min', 'et', 'be', 'hr', 'el', 'simple', 'lt', 'az', 'gl', 'sl', 'ur', + 'et', 'min', 'be', 'hr', 'el', 'simple', 'lt', 'az', 'gl', 'sl', 'ur', 'nn', 'ka', 'hi', 'th', 'ta', 'uz', 'la', 'cy', 'ast', 'vo', 'mk', 'zh-yue', 'bn', 'lv', 'tg', 'my', 'af', 'mg', 'bs', 'oc', 'sq', 'nds', 'mr', 'ky', 'ml', 'be-tarask', 'te', 'new', 'br', 'sw', 'vec', 'pms', 'jv', 'pnb', 'ht', 'su', 'lb', 'ba', 'ga', 'szl', 'is', 'ku', 'lmo', 'cv', 'fy', 'tl', 'wuu', 'an', 'sco', 'diq', 'ckb', 'pa', 'yo', 'ne', 'bar', 'io', 'gu', 'als', 'kn', 'scn', 'bpy', 'ia', 'qu', 'mn', 'avk', - 'nv', 'xmf', 'si', 'bat-smg', 'or', 'gd', 'cdo', 'ilo', 'yi', 'crh', - 'am', 'os', 'sd', 'bug', 'frr', 'nap', 'ha', 'hsb', 'sah', 'map-bms', - 'mai', 'fo', 'li', 'mzn', 'ps', 'eml', 'gor', 'ace', 'bcl', 'sa', - 'ban', 'wa', 'zh-classical', 'lij', 'lld', 'zu', 'mhr', 'shn', 'mrj', + 'nv', 'xmf', 'si', 'bat-smg', 'crh', 'or', 'gd', 'cdo', 'ilo', 'yi', + 'os', 'frr', 'am', 'sd', 'bug', 'nap', 'ha', 'sah', 'hsb', 'map-bms', + 'mai', 'fo', 'li', 'mzn', 'ps', 'eml', 'gor', 'ace', 'lld', 'bcl', + 'ban', 'sa', 'wa', 'zh-classical', 'lij', 'zu', 'shn', 'mhr', 'mrj', 'hif', 'mni', 'as', 'hak', 'roa-tara', 'hyw', 'pam', 'km', 'ie', 'nso', - 'rue', 'se', 'bh', 'nds-nl', 'vls', 'so', 'sn', 'myv', 'mi', 'nah', - 'sat', 'sc', 'vep', 'gan', 'glk', 'kab', 'tk', 'co', 'fiu-vro', 'bo', + 'rue', 'se', 'bh', 'so', 'nds-nl', 'vls', 'sn', 'myv', 'nah', 'mi', + 'sat', 'sc', 'vep', 'gan', 'glk', 'kab', 'tk', 'fiu-vro', 'co', 'bo', 'ab', 'kv', 'csb', 'frp', 'pcd', 'kw', 'ug', 'udm', 'gv', 'ay', 'ary', - 'zea', 'nrm', 'gn', 'bjn', 'mt', 'lez', 'lfn', 'stq', 'smn', 'lo', - 'mwl', 'skr', 'olo', 'rm', 'lad', 'fur', 'gom', 'ang', 'koi', 'ext', + 'nrm', 'zea', 'gn', 'bjn', 'mt', 'lez', 'lfn', 'stq', 'smn', 'skr', + 'lo', 'mwl', 'olo', 'rm', 'fur', 'lad', 'gom', 'ang', 'koi', 'ext', 'tyv', 'dsb', 'dty', 'ln', 'cbk-zam', 'dv', 'ksh', 'rw', 'gag', 'bxr', - 'pfl', 'ig', 'av', 'pag', 'pi', 'awa', 'haw', 'tay', 'pap', 'krc', + 'pfl', 'ig', 'av', 'pi', 'pag', 'haw', 'awa', 'tay', 'pap', 'krc', 'xal', 'szy', 'za', 'inh', 'pdc', 'kaa', 'atj', 'to', 'arc', 'kbp', - 'jam', 'tpi', 'na', 'wo', 'kbd', 'tcy', 'mdf', 'tw', 'nov', 'ki', - 'tet', 'dag', 'lg', 'bi', 'jbo', 'roa-rup', 'fj', 'kg', 'xh', 'lbe', - 'ty', 'mnw', 'nqo', 'shi', 'trv', 'srn', 'om', 'cu', 'gcr', 'sm', 'ks', - 'alt', 'ltg', 'chr', 'nia', 'pih', 'ny', 'got', 'st', 'mad', 'ami', - 'kl', 'rmy', 'tn', 'bm', 'ts', 'chy', 've', 'rn', 'tum', 'iu', 'ak', - 'ss', 'ch', 'pnt', 'ady', 'ik', 'ee', 'ff', 'din', 'sg', 'dz', 'ti', - 'pwn', 'cr', + 'tpi', 'jam', 'na', 'wo', 'tw', 'kbd', 'tcy', 'mdf', 'nov', 'ki', + 'tet', 'dag', 'lg', 'bi', 'jbo', 'roa-rup', 'fj', 'kg', 'nia', 'xh', + 'lbe', 'ty', 'mnw', 'nqo', 'shi', 'trv', 'srn', 'om', 'cu', 'gcr', + 'sm', 'ks', 'alt', 'ltg', 'chr', 'pih', 'ny', 'got', 'mad', 'st', + 'ami', 'kl', 'rmy', 'tn', 'bm', 'ts', 'tum', 'chy', 've', 'rn', 'iu', + 'ak', 'ss', 'ch', 'pnt', 'ady', 'ik', 'ee', 'ff', 'din', 'sg', 'dz', + 'ti', 'pwn', 'cr', ] # Sites we want to edit but not count as real languages diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 4622868..3038bce 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -1,6 +1,6 @@ """Family module for Wikiquote.""" # -# (C) Pywikibot team, 2005-2021 +# (C) Pywikibot team, 2005-2022 # # Distributed under the terms of the MIT license. # @@ -27,12 +27,12 @@ ] languages_by_size = [ - 'it', 'en', 'pl', 'ru', 'cs', 'fa', 'et', 'pt', 'de', 'uk', 'fr', 'es', - 'he', 'sk', 'tr', 'bs', 'ca', 'eo', 'fi', 'az', 'sl', 'lt', 'zh', 'ar', + 'it', 'en', 'pl', 'ru', 'cs', 'et', 'fa', 'pt', 'de', 'uk', 'fr', 'es', + 'he', 'tr', 'sk', 'bs', 'ca', 'eo', 'fi', 'az', 'sl', 'lt', 'zh', 'ar', 'bg', 'hy', 'hr', 'el', 'su', 'nn', 'id', 'sv', 'li', 'hu', 'ko', 'nl', 'ja', 'la', 'ta', 'sah', 'sr', 'gu', 'gl', 'ur', 'te', 'be', 'cy', - 'no', 'ml', 'sq', 'vi', 'kn', 'ro', 'eu', 'ku', 'uz', 'th', 'hi', 'ka', - 'da', 'sa', 'is', 'br', 'mr', 'af', 'wo', 'ky', + 'no', 'vi', 'ml', 'sq', 'kn', 'ro', 'eu', 'ku', 'uz', 'hi', 'ka', 'da', + 'sa', 'is', 'th', 'br', 'mr', 'af', 'wo', 'ky', ] category_redirect_templates = { diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index a6dfd7a..66fb5e6 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -27,10 +27,10 @@ languages_by_size = [ 'pl', 'en', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'es', 'uk', 'ar', 'cs', 'mul', 'gu', 'pt', 'sr', 'sv', 'fa', 'hu', 'ko', 'ml', 'bn', 'sa', - 'ta', 'te', 'sl', 'hy', 'tr', 'el', 'la', 'vi', 'ro', 'ja', 'fi', + 'ta', 'te', 'sl', 'tr', 'hy', 'el', 'la', 'vi', 'ro', 'ja', 'fi', 'nap', 'nl', 'az', 'ca', 'br', 'kn', 'hr', 'no', 'th', 'be', 'hi', 'eo', 'is', 'vec', 'id', 'pms', 'ban', 'da', 'lij', 'et', 'mk', 'yi', - 'as', 'mr', 'bg', 'cy', 'li', 'lt', 'wa', 'jv', 'pa', 'or', 'eu', 'gl', + 'as', 'mr', 'bg', 'cy', 'li', 'lt', 'wa', 'pa', 'or', 'jv', 'eu', 'gl', 'bs', 'sah', 'sk', 'zh-min-nan', 'fo', ] diff --git a/pywikibot/families/wikiversity_family.py b/pywikibot/families/wikiversity_family.py index 0e2571c..3eb70bd 100644 --- a/pywikibot/families/wikiversity_family.py +++ b/pywikibot/families/wikiversity_family.py @@ -16,7 +16,7 @@ name = 'wikiversity' languages_by_size = [ - 'de', 'en', 'fr', 'zh', 'it', 'ru', 'cs', 'pt', 'es', 'sl', 'ar', 'sv', + 'de', 'en', 'fr', 'zh', 'it', 'cs', 'ru', 'pt', 'es', 'sl', 'ar', 'sv', 'fi', 'el', 'ko', 'hi', 'ja', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index e7dbf58..45073ea 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -28,19 +28,19 @@ languages_by_size = [ 'en', 'fr', 'mg', 'ru', 'zh', 'de', 'sh', 'es', 'sv', 'el', 'nl', 'pl', - 'ku', 'lt', 'it', 'ca', 'fi', 'hu', 'ta', 'tr', 'io', 'hy', 'ko', 'ja', + 'ku', 'lt', 'it', 'ca', 'fi', 'ta', 'hu', 'tr', 'io', 'hy', 'ko', 'ja', 'pt', 'kn', 'vi', 'sr', 'th', 'hi', 'ro', 'no', 'et', 'id', 'cs', 'ml', - 'my', 'uz', 'li', 'or', 'te', 'eo', 'fa', 'gl', 'ar', 'jv', 'oc', 'az', - 'eu', 'skr', 'uk', 'br', 'ast', 'da', 'lo', 'simple', 'bn', 'la', 'is', + 'my', 'uz', 'li', 'or', 'te', 'eo', 'fa', 'gl', 'ar', 'oc', 'jv', 'az', + 'eu', 'skr', 'uk', 'br', 'ast', 'da', 'lo', 'simple', 'bn', 'is', 'la', 'hr', 'fj', 'tg', 'sk', 'ky', 'wa', 'bg', 'ur', 'ps', 'shn', 'cy', 'vo', 'sl', 'he', 'af', 'zh-min-nan', 'om', 'scn', 'tl', 'pa', 'sw', - 'fy', 'nn', 'ka', 'lmo', 'lv', 'mnw', 'ms', 'min', 'sq', 'sg', 'nds', + 'fy', 'sg', 'lmo', 'nn', 'mnw', 'ka', 'lv', 'ms', 'min', 'sq', 'nds', 'co', 'mn', 'pnb', 'lb', 'bs', 'nah', 'yue', 'sa', 'kk', 'km', 'diq', 'vec', 'be', 'tk', 'mk', 'sm', 'hsb', 'nia', 'shy', 'ks', 'gd', 'ga', 'mr', 'an', 'gom', 'wo', 'mni', 'su', 'ia', 'ang', 'mt', 'fo', 'sd', - 'tt', 'gn', 'ie', 'so', 'csb', 'ug', 'bcl', 'si', 'st', 'roa-rup', - 'hif', 'zu', 'kl', 'mi', 'ay', 'ha', 'jbo', 'ln', 'yi', 'gu', 'na', - 'tpi', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'qu', 'ss', 'chr', 'iu', + 'tt', 'gn', 'ie', 'so', 'bcl', 'csb', 'ug', 'si', 'st', 'roa-rup', + 'hif', 'kl', 'zu', 'mi', 'ay', 'ha', 'jbo', 'ln', 'yi', 'tpi', 'gu', + 'na', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'qu', 'ss', 'chr', 'iu', 'dv', 'ti', 'tn', ] diff --git a/pywikibot/family.py b/pywikibot/family.py index f48d38f..ebabe78 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -326,7 +326,7 @@ 'sh': '[a-zčćđžš]*', 'shi': '[ⴰ-ⵯa-zàâçéèêîôûäëïöüùÇÉÂÊÎÔÛÄËÏÖÜÀÈÙḍḥɛṛɣṣṭẓḌḤƐṚƔṢṬẒʷ]*', 'sk': '[a-záäčďéíľĺňóôŕšťúýž]*', - 'skr': '[ابپتٹثجچحخدڈذرڑزژسشصضطظعغفقکگلمنںوؤہھیئےآأءۃٻڄݙڋڰڳݨ]*', + 'skr': '[آابٻپتٹثجچڄحخدڈݙذرڑزژسشصضطظعغفقکگڳلمنݨوہھیےئأءۃڋڰںؤ]*', 'sl': '[a-zčćđžš]*', 'smn': '[a-zâčđŋšžäá]*', 'sr': '[abvgdđežzijklljmnnjoprstćufhcčdž' @@ -666,14 +666,14 @@ def get_edit_restricted_templates(self, code): """Return tuple of edit restricted templates. - *New in version 3.0.* + .. versionadded:: 3.0 """ return self.edit_restricted_templates.get(code, ()) def get_archived_page_templates(self, code): """Return tuple of archived page templates. - *New in version 3.0.* + .. versionadded:: 3.0 """ return self.archived_page_templates.get(code, ()) @@ -705,7 +705,8 @@ """ Return whether a HTTPS certificate should be verified. - *Renamed in version 5.3.* + .. versionadded:: 5.3 + renamed from ignore_certificate_error :param code: language code :return: flag to verify the SSL certificate; @@ -783,14 +784,14 @@ def eventstreams_host(self, code): """Hostname for EventStreams. - *New in version 3.0.* + .. versionadded:: 3.0 """ raise NotImplementedError('This family does not support EventStreams') def eventstreams_path(self, code): """Return path for EventStreams. - *New in version 3.0.* + .. versionadded:: 3.0 """ raise NotImplementedError('This family does not support EventStreams') @@ -1070,7 +1071,8 @@ """Common features of Fandom families. - *Renamed in version 3.0.* + .. versionadded:: 3.0 + renamed from WikiaFamily """ @classproperty -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/760621 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: stable Gerrit-Change-Id: I996a8ef09ebff443720c3cc77d7799616fc28d74 Gerrit-Change-Number: 760621 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 2 months

[Gerrit] ...core[master]: [L10N] Update linktrails and languages_by_size

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/760546 ) Change subject: [L10N] Update linktrails and languages_by_size ...................................................................... [L10N] Update linktrails and languages_by_size Change-Id: Ideb94a5d7aa6ae09c17bf0ddf8d9ba66c537efc8 --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wikiversity_family.py M pywikibot/families/wiktionary_family.py M pywikibot/family.py 7 files changed, 32 insertions(+), 32 deletions(-) Approvals: Meno25: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index 64df8dc..8374f59 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -33,7 +33,7 @@ 'he', 'fi', 'zh', 'sq', 'az', 'fa', 'ru', 'ca', 'eu', 'da', 'ko', 'ba', 'sv', 'th', 'gl', 'cs', 'sr', 'hi', 'uk', 'hr', 'no', 'tr', 'sa', 'ar', 'ta', 'eo', 'sk', 'is', 'bn', 'ro', 'si', 'bg', 'ms', 'mk', 'ka', 'tt', - 'lt', 'el', 'li', 'sl', 'tl', 'ur', 'km', 'la', 'et', 'kk', 'te', 'be', + 'lt', 'el', 'li', 'sl', 'tl', 'et', 'ur', 'km', 'la', 'kk', 'te', 'be', 'ia', 'mr', 'ml', 'oc', 'ne', 'hy', 'cv', 'pa', 'tg', 'ku', 'fy', 'af', 'bs', 'cy', 'mg', 'ky', ] diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index ddb16bb..7477236 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -30,35 +30,35 @@ languages_by_size = [ 'en', 'ceb', 'sv', 'de', 'fr', 'nl', 'ru', 'es', 'it', 'arz', 'pl', 'ja', 'vi', 'war', 'zh', 'ar', 'uk', 'pt', 'fa', 'ca', 'sr', 'id', - 'no', 'ko', 'fi', 'hu', 'cs', 'tr', 'sh', 'ce', 'zh-min-nan', 'ro', + 'no', 'ko', 'fi', 'hu', 'cs', 'tr', 'ce', 'sh', 'zh-min-nan', 'ro', 'tt', 'eu', 'ms', 'eo', 'he', 'hy', 'bg', 'da', 'azb', 'sk', 'kk', - 'min', 'et', 'be', 'hr', 'el', 'simple', 'lt', 'az', 'gl', 'sl', 'ur', + 'et', 'min', 'be', 'hr', 'el', 'simple', 'lt', 'az', 'gl', 'sl', 'ur', 'nn', 'ka', 'hi', 'th', 'ta', 'uz', 'la', 'cy', 'ast', 'vo', 'mk', 'zh-yue', 'bn', 'lv', 'tg', 'my', 'af', 'mg', 'bs', 'oc', 'sq', 'nds', 'mr', 'ky', 'ml', 'be-tarask', 'te', 'new', 'br', 'sw', 'vec', 'pms', 'jv', 'pnb', 'ht', 'su', 'lb', 'ba', 'ga', 'szl', 'is', 'ku', 'lmo', 'cv', 'fy', 'tl', 'wuu', 'an', 'sco', 'diq', 'ckb', 'pa', 'yo', 'ne', 'bar', 'io', 'gu', 'als', 'kn', 'scn', 'bpy', 'ia', 'qu', 'mn', 'avk', - 'nv', 'xmf', 'si', 'bat-smg', 'or', 'gd', 'cdo', 'ilo', 'yi', 'crh', - 'am', 'os', 'sd', 'bug', 'frr', 'nap', 'ha', 'hsb', 'sah', 'map-bms', - 'mai', 'fo', 'li', 'mzn', 'ps', 'eml', 'gor', 'ace', 'bcl', 'sa', - 'ban', 'wa', 'zh-classical', 'lij', 'lld', 'zu', 'mhr', 'shn', 'mrj', + 'nv', 'xmf', 'si', 'bat-smg', 'crh', 'or', 'gd', 'cdo', 'ilo', 'yi', + 'os', 'frr', 'am', 'sd', 'bug', 'nap', 'ha', 'sah', 'hsb', 'map-bms', + 'mai', 'fo', 'li', 'mzn', 'ps', 'eml', 'gor', 'ace', 'lld', 'bcl', + 'ban', 'sa', 'wa', 'zh-classical', 'lij', 'zu', 'shn', 'mhr', 'mrj', 'hif', 'mni', 'as', 'hak', 'roa-tara', 'hyw', 'pam', 'km', 'ie', 'nso', - 'rue', 'se', 'bh', 'nds-nl', 'vls', 'so', 'sn', 'myv', 'mi', 'nah', - 'sat', 'sc', 'vep', 'gan', 'glk', 'kab', 'tk', 'co', 'fiu-vro', 'bo', + 'rue', 'se', 'bh', 'so', 'nds-nl', 'vls', 'sn', 'myv', 'nah', 'mi', + 'sat', 'sc', 'vep', 'gan', 'glk', 'kab', 'tk', 'fiu-vro', 'co', 'bo', 'ab', 'kv', 'csb', 'frp', 'pcd', 'kw', 'ug', 'udm', 'gv', 'ay', 'ary', - 'zea', 'nrm', 'gn', 'bjn', 'mt', 'lez', 'lfn', 'stq', 'smn', 'lo', - 'mwl', 'skr', 'olo', 'rm', 'lad', 'fur', 'gom', 'ang', 'koi', 'ext', + 'nrm', 'zea', 'gn', 'bjn', 'mt', 'lez', 'lfn', 'stq', 'smn', 'skr', + 'lo', 'mwl', 'olo', 'rm', 'fur', 'lad', 'gom', 'ang', 'koi', 'ext', 'tyv', 'dsb', 'dty', 'ln', 'cbk-zam', 'dv', 'ksh', 'rw', 'gag', 'bxr', - 'pfl', 'ig', 'av', 'pag', 'pi', 'awa', 'haw', 'tay', 'pap', 'krc', + 'pfl', 'ig', 'av', 'pi', 'pag', 'haw', 'awa', 'tay', 'pap', 'krc', 'xal', 'szy', 'za', 'inh', 'pdc', 'kaa', 'atj', 'to', 'arc', 'kbp', - 'jam', 'tpi', 'na', 'wo', 'kbd', 'tcy', 'mdf', 'tw', 'nov', 'ki', - 'tet', 'dag', 'lg', 'bi', 'jbo', 'roa-rup', 'fj', 'kg', 'xh', 'lbe', - 'ty', 'mnw', 'nqo', 'shi', 'trv', 'srn', 'om', 'cu', 'gcr', 'sm', 'ks', - 'alt', 'ltg', 'chr', 'nia', 'pih', 'ny', 'got', 'st', 'mad', 'ami', - 'kl', 'rmy', 'tn', 'bm', 'ts', 'chy', 've', 'rn', 'tum', 'iu', 'ak', - 'ss', 'ch', 'pnt', 'ady', 'ik', 'ee', 'ff', 'din', 'sg', 'dz', 'ti', - 'pwn', 'cr', + 'tpi', 'jam', 'na', 'wo', 'tw', 'kbd', 'tcy', 'mdf', 'nov', 'ki', + 'tet', 'dag', 'lg', 'bi', 'jbo', 'roa-rup', 'fj', 'kg', 'nia', 'xh', + 'lbe', 'ty', 'mnw', 'nqo', 'shi', 'trv', 'srn', 'om', 'cu', 'gcr', + 'sm', 'ks', 'alt', 'ltg', 'chr', 'pih', 'ny', 'got', 'mad', 'st', + 'ami', 'kl', 'rmy', 'tn', 'bm', 'ts', 'tum', 'chy', 've', 'rn', 'iu', + 'ak', 'ss', 'ch', 'pnt', 'ady', 'ik', 'ee', 'ff', 'din', 'sg', 'dz', + 'ti', 'pwn', 'cr', ] # Sites we want to edit but not count as real languages diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 5ace1a4..3038bce 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -28,10 +28,10 @@ languages_by_size = [ 'it', 'en', 'pl', 'ru', 'cs', 'et', 'fa', 'pt', 'de', 'uk', 'fr', 'es', - 'he', 'sk', 'tr', 'bs', 'ca', 'eo', 'fi', 'az', 'sl', 'lt', 'zh', 'ar', + 'he', 'tr', 'sk', 'bs', 'ca', 'eo', 'fi', 'az', 'sl', 'lt', 'zh', 'ar', 'bg', 'hy', 'hr', 'el', 'su', 'nn', 'id', 'sv', 'li', 'hu', 'ko', 'nl', 'ja', 'la', 'ta', 'sah', 'sr', 'gu', 'gl', 'ur', 'te', 'be', 'cy', - 'no', 'ml', 'sq', 'vi', 'kn', 'ro', 'eu', 'ku', 'uz', 'hi', 'ka', 'da', + 'no', 'vi', 'ml', 'sq', 'kn', 'ro', 'eu', 'ku', 'uz', 'hi', 'ka', 'da', 'sa', 'is', 'th', 'br', 'mr', 'af', 'wo', 'ky', ] diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index a6dfd7a..66fb5e6 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -27,10 +27,10 @@ languages_by_size = [ 'pl', 'en', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'es', 'uk', 'ar', 'cs', 'mul', 'gu', 'pt', 'sr', 'sv', 'fa', 'hu', 'ko', 'ml', 'bn', 'sa', - 'ta', 'te', 'sl', 'hy', 'tr', 'el', 'la', 'vi', 'ro', 'ja', 'fi', + 'ta', 'te', 'sl', 'tr', 'hy', 'el', 'la', 'vi', 'ro', 'ja', 'fi', 'nap', 'nl', 'az', 'ca', 'br', 'kn', 'hr', 'no', 'th', 'be', 'hi', 'eo', 'is', 'vec', 'id', 'pms', 'ban', 'da', 'lij', 'et', 'mk', 'yi', - 'as', 'mr', 'bg', 'cy', 'li', 'lt', 'wa', 'jv', 'pa', 'or', 'eu', 'gl', + 'as', 'mr', 'bg', 'cy', 'li', 'lt', 'wa', 'pa', 'or', 'jv', 'eu', 'gl', 'bs', 'sah', 'sk', 'zh-min-nan', 'fo', ] diff --git a/pywikibot/families/wikiversity_family.py b/pywikibot/families/wikiversity_family.py index 0e2571c..3eb70bd 100644 --- a/pywikibot/families/wikiversity_family.py +++ b/pywikibot/families/wikiversity_family.py @@ -16,7 +16,7 @@ name = 'wikiversity' languages_by_size = [ - 'de', 'en', 'fr', 'zh', 'it', 'ru', 'cs', 'pt', 'es', 'sl', 'ar', 'sv', + 'de', 'en', 'fr', 'zh', 'it', 'cs', 'ru', 'pt', 'es', 'sl', 'ar', 'sv', 'fi', 'el', 'ko', 'hi', 'ja', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index e7dbf58..45073ea 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -28,19 +28,19 @@ languages_by_size = [ 'en', 'fr', 'mg', 'ru', 'zh', 'de', 'sh', 'es', 'sv', 'el', 'nl', 'pl', - 'ku', 'lt', 'it', 'ca', 'fi', 'hu', 'ta', 'tr', 'io', 'hy', 'ko', 'ja', + 'ku', 'lt', 'it', 'ca', 'fi', 'ta', 'hu', 'tr', 'io', 'hy', 'ko', 'ja', 'pt', 'kn', 'vi', 'sr', 'th', 'hi', 'ro', 'no', 'et', 'id', 'cs', 'ml', - 'my', 'uz', 'li', 'or', 'te', 'eo', 'fa', 'gl', 'ar', 'jv', 'oc', 'az', - 'eu', 'skr', 'uk', 'br', 'ast', 'da', 'lo', 'simple', 'bn', 'la', 'is', + 'my', 'uz', 'li', 'or', 'te', 'eo', 'fa', 'gl', 'ar', 'oc', 'jv', 'az', + 'eu', 'skr', 'uk', 'br', 'ast', 'da', 'lo', 'simple', 'bn', 'is', 'la', 'hr', 'fj', 'tg', 'sk', 'ky', 'wa', 'bg', 'ur', 'ps', 'shn', 'cy', 'vo', 'sl', 'he', 'af', 'zh-min-nan', 'om', 'scn', 'tl', 'pa', 'sw', - 'fy', 'nn', 'ka', 'lmo', 'lv', 'mnw', 'ms', 'min', 'sq', 'sg', 'nds', + 'fy', 'sg', 'lmo', 'nn', 'mnw', 'ka', 'lv', 'ms', 'min', 'sq', 'nds', 'co', 'mn', 'pnb', 'lb', 'bs', 'nah', 'yue', 'sa', 'kk', 'km', 'diq', 'vec', 'be', 'tk', 'mk', 'sm', 'hsb', 'nia', 'shy', 'ks', 'gd', 'ga', 'mr', 'an', 'gom', 'wo', 'mni', 'su', 'ia', 'ang', 'mt', 'fo', 'sd', - 'tt', 'gn', 'ie', 'so', 'csb', 'ug', 'bcl', 'si', 'st', 'roa-rup', - 'hif', 'zu', 'kl', 'mi', 'ay', 'ha', 'jbo', 'ln', 'yi', 'gu', 'na', - 'tpi', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'qu', 'ss', 'chr', 'iu', + 'tt', 'gn', 'ie', 'so', 'bcl', 'csb', 'ug', 'si', 'st', 'roa-rup', + 'hif', 'kl', 'zu', 'mi', 'ay', 'ha', 'jbo', 'ln', 'yi', 'tpi', 'gu', + 'na', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'qu', 'ss', 'chr', 'iu', 'dv', 'ti', 'tn', ] diff --git a/pywikibot/family.py b/pywikibot/family.py index 9bf0662..8ce8fb0 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -321,7 +321,7 @@ 'sh': '[a-zčćđžš]*', 'shi': '[ⴰ-ⵯa-zàâçéèêîôûäëïöüùÇÉÂÊÎÔÛÄËÏÖÜÀÈÙḍḥɛṛɣṣṭẓḌḤƐṚƔṢṬẒʷ]*', 'sk': '[a-záäčďéíľĺňóôŕšťúýž]*', - 'skr': '[ابپتٹثجچحخدڈذرڑزژسشصضطظعغفقکگلمنںوؤہھیئےآأءۃٻڄݙڋڰڳݨ]*', + 'skr': '[آابٻپتٹثجچڄحخدڈݙذرڑزژسشصضطظعغفقکگڳلمنݨوہھیےئأءۃڋڰںؤ]*', 'sl': '[a-zčćđžš]*', 'smn': '[a-zâčđŋšžäá]*', 'sr': '[abvgdđežzijklljmnnjoprstćufhcčdž' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/760546 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: Ideb94a5d7aa6ae09c17bf0ddf8d9ba66c537efc8 Gerrit-Change-Number: 760546 Gerrit-PatchSet: 5 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 2 months

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/760533 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: Ibf7beaff05412b59d59d2612fbef421c842daa57 --- M category/tr.json M redirect/hu.json 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category/tr.json b/category/tr.json index 1e99ced..e3905ec 100644 --- a/category/tr.json +++ b/category/tr.json @@ -3,6 +3,7 @@ "authors": [ "BaRaN6161 TURK", "Emperyan", + "Hedda", "Joseph", "Khutuck", "Stultiwikia", @@ -11,6 +12,7 @@ }, "category-adding": "Bot: [[Kategori:%(newcat)s]] ekleniyor", "category-also-in": "(%(alsocat)s kategorisinde de yer almaktadır)", + "category-clean": "Bot: Hâlihazırda %(child)s içinde yer alan %(category)s kategorisi kaldırılıyor", "category-listifying": "Bot: %(fromcat)s sayfasından itibaren (%(num)d girdi) listeleniyor", "category-removing": "Bot: %(oldcat)s kategorisinden kaldırılıyor", "category-renamed": "Bot: %(oldcat)s konumundan taşındı. Yazarlar: %(authors)s", diff --git a/redirect/hu.json b/redirect/hu.json index a47d69c..e0507d0 100644 --- a/redirect/hu.json +++ b/redirect/hu.json @@ -3,11 +3,12 @@ "authors": [ "Bináris", "Csega", - "Dj" + "Dj", + "Tacsipacsi" ] }, "redirect-broken-redirect-template": "{{azonnali|Hibás átirányítás}}", - "redirect-fix-broken-moved": "Bot: törött hivatkozás javítása; új cél oldal: %(to)s", + "redirect-fix-broken-moved": "Bot: átnevezett oldalra mutató, hibás átirányítás javítása, új cél: %(to)s", "redirect-fix-double": "Bot: %(to)s lapra mutató dupla átirányítás javítása", "redirect-fix-loop": "Bot: ide mutató átirányítási hurkok javítása: %(to)s", "redirect-remove-broken": "Bot: törölt vagy nem létező lapra mutató átirányítás törlése", -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/760533 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: Ibf7beaff05412b59d59d2612fbef421c842daa57 Gerrit-Change-Number: 760533 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 2 months

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits February 2022