Pywikibot-commits February 2021

pywikibot-commits@lists.wikimedia.org

1 participants
134 discussions

[Gerrit] ...core[master]: [doctest] Ignore doctest in _revision.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/667199 ) Change subject: [doctest] Ignore doctest in _revision.py ...................................................................... [doctest] Ignore doctest in _revision.py Change-Id: I0c19075f5b282f6fe9ec3c4799933f0cbd913a2f --- 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 ef9bc8b..d78d099 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,7 @@ flake8-{py35} [params] -doctest_skip = --ignore-files=(eventstreams|gui|mysql)\.py +doctest_skip = --ignore-files=(_revision|eventstreams|gui|mysql)\.py generate_user_files = -W error::UserWarning -m generate_user_files -family:wikipedia -lang:test -v [testenv] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/667199 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: I0c19075f5b282f6fe9ec3c4799933f0cbd913a2f Gerrit-Change-Number: 667199 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, 1 month

[Gerrit] ...core[master]: [doctest] solve i18n doctest

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/667198 ) Change subject: [doctest] solve i18n doctest ...................................................................... [doctest] solve i18n doctest Change-Id: I3ac625bfdf1e195f4322f2017e2e801e84bc61ad --- M pywikibot/i18n.py 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index d69349a..958ff50 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -675,6 +675,11 @@ and so on. + >>> # this code snippet is running in test environment + >>> # ignore test message "tests: max_retries reduced from 15 to 1" + >>> import os + >>> os.environ['PYWIKIBOT_TEST_QUIET'] = '1' + >>> from pywikibot import i18n >>> i18n.set_messages_package('tests.i18n') >>> # use a dictionary -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/667198 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: I3ac625bfdf1e195f4322f2017e2e801e84bc61ad Gerrit-Change-Number: 667198 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> 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, 1 month

[Gerrit] ...core[master]: [doctest] ignore mysql doctest

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/667178 ) Change subject: [doctest] ignore mysql doctest ...................................................................... [doctest] ignore mysql doctest Change-Id: I90dde97c9afc6f6572d9c3f714699b044e564c85 --- M tox.ini 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index 93d8063..ef9bc8b 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,7 @@ flake8-{py35} [params] -doctest_skip = --ignore-files=(gui\.py|eventstreams\.py) +doctest_skip = --ignore-files=(eventstreams|gui|mysql)\.py generate_user_files = -W error::UserWarning -m generate_user_files -family:wikipedia -lang:test -v [testenv] @@ -30,7 +30,9 @@ PYWIKIBOT_NO_USER_CONFIG=2 usedevelop = True commands = + flake8: flake8 --version flake8: flake8 --doctests {posargs} + test: python -m unittest discover -vv -p "*_tests.py" fasttest: python {[params]generate_user_files} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/667178 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: I90dde97c9afc6f6572d9c3f714699b044e564c85 Gerrit-Change-Number: 667178 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, 1 month

[Gerrit] ...core[master]: [doctest] Solve doctest for OptionHandler

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/667184 ) Change subject: [doctest] Solve doctest for OptionHandler ...................................................................... [doctest] Solve doctest for OptionHandler Change-Id: I20f1730c957dec7b939a22560c099ba435fbcfee --- M pywikibot/bot.py 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 7a966ab..a49ef20 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1025,10 +1025,11 @@ """Class to get and set options. How to use options of OptionHandler and its BaseBot subclasses: - First define an available_options class attribute to define all - available options: + First define an available_options class attribute for your own + option handler to define all available options: - available_options = {'foo': 'bar', 'bar': 42, 'baz': False} + >>> default_options = {'foo': 'bar', 'bar': 42, 'baz': False} + >>> class MyHandler(OptionHandler): available_options = default_options Or you may update the predefined setting in the class initializer. BaseBot predefines a 'always' options and sets it to False: @@ -1038,7 +1039,7 @@ Now you can instantiate an OptionHandler or BaseBot class passing options other than default values: - >>> bot = OptionHandler(baz=True) + >>> bot = MyHandler(baz=True) You can access bot options either as keyword item or attribute: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/667184 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: I20f1730c957dec7b939a22560c099ba435fbcfee Gerrit-Change-Number: 667184 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 1 month

[Gerrit] ...core[master]: [IMPR] Update unusedfiles.py to add custom templates

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/666962 ) Change subject: [IMPR] Update unusedfiles.py to add custom templates ...................................................................... [IMPR] Update unusedfiles.py to add custom templates patch submitted by Dr03ramos Change-Id: Idab0ec0d906c67ac072c54076e3038d12180693b Signed-off-by: xqt <info(a)gno.de> --- M CREDITS M scripts/unusedfiles.py 2 files changed, 37 insertions(+), 14 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/CREDITS b/CREDITS index ea6bbdf..ed6da85 100644 --- a/CREDITS +++ b/CREDITS @@ -53,6 +53,7 @@ Didicodes Diwanshu Mittal Dmytro Dziuma +Dr03ramos DrTrigon Dvorapa Ebrahim Byagowi diff --git a/scripts/unusedfiles.py b/scripts/unusedfiles.py index ac1e36f..b589bb8 100755 --- a/scripts/unusedfiles.py +++ b/scripts/unusedfiles.py @@ -6,15 +6,19 @@ -always Don't be asked every time. -nouserwarning Do not warn uploader about orphaned file. +-filetemplate: Use a custom template on unused file pages. +-usertemplate: Use a custom template to warn the uploader. -limit Specify number of pages to work on with "-limit:n" where n is the maximum number of articles to work on. If not used, all pages are used. """ # -# (C) Pywikibot team, 2007-2020 +# (C) Pywikibot team, 2007-2021 # # Distributed under the terms of the MIT license. # +import re + import pywikibot from pywikibot import i18n, pagegenerators from pywikibot.bot import SingleSiteBot, AutomaticTWSummaryBot, ExistingPageBot @@ -44,18 +48,31 @@ def __init__(self, **kwargs): """Initializer.""" self.available_options.update({ - 'nouserwarning': False # do not warn uploader + 'nouserwarning': False, # do not warn uploader + 'filetemplate': '', + 'usertemplate': '', }) super().__init__(**kwargs) - self.template_image = i18n.translate(self.site, - template_to_the_image) - self.template_user = i18n.translate(self.site, - template_to_the_user) - if not (self.template_image - and (self.template_user or self.opt.nouserwarning)): - raise i18n.TranslationError('This script is not localized for {0} ' - 'site.'.format(self.site)) + # handle the custom templates + if not self.opt.filetemplate: + self.opt.filetemplate = i18n.translate(self.site, + template_to_the_image) + elif not re.fullmatch('{{.+}}', self.opt.filetemplate): + self.opt.filetemplate = '{{%s}}' % self.opt.filetemplate + + if not self.opt.usertemplate: + self.opt.usertemplate = i18n.translate(self.site, + template_to_the_user) + elif not re.fullmatch('{{.+}}', self.opt.usertemplate): + self.opt.usertemplate = '{{%s}}' % self.opt.usertemplate + + if not (self.opt.filetemplate + and (self.opt.usertemplate or self.opt.nouserwarning)): + # if no templates are given + raise i18n.TranslationError( + 'This script is not localized for {} site;\n' + 'try using -filetemplate:<template name>.'.format(self.site)) def treat(self, image): """Process one image page.""" @@ -63,18 +80,19 @@ # rather than a local page with the same name as shared media. if (image.get_file_url() and not image.file_is_shared() and 'http://' not in image.text): - if self.template_image in image.text: + if self.opt.filetemplate in image.text: pywikibot.output('{0} done already' .format(image.title(as_link=True))) return - self.append_text(image, '\n\n' + self.template_image) + self.append_text(image, '\n\n' + self.opt.filetemplate) if self.opt.nouserwarning: return uploader = image.get_file_history().pop(0)['user'] user = pywikibot.User(image.site, uploader) usertalkpage = user.getUserTalkPage() - template2uploader = self.template_user % {'title': image.title()} + template2uploader = self.opt.usertemplate \ + % {'title': image.title()} msg2uploader = self.site.expand_text(template2uploader) if usertalkpage.is_flow_page(): self.post_to_flow_board(usertalkpage, msg2uploader) @@ -124,11 +142,15 @@ arg, sep, value = arg.partition(':') if arg == '-limit': total = value + elif arg == '-filetemplate': + options['filetemplate'] = value + elif arg == '-usertemplate': + options['usertemplate'] = value else: options[arg[1:]] = True site = pywikibot.Site() - gen = pagegenerators.UnusedFilesGenerator(total=total, site=site) + gen = site.unusedfiles(total=total) gen = pagegenerators.PreloadingGenerator(gen) bot = UnusedFilesBot(site=site, generator=gen, **options) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/666962 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: Idab0ec0d906c67ac072c54076e3038d12180693b Gerrit-Change-Number: 666962 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dr03ramos <dr03ramos(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 1 month

[Gerrit] ...core[master]: [flake8] Selecting Bugbear B901, B903 seems to ignore other tests

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/667167 ) Change subject: [flake8] Selecting Bugbear B901, B903 seems to ignore other tests ...................................................................... [flake8] Selecting Bugbear B901, B903 seems to ignore other tests fix flake8 issues Bug: T275879 Change-Id: I18a9cbb5173c8dbee5bceb4f5b7e7d7373b22fc1 --- M docs/conf.py M pywikibot/logentries.py M pywikibot/login.py M pywikibot/page/__init__.py M scripts/solve_disambiguation.py M tests/cosmetic_changes_tests.py M tests/proofreadpage_tests.py M tests/tools_ip_tests.py M tests/upload_tests.py M tests/wikibase_tests.py M tests/xmlreader_tests.py M tox.ini 12 files changed, 12 insertions(+), 15 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/conf.py b/docs/conf.py index 210d8d0..7d4363a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -168,7 +168,7 @@ # html_logo = None # The name of an image file (relative to this directory) to use as a favicon of -# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. # # html_favicon = None @@ -344,6 +344,7 @@ # # texinfo_no_detailmenu = False + def pywikibot_script_docstring_fixups(app, what, name, obj, options, lines): """Pywikibot specific conversions.""" from scripts.cosmetic_changes import warning diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py index 92a5d1c..09f922f 100644 --- a/pywikibot/logentries.py +++ b/pywikibot/logentries.py @@ -74,7 +74,7 @@ """Combine site and logid as the hash.""" return self.logid() ^ hash(self.site) - def __eq__(self, other)-> bool: + def __eq__(self, other) -> bool: """Compare if self is equal to other.""" if not isinstance(other, LogEntry): pywikibot.debug("'{0}' cannot be compared with '{1}'" diff --git a/pywikibot/login.py b/pywikibot/login.py index cb94816..b09128b 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -1,7 +1,7 @@ #!/usr/bin/python """Library to log the bot in to a wiki account.""" # -# (C) Pywikibot team, 2003-2020 +# (C) Pywikibot team, 2003-2021 # # Distributed under the terms of the MIT license. # @@ -19,7 +19,6 @@ from pywikibot.comms import http from pywikibot.exceptions import NoUsername from pywikibot.tools import ( - deprecated, deprecated_args, file_mode_checker, normalize_username, remove_last_args, ) diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 26fa4c2..142d248 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -54,7 +54,6 @@ deprecated_args, DotReadableDict, first_upper, - issue_deprecation_warning, redirect_func, remove_last_args, ) diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index 7091084..2c3c7b4 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -95,7 +95,7 @@ from pywikibot.backports import List from pywikibot.bot import (HighlightContextOption, ListOption, OutputProxyOption, SingleSiteBot, StandardOption) -from pywikibot.tools import deprecated, first_lower, first_upper +from pywikibot.tools import first_lower, first_upper from pywikibot.tools.formatter import SequenceOutputter diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py index 4432352..521f17b 100644 --- a/tests/cosmetic_changes_tests.py +++ b/tests/cosmetic_changes_tests.py @@ -9,6 +9,7 @@ from contextlib import suppress from pywikibot import Page + from pywikibot.cosmetic_changes import CosmeticChangesToolkit from tests.aspects import TestCase diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py index 5823e47..05ef42a 100644 --- a/tests/proofreadpage_tests.py +++ b/tests/proofreadpage_tests.py @@ -318,7 +318,7 @@ page = ProofreadPage(self.site, self.existing_unlinked['title']) # test Exception in property. with self.assertRaises(ValueError): - getattr(page, 'url_image') + page.url_image class TestPageQuality(TestCase): @@ -471,7 +471,7 @@ self.assertFalse(hasattr(page, '_index')) # Test setter with wrong type. with self.assertRaises(TypeError): - setattr(page, 'index', 'invalid index') + page.index = 'invalid index' # Test setter with correct type. page.index = index_page self.assertEqual(page.index, index_page) diff --git a/tests/tools_ip_tests.py b/tests/tools_ip_tests.py index b3ba311..95742c0 100644 --- a/tests/tools_ip_tests.py +++ b/tests/tools_ip_tests.py @@ -11,6 +11,7 @@ from pywikibot.tools import is_IP, PYTHON_VERSION from tests import unittest_print + from tests.aspects import TestCase from tests.utils import expected_failure_if diff --git a/tests/upload_tests.py b/tests/upload_tests.py index eaca6d1..8eecbd9 100644 --- a/tests/upload_tests.py +++ b/tests/upload_tests.py @@ -15,6 +15,7 @@ import pywikibot from tests import join_images_path + from tests.aspects import TestCase diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index c363406..a0e7da8 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -21,12 +21,7 @@ from pywikibot.tools import MediaWikiVersion from tests import join_pages_path, mock -from tests.aspects import ( - DeprecationTestCase, - TestCase, - unittest, - WikidataTestCase, -) +from tests.aspects import TestCase, unittest, WikidataTestCase from tests.basepage import ( BasePageMethodsTestBase, diff --git a/tests/xmlreader_tests.py b/tests/xmlreader_tests.py index fcd775b..ccd7eb7 100644 --- a/tests/xmlreader_tests.py +++ b/tests/xmlreader_tests.py @@ -11,6 +11,7 @@ from pywikibot import xmlreader from tests import join_xml_data_path + from tests.aspects import TestCase diff --git a/tox.ini b/tox.ini index 9e242c7..93d8063 100644 --- a/tox.ini +++ b/tox.ini @@ -98,7 +98,6 @@ # D413: Missing blank line after last section ignore = B007,C103,D105,D211,D401,D413,D412,FI1,H101,H238,H301,H404,H405,H903,P101,P102,P103,P205,W503 -select = B901,B903 enable-extensions = H203,H204,H205 exclude = .tox,.git,./*.egg,build,scripts/archive/*,./scripts/i18n/*,./tests/archive/* classmethod-decorators = classmethod,classproperty -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/667167 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: I18a9cbb5173c8dbee5bceb4f5b7e7d7373b22fc1 Gerrit-Change-Number: 667167 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 1 month

[Gerrit] ...core[master]: [cleanup] Remove deprecated Wikibase.lastrevid attribute

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/666874 ) Change subject: [cleanup] Remove deprecated Wikibase.lastrevid attribute ...................................................................... [cleanup] Remove deprecated Wikibase.lastrevid attribute Change-Id: I144e624b2a9fa7a54c56baf246a9ca1590bf6f8f --- M pywikibot/page/__init__.py M tests/wikibase_tests.py 2 files changed, 0 insertions(+), 64 deletions(-) Approvals: Matěj Suchánek: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 925952e..26fa4c2 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -3963,36 +3963,6 @@ # to the namespace case=first-letter. self._link.title) - def __getattribute__(self, name): - """Low-level attribute getter. Deprecates lastrevid.""" - if name == 'lastrevid': - issue_deprecation_warning( - 'WikibasePage.lastrevid', 'latest_revision_id', - warning_class=FutureWarning, - since='20150607') - name = '_revid' - return super().__getattribute__(name) - - def __setattr__(self, attr, value): - """Attribute setter. Deprecates lastrevid.""" - if attr == 'lastrevid': - issue_deprecation_warning( - 'WikibasePage.lastrevid', 'latest_revision_id', - warning_class=FutureWarning, - since='20150607') - attr = '_revid' - return super().__setattr__(attr, value) - - def __delattr__(self, attr): - """Attribute deleter. Deprecates lastrevid.""" - if attr == 'lastrevid': - issue_deprecation_warning( - 'WikibasePage.lastrevid', 'latest_revision_id', - warning_class=FutureWarning, - since='20150607') - attr = '_revid' - return super().__delattr__(attr) - def namespace(self) -> int: """ Return the number of the namespace of the entity. diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index c28d2bf..c363406 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -70,40 +70,6 @@ self._test_page_text() -class TestDeprecatedAttributes(WikidataTestCase, DeprecationTestCase): - - """Test deprecated lastrevid.""" - - def test_lastrevid(self): - """Test deprecated lastrevid.""" - item = ItemPage(self.get_repo(), 'Q60') - self.assertFalse(hasattr(item, 'lastrevid')) - item.get() - self.assertTrue(hasattr(item, 'lastrevid')) - self.assertIsInstance(item.lastrevid, int) - self.assertDeprecation() - self._reset_messages() - - item.lastrevid = 1 - self.assertTrue(hasattr(item, 'lastrevid')) - self.assertTrue(hasattr(item, '_revid')) - self.assertEqual(item.lastrevid, 1) - self.assertEqual(item._revid, 1) - self.assertDeprecation() - - def test_lastrevid_del(self): - """Test del with deprecated lastrevid.""" - item = ItemPage(self.get_repo(), 'Q60') - item.get() - self.assertTrue(hasattr(item, 'lastrevid')) - self.assertTrue(hasattr(item, '_revid')) - - del item.lastrevid - self.assertFalse(hasattr(item, 'lastrevid')) - self.assertFalse(hasattr(item, '_revid')) - self.assertDeprecation() - - class TestGeneral(WikidataTestCase): """General Wikibase tests.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/666874 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: I144e624b2a9fa7a54c56baf246a9ca1590bf6f8f Gerrit-Change-Number: 666874 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> 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, 1 month

[Gerrit] ...core[master]: [tests] simplify TestTerminalOutput tests

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/666927 ) Change subject: [tests] simplify TestTerminalOutput tests ...................................................................... [tests] simplify TestTerminalOutput tests Change-Id: I908ac09a3e71da495047368c0bf4fc9ac7c0ef20 --- M tests/ui_tests.py 1 file changed, 18 insertions(+), 38 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/ui_tests.py b/tests/ui_tests.py index c70737f..2d39155 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -211,45 +211,25 @@ """Terminal output tests.""" - def testOutputLevels_logging_debug(self): - logger.log(DEBUG, 'debug', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), '') + tests = [ + ('debug', DEBUG, '', ''), + ('verbose', VERBOSE, '', ''), + ('info', INFO, '', 'info\n'), + ('stdout', STDOUT, 'stdout\n', ''), + ('input', INPUT, '', 'input\n'), + ('WARNING', WARNING, '', 'WARNING: WARNING\n'), + ('ERROR', ERROR, '', 'ERROR: ERROR\n'), + ('CRITICAL', CRITICAL, '', 'CRITICAL: CRITICAL\n'), + ] - def testOutputLevels_logging_verbose(self): - logger.log(VERBOSE, 'verbose', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), '') - - def testOutputLevels_logging_info(self): - logger.log(INFO, 'info', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), 'info\n') - - def testOutputLevels_logging_stdout(self): - logger.log(STDOUT, 'stdout', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), 'stdout\n') - self.assertEqual(newstderr.getvalue(), '') - - def testOutputLevels_logging_input(self): - logger.log(INPUT, 'input', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), 'input\n') - - def testOutputLevels_logging_WARNING(self): - logger.log(WARNING, 'WARNING', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), 'WARNING: WARNING\n') - - def testOutputLevels_logging_ERROR(self): - logger.log(ERROR, 'ERROR', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), 'ERROR: ERROR\n') - - def testOutputLevels_logging_CRITICAL(self): - logger.log(CRITICAL, 'CRITICAL', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), 'CRITICAL: CRITICAL\n') + def test_outputlevels_logging(self): + """Test logger with output levels.""" + for text, level, out, err in self.tests: + with self.subTest(test=text): + logger.log(level, text, extra=loggingcontext) + self.assertEqual(newstdout.getvalue(), out) + self.assertEqual(newstderr.getvalue(), err) + patch() # reset terminal files def test_output(self): pywikibot.output('output') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/666927 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: I908ac09a3e71da495047368c0bf4fc9ac7c0ef20 Gerrit-Change-Number: 666927 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, 1 month

[Gerrit] ...core[master]: [scripts] Restore unusedfiles.py due to pull request

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/666908 ) Change subject: [scripts] Restore unusedfiles.py due to pull request ...................................................................... [scripts] Restore unusedfiles.py due to pull request https://github.com/wikimedia/pywikibot/pull/36/commits/6ba08da0f83681a1cd98… Change-Id: Id66681c1e6515bfb5da3a5a2bda15c5644e34744 --- M docs/scripts/scripts.rst M scripts/README.rst R scripts/unusedfiles.py M tests/script_tests.py 4 files changed, 14 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/scripts/scripts.rst b/docs/scripts/scripts.rst index 0877531..f202aa4 100644 --- a/docs/scripts/scripts.rst +++ b/docs/scripts/scripts.rst @@ -155,6 +155,11 @@ .. automodule:: scripts.replace +scripts.replicate\_wiki script +------------------------------ + +.. automodule:: scripts.replicate_wiki + scripts.revertbot script ------------------------ @@ -195,6 +200,11 @@ .. automodule:: scripts.transferbot +scripts.unusedfiles script +-------------------------- + +.. automodule:: scripts.unusedfiles + scripts.upload script --------------------- diff --git a/scripts/README.rst b/scripts/README.rst index 2e46e81..5835fbf 100644 --- a/scripts/README.rst +++ b/scripts/README.rst @@ -115,6 +115,9 @@ +------------------------+---------------------------------------------------------+ | transferbot.py | Transfers pages from a source wiki to a target wiki | +------------------------+---------------------------------------------------------+ + | unusedfiles.py | Bot appends some text to all unused images and other | + | | text to the respective uploaders. | + +------------------------+---------------------------------------------------------+ | upload.py | upload an image to a wiki. | +------------------------+---------------------------------------------------------+ | version.py | Outputs Pywikibot's revision number, Python's version | @@ -228,9 +231,6 @@ +------------------------+---------------------------------------------------------+ | unlink.py | This bot unlinks a page on every page that links to it. | +------------------------+---------------------------------------------------------+ - | unusedfiles.py | Bot appends some text to all unused images and other | - | | text to the respective uploaders. | - +------------------------+---------------------------------------------------------+ | watchlists.py | Information retrieved by watchlist.py will be stored | +------------------------+---------------------------------------------------------+ | wikisourcetext.py | This bot applies to Wikisource sites to upload text. | diff --git a/scripts/archive/unusedfiles.py b/scripts/unusedfiles.py similarity index 100% rename from scripts/archive/unusedfiles.py rename to scripts/unusedfiles.py diff --git a/tests/script_tests.py b/tests/script_tests.py index c9ee80f..7968462 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -95,6 +95,7 @@ 'noreferences', 'parser_function_count', 'shell', + 'unusedfiles', 'upload', 'welcome', ] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/666908 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: Id66681c1e6515bfb5da3a5a2bda15c5644e34744 Gerrit-Change-Number: 666908 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 1 month

[Gerrit] ...core[master]: [tests] Combine TestFullyQualified(Explicit|Implicit)LinkDifferentFam...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/666887 ) Change subject: [tests] Combine TestFullyQualified(Explicit|Implicit)LinkDifferentFamilyParser ...................................................................... [tests] Combine TestFullyQualified(Explicit|Implicit)LinkDifferentFamilyParser Change-Id: I3cd7d28f504c50ee2a8c668e57e734f1e4265b2b --- M tests/link_tests.py 1 file changed, 38 insertions(+), 87 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/link_tests.py b/tests/link_tests.py index 3f17b1f5..92a52b2 100644 --- a/tests/link_tests.py +++ b/tests/link_tests.py @@ -376,9 +376,9 @@ self.assertEqual(link.namespace, 4) -class TestFullyQualifiedExplicitLinkDifferentFamilyParser(LinkTestCase): +class TestFullyQualifiedLinkDifferentFamilyParser(LinkTestCase): - """Test link to a different family.""" + """Test link to a different family with and without preleading colon.""" sites = { 'enws': { @@ -392,43 +392,49 @@ } cached = True + PATTERN = '{colon}{first}:{second}:{title}' + def setUp(self): """Setup tests.""" super().setUp() config.mylang = 'en' config.family = 'wikisource' - def test_fully_qualified_NS0_code(self): - """Test ':en:wikipedia:Main Page' on enws is namespace 0.""" - link = Link(':en:wikipedia:Main Page') - link.parse() - self.assertEqual(link.site, self.get_site('enwp')) - self.assertEqual(link.title, 'Main Page') - self.assertEqual(link.namespace, 0) + def test_fully_qualified_NS0(self): + """Test that fully qualified link is in namespace 0.""" + family, code = 'wikipedia:en'.split(':') + for colon in ('', ':'): # with or without preleading colon + # switch code:family sequence en:wikipedia or wikipedia:en + for first, second in [(family, code), (code, family)]: + with self.subTest(colon=colon, + site='{}:{}'.format(first, second)): + link_title = self.PATTERN.format(colon=colon, + first=first, + second=second, + title='Main Page') + link = Link(link_title) + link.parse() + self.assertEqual(link.site, self.get_site('enwp')) + self.assertEqual(link.title, 'Main Page') + self.assertEqual(link.namespace, 0) - def test_fully_qualified_NS1_code(self): - """Test ':en:wikipedia:Main Page' on enwp is namespace 1.""" - link = Link(':en:wikipedia:Talk:Main Page') - link.parse() - self.assertEqual(link.site, self.get_site('enwp')) - self.assertEqual(link.title, 'Main Page') - self.assertEqual(link.namespace, 1) - - def test_fully_qualified_NS0_family(self): - """Test ':wikipedia:en:Main Page' on enws is namespace 0.""" - link = Link(':wikipedia:en:Main Page') - link.parse() - self.assertEqual(link.site, self.get_site('enwp')) - self.assertEqual(link.title, 'Main Page') - self.assertEqual(link.namespace, 0) - - def test_fully_qualified_NS1_family(self): - """Test ':wikipedia:en:Talk:Main Page' on enws is namespace 1.""" - link = Link(':wikipedia:en:Talk:Main Page') - link.parse() - self.assertEqual(link.site, self.get_site('enwp')) - self.assertEqual(link.title, 'Main Page') - self.assertEqual(link.namespace, 1) + def test_fully_qualified_NS1(self): + """Test that fully qualified link is in namespace 1.""" + family, code = 'wikipedia:en'.split(':') + for colon in ('', ':'): # with or without preleading colon + # switch code:family sequence en:wikipedia or wikipedia:en + for first, second in [(family, code), (code, family)]: + with self.subTest(colon=colon, + site='{}:{}'.format(first, second)): + link_title = self.PATTERN.format(colon=colon, + first=first, + second=second, + title='Talk:Main Page') + link = Link(link_title) + link.parse() + self.assertEqual(link.site, self.get_site('enwp')) + self.assertEqual(link.title, 'Main Page') + self.assertEqual(link.namespace, 1) class TestFullyQualifiedExplicitLinkNoLangConfigFamilyParser(LinkTestCase): @@ -720,61 +726,6 @@ self.assertEqual(link.namespace, 4) -class TestFullyQualifiedImplicitLinkDifferentFamilyParser(LinkTestCase): - - """Test link to a different family without preleading colon.""" - - sites = { - 'enws': { - 'family': 'wikisource', - 'code': 'en' - }, - 'enwp': { - 'family': 'wikipedia', - 'code': 'en' - } - } - cached = True - - def setUp(self): - """Setup tests.""" - super().setUp() - config.mylang = 'en' - config.family = 'wikisource' - - def test_fully_qualified_NS0_code(self): - """Test 'en:wikipedia:Main Page' on enws is namespace 0.""" - link = Link('en:wikipedia:Main Page') - link.parse() - self.assertEqual(link.site, self.get_site('enwp')) - self.assertEqual(link.title, 'Main Page') - self.assertEqual(link.namespace, 0) - - def test_fully_qualified_NS1_code(self): - """Test 'en:wikipedia:Main Page' on enws is namespace 1.""" - link = Link('en:wikipedia:Talk:Main Page') - link.parse() - self.assertEqual(link.site, self.get_site('enwp')) - self.assertEqual(link.title, 'Main Page') - self.assertEqual(link.namespace, 1) - - def test_fully_qualified_NS0_family(self): - """Test 'wikipedia:en:Main Page' on enws is namespace 0.""" - link = Link('wikipedia:en:Main Page') - link.parse() - self.assertEqual(link.site, self.get_site('enwp')) - self.assertEqual(link.title, 'Main Page') - self.assertEqual(link.namespace, 0) - - def test_fully_qualified_NS1_family(self): - """Test 'wikipedia:en:Talk:Main Page' on enws is namespace 1.""" - link = Link('wikipedia:en:Talk:Main Page') - link.parse() - self.assertEqual(link.site, self.get_site('enwp')) - self.assertEqual(link.title, 'Main Page') - self.assertEqual(link.namespace, 1) - - class TestFullyQualifiedImplicitLinkNoLangConfigFamilyParser(LinkTestCase): """Test implicit link from family without lang code to other family.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/666887 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: I3cd7d28f504c50ee2a8c668e57e734f1e4265b2b Gerrit-Change-Number: 666887 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, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits February 2021