Pywikibot-commits August 2019

pywikibot-commits@lists.wikimedia.org

1 participants
40 discussions

[Gerrit] pywikibot/core[master]: [lib] werkzeug 0.15.5 was published

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/532407 ) Change subject: [lib] werkzeug 0.15.5 was published ...................................................................... [lib] werkzeug 0.15.5 was published - pytest-httpbin needs httpbin and httpbin needs werkzeug >= 0.14.1 - Python 3.8 needs werkzeug 0.15.5 - github vulnerable depedency suggests werkzeug >= 0.15.3 Change-Id: Ia84b2ea485d3cf47b92e878c7d6c4c0ed65dbcf8 --- M dev-requirements.txt 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Huji: Looks good to me, approved jenkins-bot: Verified diff --git a/dev-requirements.txt b/dev-requirements.txt index a5c203b..dba1827 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -6,9 +6,10 @@ pytest-runner pytest-cov>=2.6.1 pytest-attrib>=0.1.3 -# pytest-httpbin needs httpbin needs werkzeug >=0.14.1 -# but werkzeug >= 0.15.0, < 0.15.5 fails for Python 3.8 -werkzeug != 0.15.0, != 0.15.1, != 0.15.2, != 0.15.3, != 0.15.4 ; python_version >= '3.8' +# pytest-httpbin needs httpbin needs werkzeug >= 0.14.1 +# Python 3.8 needs werkzeug >= 0.15.5 +# github vulnerable depedency suggests werkzeug >= 0.15.3 +werkzeug>=0.15.5 pytest-httpbin six -- To view, visit https://gerrit.wikimedia.org/r/532407 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia84b2ea485d3cf47b92e878c7d6c4c0ed65dbcf8 Gerrit-Change-Number: 532407 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 7 months

[Gerrit] pywikibot/core[master]: [PEP8] pep8 changes

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/532423 ) Change subject: [PEP8] pep8 changes ...................................................................... [PEP8] pep8 changes Change-Id: I1454e6d701844d72570fd3e57e90b8e4b76a07c6 --- M pywikibot/site.py 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 4b8e9b5..074fb34 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -6305,8 +6305,10 @@ 3, since='20150823') if isinstance(ignore_warnings, Iterable): ignored_warnings = ignore_warnings - ignore_warnings = lambda warnings: all( # noqa: E731 - w.code in ignored_warnings for w in warnings) + + def ignore_warnings(warnings): + return all(w.code in ignored_warnings for w in warnings) + ignore_all_warnings = not callable(ignore_warnings) and ignore_warnings if text is None: text = filepage.text -- To view, visit https://gerrit.wikimedia.org/r/532423 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1454e6d701844d72570fd3e57e90b8e4b76a07c6 Gerrit-Change-Number: 532423 Gerrit-PatchSet: 2 Gerrit-Owner: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 7 months

[Gerrit] pywikibot/core[master]: Update tox.ini file to make it pycodestyle compliant

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/532412 ) Change subject: Update tox.ini file to make it pycodestyle compliant ...................................................................... Update tox.ini file to make it pycodestyle compliant [pep8] is deprecated and should be replaced with [pycodestyle] or else a warning is shown Bug: T231219 Change-Id: Ia005c9ac9d501f3bb3f6ae8b89410913d8a60880 --- M tox.ini 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index 8114a09..3692d0b 100644 --- a/tox.ini +++ b/tox.ini @@ -249,7 +249,7 @@ tests/wikibase_tests.py: N802 tests/xmlreader_tests.py: N802 -[pep8] +[pycodestyle] exclude = .tox,.git,./*.egg,build,user-config.py,scripts/archive/*,./scripts/i18n/*,scripts/userscripts/* [pep257] -- To view, visit https://gerrit.wikimedia.org/r/532412 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia005c9ac9d501f3bb3f6ae8b89410913d8a60880 Gerrit-Change-Number: 532412 Gerrit-PatchSet: 1 Gerrit-Owner: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 7 months

[Gerrit] pywikibot/core[master]: Check a user's rights before checking its group memberships

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/531589 ) Change subject: Check a user's rights before checking its group memberships ...................................................................... Check a user's rights before checking its group memberships The current version of the code checks to see if a user is in the sysop group. This is wrong, because other groups may also have the right to delete/undelete/proected/block/unblock. Instead, it should make sure the bot user has the right through any of its group memberships, before falling back to the backward-compliant strategy that is based on user groups. Bug: T229293 Bug: T189126 Bug: T122705 Bug: T119335 Bug: T75545 Change-Id: Ie729511867340f38de24e28e55bef1d49c1d6b99 --- M pywikibot/site.py 1 file changed, 9 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved Dalba: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 22bcc27..4b8e9b5 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -1303,7 +1303,6 @@ keyword argument 'as_group'. @type group: str ('user' or 'sysop') @param right: The rights the logged in user should have. - Not supported yet and thus ignored. @return: method decorator """ @@ -1314,12 +1313,16 @@ raise UserRightsError('Site {} has been closed. Only steward ' 'can perform requested action.' .format(self.sitename)) + if right is not None: + if right in self.userinfo['rights']: + return if grp == 'user': self.login(False) elif grp == 'sysop': self.login(True) else: raise Exception('Not implemented') + return fn(self, *args, **kwargs) if not __debug__: @@ -5638,7 +5641,7 @@ 'Revision may not exist or was already undeleted.' } # other errors shouldn't occur because of pre-submission checks - @must_be(group='sysop') + @must_be(group='sysop', right='delete') @deprecate_arg('summary', 'reason') def deletepage(self, page, reason): """Delete page from the wiki. Requires appropriate privilege level. @@ -5676,7 +5679,7 @@ finally: self.unlock_page(page) - @must_be(group='sysop') + @must_be(group='sysop', right='undelete') @deprecate_arg('summary', 'reason') def undelete_page(self, page, reason, revisions=None): """Undelete page from the wiki. Requires appropriate privilege level. @@ -5749,7 +5752,7 @@ # implemented in b73b5883d486db0e9278ef16733551f28d9e096d return set(self.siteinfo.get('restrictions')['levels']) - @must_be(group='sysop') + @must_be(group='sysop', right='protect') @deprecate_arg('summary', 'reason') def protect(self, page, protections, reason, expiry=None, **kwargs): """(Un)protect a wiki page. Requires administrator status. @@ -5907,7 +5910,7 @@ yield result['patrol'] - @must_be(group='sysop') + @must_be(group='sysop', right='block') def blockuser(self, user, expiry, reason, anononly=True, nocreate=True, autoblock=True, noemail=False, reblock=False, allowusertalk=False): @@ -5965,7 +5968,7 @@ data = req.submit() return data - @must_be(group='sysop') + @must_be(group='sysop', right='block') def unblockuser(self, user, reason=None): """ Remove the block for the user. -- To view, visit https://gerrit.wikimedia.org/r/531589 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie729511867340f38de24e28e55bef1d49c1d6b99 Gerrit-Change-Number: 531589 Gerrit-PatchSet: 9 Gerrit-Owner: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 7 months

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

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/531795 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I65d0a369b7799a8e214ed4867386b0edb9b0a1c0 --- M archivebot/nb.json M category/sr.json M category_redirect/nb.json M category_redirect/sr.json M checkimages/nb.json M pywikibot/nb.json A standardize_interwiki/nb.json 7 files changed, 29 insertions(+), 10 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/archivebot/nb.json b/archivebot/nb.json index 07644cf..0bb41bb 100644 --- a/archivebot/nb.json +++ b/archivebot/nb.json @@ -3,12 +3,13 @@ "authors": [ "Xqt", "Danmichaelo", - "SuperPotato" + "SuperPotato", + "Jon Harald Søby" ] }, "archivebot-archive-full": "(ARKIV FULLT)", "archivebot-archive-summary": "Robot: Arkiverer %(count)d {{PLURAL:%(count)d|tråd|tråder}} fra [[%(from)s]]", "archivebot-archiveheader": "{{Arkivert}}", - "archivebot-older-than": "eldre enn %(duration)s", + "archivebot-older-than": "{{PLURAL:%(count)d|eldre}} enn %(duration)s", "archivebot-page-summary": "Bot: Arkiverer %(count)d {{PLURAL:%(count)d|tråd|tråder}} (%(why)s) til %(archives)s" } diff --git a/category/sr.json b/category/sr.json index b2ff390..7225af6 100644 --- a/category/sr.json +++ b/category/sr.json @@ -18,7 +18,7 @@ "category-section-title": "Историја раније верзије странице %(oldcat)s", "category-strip-cfd-templates": "Бот: уклањање CFD шаблона за извршену радњу", "category-strip-sort-keys": "Бот: Уклањање кључева за сортирање за довршену радњу", - "category-strip-both": "Бот: уклањање CFD шаблона и кључева за сортирање за извршену радњу", + "category-strip-both": "Бот: Уклањање CFD шаблона и кључева за сортирање за довршену радњу", "category-version-history": "Бот: чувам историју раније верзије странице %(oldcat)s", "category-was-disbanded": "Бот: категорија је распуштена", "category-was-moved": "Бот: категорија је премештена у [[:Категорија:%(newcat)s|%(title)s]]" diff --git a/category_redirect/nb.json b/category_redirect/nb.json index 0461c40..b0f9ee1 100644 --- a/category_redirect/nb.json +++ b/category_redirect/nb.json @@ -16,7 +16,7 @@ "category_redirect-log-add-failed": "* Kunne ikke legge til [[%(ns)s%(template)s]] på %(oldcat)s", "category_redirect-log-double": "* Fikset dobbel omdirigering: %(oldcat)s → %(newcat)s → %(targetcat)s", "category_redirect-log-failed": "** Feilet: %(error)s", - "category_redirect-log-false-positive": "* Falsk positiv: %(oldcat)s", + "category_redirect-log-false-positive": "* Uventet ikke-omdirigering: %(oldcat)s", "category_redirect-log-ignoring": "* Ignorerer %(oldcat)s", "category_redirect-log-loop": "* Omdirigeringssløyfe fra %(oldcat)s", "category_redirect-log-moved": "* %(oldcat)s: %(found)d funnet, %(moved)d flyttet", diff --git a/category_redirect/sr.json b/category_redirect/sr.json index 772e099..2340121 100644 --- a/category_redirect/sr.json +++ b/category_redirect/sr.json @@ -18,7 +18,7 @@ "category_redirect-log-add-failed": "* Није успело додавање [[%(ns)s%(template)s]] у %(oldcat)s", "category_redirect-log-double": "* Поправљено дупло преусмерење: %(oldcat)s -> %(newcat)s -> %(targetcat)s", "category_redirect-log-failed": "** Није успело: %(error)s", - "category_redirect-log-false-positive": "* Неочекивано не-преусмерење: %(oldcat)s", + "category_redirect-log-false-positive": "* Неочекивано непреусмерење: %(oldcat)s", "category_redirect-log-ignoring": "* Игнорисање %(oldcat)s", "category_redirect-log-loop": "* Преусмеравајућа петља од %(oldcat)s", "category_redirect-log-moved": "* %(oldcat)s: %(found)d пронађено, %(moved)d премештено", @@ -27,7 +27,7 @@ "category_redirect-log-not-loaded": "* Није могуће учитати %(oldcat)s; игнорисање", "category_redirect-log-skipping": "* Прескакање %(oldcat)s; у периоду обуставе", "category_redirect-older-logs": "'''[%(oldlogs)s Старији дневници]'''", - "category_redirect-problem-hard": "# %(oldcat)s је тешко преусмерење на %(page)s", + "category_redirect-problem-hard": "# %(oldcat)s је чврсто преусмерење на %(page)s", "category_redirect-problem-redirects": "# %(oldcat)s преусмерава на %(redpage)s", - "category_redirect-problem-self-linked": "# %(oldcat)s је самостално-повезано преусмерење" + "category_redirect-problem-self-linked": "# %(oldcat)s је самоповезано преусмерење" } diff --git a/checkimages/nb.json b/checkimages/nb.json index c148813..74ed236 100644 --- a/checkimages/nb.json +++ b/checkimages/nb.json @@ -1,9 +1,18 @@ { "@metadata": { "authors": [ - "SuperPotato" + "SuperPotato", + "Jon Harald Søby" ] }, + "checkimages-deletion-comment": "Bot: Legger til %(adding)s", + "checkimages-doubles-file-comment": "Bot: Fila finnes allerede på Commons, kan slettes", + "checkimages-doubles-head": "Duplikatfil", + "checkimages-doubles-talk-comment": "Bot: Fortell at fila allerede finnes på Commons", + "checkimages-log-comment": "Bot: Oppdaterer loggen", + "checkimages-no-license-head": "Bilde uten lisens", "checkimages-source-tag-comment": "Robot: Markerer den nylig opplastet umarkerte filen", - "checkimages-source-notice-comment": "Robot: Spør etter kilde informasjon." + "checkimages-source-notice-comment": "Robot: Spør etter kilde informasjon.", + "checkimages-unknown-extension-head": "Ukjent filendelse!", + "checkimages-unknown-extension-msg": "Fila %(file)s ser ut til å ha gal filendelse, vennligst sjekk." } diff --git a/pywikibot/nb.json b/pywikibot/nb.json index 28c8668..e9ec31d 100644 --- a/pywikibot/nb.json +++ b/pywikibot/nb.json @@ -15,5 +15,6 @@ "pywikibot-enter-xml-filename": "Skriv inn XML-dumpens filnavn:", "pywikibot-fixes-fckeditor": "Robot: Fikser HTML fra wysiwyg-editor", "pywikibot-fixes-html": "Robot: Konverterer/fikser HTML", - "pywikibot-fixes-syntax": "Robot: Fikser wikisyntaks" + "pywikibot-fixes-syntax": "Robot: Fikser wikisyntaks", + "pywikibot-touch": "Pywikibot-nullredigering" } diff --git a/standardize_interwiki/nb.json b/standardize_interwiki/nb.json new file mode 100644 index 0000000..0060144 --- /dev/null +++ b/standardize_interwiki/nb.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Jon Harald Søby" + ] + }, + "standardize_interwiki-comment": "Bot: Interwikistandardisering" +} -- To view, visit https://gerrit.wikimedia.org/r/531795 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I65d0a369b7799a8e214ed4867386b0edb9b0a1c0 Gerrit-Change-Number: 531795 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 (75)

4 years, 7 months

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

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/530817 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: If6eeb0be462cdd664e38e6a8929578f096c1a779 --- A archivebot/tt.json M checkimages/nl.json A pywikibot/tt.json A thirdparty/tt.json M welcome/tt.json 5 files changed, 31 insertions(+), 4 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/archivebot/tt.json b/archivebot/tt.json new file mode 100644 index 0000000..70a6532 --- /dev/null +++ b/archivebot/tt.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Ерней" + ] + }, + "archivebot-archive-full": "(АРХИВ ТУЛГАН)" +} diff --git a/checkimages/nl.json b/checkimages/nl.json index 6ab9384..42c9a55 100644 --- a/checkimages/nl.json +++ b/checkimages/nl.json @@ -1,9 +1,11 @@ { "@metadata": { "authors": [ - "Siebrand" + "Siebrand", + "Optilete" ] }, + "checkimages-doubles-head": "Dubbel bestand", "checkimages-source-tag-comment": "Robot: nieuw bestand zonder labels gemarkeerd", "checkimages-source-notice-comment": "Robot: verzoek om brongegevens." } diff --git a/pywikibot/tt.json b/pywikibot/tt.json new file mode 100644 index 0000000..b9fa17e --- /dev/null +++ b/pywikibot/tt.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Ерней" + ] + }, + "pywikibot-touch": "Pywikibot төзәтмәсе" +} diff --git a/thirdparty/tt.json b/thirdparty/tt.json new file mode 100644 index 0000000..7d8f268 --- /dev/null +++ b/thirdparty/tt.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Ерней" + ] + }, + "thirdparty-drtrigonbot-sum_disc-notify-maintmsg": "БОТ ХӘБӘРЕ" +} diff --git a/welcome/tt.json b/welcome/tt.json index 637ecd8..8a06c12 100644 --- a/welcome/tt.json +++ b/welcome/tt.json @@ -1,10 +1,11 @@ { "@metadata": { "authors": [ - "Ajdar" + "Ajdar", + "Ерней" ] }, - "welcome-bad_username": "Робот:Шикле кулланучы исеме өстәлгән", - "welcome-updating": "Робот:Яңарту", + "welcome-bad_username": "Бот: шикле кулланучы исеме өстәлгән", + "welcome-updating": "Бот: көндәлекне яңарту", "welcome-welcome": "Рәхим итегез!" } -- To view, visit https://gerrit.wikimedia.org/r/530817 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If6eeb0be462cdd664e38e6a8929578f096c1a779 Gerrit-Change-Number: 530817 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 (75)

4 years, 8 months

[Gerrit] pywikibot/core[master]: refactor: remove unused local variable assignments

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/517810 ) Change subject: refactor: remove unused local variable assignments ...................................................................... refactor: remove unused local variable assignments Change-Id: I6931b0abd6e635412c26dbb947a7b78f9d973c05 --- M pywikibot/botirc.py M pywikibot/i18n.py M pywikibot/site.py M pywikibot/specialbots.py M scripts/category.py M scripts/cfd.py M scripts/commonscat.py M scripts/data_ingestion.py M scripts/imagecopy_self.py M scripts/imagerecat.py M scripts/imagetransfer.py M scripts/interwiki.py M scripts/listpages.py M scripts/match_images.py M scripts/nowcommons.py M scripts/patrol.py M scripts/protect.py M scripts/redirect.py M scripts/reflinks.py M scripts/touch.py M tests/djvu_tests.py M tests/flow_thanks_tests.py M tests/generate_family_files_tests.py M tests/site_tests.py M tests/thanks_tests.py M tests/xmlreader_tests.py 26 files changed, 18 insertions(+), 56 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/botirc.py b/pywikibot/botirc.py index 3286341..c7abf71 100644 --- a/pywikibot/botirc.py +++ b/pywikibot/botirc.py @@ -104,7 +104,7 @@ entry = self.api_found.findall(text) page = pywikibot.Page(self.site, name) try: - text = page.get() + page.get() except pywikibot.NoPage: return except pywikibot.IsRedirectPage: diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index d138c13..607553b 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -435,20 +435,19 @@ if twtitle in _cache[lang]: return _cache[lang][twtitle] message_bundle = twtitle.split('-')[0] - trans_text = None filename = '%s/%s.json' % (message_bundle, lang) try: trans_text = pkgutil.get_data( _messages_package_name, filename).decode('utf-8') except (OSError, IOError): # file open can cause several exceptions _cache[lang][twtitle] = None - return + return None transdict = json.loads(trans_text) _cache[lang].update(transdict) try: return transdict[twtitle] except KeyError: - return + return None def _extract_plural(code, message, parameters): diff --git a/pywikibot/site.py b/pywikibot/site.py index 53928d7..22bcc27 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2632,8 +2632,6 @@ for nsdata in self.siteinfo.get('namespaces', cache=False).values(): ns = nsdata.pop('id') - custom_name = None - canonical_name = None if ns == 0: canonical_name = nsdata.pop('*') custom_name = canonical_name diff --git a/pywikibot/specialbots.py b/pywikibot/specialbots.py index 8c5448b..2bfbed1 100644 --- a/pywikibot/specialbots.py +++ b/pywikibot/specialbots.py @@ -3,7 +3,7 @@ """Library containing special bots.""" # # (C) Rob W.W. Hooft, Andre Engels 2003-2004 -# (C) Pywikibot team, 2003-2018 +# (C) Pywikibot team, 2003-2019 # # Distributed under the terms of the MIT license. # @@ -422,7 +422,6 @@ pywikibot.output('Uploading file to {0}...'.format(site)) - success = False ignore_warnings = self.ignoreWarning is True or self._handle_warnings if ('://' in file_url and 'upload_by_url' not in site.userinfo['rights']): @@ -441,10 +440,8 @@ % site) else: pywikibot.error('Upload error: ', exc_info=True) - return None except Exception: pywikibot.error('Upload error: ', exc_info=True) - return None else: if success: # No warning, upload complete. @@ -453,7 +450,7 @@ return filename # data['filename'] else: pywikibot.output('Upload aborted.') - return None + return None def run(self): """Run bot.""" diff --git a/scripts/category.py b/scripts/category.py index 9be9060..e07d71e 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -1365,9 +1365,6 @@ local_args = pywikibot.handle_args(args) gen_factory = pagegenerators.GeneratorFactory() - # The generator gives the pages that should be worked upon. - gen = None - # When this is True then the custom edit summary given for removing # categories from articles will also be used as the deletion reason. # Otherwise it will generate deletion specific comments. @@ -1444,7 +1441,6 @@ else: gen_factory.handleArg(arg) - cat_db = None bot = None cat_db = CategoryDatabase(rebuild=rebuild) diff --git a/scripts/cfd.py b/scripts/cfd.py index ff5d6e4..f232d25 100755 --- a/scripts/cfd.py +++ b/scripts/cfd.py @@ -107,18 +107,14 @@ day = 'None' mode = 'None' summary = '' - action_summary = '' robot = None m = ReCheck() for line in page.text.split('\n'): - if nobots.search(line): - # NO BOTS!!! - pass - elif example.search(line): - # Example line - pass - elif speedymode.search(line): + if nobots.search(line) or example.search(line): + # NO BOTS or example line + continue + if speedymode.search(line): mode = 'Speedy' day = 'None' elif movemode.search(line): diff --git a/scripts/commonscat.py b/scripts/commonscat.py index a8cf10b..53cc9d0 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -400,8 +400,6 @@ primaryCommonscat, commonscatAlternatives = i18n.translate( wikipediaPage.site.code, commonscatTemplates, fallback=i18n.DEFAULT_FALLBACK) - commonscatTemplate = '' - commonscatTarget = '' commonscatLinktext = '' commonscatNote = '' # See if commonscat is present diff --git a/scripts/data_ingestion.py b/scripts/data_ingestion.py index ce846a0..ed8977f 100755 --- a/scripts/data_ingestion.py +++ b/scripts/data_ingestion.py @@ -63,7 +63,7 @@ urlparse(URL)[2])[1] self.metadata['_ext'] = ext = filename.split('.')[-1] if ext == filename: - self.metadata['_ext'] = ext = None + self.metadata['_ext'] = None self.contents = None if not site: diff --git a/scripts/imagecopy_self.py b/scripts/imagecopy_self.py index 57394c8..afe7ae2 100644 --- a/scripts/imagecopy_self.py +++ b/scripts/imagecopy_self.py @@ -431,9 +431,6 @@ # "strange" fields description = '' - source = '' - date = '' - author = '' permission = '' other_versions = '' contents = {} diff --git a/scripts/imagerecat.py b/scripts/imagerecat.py index 6e66b08..04e3fd0 100755 --- a/scripts/imagerecat.py +++ b/scripts/imagerecat.py @@ -287,7 +287,7 @@ result = [] lang = '' project = '' - article = '' + articles = '' usageRe = re.compile( r'^(?P<lang>([\w-]+))\.(?P<project>([\w]+))\.org:(?P<articles>\s(.*))') matches = usageRe.search(use) @@ -454,7 +454,6 @@ @param args: command line arguments @type args: str """ - generator = None onlyFilter = False onlyUncat = False diff --git a/scripts/imagetransfer.py b/scripts/imagetransfer.py index eca4a5d..5968112 100755 --- a/scripts/imagetransfer.py +++ b/scripts/imagetransfer.py @@ -29,7 +29,7 @@ """ # # (C) Andre Engels, 2004 -# (C) Pywikibot team, 2004-2018 +# (C) Pywikibot team, 2004-2019 # # Distributed under the terms of the MIT license. # @@ -167,11 +167,9 @@ if sourceSite.family == self.targetSite.family: description += '\n\n{0}'.format(sourceImagePage) except pywikibot.NoPage: - description = '' pywikibot.output( 'Image does not exist or description page is empty.') except pywikibot.IsRedirectPage: - description = '' pywikibot.output('Image description page is redirect.') else: bot = UploadRobot(url=url, description=description, @@ -291,8 +289,6 @@ @param args: command line arguments @type args: str """ - gen = None - interwiki = False keep_name = False targetLang = None diff --git a/scripts/interwiki.py b/scripts/interwiki.py index 3a1d7f0..ff40822 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -1176,7 +1176,6 @@ # Only once! self.hintsAsked = True if self.conf.untranslated: - newhint = None t = self.conf.showtextlink if t: pywikibot.output(self.originPage.get()[:t]) diff --git a/scripts/listpages.py b/scripts/listpages.py index 3328ff5..f13a861 100755 --- a/scripts/listpages.py +++ b/scripts/listpages.py @@ -177,7 +177,6 @@ @param args: command line arguments @type args: str """ - gen = None notitle = False fmt = '1' outputlang = None diff --git a/scripts/match_images.py b/scripts/match_images.py index 442e944..08981a7 100755 --- a/scripts/match_images.py +++ b/scripts/match_images.py @@ -24,7 +24,7 @@ """ # # (c) Multichill, 2009 -# (c) Pywikibot team, 2009-2018 +# (c) Pywikibot team, 2009-2019 # # Distributed under the terms of the MIT license. # @@ -54,7 +54,6 @@ imageB = get_image_from_image_page(imagePageB) (imA_width, imA_height) = imageA.size - (imB_width, imB_height) = imageB.size imageB = imageB.resize((imA_width, imA_height)) @@ -113,7 +112,6 @@ def get_image_from_image_page(imagePage): """Get the image object to work based on an imagePage object.""" - imageBuffer = None imageURL = imagePage.fileUrl() imageURLopener = http.fetch(imageURL) imageBuffer = io.BytesIO(imageURLopener.raw[:]) @@ -147,8 +145,6 @@ images = [] other_family = '' other_lang = '' - imagePageA = None - imagePageB = None # Read commandline parameters. local_args = pywikibot.handle_args(args) diff --git a/scripts/nowcommons.py b/scripts/nowcommons.py index 1bf112f..1b4b25f 100755 --- a/scripts/nowcommons.py +++ b/scripts/nowcommons.py @@ -229,7 +229,6 @@ def findFilenameOnCommons(self, localImagePage): """Find filename on Commons.""" - filenameOnCommons = None for templateName, params in localImagePage.templatesWithParams(): if templateName in self.nc_templates: if params == []: diff --git a/scripts/patrol.py b/scripts/patrol.py index 200a7d4..9e35343 100755 --- a/scripts/patrol.py +++ b/scripts/patrol.py @@ -425,7 +425,6 @@ # that are also used by other scripts and that determine on which pages # to work on. usercontribs = None - gen = None recentchanges = False newpages = False repeat = False diff --git a/scripts/protect.py b/scripts/protect.py index 986e35d..7623166 100755 --- a/scripts/protect.py +++ b/scripts/protect.py @@ -163,7 +163,6 @@ """ options = {} message_properties = {} - generator = None protections = {} default_level = 'sysop' default_summaries = { diff --git a/scripts/redirect.py b/scripts/redirect.py index a5cc986..54a2985 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -203,7 +203,6 @@ def get_redirect_pages_via_api(self): """Yield Pages that are redirects.""" for ns in self.namespaces: - done = False gen = self.site.allpages(start=self.api_start, namespace=ns, filterredir=True) diff --git a/scripts/reflinks.py b/scripts/reflinks.py index 1963ff5..a2616ce 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -540,7 +540,6 @@ continue ref = RefLink(link, match.group('name'), site=self.site) - f = None try: f = comms.http.fetch( diff --git a/scripts/touch.py b/scripts/touch.py index e949bea..95cad9c 100755 --- a/scripts/touch.py +++ b/scripts/touch.py @@ -100,7 +100,6 @@ @param args: command line arguments @type args: str """ - gen = None options = {} # Process global args and prepare generator args parser diff --git a/tests/djvu_tests.py b/tests/djvu_tests.py index b2e375f..a00374d 100644 --- a/tests/djvu_tests.py +++ b/tests/djvu_tests.py @@ -41,7 +41,7 @@ dp = subprocess.Popen(['djvudump'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdoutdata, stderrdata = dp.communicate() + dp.communicate() except OSError: raise unittest.SkipTest('djvulibre library not installed.') diff --git a/tests/flow_thanks_tests.py b/tests/flow_thanks_tests.py index 1a37feb6..c0b2f4e 100644 --- a/tests/flow_thanks_tests.py +++ b/tests/flow_thanks_tests.py @@ -33,7 +33,6 @@ def test_thank_post(self): """Test thanks for Flow posts.""" - found_log = False site = self.get_site() topic = Topic(site, self._topic_title) for post in reversed(topic.replies()): diff --git a/tests/generate_family_files_tests.py b/tests/generate_family_files_tests.py index 210f254..1c54bb8 100644 --- a/tests/generate_family_files_tests.py +++ b/tests/generate_family_files_tests.py @@ -23,7 +23,7 @@ def getapis(self): """Only load additional two additional wikis randomly.""" save = self.langs - self.langs = [choice(save) for i in range(2)] + self.langs = [choice(save), choice(save)] self.prefixes = [item['prefix'] for item in self.langs] super(FamilyTestGenerator, self).getapis() self.langs = save diff --git a/tests/site_tests.py b/tests/site_tests.py index 91204f2..30e1887 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -2111,7 +2111,7 @@ try: # no such rcid, revid or too old revid - result = list(mysite.patrol(**params)) + list(mysite.patrol(**params)) except api.APIError as error: if error.code == 'badtoken': self.skipTest(error) diff --git a/tests/thanks_tests.py b/tests/thanks_tests.py index 051a1a0..7612cb3 100644 --- a/tests/thanks_tests.py +++ b/tests/thanks_tests.py @@ -32,7 +32,6 @@ there must make edits made before reruns of this test. Please see https://phabricator.wikimedia.org/T137836. """ - found_log = False site = self.get_site() data = site.recentchanges(total=20) for rev in data: diff --git a/tests/xmlreader_tests.py b/tests/xmlreader_tests.py index b3c6198..190c810 100644 --- a/tests/xmlreader_tests.py +++ b/tests/xmlreader_tests.py @@ -54,7 +54,7 @@ def test_XmlDumpRedirect(self): """Test XmlDump correctly parsing whether a page is a redirect.""" - pages = self._get_entries('article-pyrus.xml', allrevisions=True) + self._get_entries('article-pyrus.xml', allrevisions=True) pages = [r for r in xmlreader.XmlDump( join_xml_data_path('article-pyrus.xml')).parse()] @@ -75,7 +75,7 @@ previous = self._compare(previous, '.xml', all_revisions) previous = self._compare(previous, '-utf16.xml', all_revisions) previous = self._compare(previous, '.xml.bz2', all_revisions) - previous = self._compare(previous, '-utf16.xml.bz2', all_revisions) + self._compare(previous, '-utf16.xml.bz2', all_revisions) def test_XmlDump_compare_all(self): """Compare the different XML files using all revisions.""" -- To view, visit https://gerrit.wikimedia.org/r/517810 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6931b0abd6e635412c26dbb947a7b78f9d973c05 Gerrit-Change-Number: 517810 Gerrit-PatchSet: 4 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75) Gerrit-CC: Mpaa <mpaa.wiki(a)gmail.com>

4 years, 8 months

[Gerrit] pywikibot/core[master]: [bugfix] Fix the comparison in archivebot

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/528474 ) Change subject: [bugfix] Fix the comparison in archivebot ...................................................................... [bugfix] Fix the comparison in archivebot Fix the comparison in archivebot. Also removed cause of deprecation for 'test_family' in TestDiscussionPageObject. Bug: T228587 Change-Id: Id3f3324db0856603a4539e017fcef44d0bedc977 --- M scripts/archivebot.py M tests/archivebot_tests.py 2 files changed, 70 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/archivebot.py b/scripts/archivebot.py index c0381f8..86b54a3 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -571,9 +571,14 @@ """Load and validate archiver template.""" pywikibot.output('Looking for: {{%s}} in %s' % (self.tpl.title(), self.page)) - for tpl in self.page.raw_extracted_templates: - if tpl[0] == self.tpl.title(with_ns=False): - for item, value in tpl[1].items(): + for tpl, params in self.page.raw_extracted_templates: + try: # Check tpl name before comparing; it might be invalid. + tpl_page = pywikibot.Page(self.site, tpl, ns=10) + tpl_page.title() + except pywikibot.Error: + continue + if tpl_page == self.tpl: + for item, value in params.items(): self.set_attr(item.strip(), value.strip()) break else: diff --git a/tests/archivebot_tests.py b/tests/archivebot_tests.py index 6896711..c8b5bc3 100644 --- a/tests/archivebot_tests.py +++ b/tests/archivebot_tests.py @@ -240,7 +240,7 @@ """Test DiscussionPage object.""" cached = True - family = 'test' + family = 'wikipedia' code = 'test' def testTwoThreadsWithCommentedOutThread(self): @@ -301,6 +301,67 @@ self.assertEqual([x.title for x in page.threads], ['A', 'B']) +class TestPageArchiverObject(TestCase): + + """Test PageArchiver object.""" + + cached = True + family = 'wikipedia' + code = 'test' + + def testLoadConfigInTemplateNamespace(self): + """Test loading of config with TEMPLATE_PAGE in Template ns. + + Talk:For-pywikibot-archivebot-01 must have: + + {{Pywikibot_archivebot + |archive = Talk:Main_Page/archive + |algo = old(30d) + }} + """ + site = self.get_site() + page = pywikibot.Page(site, 'Talk:For-pywikibot-archivebot-01') + + # TEMPLATE_PAGE assumed in ns=10 if ns is not explicit. + tmpl_with_ns = pywikibot.Page(site, 'Template:Pywikibot_archivebot') + tmpl_without_ns = pywikibot.Page(site, 'Pywikibot_archivebot', ns=10) + + try: + archivebot.PageArchiver(page, tmpl_with_ns, '') + except pywikibot.Error as e: + self.fail('PageArchiver() raised {}!'.format(e)) + + try: + archivebot.PageArchiver(page, tmpl_without_ns, '') + except pywikibot.Error as e: + self.fail('PageArchiver() raised {}!'.format(e)) + + def testLoadConfigInOtherNamespace(self): + """Test loading of config with TEMPLATE_PAGE not in Template ns. + + Talk:For-pywikibot-archivebot must have: + + {{User:MiszaBot/config + |archive = Talk:Main_Page/archive + |algo = old(30d) + }} + """ + site = self.get_site() + page = pywikibot.Page(site, 'Talk:For-pywikibot-archivebot') + + tmpl_with_ns = pywikibot.Page(site, 'User:MiszaBot/config', ns=10) + tmpl_without_ns = pywikibot.Page(site, 'MiszaBot/config', ns=10) + + # TEMPLATE_PAGE assumed in ns=10 if ns is not explicit. + try: + archivebot.PageArchiver(page, tmpl_with_ns, '') + except pywikibot.Error as e: + self.fail('PageArchiver() raised {}!'.format(e)) + + with self.assertRaises(archivebot.MissingConfigError): + archivebot.PageArchiver(page, tmpl_without_ns, '') + + if __name__ == '__main__': # pragma: no cover try: unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/528474 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id3f3324db0856603a4539e017fcef44d0bedc977 Gerrit-Change-Number: 528474 Gerrit-PatchSet: 9 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75) Gerrit-CC: MarcoAurelio <maurelio(a)tools.wmflabs.org>

4 years, 8 months

[Gerrit] pywikibot/core[master]: [L10N] Update languages_by_size

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/530577 ) Change subject: [L10N] Update languages_by_size ...................................................................... [L10N] Update languages_by_size Change-Id: I5a878f74141f37a81c7f55478d7d14a1d201f883 --- M pywikibot/families/wikinews_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 6 files changed, 37 insertions(+), 36 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikinews_family.py b/pywikibot/families/wikinews_family.py index a30999e..f312b77 100644 --- a/pywikibot/families/wikinews_family.py +++ b/pywikibot/families/wikinews_family.py @@ -24,7 +24,7 @@ languages_by_size = [ 'sr', 'en', 'fr', 'ru', 'pt', 'de', 'pl', 'es', 'zh', 'it', 'ar', 'cs', - 'ca', 'nl', 'el', 'ta', 'sv', 'uk', 'fa', 'bg', 'ro', 'fi', 'tr', 'ja', + 'ca', 'nl', 'el', 'ta', 'sv', 'uk', 'bg', 'fa', 'ro', 'fi', 'tr', 'ja', 'li', 'sq', 'no', 'eo', 'ko', 'bs', 'he', ] diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index e2a9f3d..3a7b93d 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -34,30 +34,30 @@ 'vi', 'ja', 'zh', 'pt', 'uk', 'ar', 'fa', 'sr', 'ca', 'no', 'id', 'fi', 'ko', 'hu', 'sh', 'cs', 'ro', 'eu', 'tr', 'ms', 'eo', 'hy', 'bg', 'da', 'he', 'sk', 'zh-min-nan', 'kk', 'min', 'ce', 'hr', 'et', 'lt', 'be', - 'el', 'sl', 'gl', 'azb', 'nn', 'az', 'ur', 'simple', 'th', 'hi', 'uz', - 'la', 'ka', 'vo', 'ta', 'cy', 'mk', 'ast', 'tg', 'lv', 'mg', 'tt', - 'oc', 'af', 'bs', 'ky', 'sq', 'tl', 'zh-yue', 'new', 'te', 'bn', - 'be-tarask', 'br', 'pms', 'ml', 'lb', 'jv', 'ht', 'sco', 'mr', 'nds', - 'sw', 'ga', 'su', 'ba', 'pnb', 'is', 'my', 'fy', 'cv', 'lmo', 'an', - 'ne', 'yo', 'pa', 'gu', 'io', 'bar', 'ku', 'als', 'scn', 'bpy', 'kn', - 'ckb', 'ia', 'qu', 'wuu', 'arz', 'mn', 'bat-smg', 'si', 'wa', 'or', + 'el', 'sl', 'gl', 'azb', 'nn', 'az', 'simple', 'ur', 'th', 'hi', 'uz', + 'ka', 'la', 'ta', 'vo', 'cy', 'mk', 'ast', 'tg', 'lv', 'mg', 'tt', + 'oc', 'af', 'bs', 'ky', 'sq', 'tl', 'zh-yue', 'new', 'bn', 'te', + 'be-tarask', 'br', 'ml', 'pms', 'lb', 'jv', 'ht', 'sco', 'mr', 'nds', + 'sw', 'su', 'ga', 'ba', 'is', 'pnb', 'my', 'fy', 'cv', 'lmo', 'an', + 'ne', 'yo', 'pa', 'io', 'gu', 'bar', 'ku', 'als', 'scn', 'bpy', 'kn', + 'ckb', 'ia', 'qu', 'wuu', 'arz', 'mn', 'bat-smg', 'wa', 'si', 'or', 'gd', 'yi', 'am', 'cdo', 'nap', 'bug', 'hsb', 'mai', 'map-bms', 'fo', 'mzn', 'xmf', 'ilo', 'li', 'vec', 'eml', 'sah', 'sd', 'os', 'sa', - 'diq', 'ps', 'mrj', 'mhr', 'hif', 'zh-classical', 'roa-tara', 'bcl', - 'frr', 'ace', 'hak', 'pam', 'szl', 'nv', 'nso', 'km', 'se', 'hyw', + 'diq', 'ps', 'mrj', 'mhr', 'zh-classical', 'hif', 'roa-tara', 'bcl', + 'frr', 'nv', 'ace', 'hak', 'pam', 'szl', 'nso', 'se', 'km', 'hyw', 'rue', 'mi', 'nah', 'vls', 'bh', 'nds-nl', 'crh', 'gan', 'vep', 'sc', - 'bo', 'as', 'myv', 'glk', 'co', 'tk', 'so', 'fiu-vro', 'lrc', 'kv', - 'csb', 'shn', 'gv', 'udm', 'sn', 'zea', 'ay', 'ie', 'pcd', 'nrm', 'ug', - 'ab', 'stq', 'lez', 'kw', 'lad', 'kab', 'mwl', 'gom', 'ha', 'gn', + 'ab', 'bo', 'as', 'myv', 'glk', 'co', 'tk', 'so', 'fiu-vro', 'lrc', + 'kv', 'csb', 'shn', 'gv', 'sn', 'udm', 'zea', 'ay', 'ie', 'pcd', 'nrm', + 'ug', 'kab', 'stq', 'lez', 'kw', 'lad', 'mwl', 'ha', 'gom', 'gn', 'haw', 'rm', 'lij', 'lfn', 'koi', 'lo', 'mt', 'frp', 'fur', 'dsb', - 'ln', 'ang', 'ext', 'dty', 'olo', 'cbk-zam', 'dv', 'ksh', 'gag', 'bjn', - 'pi', 'pag', 'pfl', 'av', 'bxr', 'xal', 'gor', 'krc', 'za', 'pap', - 'kaa', 'pdc', 'rw', 'tyv', 'to', 'kl', 'nov', 'jam', 'arc', 'kbp', - 'kbd', 'tpi', 'tet', 'ig', 'ki', 'na', 'wo', 'jbo', 'roa-rup', 'lbe', - 'bi', 'ty', 'zu', 'kg', 'mdf', 'lg', 'srn', 'tcy', 'inh', 'atj', 'sat', - 'xh', 'chr', 'ltg', 'sm', 'om', 'pih', 'cu', 'tw', 'rmy', 'tn', 'bm', - 'ak', 'chy', 'rn', 'got', 'ts', 'tum', 'st', 'ny', 'ch', 'ss', 'pnt', - 'fj', 'iu', 'ady', 'ee', 'ks', 've', 'ik', 'sg', 'ff', 'dz', 'ti', + 'ext', 'ln', 'ang', 'dty', 'olo', 'cbk-zam', 'dv', 'ksh', 'gag', 'bjn', + 'pi', 'pag', 'pfl', 'av', 'bxr', 'gor', 'xal', 'krc', 'za', 'pap', + 'kaa', 'pdc', 'tyv', 'rw', 'to', 'kl', 'nov', 'arc', 'jam', 'kbp', + 'kbd', 'tpi', 'tet', 'ig', 'ki', 'zu', 'na', 'wo', 'jbo', 'roa-rup', + 'lbe', 'bi', 'ty', 'kg', 'mdf', 'lg', 'tcy', 'srn', 'sat', 'inh', 'xh', + 'atj', 'ltg', 'chr', 'sm', 'pih', 'om', 'tn', 'cu', 'ak', 'tw', 'rmy', + 'bm', 'ts', 'chy', 'rn', 'st', 'got', 'tum', 'ny', 'ch', 'ss', 'pnt', + 'fj', 'iu', 'ady', 've', 'ee', 'ks', 'ik', 'sg', 'ff', 'dz', 'ti', 'din', 'cr', ] diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 32369ff..c6c1642 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -31,10 +31,10 @@ languages_by_size = [ 'en', 'it', 'pl', 'ru', 'cs', 'fa', 'de', 'pt', 'es', 'uk', 'fr', 'sk', - 'bs', 'he', 'ca', 'fi', 'tr', 'th', 'sl', 'lt', 'az', 'bg', 'zh', 'eo', + 'he', 'bs', 'ca', 'fi', 'tr', 'th', 'sl', 'lt', 'az', 'bg', 'zh', 'eo', 'hy', 'hr', 'el', 'su', 'nn', 'id', 'ar', 'sv', 'hu', 'li', 'ko', 'nl', - 'et', 'ja', 'la', 'sr', 'sah', 'gu', 'gl', 'ta', 'ur', 'te', 'cy', - 'be', 'no', 'ml', 'kn', 'ro', 'ku', 'eu', 'vi', 'hi', 'sq', 'ka', 'da', + 'et', 'ja', 'la', 'sr', 'sah', 'ta', 'gu', 'gl', 'ur', 'te', 'cy', + 'be', 'vi', 'no', 'ml', 'kn', 'ro', 'ku', 'eu', 'sq', 'hi', 'ka', 'da', 'sa', 'is', 'br', 'mr', 'af', 'uz', 'wo', 'ky', ] diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index 5738c7f..babe9fa 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -30,10 +30,11 @@ languages_by_size = [ 'en', 'pl', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'es', 'ar', 'cs', 'pt', 'www', 'fa', 'gu', 'hu', 'ml', 'sv', 'ko', 'bn', 'sr', 'sa', 'uk', - 'hy', 'sl', 'te', 'el', 'th', 'ro', 'fi', 'ja', 'vi', 'az', 'ta', 'ca', - 'br', 'nl', 'kn', 'hr', 'la', 'no', 'is', 'eo', 'vec', 'tr', 'pms', - 'et', 'be', 'mk', 'da', 'id', 'yi', 'bg', 'li', 'as', 'mr', 'or', 'gl', - 'bs', 'sah', 'lt', 'sk', 'pa', 'eu', 'cy', 'zh-min-nan', 'fo', 'nap', + 'hy', 'sl', 'te', 'el', 'ro', 'fi', 'ja', 'vi', 'nap', 'az', 'ta', + 'th', 'ca', 'br', 'nl', 'kn', 'hr', 'la', 'no', 'is', 'eo', 'vec', + 'tr', 'pms', 'be', 'et', 'da', 'mk', 'id', 'yi', 'bg', 'li', 'as', + 'mr', 'or', 'gl', 'bs', 'sah', 'lt', 'sk', 'pa', 'eu', 'cy', + 'zh-min-nan', 'fo', ] # Sites we want to edit but not count as real languages diff --git a/pywikibot/families/wikiversity_family.py b/pywikibot/families/wikiversity_family.py index 6e8936a..e8b52d9 100644 --- a/pywikibot/families/wikiversity_family.py +++ b/pywikibot/families/wikiversity_family.py @@ -19,7 +19,7 @@ languages_by_size = [ 'de', 'en', 'fr', 'ru', 'it', 'zh', 'cs', 'beta', 'pt', 'es', 'ar', - 'sv', 'fi', 'sl', 'el', 'ko', 'hi', 'ja', + 'sv', 'fi', 'sl', 'el', 'hi', 'ko', 'ja', ] category_redirect_templates = { diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index 305cf3b..b9b98b2 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -31,18 +31,18 @@ ] languages_by_size = [ - 'en', 'mg', 'fr', 'ru', 'sh', 'es', 'zh', 'de', 'nl', 'sv', 'pl', 'ku', - 'lt', 'it', 'el', 'ca', 'fi', 'hu', 'ta', 'tr', 'hy', 'ko', 'io', 'kn', + 'en', 'mg', 'fr', 'ru', 'sh', 'es', 'zh', 'de', 'ku', 'nl', 'sv', 'pl', + 'lt', 'it', 'el', 'ca', 'fi', 'hu', 'ta', 'tr', 'hy', 'io', 'ko', 'kn', 'pt', 'vi', 'sr', 'ja', 'chr', 'th', 'hi', 'ro', 'no', 'id', 'et', 'ml', 'my', 'uz', 'li', 'cs', 'or', 'te', 'eo', 'fa', 'ar', 'jv', 'az', 'eu', 'gl', 'oc', 'br', 'uk', 'da', 'lo', 'hr', 'fj', 'tg', 'ky', 'bg', - 'la', 'simple', 'sk', 'ast', 'ps', 'ur', 'wa', 'cy', 'is', 'vo', + 'la', 'sk', 'simple', 'ast', 'ps', 'ur', 'wa', 'is', 'cy', 'vo', 'zh-min-nan', 'af', 'he', 'scn', 'tl', 'pa', 'sw', 'fy', 'nn', 'lv', 'bn', 'sq', 'co', 'ka', 'mn', 'pnb', 'nds', 'sl', 'lb', 'bs', 'nah', - 'sa', 'kk', 'tk', 'sm', 'km', 'mk', 'hsb', 'ms', 'be', 'vec', 'ga', - 'yue', 'an', 'wo', 'ang', 'tt', 'mt', 'sd', 'gn', 'mr', 'ie', 'so', - 'gd', 'csb', 'ug', 'ia', 'st', 'roa-rup', 'si', 'hif', 'mi', 'ay', - 'fo', 'kl', 'jbo', 'ln', 'su', 'zu', 'na', 'gu', 'gv', 'kw', 'rw', + 'sa', 'kk', 'tk', 'sm', 'km', 'mk', 'hsb', 'ms', 'be', 'vec', 'yue', + 'ga', 'an', 'wo', 'ang', 'tt', 'mt', 'sd', 'gn', 'mr', 'ie', 'so', + 'gd', 'csb', 'ug', 'ia', 'st', 'roa-rup', 'si', 'hif', 'mi', 'fo', + 'ay', 'kl', 'jbo', 'ln', 'su', 'zu', 'na', 'gu', 'gv', 'kw', 'rw', 'ts', 'ne', 'om', 'qu', 'ss', 'ha', 'iu', 'am', 'dv', 'tpi', 'yi', 'ti', 'sg', 'tn', 'ks', ] -- To view, visit https://gerrit.wikimedia.org/r/530577 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5a878f74141f37a81c7f55478d7d14a1d201f883 Gerrit-Change-Number: 530577 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 8 months

[Gerrit] pywikibot/core[master]: proofreadpage.py: fix footer detection

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/529616 ) Change subject: proofreadpage.py: fix footer detection ...................................................................... proofreadpage.py: fix footer detection Fix footer detection when footer contains a </div> tag at the end. Bug: T230301 Change-Id: Ia2be695b5e8ea06f9760c86eebd3e8e836305a77 --- M pywikibot/proofreadpage.py M tests/proofreadpage_tests.py 2 files changed, 24 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index e323d76..5ca3dfd 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -126,6 +126,7 @@ close_tag = '</noinclude>' p_open = re.compile(r'<noinclude>') p_close = re.compile(r'(</div>|\n\n\n)?</noinclude>') + p_close_no_div = re.compile('</noinclude>') # V2 page format. # phetools ocr utility _HOCR_CMD = ('https://tools.wmflabs.org/phetools/hocr_cgi.py?' @@ -461,24 +462,32 @@ @raise Error: the page is not formatted according to ProofreadPage extension. """ + def _assert_len(len_oq, len_cq, title): + if (len_oq != len_cq) or (len_oq < 2 or len_cq < 2): + raise pywikibot.Error('ProofreadPage %s: invalid format' + % title) + # Property force page text loading. if not (hasattr(self, '_text') or self.text): self._create_empty_page() return + _title = self.title(as_link=True) + open_queue = list(self.p_open.finditer(self._text)) close_queue = list(self.p_close.finditer(self._text)) - - len_oq = len(open_queue) - len_cq = len(close_queue) - if (len_oq != len_cq) or (len_oq < 2 or len_cq < 2): - raise pywikibot.Error('ProofreadPage %s: invalid format' - % self.title(as_link=True)) + _assert_len(len(open_queue), len(close_queue), _title) f_open, f_close = open_queue[0], close_queue[0] self._full_header = FullHeader( self._text[f_open.end():f_close.start()]) + # check version of page format and in case recompute last match, + # in order not to include </div>. + if not self._full_header._has_div: + close_queue = list(self.p_close_no_div.finditer(self._text)) + _assert_len(len(open_queue), len(close_queue), _title) + l_open, l_close = open_queue[-1], close_queue[-1] self._footer = self._text[l_open.end():l_close.start()] diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py index 8a55cce..99722c4 100644 --- a/tests/proofreadpage_tests.py +++ b/tests/proofreadpage_tests.py @@ -172,6 +172,10 @@ 'title1': 'User:Popular Science Monthly Volume 1.djvu/12' } + div_in_footer = { + 'title': 'Page:Pywikibot unlinked test page', + } + class_pagetext_fmt = { True: ('<div class="pagetext">\n\n\n', '</div>'), False: ('', ''), @@ -232,6 +236,11 @@ self.assertEqual(page.header, self.valid['header']) self.assertEqual(page.footer, self.valid['footer']) + def test_div_in_footer(self): + """Test ProofreadPage page parsing functions.""" + page = ProofreadPage(self.site, self.div_in_footer['title']) + self.assertTrue(page.footer.endswith('</div>')) + def test_decompose_recompose_text(self): """Test ProofreadPage page decomposing/composing text.""" page = ProofreadPage(self.site, self.valid['title']) -- To view, visit https://gerrit.wikimedia.org/r/529616 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia2be695b5e8ea06f9760c86eebd3e8e836305a77 Gerrit-Change-Number: 529616 Gerrit-PatchSet: 1 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 8 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits August 2019