Pywikibot-commits November 2020

pywikibot-commits@lists.wikimedia.org

1 participants
127 discussions

[Gerrit] ...core[master]: [IMPR] Rewrite pywikibot scripts to support Python 3.5+ only

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/640363 ) Change subject: [IMPR] Rewrite pywikibot scripts to support Python 3.5+ only ...................................................................... [IMPR] Rewrite pywikibot scripts to support Python 3.5+ only Bug: T257399 Change-Id: Ib855930136bc8a5e09444fee182725f39c604450 --- M tests/data/fixes.py M tests/data/set-fixes.py M tests/i18n/pywikibot.py M tests/pwb/print_env.py M tests/pwb/print_locals.py M tests/pwb/print_unicode.py M tests/template_bot_tests.py 7 files changed, 6 insertions(+), 20 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/data/fixes.py b/tests/data/fixes.py index 3f04424..b69c00c 100644 --- a/tests/data/fixes.py +++ b/tests/data/fixes.py @@ -1,12 +1,10 @@ # -*- coding: utf-8 -*- """Collection of fixes for tests.""" # -# (C) Pywikibot team, 2015-2018 +# (C) Pywikibot team, 2015-2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - # flake8 cannot detect that fixes is defined via pywikibot.fixes if 'fixes' not in globals(): fixes = {} diff --git a/tests/data/set-fixes.py b/tests/data/set-fixes.py index 3911506..f626b7c 100644 --- a/tests/data/set-fixes.py +++ b/tests/data/set-fixes.py @@ -1,11 +1,9 @@ # -*- coding: utf-8 -*- """Fixes implementation which overwrites the variable.""" # -# (C) Pywikibot team, 2015-2018 +# (C) Pywikibot team, 2015-2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - # Just kill the old value suffices fixes = {} diff --git a/tests/i18n/pywikibot.py b/tests/i18n/pywikibot.py index 5261a7f..fb48092 100644 --- a/tests/i18n/pywikibot.py +++ b/tests/i18n/pywikibot.py @@ -1,10 +1,8 @@ # -*- coding: utf-8 -*- """i18n message bundle called 'pywikibot' to fool the i18n loader.""" # -# (C) Pywikibot team, 2014-2018 +# (C) Pywikibot team, 2014-2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - msg = {} diff --git a/tests/pwb/print_env.py b/tests/pwb/print_env.py index 6f4d4c7..48c660c 100644 --- a/tests/pwb/print_env.py +++ b/tests/pwb/print_env.py @@ -2,12 +2,10 @@ # -*- coding: utf-8 -*- """Script that forms part of pwb_tests.""" # -# (C) Pywikibot team, 2015-2018 +# (C) Pywikibot team, 2015-2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import os import sys diff --git a/tests/pwb/print_locals.py b/tests/pwb/print_locals.py index 5b6b2df..c1f27e3 100644 --- a/tests/pwb/print_locals.py +++ b/tests/pwb/print_locals.py @@ -2,12 +2,10 @@ # -*- coding: utf-8 -*- """Script that forms part of pwb_tests.""" # -# (C) Pywikibot team, 2013-2018 +# (C) Pywikibot team, 2013-2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import os.path if __name__ == '__main__': diff --git a/tests/pwb/print_unicode.py b/tests/pwb/print_unicode.py index cacccbc..2f55325 100644 --- a/tests/pwb/print_unicode.py +++ b/tests/pwb/print_unicode.py @@ -2,12 +2,10 @@ # -*- coding: utf-8 -*- """Script that forms part of pwb_tests.""" # -# (C) Pywikibot team, 2018 +# (C) Pywikibot team, 2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import pywikibot if __name__ == '__main__': diff --git a/tests/template_bot_tests.py b/tests/template_bot_tests.py index d978eed..10a0f0f 100644 --- a/tests/template_bot_tests.py +++ b/tests/template_bot_tests.py @@ -5,8 +5,6 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import pywikibot from pywikibot.pagegenerators import XMLDumpPageGenerator -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/640363 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: Ib855930136bc8a5e09444fee182725f39c604450 Gerrit-Change-Number: 640363 Gerrit-PatchSet: 2 Gerrit-Owner: Udoka <UdokakuUgochukwu(a)gmail.com> Gerrit-Reviewer: Isaacandy <isaac(a)iznd.xyz> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [bugfix] check for {{bots}}/{{nobots}} for original wiki text first

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/639893 ) Change subject: [bugfix] check for {{bots}}/{{nobots}} for original wiki text first ...................................................................... [bugfix] check for {{bots}}/{{nobots}} for original wiki text first {{bots}}/{{nobots}} templates are checked for Page.text whenever the Page is saved but this does not work if the text was changed and these templates are removed. Therefore check for these templates with the first get() statement and save the result. Also print the exception in category_redirect.py and decrease nested flow statements. Tests added- Bug: T262136 Change-Id: I6acaccaf654c32ec501a825b3fd2c7010e824583 --- M pywikibot/families/wikipedia_family.py M pywikibot/page/__init__.py M scripts/category_redirect.py M tests/page_tests.py 4 files changed, 49 insertions(+), 27 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 3cc3f05..1217c68 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -202,6 +202,7 @@ 'he': ('בעבודה',), 'hr': ('Radovi',), 'sr': ('Радови у току', 'Рут',), + 'test': ('In use',), 'ur': ('زیر ترمیم',), 'zh': ('Inuse',), } diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 23ae11c..248ee77 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -615,12 +615,20 @@ """ if getattr(self, '_text', None) is not None: return self._text + + if hasattr(self, '_revid'): + return self.latest_revision.text + try: - return self.get(get_redirect=True) + self.get(get_redirect=True) except pywikibot.NoPage: # TODO: what other exceptions might be returned? return '' + # check botMayEdit on a very early state (T262136) + self._bot_may_edit = self.botMayEdit() + return self.latest_revision.text + @text.setter def text(self, value: str): """ @@ -1099,6 +1107,9 @@ to override this by setting ignore_bot_templates=True in user-config.py, or using page.put(force=True). """ + if hasattr(self, '_bot_may_edit'): + return self._bot_may_edit + if not hasattr(self, 'templatesWithParams'): return True diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 9b45398..2118a40 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -247,36 +247,36 @@ # race condition: someone else removed the redirect while we # were checking for it continue - if target.is_categorypage(): - # this is a hard-redirect to a category page - newtext = ('{{%(template)s|%(cat)s}}' - % {'cat': target.title(with_ns=False), - 'template': self.template_list[0]}) - try: - page.text = newtext - page.save(comment) - message = i18n.twtranslate( - self.site, 'category_redirect-log-added', { - 'ns': self.site.namespaces.TEMPLATE, - 'template': self.template_list[0], - 'oldcat': page.title(as_link=True, textlink=True) - }) - self.log_text.append(message) - except pywikibot.Error: - message = i18n.twtranslate( - self.site, 'category_redirect-log-add-failed', { - 'ns': self.site.namespaces.TEMPLATE, - 'template': self.template_list[0], - 'oldcat': page.title(as_link=True, textlink=True) - }) - self.log_text.append(message) - else: + + if not target.is_categorypage(): message = i18n.twtranslate( self.site, 'category_redirect-problem-hard', { 'oldcat': page.title(as_link=True, textlink=True), 'page': target.title(as_link=True, textlink=True) }) self.problems.append(message) + continue + + # this is a hard-redirect to a category page + newtext = ('{{%(template)s|%(cat)s}}' + % {'cat': target.title(with_ns=False), + 'template': self.template_list[0]}) + params = { + 'ns': self.site.namespaces.TEMPLATE, + 'template': self.template_list[0], + 'oldcat': page.title(as_link=True, textlink=True) + } + try: + page.text = newtext + page.save(comment) + message = i18n.twtranslate( + self.site, 'category_redirect-log-added', params) + self.log_text.append(message) + except pywikibot.Error: + pywikibot.exception() + message = i18n.twtranslate( + self.site, 'category_redirect-log-add-failed', params) + self.log_text.append(message) def run(self): """Run the bot.""" diff --git a/tests/page_tests.py b/tests/page_tests.py index 7df0893..e4ef897 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -724,7 +724,7 @@ """Test Page.botMayEdit() method.""" family = 'wikipedia' - code = 'en' + code = 'test' cached = True user = True @@ -869,13 +869,23 @@ @mock.patch.object(config, 'ignore_bot_templates', False) def test_bot_may_edit_inuse(self): - """Test with {{inuse}} that bot is allowed to edit.""" + """Test with {{in use}} that bot is allowed to edit.""" self.page._templates = [pywikibot.Page(self.site, 'Template:In use')] # Ban all users including bots. self.page.text = '{{in use}}' self.assertFalse(self.page.botMayEdit()) + def test_bot_may_edit_page(self): + """Test botMayEdit when changing content.""" + self.assertTrue(self.page.botMayEdit()) + self.page.text = '{{nobots}}' + self.assertTrue(self.page.botMayEdit()) + page = pywikibot.Page(self.site, 'Pywikibot nobots test') + self.assertFalse(page.botMayEdit()) + page.text = '' + self.assertFalse(page.botMayEdit()) + class TestPageHistory(DefaultSiteTestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/639893 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: I6acaccaf654c32ec501a825b3fd2c7010e824583 Gerrit-Change-Number: 639893 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: MarcoAurelio <maurelio(a)tools.wmflabs.org> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Rubin <rubin(a)wikimedia.ru> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [IMPR] Rewrite pywikibot scripts to support Python 3.5+ only

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/640361 ) Change subject: [IMPR] Rewrite pywikibot scripts to support Python 3.5+ only ...................................................................... [IMPR] Rewrite pywikibot scripts to support Python 3.5+ only Bug: T257399 Change-Id: I0c644a49a060925e058e6c9e4f9bcc2a97e0b5d9 --- M tests/flow_thanks_tests.py M tests/imagecopy_tests.py M tests/login_tests.py M tests/noreferences_tests.py M tests/pwb_tests.py M tests/reflinks_tests.py M tests/site_decorators_tests.py 7 files changed, 11 insertions(+), 25 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/flow_thanks_tests.py b/tests/flow_thanks_tests.py index 7730992..34f8ba2 100644 --- a/tests/flow_thanks_tests.py +++ b/tests/flow_thanks_tests.py @@ -1,12 +1,10 @@ # -*- coding: utf-8 -*- """Tests for thanks-related code.""" # -# (C) Pywikibot team, 2016-2019 +# (C) Pywikibot team, 2016-2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - from pywikibot.flow import Topic from tests.aspects import TestCase @@ -28,7 +26,7 @@ @classmethod def setUpClass(cls): """Set up class.""" - super(TestThankFlowPost, cls).setUpClass() + super().setUpClass() cls._topic_title = 'Topic:Tvkityksg1ukyrrw' def test_thank_post(self): diff --git a/tests/imagecopy_tests.py b/tests/imagecopy_tests.py index 09a2def..7dedfa0 100644 --- a/tests/imagecopy_tests.py +++ b/tests/imagecopy_tests.py @@ -1,12 +1,10 @@ # -*- coding: utf-8 -*- """Tests for imagecopy script.""" # -# (C) Pywikibot team, 2018 +# (C) Pywikibot team, 2018-2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import re from scripts.imagecopy import pageTextPost diff --git a/tests/login_tests.py b/tests/login_tests.py index 888747c..a8f3cb3 100644 --- a/tests/login_tests.py +++ b/tests/login_tests.py @@ -5,12 +5,10 @@ e.g. used to test password-file based login. """ # -# (C) Pywikibot team, 2012-2018 +# (C) Pywikibot team, 2012-2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - from collections import defaultdict from io import StringIO @@ -94,7 +92,7 @@ def setUp(self): """Patch a variety of dependencies.""" - super(TestPasswordFile, self).setUp() + super().setUp() self.config = self.patch('pywikibot.login.config') self.config.usernames = FakeConfig.usernames self.config.password_file = '~FakeFile' diff --git a/tests/noreferences_tests.py b/tests/noreferences_tests.py index e3c9f5b..02f190d 100644 --- a/tests/noreferences_tests.py +++ b/tests/noreferences_tests.py @@ -1,12 +1,10 @@ # -*- coding: utf-8 -*- """Test noreferences bot module.""" # -# (C) Pywikibot team, 2018 +# (C) Pywikibot team, 2018-2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import pywikibot from scripts.noreferences import NoReferencesBot diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py index ab653d3..0ed6ecc 100644 --- a/tests/pwb_tests.py +++ b/tests/pwb_tests.py @@ -11,8 +11,6 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import io import sys diff --git a/tests/reflinks_tests.py b/tests/reflinks_tests.py index 11d54d7..7a0d260 100644 --- a/tests/reflinks_tests.py +++ b/tests/reflinks_tests.py @@ -5,8 +5,6 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - from scripts.reflinks import XmlDumpPageGenerator, ReferencesRobot, main from tests import join_xml_data_path @@ -137,7 +135,7 @@ def setUp(self): """Set up the script by patching the bot class.""" - super(TestReferencesBotConstructor, self).setUp() + super().setUp() self._original_constructor = ReferencesRobot.__init__ self._original_run = ReferencesRobot.run ReferencesRobot.__init__ = dummy_constructor @@ -148,7 +146,7 @@ ReferencesRobot.__init__ = self._original_constructor ReferencesRobot.run = self._original_run with empty_sites(): - super(TestReferencesBotConstructor, self).tearDown() + super().tearDown() def test_xml_simple(self): """Test the generator without any narrowing.""" diff --git a/tests/site_decorators_tests.py b/tests/site_decorators_tests.py index f2d30c0..5962145 100644 --- a/tests/site_decorators_tests.py +++ b/tests/site_decorators_tests.py @@ -5,8 +5,6 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - from pywikibot.tools import deprecated from pywikibot.site._decorators import must_be, need_right, need_version from pywikibot.exceptions import UserRightsError @@ -31,7 +29,7 @@ self._logged_in_as = None self._userinfo = [] self.obsolete = False - super(TestMustBe, self).setUp() + super().setUp() self.version = lambda: '1.19' # lowest supported release def login(self, group): @@ -143,7 +141,7 @@ self._logged_in_as = None self._userinfo = [] self.obsolete = False - super(TestNeedRight, self).setUp() + super().setUp() self.version = lambda: '1.14' # lowest supported release def login(self, group, right): @@ -200,7 +198,7 @@ # were not completely disposed and recreated but retained 'memory' def setUp(self): """Set up test method.""" - super(TestNeedVersion, self).setUp() + super().setUp() self.version = lambda: '1.23' @need_version('1.24') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/640361 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: I0c644a49a060925e058e6c9e4f9bcc2a97e0b5d9 Gerrit-Change-Number: 640361 Gerrit-PatchSet: 2 Gerrit-Owner: Udoka <UdokakuUgochukwu(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [tests] Update appveyor build version

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/640397 ) Change subject: [tests] Update appveyor build version ...................................................................... [tests] Update appveyor build version Change-Id: Idb65e0411b45a658a2b8a8708b8f82a455d840e7 --- M .appveyor.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index 0a518f3..0fe4e88 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,6 +1,6 @@ clone_depth: 50 skip_tags: true -version: 5.1.{build} +version: 5.2.{build} environment: APPVEYOR_PYTHON_URL: "https://raw.githubusercontent.com/dvorapa/python-appveyor-demo/master/appve…" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/640397 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: Idb65e0411b45a658a2b8a8708b8f82a455d840e7 Gerrit-Change-Number: 640397 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [cleanup] Remove deprecated UserBlocked exception and Page.contributi...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/637876 ) Change subject: [cleanup] Remove deprecated UserBlocked exception and Page.contributingUsers() ...................................................................... [cleanup] Remove deprecated UserBlocked exception and Page.contributingUsers() UserBlocked exception and Page.contributingUsers() are deprecated for more than 5 years and their removal was announced in Pywikibot 4.3. Change-Id: Ie797b335e91b4e5d3e6d328486e0fc6ff38c5c2a --- M pywikibot/__init__.py M pywikibot/exceptions.py M pywikibot/page/__init__.py M scripts/category.py 4 files changed, 18 insertions(+), 44 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index e9f40c7..f8216e2 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -36,18 +36,16 @@ from pywikibot.data.api import UploadWarning from pywikibot.diff import PatchManager from pywikibot.exceptions import ( - Error, InvalidTitle, BadTitle, NoPage, NoMoveTarget, SectionError, - SiteDefinitionError, NoSuchSite, UnknownSite, UnknownFamily, - UnknownExtension, - NoUsername, UserBlocked, - PageRelatedError, UnsupportedPage, IsRedirectPage, IsNotRedirectPage, - PageSaveRelatedError, PageNotSaved, OtherPageSaveError, - LockedPage, CascadeLockedPage, LockedNoPage, NoCreateError, - EditConflict, PageDeletedConflict, PageCreatedConflict, - ServerError, FatalServerError, Server414Error, Server504Error, - CaptchaError, SpamblacklistError, TitleblacklistError, - CircularRedirect, InterwikiRedirectPage, WikiBaseError, NoWikibaseEntity, - CoordinateGlobeUnknownException, + BadTitle, CaptchaError, CascadeLockedPage, CircularRedirect, + CoordinateGlobeUnknownException, EditConflict, Error, FatalServerError, + InterwikiRedirectPage, InvalidTitle, IsNotRedirectPage, IsRedirectPage, + LockedNoPage, LockedPage, NoCreateError, NoMoveTarget, NoPage, NoSuchSite, + NoUsername, NoWikibaseEntity, OtherPageSaveError, PageCreatedConflict, + PageDeletedConflict, PageNotSaved, PageRelatedError, PageSaveRelatedError, + SectionError, Server414Error, Server504Error, ServerError, + SiteDefinitionError, SpamblacklistError, TitleblacklistError, + UnknownExtension, UnknownFamily, UnknownSite, UnsupportedPage, + WikiBaseError, ) from pywikibot.family import Family from pywikibot.i18n import translate @@ -89,15 +87,14 @@ 'NoSuchSite', 'NoUsername', 'NoWikibaseEntity', 'OtherPageSaveError', 'output', 'Page', 'PageCreatedConflict', 'PageDeletedConflict', 'PageNotSaved', 'PageRelatedError', 'PageSaveRelatedError', 'PropertyPage', - 'QuitKeyboardInterrupt', 'SectionError', - 'ServerError', 'FatalServerError', 'Server414Error', 'Server504Error', - 'showDiff', 'show_help', 'showHelp', 'Site', 'SiteDefinitionError', - 'SiteLink', 'SpamblacklistError', 'stdout', 'Timestamp', - 'TitleblacklistError', 'translate', 'ui', 'unicode2html', + 'QuitKeyboardInterrupt', 'SectionError', 'Server414Error', + 'Server504Error', 'ServerError', 'showDiff', 'show_help', 'showHelp', + 'Site', 'SiteDefinitionError', 'SiteLink', 'SpamblacklistError', 'stdout', + 'Timestamp', 'TitleblacklistError', 'translate', 'ui', 'unicode2html', 'UnknownExtension', 'UnknownFamily', 'UnknownSite', 'UnsupportedPage', - 'UploadWarning', 'url2unicode', 'User', 'UserBlocked', 'warning', - 'WbGeoShape', 'WbMonolingualText', 'WbQuantity', 'WbTabularData', 'WbTime', - 'WbUnknown', 'WikiBaseError', 'WikidataBot', + 'UploadWarning', 'url2unicode', 'User', 'warning', 'WbGeoShape', + 'WbMonolingualText', 'WbQuantity', 'WbTabularData', 'WbTime', 'WbUnknown', + 'WikiBaseError', 'WikidataBot', ) diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index 662a1dd..709adfe 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -5,7 +5,6 @@ Error: Base class, all exceptions should the subclass of this class. - NoUsername: Username is not in user-config.py, or it is invalid. - - UserBlocked: Username or IP has been blocked - AutoblockUser: requested action on a virtual autoblock user not valid - UserRightsError: insufficient rights for requested action - BadTitle: Server responded with BadTitle @@ -563,13 +562,3 @@ """Request failed with a maxlag timeout error.""" pass - -# DEPRECATED exceptions which will be removed ########################## - - -# UserBlocked exceptions is not used by the framework. -class UserBlocked(Error): - - """DEPRECATED. Your username or IP has been blocked.""" - - pass diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 35b04b6..8cd9b52 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -1728,18 +1728,6 @@ self.revisions(total=total, starttime=starttime, endtime=endtime)) - @deprecated('contributors().keys()', since='20150206', future_warning=True) - def contributingUsers(self, - total: Optional[int] = None): # pragma: no cover - """ - Return a set of usernames (or IPs) of users who edited this page. - - @param total: iterate no more than this number of revisions in total - - @rtype: dict_keys - """ - return self.contributors(total=total).keys() - def revision_count(self, contributors=None) -> int: """Determine number of edits from contributors. diff --git a/scripts/category.py b/scripts/category.py index 46f1a67..67d9c68 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -792,7 +792,7 @@ pywikibot.output('Moving text from {} to {}.'.format( self.oldcat.title(), self.newcat.title())) comma = self.site.mediawiki_message('comma-separator') - authors = comma.join(self.oldcat.contributingUsers()) + authors = comma.join(self.oldcat.contributors().keys()) template_vars = {'oldcat': self.oldcat.title(), 'authors': authors} summary = i18n.twtranslate(self.site, 'category-renamed', template_vars) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/637876 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: Ie797b335e91b4e5d3e6d328486e0fc6ff38c5c2a Gerrit-Change-Number: 637876 Gerrit-PatchSet: 3 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-CC: Hazard-SJ <hazardsjwiki(a)gmail.com> Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: Update docs

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/640366 ) Change subject: Update docs ...................................................................... Update docs * Official name is Wikimedia Meta-Wiki * wikimedia -> Wikimedia * wikivoyage -> Wikivoyage Change-Id: I8c31dd2731155ccdac83e9ca81e3120a6a4b3150 --- M pywikibot/comms/eventstreams.py M pywikibot/families/meta_family.py M pywikibot/families/wikivoyage_family.py M scripts/README.rst M scripts/fixing_redirects.py 5 files changed, 5 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/eventstreams.py b/pywikibot/comms/eventstreams.py index be525cd..e354ffb 100644 --- a/pywikibot/comms/eventstreams.py +++ b/pywikibot/comms/eventstreams.py @@ -89,7 +89,7 @@ Multiple streams may be given as a string with comma separated stream types or an iterable of strings Refer https://stream.wikimedia.org/?doc for available - wikimedia stream types. + Wikimedia stream types. @type streams: str or iterable @keyword timeout: a timeout value indication how long to wait to send data before giving up diff --git a/pywikibot/families/meta_family.py b/pywikibot/families/meta_family.py index c1366e8..bcab195 100644 --- a/pywikibot/families/meta_family.py +++ b/pywikibot/families/meta_family.py @@ -8,7 +8,7 @@ from pywikibot import family -# The meta wikimedia family +# The Wikimedia Meta-Wiki family class Family(family.WikimediaOrgFamily): """Family class for Meta Wiki.""" diff --git a/pywikibot/families/wikivoyage_family.py b/pywikibot/families/wikivoyage_family.py index d99caa9..97e290d 100644 --- a/pywikibot/families/wikivoyage_family.py +++ b/pywikibot/families/wikivoyage_family.py @@ -5,7 +5,7 @@ # # Distributed under the terms of the MIT license. # -# The new wikivoyage family that is hosted at wikimedia +# The new Wikivoyage family that is hosted at Wikimedia from pywikibot import family diff --git a/scripts/README.rst b/scripts/README.rst index c8df3da..24e48af 100644 --- a/scripts/README.rst +++ b/scripts/README.rst @@ -107,7 +107,7 @@ | image.py | This script can be used to change one image to another | | | or remove an image entirely. | +------------------------+---------------------------------------------------------+ - | imagecopy.py | Copies images from a wikimedia wiki to Commons | + | imagecopy.py | Copies images from a Wikimedia wiki to Commons | +------------------------+---------------------------------------------------------+ | imagecopy_self.py | Copy self published files from the English Wikipedia to | | | Commons. | diff --git a/scripts/fixing_redirects.py b/scripts/fixing_redirects.py index 83f385b..d272888 100755 --- a/scripts/fixing_redirects.py +++ b/scripts/fixing_redirects.py @@ -5,7 +5,7 @@ Can be used with: --featured Run over featured pages (for some wikimedia wikis only) +-featured Run over featured pages (for some Wikimedia wikis only) &params; """ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/640366 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: I8c31dd2731155ccdac83e9ca81e3120a6a4b3150 Gerrit-Change-Number: 640366 Gerrit-PatchSet: 4 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [IMPR] Ignore RuntimeError for missing 'redirects' in api response

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/640327 ) Change subject: [IMPR] Ignore RuntimeError for missing 'redirects' in api response ...................................................................... [IMPR] Ignore RuntimeError for missing 'redirects' in api response Bug: T267567 Change-Id: I9453acbcae0bebcc41763e4150dc330b3afbe4a3 --- M scripts/fixing_redirects.py 1 file changed, 34 insertions(+), 23 deletions(-) Approvals: Meno25: Looks good to me, but someone else must approve Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/fixing_redirects.py b/scripts/fixing_redirects.py index f29d272..83f385b 100755 --- a/scripts/fixing_redirects.py +++ b/scripts/fixing_redirects.py @@ -16,6 +16,8 @@ # import re +from contextlib import suppress + import pywikibot from pywikibot import pagegenerators from pywikibot.bot import (SingleSiteBot, ExistingPageBot, NoRedirectPageBot, @@ -129,36 +131,45 @@ continue return text + @staticmethod + def get_target(page): + """Get the target page for a given page.""" + target = None + if not page.exists(): + with suppress(pywikibot.NoMoveTarget, + pywikibot.CircularRedirect, + pywikibot.InvalidTitle): + target = page.moved_target() + elif page.isRedirectPage(): + try: + target = page.getRedirectTarget() + except (pywikibot.CircularRedirect, + pywikibot.InvalidTitle): + pass + except RuntimeError: + pywikibot.exception() + else: + section = target.section() + if section and not does_text_contain_section(target.text, + section): + pywikibot.warning( + 'Section #{} not found on page {}' + .format(section, target.title(as_link=True, + with_section=False))) + target = None + return target + def treat_page(self): """Change all redirects from the current page to actual links.""" links = self.current_page.linkedPages() newtext = self.current_page.text i = None for i, page in enumerate(links): - if not page.exists(): - try: - target = page.moved_target() - except (pywikibot.NoMoveTarget, - pywikibot.CircularRedirect, - pywikibot.InvalidTitle): - continue - elif page.isRedirectPage(): - try: - target = page.getRedirectTarget() - except (pywikibot.CircularRedirect, - pywikibot.InvalidTitle): - continue - else: - section = target.section() - if section and not does_text_contain_section(target.text, - section): - pywikibot.warning( - 'Section #{0} not found on page {1}'.format( - section, target.title(as_link=True, - with_section=False))) - continue - else: + target = self.get_target(page) + + if target is None: continue + # no fix to user namespaces if target.namespace() in [2, 3] and page.namespace() not in [2, 3]: continue -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/640327 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: I9453acbcae0bebcc41763e4150dc330b3afbe4a3 Gerrit-Change-Number: 640327 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [IMPR] add support for some 'wbset' actions in DataSite

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/637872 ) Change subject: [IMPR] add support for some 'wbset' actions in DataSite ...................................................................... [IMPR] add support for some 'wbset' actions in DataSite It can be useful for atomic operations as the API add automatic summary, which creates a cleaner page history. To be decided: add support also at page level or not, given that method for supporting such actions are present via editEntity. Change-Id: Idfd5de485d2b5aab8d8b1960ceb3c3a3c6b64315 --- M pywikibot/site/__init__.py M tests/wikibase_edit_tests.py 2 files changed, 199 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index c21feb2..f33c42e 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -7637,6 +7637,146 @@ total=total, parameters=parameters) return gen + def _wbset_action(self, itemdef, action, action_data, **kwargs): + """ + Execute wbset{action}' on a Wikibase item. + + Supported actions are: + wbsetaliases, wbsetdescription, wbsetlabel and wbsetsitelink + + @param itemdef: Item to modify or create + @type itemdef: str, WikibasePage or Page coonected to such item + @param action: wbset{action] to perform: + 'wbsetaliases', 'wbsetdescription', 'wbsetlabel', 'wbsetsitelink' + @type action: str + @param data: data to be used in API request, see API help + @type data: SiteLink or dict + wbsetaliases: + dict shall have the following structure: + {'language': value (str), + 'add': list of language codes (str), + 'remove': list of language codes (str), + 'set' list of language codes (str) + } + 'add' and 'remove' are alternative to 'set' + wbsetdescription and wbsetlabel: + dict shall have keys 'language', 'value' + wbsetsitelink: + dict shall have keys 'linksite', 'linktitle' and + optionally 'badges' + @kwargs bot: Whether to mark the edit as a bot edit, default is False + @type bot: bool + @return: query result + @rtype: dict + @raises AssertionError, TypeError + """ + def format_sitelink(sitelink): + """Convert SiteLink to a dict accepted by wbsetsitelink API.""" + if isinstance(sitelink, pywikibot.page.SiteLink): + _dict = { + 'linksite': sitelink._sitekey, + 'linktitle': sitelink._rawtitle, + 'badges': '|'.join([b.title() for b in sitelink.badges]), + } + else: + _dict = sitelink + + return _dict + + def prepare_data(action, data): + """Prepare data as expected by API.""" + if action == 'wbsetaliases': + res = data + keys = set(res) + assert keys < {'language', 'add', 'remove', 'set'} + assert keys & {'add', 'set'} == {} + assert keys & {'remove', 'set'} == {} + elif action in ('wbsetlabel', 'wbsetdescription'): + res = data + keys = set(res) + assert keys == {'language', 'value'} + elif action == 'wbsetsitelink': + res = format_sitelink(data) + keys = set(res) + assert keys >= {'linksite'} + assert keys <= {'linksite', 'linktitle', 'badges'} + else: + raise ValueError('Something has gone wrong ...') + + return res + + # Supported actions + assert action in ('wbsetaliases', 'wbsetdescription', + 'wbsetlabel', 'wbsetsitelink'), \ + 'action {} not supported.'.format(action) + + # prefer ID over (site, title) + if isinstance(itemdef, str): + itemdef = pywikibot.ItemPage(self, itemdef) + elif isinstance(itemdef, pywikibot.Page): + try: + itemdef = itemdef.data_item() + except pywikibot.NoPage: + itemdef = pywikibot.ItemPage(self) + if not isinstance(itemdef, pywikibot.page.WikibasePage): + raise TypeError('itemdef shall be str, WikibasePage or Page') + + params = itemdef._defined_by(singular=True) + # TODO: support 'new' + baserevid = kwargs.pop('baserevid', 0) or itemdef.latest_revision_id + params.update( + {'id': itemdef.id, + 'baserevid': baserevid, + 'action': action, + 'token': self.tokens['edit'], + 'bot': kwargs.pop('bot', False), + }) + params.update(prepare_data(action, action_data)) + + for arg in kwargs: + if arg in ['summary']: + params[arg] = kwargs[arg] + else: + warn('Unknown parameter {} for action {}, ignored' + .format(arg, action), UserWarning, 2) + + req = self._simple_request(**params) + data = req.submit() + return data + + def wbsetaliases(self, itemdef, aliases, **kwargs): + """ + Set aliases for a single Wikibase entity. + + See self._wbset_action(self, itemdef, action, action_data, **kwargs) + """ + return self._wbset_action(itemdef, 'wbsetaliases', aliases, **kwargs) + + def wbsetdescription(self, itemdef, description, **kwargs): + """ + Set description for a single Wikibase entity. + + See self._wbset_action(self, itemdef, action, action_data, **kwargs) + """ + return self._wbset_action(itemdef, 'wbsetdescription', description, + **kwargs) + + def wbsetlabel(self, itemdef, label, **kwargs): + """ + Set label for a single Wikibase entity. + + See self._wbset_action(self, itemdef, action, action_data, **kwargs) + """ + return self._wbset_action(itemdef, 'wbsetlabel', label, **kwargs) + + def wbsetsitelink(self, itemdef, sitelink, **kwargs): + """ + Set, remove or modify a sitelink on a Wikibase item. + + See self._wbset_action(self, itemdef, action, action_data, **kwargs) + """ + return self._wbset_action(itemdef, 'wbsetsitelink', sitelink, **kwargs) + wrapper = ModuleDeprecationWrapper(__name__) # Note: use LoginStatus instead of _LoginStatus diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py index e8ece10..a75fd81 100644 --- a/tests/wikibase_edit_tests.py +++ b/tests/wikibase_edit_tests.py @@ -458,6 +458,65 @@ self.assertNotIn('P88', claim.qualifiers.keys()) +class TestWikibaseDataSiteWbsetActions(WikibaseTestCase): + + """Run general wikibase write tests.""" + + family = 'wikidata' + code = 'test' + + user = True + write = True + + def setUp(self): + """Setup tests.""" + self.testsite = self.get_repo() + self.item = pywikibot.ItemPage(self.testsite, 'Q68') + badge = pywikibot.ItemPage(self.testsite, 'Q608') + self.sitelink = pywikibot.page.SiteLink('Test page', + site='enwikisource', + badges=[badge]) + super().setUp() + + def tearDown(self): + """Tear down tests.""" + self.item = None + self.sitelink = None + super().tearDown() + + def test_wbsetlabel_set_from_id(self): + """Test setting an Italian label using id.""" + self.assertEqual(self.item.getID(), 'Q68') + self.testsite.wbsetlabel('Q68', {'language': 'it', 'value': 'Test123'}) + self.item.get(force=True) + self.assertEqual(self.item.labels['it'], 'Test123') + + def test_wbsetlabel_remove_from_item(self): + """Test removing an Italian label using item.""" + self.assertEqual(self.item.getID(), 'Q68') + self.testsite.wbsetlabel(self.item, {'language': 'it', 'value': ''}) + # Check 'it' label is removed + self.item.get(force=True) + self.assertNotIn('it', self.item.labels.keys()) + + def test_wbsetsitelink_set_remove(self): + """Test setting a sitelink using id.""" + self.assertEqual(self.item.getID(), 'Q68') + # add sitelink + self.testsite.wbsetsitelink( + 'Q68', + {'linksite': 'enwikisource', + 'linktitle': 'Test page', + 'badges': 'Q608' + }) + self.item.get(force=True) + self.assertEqual(self.item.sitelinks['enwikisource'], self.sitelink) + # remove sitelink + self.testsite.wbsetsitelink(self.item, {'linksite': 'enwikisource'}) + self.item.get(force=True) + self.assertIsNone(self.item.sitelinks.get('enwikisource')) + + if __name__ == '__main__': # pragma: no cover with suppress(SystemExit): unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/637872 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: Idfd5de485d2b5aab8d8b1960ceb3c3a3c6b64315 Gerrit-Change-Number: 637872 Gerrit-PatchSet: 5 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [bugfix] Do not use UploadRobot.run() with imagetransfer

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/640229 ) Change subject: [bugfix] Do not use UploadRobot.run() with imagetransfer ...................................................................... [bugfix] Do not use UploadRobot.run() with imagetransfer imagetransfer needs the final target filename for tagging nocommons template. Therefore don't use bulk upload with UploadRobot.run() but use the UploadRobot.upload_file method to upload a single file. Bug: T267579 Change-Id: I9b792bd850de8686ffd3a6ef4a58822565eca1b7 --- M scripts/imagetransfer.py 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/imagetransfer.py b/scripts/imagetransfer.py index 0d11a80..0171c19 100755 --- a/scripts/imagetransfer.py +++ b/scripts/imagetransfer.py @@ -197,9 +197,13 @@ keep_filename=self.keep_name, verify_description=not self.keep_name, ignore_warning=self.ignore_warning) + # try to upload - targetFilename = bot.run() - if targetFilename and self.targetSite.family.name == 'commons' \ + if bot.self.skip_run(): + return + target_filename = bot.upload_file(url) + + if target_filename and self.targetSite.family.name == 'commons' \ and self.targetSite.code == 'commons': # upload to Commons was successful reason = i18n.twtranslate(sourceSite, @@ -217,7 +221,7 @@ + sourceImagePage.title()) sourceImagePage.put(sourceImagePage.get() + '\n\n' + nowCommonsTemplate[sourceSite.lang] - % targetFilename, + % target_filename, summary=reason) def show_image_list(self, imagelist): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/640229 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: I9b792bd850de8686ffd3a6ef4a58822565eca1b7 Gerrit-Change-Number: 640229 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [IMPR] reduce code complexity of pagegenerators.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/640259 ) Change subject: [IMPR] reduce code complexity of pagegenerators.py ...................................................................... [IMPR] reduce code complexity of pagegenerators.py Change-Id: Ibc6f9eb7172ba287e150733727a26c0a59ed63e9 --- M pywikibot/pagegenerators.py M tests/pagegenerators_tests.py 2 files changed, 46 insertions(+), 19 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 22ca97b..ebb4a7f 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -419,6 +419,11 @@ filter_unique, key=lambda page: '{}:{}:{}'.format(*page._cmpkey())) +def _output_if(predicate, msg): + if predicate: + pywikibot.output(msg) + + class GeneratorFactory: """Process command line arguments and return appropriate page generator. @@ -1878,10 +1883,6 @@ @type show_filtered: bool """ - def output_if(predicate, msg): - if predicate: - pywikibot.output(msg) - def to_be_yielded(edit, page, show_filtered): if not edit.do_edit: return True @@ -1898,11 +1899,11 @@ time=edit_time.isoformat()) if edit_time < edit.edit_start: - output_if(show_filtered, msg.format(when='old')) + _output_if(show_filtered, msg.format(when='old')) return False if edit_time > edit.edit_end: - output_if(show_filtered, msg.format(when='recent')) + _output_if(show_filtered, msg.format(when='recent')) return False return True @@ -2162,24 +2163,19 @@ @return: Wrapped generator @rtype: generator """ + why = "doesn't" if has_item else 'has' + msg = '{{page}} {why} a wikidata item. Skipping.'.format(why=why) + for page in generator or []: try: page_item = pywikibot.ItemPage.fromPage(page, lazy_load=False) except pywikibot.NoPage: page_item = None - if page_item: - if not has_item: - if show_filtered: - pywikibot.output( - '%s has a wikidata item. Skipping.' % page) - continue - else: - if has_item: - if show_filtered: - pywikibot.output( - "%s doesn't have a wikidata item. Skipping." % page) - continue + to_be_skipped = bool(page_item) != has_item + if to_be_skipped: + _output_if(show_filtered, msg.format(page=page)) + continue yield page diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 3524234..357d8bb 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -21,7 +21,8 @@ from pywikibot.pagegenerators import ( PagesFromTitlesGenerator, PreloadingGenerator, - CategorizedPageGenerator + CategorizedPageGenerator, + WikibaseItemFilterPageGenerator, ) from pywikibot.tools import has_module, suppress_warnings @@ -633,6 +634,36 @@ pywikibot.ItemPage) for item in gen)) +class WikibaseItemFilterPageGeneratorTestCase(TestCase): + + """Test WikibaseItemFilterPageGenerator.""" + + family = 'wikipedia' + code = 'en' + + def test_filter_pages_with_item(self): + """Test WikibaseItemFilterPageGenerator on pages with item.""" + gf = pagegenerators.GeneratorFactory(site=self.site) + gf.handleArg('-page:Main_Page') + gen = gf.getCombinedGenerator() + pages = list(gen) + gen = WikibaseItemFilterPageGenerator(pages, has_item=True) + self.assertLength(list(gen), 1) + gen = WikibaseItemFilterPageGenerator(pages, has_item=False) + self.assertLength(list(gen), 0) + + def test_filter_pages_without_item(self): + """Test WikibaseItemFilterPageGenerator on pages without item.""" + gf = pagegenerators.GeneratorFactory(site=self.site) + gf.handleArg('-page:Talk:Main_Page') + gen = gf.getCombinedGenerator() + pages = list(gen) + gen = WikibaseItemFilterPageGenerator(pages, has_item=True) + self.assertLength(list(gen), 0) + gen = WikibaseItemFilterPageGenerator(pages, has_item=False) + self.assertLength(list(gen), 1) + + class DryFactoryGeneratorTest(TestCase): """Dry tests for pagegenerators.GeneratorFactory.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/640259 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: Ibc6f9eb7172ba287e150733727a26c0a59ed63e9 Gerrit-Change-Number: 640259 Gerrit-PatchSet: 2 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

← Newer
1
2
3
4
5
6
7
8
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits November 2020