Pywikibot-commits April 2023

pywikibot-commits@lists.wikimedia.org

1 participants
130 discussions

[Gerrit] ...core[master]: Update closed_wikis: cnwikimedia closed
by jenkins-bot (Code Review) 28 Apr '23

28 Apr '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/912882 ) Change subject: Update closed_wikis: cnwikimedia closed ...................................................................... Update closed_wikis: cnwikimedia closed Bug: T274083 Change-Id: Ida625ebf3365cf9acc8c149bb03f1d935bf99aa9 --- M pywikibot/families/wikimediachapter_family.py 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikimediachapter_family.py b/pywikibot/families/wikimediachapter_family.py index 4766755..3ea8aea 100644 --- a/pywikibot/families/wikimediachapter_family.py +++ b/pywikibot/families/wikimediachapter_family.py @@ -16,10 +16,10 @@ 'et': 'ee' } - closed_wikis = ['nz', 'pa-us', ] + closed_wikis = ['cn', 'nz', 'pa-us', ] codes = [ - 'am', 'ar', 'az', 'bd', 'be', 'br', 'ca', 'cn', 'co', 'dk', 'ec', 'ee', + 'am', 'ar', 'az', 'bd', 'be', 'br', 'ca', 'co', 'dk', 'ec', 'ee', 'fi', 'ge', 'gr', 'hi', 'id', 'id-internal', 'il', 'mai', 'mk', 'mx', 'ng', 'nl', 'no', 'nyc', 'pl', 'pt', 'punjabi', 'romd', 'rs', 'ru', 'se', 'tr', 'ua', 'uk', 've', 'wb', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/912882 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: Ida625ebf3365cf9acc8c149bb03f1d935bf99aa9 Gerrit-Change-Number: 912882 Gerrit-PatchSet: 1 Gerrit-Owner: Stang <stang(a)toolforge.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 27 Apr '23

27 Apr '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/912825 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I1541ab6a987bc8a4cd978b5d24c89d89331ad6c6 --- M redirect/ia.json A replicate_wiki/ia.json M protect/ia.json A replicate_wiki/fr.json M delinker/ia.json A replicate_wiki/ko.json A replicate_wiki/sl.json M unprotect/ia.json A replicate_wiki/he.json A replicate_wiki/hi.json A replicate_wiki/ru.json M redirect/he.json 12 files changed, 92 insertions(+), 9 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/delinker/ia.json b/delinker/ia.json index 070a87c..da03f95 100644 --- a/delinker/ia.json +++ b/delinker/ia.json @@ -4,5 +4,5 @@ "McDutchie" ] }, - "delinker-delink": "Robot: Le file [[%(title)s]] ha essite removite perque illo ha essite delite per [[:User:%(user)s]]: ''%(comment)s''." + "delinker-delink": "Robot: Le file [[%(title)s]] ha essite removite perque illo ha essite delite per [[:User:%(user)s]]: ''%(comment)s''" } diff --git a/protect/ia.json b/protect/ia.json index 0bc9c7f..daa0f4b 100644 --- a/protect/ia.json +++ b/protect/ia.json @@ -7,6 +7,6 @@ "protect-category": "Robot: Protege tote le paginas in categoria %(cat)s", "protect-images": "Robot: Protege tote le imagines in le pagina %(page)s", "protect-links": "Robot: Protege tote le paginas ligate ab %(page)s", - "protect-ref": "Robot: Protege tote le paginas que refere a %(page)s", + "protect-ref": "Robot: Protection de tote le paginas que refere a %(page)s", "protect-simple": "Robot: Protege un lista de files" } diff --git a/redirect/he.json b/redirect/he.json index 128d57d..de47e62 100644 --- a/redirect/he.json +++ b/redirect/he.json @@ -8,8 +8,8 @@ ] }, "redirect-fix-broken-moved": "תיקון הפניה שבורה לדף היעד %(to)s, שהועבר", - "redirect-fix-double": "מתקן הפניה כפולה → %(to)s", - "redirect-fix-loop": "תיקון הפניה מעגלית ל%(to)s", + "redirect-fix-double": "מתקן הפניה כפולה לקישור %(to)s", + "redirect-fix-loop": "תיקון הפניה מעגלית לקישור %(to)s", "redirect-remove-broken": "יעד ההפניה נמחק או שאינו קיים", - "redirect-remove-loop": "הפניה זו גורמת ללולאה אין־סופית של הפניות" + "redirect-remove-loop": "ההפניה הזאת גורמת ללולאה אין־סופית של הפניות" } diff --git a/redirect/ia.json b/redirect/ia.json index 2492fa5..f07d957 100644 --- a/redirect/ia.json +++ b/redirect/ia.json @@ -6,9 +6,9 @@ ] }, "redirect-broken-redirect-template": "{{eliminar|Redirection a un pagina delite o non existente}}", - "redirect-fix-broken-moved": "Repara un redirection rupte verso un pagina renominate: %(to)s", - "redirect-fix-double": "reparation de duple redirection → %(to)s", - "redirect-fix-loop": "Repara redirection circular a %(to)s", + "redirect-fix-broken-moved": "Reparation de un redirection rupte verso le pagina renominate %(to)s", + "redirect-fix-double": "Reparation de un duple redirection a %(to)s", + "redirect-fix-loop": "Reparation de un bucla de redirectiones a %(to)s", "redirect-remove-broken": "Redirection a un pagina delite o non existente", "redirect-remove-loop": "Le destination del redirection forma un circulo de redirectiones" } diff --git a/replicate_wiki/fr.json b/replicate_wiki/fr.json new file mode 100644 index 0000000..7128ec2 --- /dev/null +++ b/replicate_wiki/fr.json @@ -0,0 +1,12 @@ +{ + "@metadata": { + "authors": [ + "Verdy p" + ] + }, + "replicate_wiki-headline": "Pages différentes de l’original", + "replicate_wiki-missing-users": "Administrateurs de l’original qui manquent ici", + "replicate_wiki-same-pages": "Toutes les pages importantes sont identiques", + "replicate_wiki-same-users": "Tous les utilisateurs de l’original sont également présents sur ce wiki", + "replicate_wiki-summary": "Bot : synchronisation du wiki à partir de %(source)s" +} diff --git a/replicate_wiki/he.json b/replicate_wiki/he.json new file mode 100644 index 0000000..e6e3b1f --- /dev/null +++ b/replicate_wiki/he.json @@ -0,0 +1,12 @@ +{ + "@metadata": { + "authors": [ + "Amire80" + ] + }, + "replicate_wiki-headline": "דפים שונים מהמקור", + "replicate_wiki-missing-users": "מפעילים מהמקור שחסרים כאן", + "replicate_wiki-same-pages": "כל הדפים החשובים זהים", + "replicate_wiki-same-users": "כל המשתמשים מהמקור נמצאים גם בוויקי הזה", + "replicate_wiki-summary": "סנכרון ויקי מאתר %(source)s" +} diff --git a/replicate_wiki/hi.json b/replicate_wiki/hi.json new file mode 100644 index 0000000..61aa36f --- /dev/null +++ b/replicate_wiki/hi.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Abijeet Patro" + ] + }, + "replicate_wiki-headline": "पृष्ठ जो मूल से भिन्न हैं", + "replicate_wiki-same-pages": "सभी महत्वपूर्ण पृष्ठ समान हैं" +} diff --git a/replicate_wiki/ia.json b/replicate_wiki/ia.json new file mode 100644 index 0000000..2cc3f8d --- /dev/null +++ b/replicate_wiki/ia.json @@ -0,0 +1,12 @@ +{ + "@metadata": { + "authors": [ + "McDutchie" + ] + }, + "replicate_wiki-headline": "Paginas que differe del original", + "replicate_wiki-missing-users": "Administratores del original que manca hic", + "replicate_wiki-same-pages": "Tote le paginas importante es identic", + "replicate_wiki-same-users": "Tote le usatores del original es tamben presente sur iste wiki", + "replicate_wiki-summary": "Robot: Synchronisation wiki desde %(source)s" +} diff --git a/replicate_wiki/ko.json b/replicate_wiki/ko.json new file mode 100644 index 0000000..aef96f8 --- /dev/null +++ b/replicate_wiki/ko.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Ykhwong" + ] + }, + "replicate_wiki-same-pages": "중요한 모든 문서가 동일합니다" +} diff --git a/replicate_wiki/ru.json b/replicate_wiki/ru.json new file mode 100644 index 0000000..63e01c5 --- /dev/null +++ b/replicate_wiki/ru.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Okras" + ] + }, + "replicate_wiki-headline": "Страницы, отличающиеся от оригинала", + "replicate_wiki-same-pages": "Все важные страницы одинаковы" +} diff --git a/replicate_wiki/sl.json b/replicate_wiki/sl.json new file mode 100644 index 0000000..812b895 --- /dev/null +++ b/replicate_wiki/sl.json @@ -0,0 +1,12 @@ +{ + "@metadata": { + "authors": [ + "Eleassar" + ] + }, + "replicate_wiki-headline": "Strani, ki se razlikujejo od izvirnika", + "replicate_wiki-missing-users": "Administratorji iz izvirnika, ki tukaj manjkajo", + "replicate_wiki-same-pages": "Vse pomembne strani so enake", + "replicate_wiki-same-users": "Vsi uporabniki iz izvirnika so prisotni tudi v tem vikiju", + "replicate_wiki-summary": "Bot: Vikisinhronizacija iz %(source)s" +} diff --git a/unprotect/ia.json b/unprotect/ia.json index c2b9e75..a49b620 100644 --- a/unprotect/ia.json +++ b/unprotect/ia.json @@ -7,6 +7,6 @@ "unprotect-category": "Robot: Disprotege tote le paginas del categoria %(cat)s", "unprotect-images": "Robot: Disprotege tote le files sur le pagina %(page)s", "unprotect-links": "Robot: Disprotege tote le paginas ligate ab %(page)s", - "unprotect-ref": "Robot: Disprotege tote le paginas que refere a %(page)s", + "unprotect-ref": "Robot: Disprotection de tote le paginas que refere a %(page)s", "unprotect-simple": "Robot: Disprotege un lista de files" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/912825 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: I1541ab6a987bc8a4cd978b5d24c89d89331ad6c6 Gerrit-Change-Number: 912825 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

1 0

[Gerrit] ...core[master]: [i18n] add i18n support for replicate_wiki.py
by jenkins-bot (Code Review) 26 Apr '23

26 Apr '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/904893 ) Change subject: [i18n] add i18n support for replicate_wiki.py ...................................................................... [i18n] add i18n support for replicate_wiki.py Also update tests Bug: T333759 Change-Id: I1ce34ca5101640d2e1b27f59c61de1e85c75fc67 --- M scripts/replicate_wiki.py M pywikibot/i18n.py 2 files changed, 23 insertions(+), 11 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 32383f1..9965181 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -875,7 +875,7 @@ >>> from pywikibot import i18n >>> bundles = sorted(i18n.bundles(stem=True)) >>> len(bundles) - 37 + 38 >>> bundles[:4] ['add_text', 'archivebot', 'basic', 'blockpageschecker'] >>> bundles[-5:] diff --git a/scripts/replicate_wiki.py b/scripts/replicate_wiki.py index 3fa9ece..a9512a1 100755 --- a/scripts/replicate_wiki.py +++ b/scripts/replicate_wiki.py @@ -49,6 +49,7 @@ import pywikibot from pywikibot import Page, config from pywikibot.exceptions import IsRedirectPageError, NoPageError +from pywikibot.i18n import twtranslate def multiple_replace(text, word_dict): @@ -151,23 +152,22 @@ """Create page on wikis with overview of bot results.""" for site in self.sites: sync_overview_page = Page(site, - 'User:{}/sync.py overview' - .format(site.user())) - output = '== Pages that differ from original ==\n\n' + f'User:{site.user()}/sync.py overview') + output = '== {} ==\n\n'.format( + twtranslate(site, 'replicate_wiki-headline')) if self.differences[site]: output += ''.join(f'* [[:{page_title}]]\n' for page_title in self.differences[site]) else: - output += 'All important pages are the same' + output += twtranslate(site, 'replicate_wiki-same-pages') - output += ( - '\n\n== Admins from original that are missing here ==\n\n') + output += '\n\n== {} ==\n\n'.format( + twtranslate(site, 'replicate_wiki-missing-users')) if self.user_diff[site]: output += ''.join('* {}\n'.format(user_name.replace('_', ' ')) for user_name in self.user_diff[site]) else: - output += ( - 'All users from original are also present on this wiki') + output += twtranslate(site, 'replicate_wiki-same-users') pywikibot.info(output) sync_overview_page.text = output @@ -175,8 +175,8 @@ def put_message(self, site) -> str: """Return synchronization message.""" - return ('{} replicate_wiki.py synchronization from {}' - .format(site.user(), str(self.original))) + return twtranslate(site, 'replicate_wiki-summary', + {'source': str(self.original)}) def check_page(self, pagename) -> None: """Check one page.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/904893 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: I1ce34ca5101640d2e1b27f59c61de1e85c75fc67 Gerrit-Change-Number: 904893 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...i18n[master]: [i18n] Add i18n support for replicate_wiki
by jenkins-bot (Code Review) 25 Apr '23

25 Apr '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/904891 ) Change subject: [i18n] Add i18n support for replicate_wiki ...................................................................... [i18n] Add i18n support for replicate_wiki Bug: T333759 Change-Id: I2325a4a416a6e9d6e741c0356b5d21c10984ab62 --- A replicate_wiki/qqq.json A replicate_wiki/en.json 2 files changed, 35 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/replicate_wiki/en.json b/replicate_wiki/en.json new file mode 100644 index 0000000..e248c02 --- /dev/null +++ b/replicate_wiki/en.json @@ -0,0 +1,13 @@ +{ + "@metadata": { + "authors": [ + "Valhallasw", + "Xqt" + ] + }, + "replicate_wiki-headline": "Pages that differ from original", + "replicate_wiki-missing-users": "Admins from original that are missing here", + "replicate_wiki-same-pages": "All important pages are the same", + "replicate_wiki-same-users": "All users from original are also present on this wiki", + "replicate_wiki-summary": "Bot: Wiki synchronization from %(source)s" +} diff --git a/replicate_wiki/qqq.json b/replicate_wiki/qqq.json new file mode 100644 index 0000000..84123c7 --- /dev/null +++ b/replicate_wiki/qqq.json @@ -0,0 +1,12 @@ +{ + "@metadata": { + "authors": [ + "Xqt" + ] + }, + "replicate_wiki-headline": "Headline for replication overview for pages that differ from source wiki", + "replicate_wiki-missing-users": "Headline for replication overview for users missing on target wiki", + "replicate_wiki-same-pages": "Text if no important pages differ from source", + "replicate_wiki-same-users": "Text if no user from original wiki is missing on target wiki", + "replicate_wiki-summary": "Edit summary when the bot transfers pages from a source wiki to target. Parameters:\n* %(source)s - name of the source wiki" +} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/904891 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: I2325a4a416a6e9d6e741c0356b5d21c10984ab62 Gerrit-Change-Number: 904891 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] Add subtests to TestUserContribsWithoutUser.test_user_prefix
by Xqt (Code Review) 25 Apr '23

25 Apr '23

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/911775 ) Change subject: [tests] Add subtests to TestUserContribsWithoutUser.test_user_prefix ...................................................................... [tests] Add subtests to TestUserContribsWithoutUser.test_user_prefix Change-Id: Ia7d8e52b64fb5dc0994b95fcbb6290b9dcc3cd5a --- M tests/site_generators_tests.py 1 file changed, 28 insertions(+), 16 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/tests/site_generators_tests.py b/tests/site_generators_tests.py index 2f5a68a..2f5888a 100755 --- a/tests/site_generators_tests.py +++ b/tests/site_generators_tests.py @@ -1183,27 +1183,30 @@ """Test the site.usercontribs() method.""" mysite = self.get_site() start = '2008-10-06T01:02:03Z' - for contrib in mysite.usercontribs( - userprefix='Jane', - start=pywikibot.Timestamp.fromISOformat(start), - total=5): - self.assertLessEqual(contrib['timestamp'], start) + with self.subTest(start=start): + for contrib in mysite.usercontribs( + userprefix='Jane', + start=pywikibot.Timestamp.fromISOformat(start), + total=5): + self.assertLessEqual(contrib['timestamp'], start) end = '2008-10-07T02:03:04Z' - for contrib in mysite.usercontribs( - userprefix='Jane', - end=pywikibot.Timestamp.fromISOformat(end), - total=5): - self.assertGreaterEqual(contrib['timestamp'], end) + with self.subTest(end=end): + for contrib in mysite.usercontribs( + userprefix='Jane', + end=pywikibot.Timestamp.fromISOformat(end), + total=5): + self.assertGreaterEqual(contrib['timestamp'], end) start = '2008-10-10T11:59:59Z' end = '2008-10-10T00:00:01Z' - for contrib in mysite.usercontribs( - userprefix='Timshiel', - start=pywikibot.Timestamp.fromISOformat(start), - end=pywikibot.Timestamp.fromISOformat(end), - total=5): - self.assertTrue(end <= contrib['timestamp'] <= start) + with self.subTest(start=start, end=end): + for contrib in mysite.usercontribs( + userprefix='Timshiel', + start=pywikibot.Timestamp.fromISOformat(start), + end=pywikibot.Timestamp.fromISOformat(end), + total=5): + self.assertTrue(end <= contrib['timestamp'] <= start) def test_user_prefix_reverse(self): """Test the site.usercontribs() method with range reversed.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/911775 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: Ia7d8e52b64fb5dc0994b95fcbb6290b9dcc3cd5a Gerrit-Change-Number: 911775 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Revise Family class
by jenkins-bot (Code Review) 25 Apr '23

25 Apr '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/909314 ) Change subject: [IMPR] Revise Family class ...................................................................... [IMPR] Revise Family class - remove obsolete.setter which is only used for tests - move interwiki_replacements and interwiki_removals class properties from WikimediaFamily to Family class to have a unique result for all families - add empty closed_wikis, removed_wikis and code_aliases to Family class which are used by interwiki_replacements and interwiki_removals; remove closed_wikis and removed_wikis from WikimediaFamily. - simplify SingleSiteFamily because closed_wikis is always present - codes must be a List not a Tuple in Family classes because SubdomainFamily modifies codes; update wikihow and wowwiki families - update tests accordingly This changes enables to change the interface for removed or closed sites with wowwiki and others. Bug: T334834 Change-Id: Ib22cbb964670471a60b47d89734fb4d63cea5710 --- M pywikibot/families/wikihow_family.py M pywikibot/family.py M pywikibot/families/wowwiki_family.py M tests/family_tests.py 4 files changed, 95 insertions(+), 61 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikihow_family.py b/pywikibot/families/wikihow_family.py index d72fe38..d49b642 100644 --- a/pywikibot/families/wikihow_family.py +++ b/pywikibot/families/wikihow_family.py @@ -3,7 +3,7 @@ .. versionadded:: 3.0 """ # -# (C) Pywikibot team, 2020-2022 +# (C) Pywikibot team, 2020-2023 # # Distributed under the terms of the MIT license. # @@ -21,10 +21,10 @@ name = 'wikihow' domain = 'wikihow.com' - codes = ( + codes = [ 'ar', 'cs', 'de', 'en', 'es', 'fr', 'hi', 'id', 'it', 'ja', 'ko', 'nl', 'pt', 'ru', 'th', 'tr', 'vi', 'zh', - ) + ] removed_wikis = ['ca', 'cy', 'fa', 'he', 'pl', 'ur'] diff --git a/pywikibot/families/wowwiki_family.py b/pywikibot/families/wowwiki_family.py index b683c71..fdb5871 100644 --- a/pywikibot/families/wowwiki_family.py +++ b/pywikibot/families/wowwiki_family.py @@ -15,11 +15,11 @@ name = 'wowwiki' domain = 'wowwiki.fandom.com' - codes = ( + codes = [ 'ar', 'cs', 'da', 'de', 'el', 'en', 'es', 'et', 'fa', 'fi', 'fr', 'he', 'hu', 'it', 'ja', 'ko', 'nl', 'no', 'pl', 'pt', 'pt-br', 'ru', 'uk', 'zh', 'zh-tw', - ) + ] removed_wikis = ['is', 'hr', 'lt', 'lv', 'ro', 'sk', 'sr', 'sv', 'tr'] diff --git a/pywikibot/family.py b/pywikibot/family.py index 9966afe..1d9d0b8 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -1,6 +1,6 @@ """Objects representing MediaWiki families.""" # -# (C) Pywikibot team, 2004-2022 +# (C) Pywikibot team, 2004-2023 # # Distributed under the terms of the MIT license. # @@ -18,9 +18,11 @@ import pywikibot from pywikibot import config -from pywikibot.backports import ( # skipcq: PY-W2000 +from pywikibot.backports import ( Dict, + FrozenSet, List, + Mapping, Set, Tuple, removesuffix, @@ -45,6 +47,8 @@ .. versionchanged:: 8.0 ``alphabetic``, ``alphabetic_revised`` and ``fyinterwiki`` attributes where removed. + .. versionchanged:: 8.2 + :attr:`obsolete` setter was removed. """ def __new__(cls): @@ -82,6 +86,19 @@ name = None + #: Not open for edits; stewards can still edit. + closed_wikis: List[str] = [] + + #: Completely removed sites + removed_wikis: List[str] = [] + + code_aliases: Dict[str, str] = {} + """Code mappings which are only an alias, and there is no 'old' wiki. + + For all except 'nl_nds', subdomains do exist as a redirect, but that + should not be relied upon. + """ + langs: Dict[str, str] = {} # A list of category redirect template names in different languages @@ -161,15 +178,6 @@ # family. interwiki_forward = None - # Which language codes no longer exist and by which language code - # should they be replaced. If for example the language with code xx: - # now should get code yy:, add {'xx':'yy'} to obsolete. - interwiki_replacements: Dict[str, str] = {} - - # Codes that should be removed, usually because the site has been - # taken down. - interwiki_removals: List[str] = [] - # Language codes of the largest wikis. They should be roughly sorted # by size. languages_by_size: List[str] = [] @@ -528,7 +536,7 @@ """Return the path to title using index.php with redirects disabled.""" return f'{self.path(code)}?title={title}&redirect=no' - def interface(self, code) -> str: + def interface(self, code: str) -> str: """Return interface to use for code.""" if code in self.interwiki_removals: if code in self.codes: @@ -691,16 +699,6 @@ data.update(self.interwiki_replacements) return types.MappingProxyType(data) - @obsolete.setter - def obsolete(self, data) -> None: - """Split obsolete dict into constituent parts.""" - self.interwiki_removals[:] = [old for (old, new) in data.items() - if new is None] - self.interwiki_replacements.clear() - self.interwiki_replacements.update((old, new) - for (old, new) in data.items() - if new is not None) - @classproperty def domains(cls) -> Set[str]: """ @@ -719,6 +717,32 @@ """ return set(cls.langs.keys()) + @classproperty + def interwiki_replacements(cls) -> Mapping[str, str]: + """Return an interwiki code replacement mapping. + + Which language codes no longer exist and by which language code + should they be replaced. If for example the language with code + xx: now should get code yy:, add {'xx':'yy'} to + :attr:`code_aliases`. + + .. versionchanged:: 8.2 + changed from dict to invariant mapping. + """ + return types.MappingProxyType(cls.code_aliases) + + @classproperty + def interwiki_removals(cls) -> FrozenSet[str]: + """Return a list of interwiki codes to be removed from wiki pages. + + Codes that should be removed, usually because the site has been + taken down. + + .. versionchanged:: 8.2 + changed from list to invariant frozenset. + """ + return frozenset(cls.removed_wikis + cls.closed_wikis) + class SingleSiteFamily(Family): @@ -761,16 +785,13 @@ if hasattr(cls, 'test_codes'): codes += cls.test_codes - if hasattr(cls, 'closed_wikis'): - codes += cls.closed_wikis + + codes += cls.closed_wikis # shortcut this classproperty - cls.langs = {code: f'{code}.{cls.domain}' - for code in codes} - - if hasattr(cls, 'code_aliases'): - cls.langs.update({alias: f'{code}.{cls.domain}' - for alias, code in cls.code_aliases.items()}) + cls.langs = {code: f'{code}.{cls.domain}' for code in codes} + cls.langs.update({alias: f'{code}.{cls.domain}' + for alias, code in cls.code_aliases.items()}) return cls.langs @@ -934,11 +955,6 @@ 'be-x-old': 'be-tarask', } - # Not open for edits; stewards can still edit. - closed_wikis: List[str] = [] - # Completely removed - removed_wikis: List[str] = [] - # WikimediaFamily uses Wikibase for the category name containing # disambiguation pages for the various languages. We need the # Wikibase code and item number: @@ -960,16 +976,6 @@ raise NotImplementedError( f"Family {cls.name} needs to define property 'domain'") - @classproperty - def interwiki_removals(cls): - """Return a list of interwiki codes to be removed from wiki pages.""" - return frozenset(cls.removed_wikis + cls.closed_wikis) - - @classproperty - def interwiki_replacements(cls): - """Return an interwiki code replacement mapping.""" - return types.MappingProxyType(cls.code_aliases) - def shared_image_repository(self, code): """Return Wikimedia Commons as the shared image repository.""" return ('commons', 'commons') diff --git a/tests/family_tests.py b/tests/family_tests.py index 2e65095..3ca109e 100755 --- a/tests/family_tests.py +++ b/tests/family_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """Tests for the family module.""" # -# (C) Pywikibot team, 2014-2022 +# (C) Pywikibot team, 2014-2023 # # Distributed under the terms of the MIT license. # @@ -103,6 +103,8 @@ family = Family.load('wikipedia') self.assertIsInstance(family.obsolete, Mapping) # redirected code (see site tests test_alias_code_site) + self.assertEqual(family.code_aliases['dk'], 'da') + self.assertEqual(family.interwiki_replacements['dk'], 'da') self.assertEqual(family.obsolete['dk'], 'da') # closed/locked site (see site tests test_locked_site) self.assertIsNone(family.obsolete['mh']) @@ -110,19 +112,21 @@ self.assertIsNone(family.obsolete['ru-sib']) self.assertIn('dk', family.interwiki_replacements) - def test_set_obsolete(self): - """Test obsolete can be set.""" + def test_obsolete_from_attributes(self): + """Test obsolete property for given class attributes.""" # Construct a temporary family and instantiate it family = type('TempFamily', (Family,), {})() self.assertEqual(family.obsolete, {}) self.assertEqual(family.interwiki_replacements, {}) - self.assertEqual(family.interwiki_removals, []) + self.assertEqual(family.interwiki_removals, frozenset()) - family.obsolete = {'a': 'b', 'c': None} + # Construct a temporary family with other attributes and instantiate it + family = type('TempFamily', (Family,), + {'code_aliases': {'a': 'b'}, 'closed_wikis': ['c']})() self.assertEqual(family.obsolete, {'a': 'b', 'c': None}) self.assertEqual(family.interwiki_replacements, {'a': 'b'}) - self.assertEqual(family.interwiki_removals, ['c']) + self.assertEqual(family.interwiki_removals, frozenset('c')) def test_obsolete_readonly(self): """Test obsolete result not updatable.""" @@ -137,12 +141,10 @@ "'mappingproxy' object does not support item assignment"): family.obsolete['a'] = 'b' - def test_WikimediaFamily_obsolete_readonly(self): - """Test WikimediaFamily obsolete is readonly.""" - family = Family.load('wikipedia') with self.assertRaisesRegex( - TypeError, - "'frozenset' object does not support item assignment"): + AttributeError, + "property 'obsolete' of 'Family' object has no setter|" + "can't set attribute"): family.obsolete = {'a': 'b', 'c': None} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/909314 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: Ib22cbb964670471a60b47d89734fb4d63cea5710 Gerrit-Change-Number: 909314 Gerrit-PatchSet: 9 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 24 Apr '23

24 Apr '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/911274 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I51deb85348423f5600993247bb9393328a852448 --- M pywikibot/pfl.json M redirect/nl.json M redirect/kk.json M redirect/fr.json M redirect/it.json M redirect/lt.json 6 files changed, 29 insertions(+), 13 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pfl.json b/pywikibot/pfl.json index 4b36540..84fa222 100644 --- a/pywikibot/pfl.json +++ b/pywikibot/pfl.json @@ -1,6 +1,9 @@ { "@metadata": { - "authors": [] + "authors": [ + "Xqt" + ] }, + "pywikibot-bot-prefix": "Bot:", "pywikibot-cosmetic-changes": "; klännere Ännerunge" } diff --git a/redirect/fr.json b/redirect/fr.json index 7c33cc6..475fdeb 100644 --- a/redirect/fr.json +++ b/redirect/fr.json @@ -7,15 +7,16 @@ "IAlex", "MarcoAurelio", "Od1n", + "SleaY", "Verdy p", "Wladek92", "Xqt" ] }, "redirect-broken-redirect-template": "{{Suppression Immédiate|1=G8}}", - "redirect-fix-broken-moved": "Robot : correction des redirections erronées vers la page déplacée cible %(to)s", - "redirect-fix-double": "Robot : correction d’une double redirection vers %(to)s", - "redirect-fix-loop": "Robot : correction d’une boucle de redirection sur %(to)s", - "redirect-remove-broken": "Robot : redirection vers une page supprimée ou inexistante", - "redirect-remove-loop": "Robot : la cible de la redirection génère une boucle de redirection" + "redirect-fix-broken-moved": "Correction des redirections erronées vers la page déplacée cible %(to)s", + "redirect-fix-double": "Correction d’une double redirection vers %(to)s", + "redirect-fix-loop": "Correction d’une boucle de redirection sur %(to)s", + "redirect-remove-broken": "Redirection vers une page supprimée ou inexistante", + "redirect-remove-loop": "La cible de la redirection génère une boucle de redirection" } diff --git a/redirect/it.json b/redirect/it.json index b25ea4c..14b2d39 100644 --- a/redirect/it.json +++ b/redirect/it.json @@ -9,7 +9,7 @@ }, "redirect-broken-redirect-template": "{{Cancella subito|9}}", "redirect-fix-broken-moved": "Correggo reindirizzamento interrotto alla pagina spostata %(to)s", - "redirect-fix-double": "sistemo i redirect doppi a %(to)s", + "redirect-fix-double": "Sistemo i redirect doppi a %(to)s", "redirect-fix-loop": "Correggo ciclo di reindirizzamento a %(to)s", "redirect-remove-broken": "Reindirizzamento a una pagina cancellata o inesistente", "redirect-remove-loop": "La destinazione del reindirizzamento rimanda alla pagina di partenza" diff --git a/redirect/kk.json b/redirect/kk.json index 28eb94a..fe5b442 100644 --- a/redirect/kk.json +++ b/redirect/kk.json @@ -1,9 +1,10 @@ { "@metadata": { "authors": [ - "Arystanbek" + "Arystanbek", + "Batyrbek.kz" ] }, "redirect-fix-double": "Шынжырлы айдатуды түзетті → %(to)s", - "redirect-remove-broken": "Бағыттау беті жойылған не жоқ болды" + "redirect-remove-broken": "Бағыттау беті жойылған немесе мұндай бет жоқ" } diff --git a/redirect/lt.json b/redirect/lt.json index 98111b5..c0d4517 100644 --- a/redirect/lt.json +++ b/redirect/lt.json @@ -3,11 +3,12 @@ "authors": [ "Aswanas", "Hugo.arg", - "Mantak111" + "Mantak111", + "Nokeoo" ] }, - "redirect-fix-broken-moved": "Pataiso sugadintą nuorodą į perkeltą puslapį %(to)s", - "redirect-fix-double": "Taisomas dvigubas peradresavimas → %(to)s", + "redirect-fix-broken-moved": "Taisomi neveikiantys nukreipimai į tikslo puslapį %(to)s", + "redirect-fix-double": "Taisomi dvigubi peradresavimai į %(to)s", "redirect-fix-loop": "Pataiso nukreipimo ciklą į %(to)s", "redirect-remove-broken": "peradresavimas į ištrintą ar nesantį puslapį", "redirect-remove-loop": "Nukreipimo tikslas formuoja nukreipimo ciklą" diff --git a/redirect/nl.json b/redirect/nl.json index 98a4538..c575586 100644 --- a/redirect/nl.json +++ b/redirect/nl.json @@ -1,6 +1,7 @@ { "@metadata": { "authors": [ + "HanV", "Krinkle", "McDutchie", "Siebrand" @@ -10,6 +11,6 @@ "redirect-fix-broken-moved": "kapotte doorverwijzing gecorrigeerd door aanpassing naar hernoemde doelpagina %(to)s", "redirect-fix-double": "dubbele doorverwijzing gecorrigeerd naar %(to)s", "redirect-fix-loop": "doorverwijs-lus naar %(to)s gecorrigeerd", - "redirect-remove-broken": "doorverwijzing naar een verwijderde of niet-bestaande pagina", + "redirect-remove-broken": "Doorverwijzing naar een verwijderde of niet-bestaande pagina", "redirect-remove-loop": "het doel van de doorverwijzing vormt een doorverwijzingslus" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/911274 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: I51deb85348423f5600993247bb9393328a852448 Gerrit-Change-Number: 911274 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

1 0

[Gerrit] ...core[master]: [tests] Priorize test on test-wiki which needs a lot of time
by Xqt (Code Review) 24 Apr '23

24 Apr '23

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/911261 ) Change subject: [tests] Priorize test on test-wiki which needs a lot of time ...................................................................... [tests] Priorize test on test-wiki which needs a lot of time Change-Id: I5ee1e848774d31d410a0d13957c7ebb100a17584 --- M .github/workflows/pywikibot-ci.yml 1 file changed, 13 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 614ceba..d165f33 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -31,6 +31,10 @@ test_prod_only: [true] include: # ubuntu-20.04 required for Python 3.6 + - python-version: 3.7 + site: wikipedia:test + write-test: true + experimental: true - python-version: 3.6 site: False family: wpbeta @@ -44,10 +48,6 @@ - python-version: 3.8 site: wsbeta:en - python-version: 3.7 - site: wikipedia:test - write-test: true - experimental: true - - python-version: 3.7 site: wikidata:test - python-version: 3.9 site: wiktionary:ar -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/911261 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: I5ee1e848774d31d410a0d13957c7ebb100a17584 Gerrit-Change-Number: 911261 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] Point to the staple documetation within README.rst
by Xqt (Code Review) 24 Apr '23

24 Apr '23

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/910862 ) Change subject: [doc] Point to the staple documetation within README.rst ...................................................................... [doc] Point to the staple documetation within README.rst The documentation should lead to the staple version instead of a list several release documentations Change-Id: I9ffd73f2caddd31b5f552eefc7336be6eb1c2c6d --- M README.rst 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/README.rst b/README.rst index eed4dc1..ed72d48 100644 --- a/README.rst +++ b/README.rst @@ -44,7 +44,7 @@ different tasks. For further information about the library excluding scripts see -the full `code documentation <https://doc.wikimedia.org/pywikibot/>`_. +the full `code documentation <https://doc.wikimedia.org/pywikibot/stable/>`_. Quick start =========== -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/910862 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: I9ffd73f2caddd31b5f552eefc7336be6eb1c2c6d Gerrit-Change-Number: 910862 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] Add TestPwb comment to TestPwb doc string
by jenkins-bot (Code Review) 24 Apr '23

24 Apr '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/910861 ) Change subject: [doc] Add TestPwb comment to TestPwb doc string ...................................................................... [doc] Add TestPwb comment to TestPwb doc string Also remove outdated link Change-Id: If9041c99f0603a5785a683223908b99abd031bea --- M tests/pwb_tests.py 1 file changed, 19 insertions(+), 11 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py index 537a0c0..4fd6314 100755 --- a/tests/pwb_tests.py +++ b/tests/pwb_tests.py @@ -1,13 +1,7 @@ #!/usr/bin/env python3 -""" -Test pwb.py. - -If pwb.py does not load python files as expected, more tests from coverage -should be added locally. -https://bitbucket.org/ned/coveragepy/src/default/tests/test_execfile.py -""" +"""Test pwb.py.""" # -# (C) Pywikibot team, 2007-2022 +# (C) Pywikibot team, 2007-2023 # # Distributed under the terms of the MIT license. # @@ -29,11 +23,14 @@ This is registered as a Site test because it will not run without a user config file. + + .. note:: + ``site`` must be explicitly set for pwb tests. This test does not + require network access, because tests/pwb/print_locals.py does + not use handle_args, etc. so version.py doesn't talk on the + network. """ - # site must be explicitly set for pwb tests. This test does not require - # network access, because tests/pwb/print_locals.py does not use - # handle_args, etc. so version.py doesn't talk on the network. site = False net = False -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/910861 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: If9041c99f0603a5785a683223908b99abd031bea Gerrit-Change-Number: 910861 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits April 2023