Pywikibot-commits June 2021

pywikibot-commits@lists.wikimedia.org

1 participants
104 discussions

[Gerrit] ...core[master]: [IMPR] use *iterables instead of genlist in intersect_generators
by jenkins-bot (Code Review) 22 Jun '21

22 Jun '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/700445 ) Change subject: [IMPR] use *iterables instead of genlist in intersect_generators ...................................................................... [IMPR] use *iterables instead of genlist in intersect_generators - as common in itertool enable multiple argumensts for *iterables instead of a single genlist list - deprecate then old behaviour - force allow_duplicates to be a keyword argument and deprecate the unwanted unwanted usage as positional argument - early return if there are less than 2 iterables - don't import Counter again - update documentation and add a sample - update tests accordingly Change-Id: Iec0fc7f9c220883b8f3b5e76786539b9320bb3f2 --- M pywikibot/pagegenerators.py M pywikibot/tools/__init__.py M tests/thread_tests.py 3 files changed, 44 insertions(+), 17 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/pagegenerators.py b/pywikibot/pagegenerators.py index 5be66b9..1545ca2 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -593,7 +593,7 @@ '"-intersect" ignored as only one generator is specified.') elif self.intersect: # By definition no duplicates are possible. - dupfiltergen = intersect_generators(self.gens) + dupfiltergen = intersect_generators(*self.gens) else: dupfiltergen = _filter_unique_pages(itertools.chain(*self.gens)) diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 52b40ff..996efd8 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -926,11 +926,10 @@ .format(thd, thd.queue.qsize()), self._logger) -def intersect_generators(genlist, allow_duplicates=False): - """ - Intersect generators listed in genlist. +def intersect_generators(*iterables, allow_duplicates: bool = False): + """Intersect generators listed in iterables. - Yield items only if they are yielded by all generators in genlist. + Yield items only if they are yielded by all generators of iterables. Threads (via ThreadedGenerator) are used in order to run generators in parallel, so that items can be yielded before generators are exhausted. @@ -939,13 +938,42 @@ Quitting before all generators are finished is attempted if there is no more chance of finding an item in all queues. - :param genlist: list of page generators - :type genlist: list - :param allow_duplicates: allow duplicates if present in all generators - :type allow_duplicates: bool + Sample: + >>> iterables = 'mississippi', 'missouri' + >>> list(intersect_generators(*iterables)) + ['m', 'i', 's'] + >>> list(intersect_generators(*iterables, allow_duplicates=True)) + ['m', 'i', 's', 's', 'i'] + + :param iterables: page generators + :param allow_duplicates: optional keyword argument to allow duplicates + if present in all generators """ + # 'allow_duplicates' must be given as keyword argument + if iterables and iterables[-1] in (True, False): + allow_duplicates = iterables[-1] + iterables = iterables[:-1] + issue_deprecation_warning("'allow_duplicates' as positional argument", + 'keyword argument "allow_duplicates={}"' + .format(allow_duplicates), + since='6.4.0') + + # iterables must not be given as tuple or list + if len(iterables) == 1 and isinstance(iterables[0], (list, tuple)): + iterables = iterables[0] + issue_deprecation_warning("'iterables' as list type", + "consecutive iterables or use '*' to unpack", + since='6.4.0') + + if not iterables: + return + + if len(iterables) == 1: + yield from iterables[0] + return + # If any generator is empty, no pages are going to be returned - for source in genlist: + for source in iterables: if not source: debug('At least one generator ({!r}) is empty and execution was ' 'skipped immediately.'.format(source), 'intersect') @@ -953,20 +981,19 @@ # Item is cached to check that it is found n_gen # times before being yielded. - from collections import Counter - cache = collections.defaultdict(Counter) - n_gen = len(genlist) + cache = collections.defaultdict(collections.Counter) + n_gen = len(iterables) # Class to keep track of alive threads. # Start new threads and remove completed threads. thrlist = ThreadList() - for source in genlist: + for source in iterables: threaded_gen = ThreadedGenerator(name=repr(source), target=source) threaded_gen.daemon = True thrlist.append(threaded_gen) - ones = Counter(thrlist) + ones = collections.Counter(thrlist) seen = {} while True: diff --git a/tests/thread_tests.py b/tests/thread_tests.py index dfc7c07..44ec655 100644 --- a/tests/thread_tests.py +++ b/tests/thread_tests.py @@ -49,7 +49,7 @@ # first otherwise the generator is empty the second time. datasets = [list(gen) for gen in gens] set_result = set(datasets[0]).intersection(*datasets[1:]) - result = list(intersect_generators(datasets)) + result = list(intersect_generators(*datasets)) self.assertCountEqual(set(result), result) self.assertCountEqual(result, set_result) @@ -63,7 +63,7 @@ for dataset in datasets[1:]: counter_result = counter_result & Counter(dataset) counter_result = list(counter_result.elements()) - result = list(intersect_generators(datasets, allow_duplicates=True)) + result = list(intersect_generators(*datasets, allow_duplicates=True)) self.assertCountEqual(counter_result, result) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/700445 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: Iec0fc7f9c220883b8f3b5e76786539b9320bb3f2 Gerrit-Change-Number: 700445 Gerrit-PatchSet: 7 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(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

1 0

[Gerrit] ...core[master]: [IMPR] Simplify and test add_text's skip_page() method
by jenkins-bot (Code Review) 22 Jun '21

22 Jun '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/700113 ) Change subject: [IMPR] Simplify and test add_text's skip_page() method ...................................................................... [IMPR] Simplify and test add_text's skip_page() method JJMC89 reverted commit 2d9d42d3 due to T285015. This adds test coverage and takes another run at simplifying this method. Bug: T285015 Change-Id: I8cac6221148ddb3ea55850242ed773c205a908da --- M scripts/add_text.py M tests/add_text_tests.py 2 files changed, 82 insertions(+), 14 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/add_text.py b/scripts/add_text.py index 9f23df4..dd54b72 100755 --- a/scripts/add_text.py +++ b/scripts/add_text.py @@ -63,7 +63,11 @@ from pywikibot import config, i18n, pagegenerators, textlib from pywikibot.backports import Dict, Tuple -from pywikibot.bot import AutomaticTWSummaryBot, NoRedirectPageBot +from pywikibot.bot import ( + AutomaticTWSummaryBot, + ExistingPageBot, + NoRedirectPageBot, +) from pywikibot.bot_choice import QuitKeyboardInterrupt from pywikibot.exceptions import ( EditConflictError, @@ -297,7 +301,7 @@ error_count += 1 -class AddTextBot(AutomaticTWSummaryBot, NoRedirectPageBot): +class AddTextBot(AutomaticTWSummaryBot, ExistingPageBot, NoRedirectPageBot): """A bot which adds a text to a page.""" @@ -329,25 +333,21 @@ def skip_page(self, page): """Skip if -exceptUrl matches or page does not exists.""" - if not page.exists(): - if not page.isTalkPage(): - pywikibot.warning('Page {page} does not exist on {page.site}.' - .format(page=page)) - return True - elif self.opt.regex_skip_url: + if page.exists() and self.opt.regex_skip_url: url = page.full_url() result = re.findall(self.opt.regex_skip_url, page.site.getUrl(url)) + if result: pywikibot.warning( - 'Regex (or word) used with -exceptUrl is in the page. ' - 'Skipping {page}\nMatch was: {result}' + 'Skipping {page} because -excepturl matches {result}.' .format(page=page, result=result)) return True - skipping = super().skip_page(page) - if not skipping and not page.exists(): + if page.isTalkPage() and not page.exists(): pywikibot.output("{} doesn't exist, creating it!".format(page)) - return skipping + return False + + return super().skip_page(page) def treat_page(self): """Add text to the page.""" diff --git a/tests/add_text_tests.py b/tests/add_text_tests.py index e8932c7..90f05b0 100644 --- a/tests/add_text_tests.py +++ b/tests/add_text_tests.py @@ -5,7 +5,7 @@ # Distributed under the terms of the MIT license. # import unittest -from unittest.mock import ANY, Mock, mock_open, patch +from unittest.mock import ANY, MagicMock, Mock, mock_open, patch import pywikibot import pywikibot.pagegenerators @@ -15,6 +15,21 @@ from tests.aspects import TestCase +def _mock_page(exists=True, redirect=False, talk=False, url='wikipedia.org'): + """Provides a page with these attributes.""" + page = MagicMock() + + page.exists.return_value = exists + page.isRedirectPage.return_value = redirect + page.isTalkPage.return_value = talk + page.site.getUrl.return_value = url + + page.__str__.return_value = 'mock_page' + page.site.__str__.return_value = 'mock_site' + + return page + + class TestAdding(TestCase): """Test adding text.""" @@ -27,6 +42,7 @@ def setUp(self): """Setup test.""" super().setUp() + pywikibot.bot.ui.clear() self.generator_factory = pywikibot.pagegenerators.GeneratorFactory() @patch('pywikibot.handle_args', Mock(side_effect=lambda args: args)) @@ -132,6 +148,58 @@ mock_file.assert_called_with('/path/to/my/file.txt', 'rb', ANY) + def test_not_skipped(self): + """Exercise skip_page() with a page we should accept.""" + bot = AddTextBot() + page = _mock_page() + + self.assertFalse(bot.skip_page(page)) + self.assertEqual([], pywikibot.bot.ui.pop_output()) + + def test_skip_missing_standard(self): + """Exercise skip_page() with a non-talk page that doesn't exist.""" + bot = AddTextBot() + page = _mock_page(exists=False) + + self.assertTrue(bot.skip_page(page)) + self.assertEqual([ + 'Page mock_page does not exist on mock_site.' + ], pywikibot.bot.ui.pop_output()) + + def test_skip_missing_talk(self): + """Exercise skip_page() with a talk page that doesn't exist.""" + bot = AddTextBot() + page = _mock_page(exists=False, talk=True) + + self.assertFalse(bot.skip_page(page)) + self.assertEqual([ + "mock_page doesn't exist, creating it!" + ], pywikibot.bot.ui.pop_output()) + + def test_skip_if_redirect(self): + """Exercise skip_page() with a page that is a redirect.""" + bot = AddTextBot() + page = _mock_page(redirect=True) + + self.assertTrue(bot.skip_page(page)) + self.assertEqual([ + 'Page mock_page on mock_site is skipped because it is a redirect' + ], pywikibot.bot.ui.pop_output()) + + def test_skip_if_url_match(self): + """Exercise skip_page() with a '-excepturl' argument.""" + bot = AddTextBot(regex_skip_url='.*\\.com') + + page = _mock_page(url='wikipedia.org') + self.assertFalse(bot.skip_page(page)) + self.assertEqual([], pywikibot.bot.ui.pop_output()) + + page = _mock_page(url='wikipedia.com') + self.assertTrue(bot.skip_page(page)) + self.assertEqual([ + "Skipping mock_page because -excepturl matches ['wikipedia.com']." + ], pywikibot.bot.ui.pop_output()) + if __name__ == '__main__': # pragma: no cover unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/700113 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: I8cac6221148ddb3ea55850242ed773c205a908da Gerrit-Change-Number: 700113 Gerrit-PatchSet: 4 Gerrit-Owner: Damian <atagar1(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] Additional add_text test coverage
by jenkins-bot (Code Review) 22 Jun '21

22 Jun '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/699504 ) Change subject: [tests] Additional add_text test coverage ...................................................................... [tests] Additional add_text test coverage Following up our add_text overhaul with a bit more test coverage before moving on to another script. Change-Id: I53042176bdef5cc73b7dc000911dcca78009d09a --- M scripts/add_text.py M tests/add_text_tests.py 2 files changed, 56 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/add_text.py b/scripts/add_text.py index bd0aebc..9f23df4 100755 --- a/scripts/add_text.py +++ b/scripts/add_text.py @@ -397,7 +397,7 @@ :param argv: input arguments to be parsed :param generator_factory: factory that will determine the page to edit - :return: a namedtuple with our parsed arguments + :return: dictionary with our parsed arguments @raise: ValueError if we receive invalid arguments """ diff --git a/tests/add_text_tests.py b/tests/add_text_tests.py index 18ad26a..e8932c7 100644 --- a/tests/add_text_tests.py +++ b/tests/add_text_tests.py @@ -5,12 +5,12 @@ # Distributed under the terms of the MIT license. # import unittest -from unittest.mock import Mock, patch +from unittest.mock import ANY, Mock, mock_open, patch import pywikibot import pywikibot.pagegenerators -from scripts.add_text import parse +from scripts.add_text import AddTextBot, main, parse from tests.aspects import TestCase @@ -27,7 +27,6 @@ def setUp(self): """Setup test.""" super().setUp() - self.page = pywikibot.Page(self.site, 'foo') self.generator_factory = pywikibot.pagegenerators.GeneratorFactory() @patch('pywikibot.handle_args', Mock(side_effect=lambda args: args)) @@ -80,6 +79,59 @@ self.assertEqual('hello world', args['text']) input_mock.assert_called_with('What text do you want to add?') + @patch('pywikibot.handle_args', Mock(side_effect=lambda args: args)) + def test_main_no_arguments(self): + """Invoke our main method without any arguments.""" + main() + + self.assertEqual([ + "Either the '-text' or '-textfile' is required\n" + 'Use -help for further information.' + ], pywikibot.bot.ui.pop_output()) + + @patch('pywikibot.handle_args', Mock(side_effect=lambda args: args)) + def test_main_unrecognized_argument(self): + """Invoke our main method with an invalid argument.""" + main('no_such_arg') + + self.assertEqual([ + "Argument 'no_such_arg' is unrecognized\n" + 'Use -help for further information.', + ], pywikibot.bot.ui.pop_output()) + + @patch('pywikibot.handle_args', Mock(side_effect=lambda args: args)) + def test_main_no_generator_found(self): + """Invoke main when our generator_factory can't provide a generator.""" + main('-text:hello') + + self.assertEqual([ + 'Unable to execute script because no generator was defined.\n' + 'Use -help for further information.' + ], pywikibot.bot.ui.pop_output()) + + def test_setup_with_text(self): + """Exercise bot with a -text argument.""" + bot = AddTextBot(text='hello\\nworld') + + # setup unescapes any newlines + + self.assertEqual('hello\\nworld', bot.opt.text) + bot.setup() + self.assertEqual('hello\nworld', bot.opt.text) + + @patch('builtins.open', new_callable=mock_open, read_data=b'file data') + def test_setup_with_textfile(self, mock_file): + """Exercise both with a -textfile argument.""" + bot = AddTextBot(textfile='/path/to/my/file.txt') + + # setup reads the file content + + self.assertEqual('', bot.opt.text) + bot.setup() + self.assertEqual('file data', bot.opt.text) + + mock_file.assert_called_with('/path/to/my/file.txt', 'rb', ANY) + if __name__ == '__main__': # pragma: no cover unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/699504 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: I53042176bdef5cc73b7dc000911dcca78009d09a Gerrit-Change-Number: 699504 Gerrit-PatchSet: 6 Gerrit-Owner: Damian <atagar1(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] Suppress and check replacebot logs
by jenkins-bot (Code Review) 22 Jun '21

22 Jun '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/678644 ) Change subject: [tests] Suppress and check replacebot logs ...................................................................... [tests] Suppress and check replacebot logs Our unit tests dump ~536 lines to stdout because bots print their logs. This verbosity makes it difficult to glean important information from our test output. This adds a buffer interface to capture bot logs and let us assert about their content. This has a couple advantages... 1. Less verbose test output. 2. Better test coverage by ensuring our bots emit the right output. If you like this direction I'll do the same for our other tests. Bug: T281199 Change-Id: I2c204795e9ff8189f95eebf658f3aeffb741aba0 --- M pywikibot/bot.py M pywikibot/config.py A pywikibot/userinterfaces/buffer_interface.py M tests/aspects.py M tests/diff_tests.py M tests/i18n_tests.py M tests/replacebot_tests.py M tests/ui_tests.py 8 files changed, 203 insertions(+), 57 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 7dc13bd..087a2bb 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -176,13 +176,8 @@ # Note: all output goes through python std library "logging" module _logger = 'bot' -# User interface initialization -# search for user interface module in the 'userinterfaces' subdirectory -uiModule = __import__('pywikibot.userinterfaces.{}_interface' - .format(config.userinterface), fromlist=['UI']) -ui = uiModule.UI() -atexit.register(ui.flush) -pywikibot.argvu = ui.argvu() +ui = None + _GLOBAL_HELP = """ GLOBAL OPTIONS @@ -258,6 +253,24 @@ """ +def set_interface(module_name): + """Configures any bots to use the given interface module.""" + global ui + + # User interface initialization + # search for user interface module in the 'userinterfaces' subdirectory + ui_module = __import__('pywikibot.userinterfaces.{}_interface' + .format(module_name), fromlist=['UI']) + ui = ui_module.UI() + atexit.register(ui.flush) + pywikibot.argvu = ui.argvu() + + # re-initialize if we were already initialized with another UI + + if _handlers_initialized: + init_handlers() + + # Initialize the handlers and formatters for the logging system. # # This relies on the global variable 'ui' which is a UserInterface object @@ -2229,3 +2242,6 @@ raise NotImplementedError('Method {}.treat_page_and_item() not ' 'implemented.' .format(self.__class__.__name__)) + + +set_interface(config.userinterface) diff --git a/pywikibot/config.py b/pywikibot/config.py index d263da0..2304599 100644 --- a/pywikibot/config.py +++ b/pywikibot/config.py @@ -472,7 +472,7 @@ # https://docs.python.org/3/library/codecs.html#standard-encodings textfile_encoding = 'utf-8' -# currently terminal is the only userinterface supported +# currently terminal and buffer are the only supported userinterfaces userinterface = 'terminal' # this can be used to pass variables to the UI init function diff --git a/pywikibot/userinterfaces/buffer_interface.py b/pywikibot/userinterfaces/buffer_interface.py new file mode 100755 index 0000000..8978304 --- /dev/null +++ b/pywikibot/userinterfaces/buffer_interface.py @@ -0,0 +1,68 @@ +"""Non-interactive interface that stores output.""" +# +# (C) Pywikibot team, 2021 +# +# Distributed under the terms of the MIT license. +# +import logging +from typing import Any, Sequence, Union + +from pywikibot import config +from pywikibot.logging import INFO, VERBOSE +from pywikibot.userinterfaces._interface_base import ABUIC + + +class UI(ABUIC, logging.Handler): + + """Collects output into an unseen buffer.""" + + def __init__(self): + """Initialize the UI.""" + super().__init__() + self.setLevel(VERBOSE if config.verbose_output else INFO) + self.setFormatter(logging.Formatter(fmt='%(message)s%(newline)s')) + + self._output = [] + + def init_handlers(self, root_logger, *args, **kwargs): + """Initialize the handlers for user output.""" + root_logger.addHandler(self) + + def input(self, question: str, password: bool = False, + default: str = '', force: bool = False) -> str: + """Ask the user a question and return the answer.""" + return default + + def input_choice(self, question: str, options, default: str = None, + return_shortcut: bool = True, + automatic_quit: bool = True, force: bool = False): + """Ask the user and returns a value from the options.""" + return default + + def input_list_choice(self, question: str, answers: Sequence[Any], + default: Union[int, str, None] = None, + force: bool = False) -> Any: + """Ask the user to select one entry from a list of entries.""" + return default + + def output(self, text, *args, **kwargs) -> None: + """Output text that would usually go to a stream.""" + self._output.append(text) + + def emit(self, record: logging.LogRecord) -> None: + """Logger output.""" + self.output(record.getMessage()) + + def get_output(self): + """Provides any output we've buffered.""" + return list(self._output) + + def pop_output(self): + """Provide and clear any buffered output.""" + buffered_output = self.get_output() + self.clear() + return buffered_output + + def clear(self): + """Removes any buffered output.""" + self._output.clear() diff --git a/tests/aspects.py b/tests/aspects.py index 8a137b0..98b44cb 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -62,6 +62,7 @@ return f OSWIN32 = (sys.platform == 'win32') +pywikibot.bot.set_interface('buffer') class TestCaseBase(unittest.TestCase): diff --git a/tests/diff_tests.py b/tests/diff_tests.py index 1808947..6fdea61 100644 --- a/tests/diff_tests.py +++ b/tests/diff_tests.py @@ -218,7 +218,7 @@ mock.assert_any_call(self.header_base.format(header)) @patch('pywikibot.output') - @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', + @patch('pywikibot.userinterfaces.buffer_interface.UI.input', return_value='y') def test_accept(self, input, mock): """Check output of cherry_pick if changes accepted.""" @@ -227,7 +227,7 @@ mock.assert_any_call(self.diff_message) @patch('pywikibot.output') - @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', + @patch('pywikibot.userinterfaces.buffer_interface.UI.input', return_value='n') def test_reject(self, input, mock): """Check output of cherry_pick if changes rejected.""" @@ -237,7 +237,7 @@ mock.assert_any_call(self.none_message) @patch('pywikibot.output') - @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', + @patch('pywikibot.userinterfaces.buffer_interface.UI.input', return_value='q') def test_quit(self, input, mock): """Check output of cherry_pick if quit.""" @@ -247,7 +247,7 @@ mock.assert_any_call(self.none_message) @patch('pywikibot.output') - @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', + @patch('pywikibot.userinterfaces.buffer_interface.UI.input', return_value='y') def test_by_letter_accept(self, input, mock): """Check cherry_pick output. @@ -260,7 +260,7 @@ mock.assert_any_call(self.diff_by_letter_message) @patch('pywikibot.output') - @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', + @patch('pywikibot.userinterfaces.buffer_interface.UI.input', return_value='q') def test_by_letter_quit(self, input, mock): """Check cherry_pick output. diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 74c2be5..21d22d3 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -338,6 +338,7 @@ def setUp(self): """Patch the output and input methods.""" super().setUp() + bot.set_interface('terminal') self.output_text = '' self.orig_raw_input = bot.ui._raw_input self.orig_output = bot.ui.output @@ -350,6 +351,7 @@ config.cosmetic_changes_mylang_only = self.old_cc_setting bot.ui._raw_input = self.orig_raw_input bot.ui.output = self.orig_output + bot.set_interface('buffer') super().tearDown() def test_i18n_input(self): diff --git a/tests/replacebot_tests.py b/tests/replacebot_tests.py index d45bb73..863ab1f 100644 --- a/tests/replacebot_tests.py +++ b/tests/replacebot_tests.py @@ -71,6 +71,8 @@ replace.pywikibot.input = self._fake_input replace.pywikibot.Site = patched_site + pywikibot.bot.ui.clear() + def tearDown(self): """Bring back the old bot class.""" replace.ReplaceRobot = self._original_bot @@ -99,9 +101,17 @@ """Test invalid command line replacement configurations.""" # old and new need to be together self.assertFalse(self._run('foo', '-pairsfile:/dev/null', 'bar')) + + self.assertEqual([ + '-pairsfile used between a pattern replacement pair.', + ], pywikibot.bot.ui.pop_output()) + # only old provided with empty_sites(): self.assertFalse(self._run('foo')) + self.assertEqual([ + 'Incomplete command line pattern replacement pair.', + ], pywikibot.bot.ui.pop_output()) # In the end no bots should've been created self.assertFalse(self.bots) @@ -169,6 +179,11 @@ self.assertLength(bot.replacements, 1) self._test_replacement(bot.replacements[0]) + self.assertEqual([ + 'The summary message for the command line replacements will ' + 'be something like: Bot: Automated text replacement (-1 +2)', + ], pywikibot.bot.ui.pop_output()) + def test_cmd_automatic(self): """Test command line replacements with automatic summary.""" bot = self._get_bot(None, '1', '2', '-automaticsummary') @@ -176,17 +191,24 @@ self._test_replacement(bot.replacements[0]) self.assertEqual(self.inputs, []) + self.assertEqual([ + 'The summary message for the command line replacements will ' + 'be something like: Bot: Automated text replacement (-1 +2)', + ], pywikibot.bot.ui.pop_output()) + def test_only_fix_global_message(self): """Test fixes replacements only.""" bot = self._get_bot(None, '-fix:has-msg') self.assertLength(bot.replacements, 1) self._test_fix_replacement(bot.replacements[0]) + self.assertEqual([], pywikibot.bot.ui.pop_output()) def test_only_fix_global_message_tw(self): """Test fixes replacements only.""" bot = self._get_bot(None, '-fix:has-msg-tw') self.assertLength(bot.replacements, 1) self._test_fix_replacement(bot.replacements[0]) + self.assertEqual([], pywikibot.bot.ui.pop_output()) def test_only_fix_no_message(self): """Test fixes replacements only.""" @@ -194,11 +216,18 @@ self.assertLength(bot.replacements, 1) self._test_fix_replacement(bot.replacements[0]) + self.assertEqual([ + 'The summary will not be used when the fix has one defined but ' + 'the following fix(es) do(es) not have a summary defined: ' + '"no-msg" (all replacements)', + ], pywikibot.bot.ui.pop_output()) + def test_only_fix_all_replacement_summary(self): """Test fixes replacements only.""" bot = self._get_bot(None, '-fix:all-repl-msg') self.assertLength(bot.replacements, 1) self._test_fix_replacement(bot.replacements[0], msg=True) + self.assertEqual([], pywikibot.bot.ui.pop_output()) def test_only_fix_partial_replacement_summary(self): """Test fixes replacements only.""" @@ -207,12 +236,19 @@ self._test_fix_replacement(replacement, 2, offset, offset == 0) self.assertLength(bot.replacements, 2) + self.assertEqual([ + 'The summary will not be used when the fix has one defined but ' + 'the following fix(es) do(es) not have a summary defined: ' + '"partial-repl-msg" (replacement #2)', + ], pywikibot.bot.ui.pop_output()) + def test_only_fix_multiple(self): """Test fixes replacements only.""" bot = self._get_bot(None, '-fix:has-msg-multiple') for offset, replacement in enumerate(bot.replacements): self._test_fix_replacement(replacement, 3, offset) self.assertLength(bot.replacements, 3) + self.assertEqual([], pywikibot.bot.ui.pop_output()) def test_cmd_and_fix(self): """Test command line and fix replacements together.""" @@ -221,6 +257,11 @@ self._test_replacement(bot.replacements[0]) self._test_fix_replacement(bot.replacements[1]) + self.assertEqual([ + 'The summary message for the command line replacements will be ' + 'something like: Bot: Automated text replacement (-1 +2)', + ], pywikibot.bot.ui.pop_output()) + def test_except_title(self): """Test excepting and requiring a title specific to fix.""" bot = self._get_bot(True, '-fix:no-msg-title-exceptions') @@ -228,9 +269,27 @@ self._test_fix_replacement(bot.replacements[0]) self.assertIn('title', bot.replacements[0].exceptions) self.assertIn('require-title', bot.replacements[0].exceptions) + + self.assertEqual([ + 'The summary will not be used when the fix has one defined but ' + 'the following fix(es) do(es) not have a summary defined: ' + '"no-msg-title-exceptions" (all replacements)', + ], pywikibot.bot.ui.pop_output()) + self._apply(bot, 'Hello 1', missing=True, title='Neither') + self.assertEqual([ + 'Skipping fix "no-msg-title-exceptions" on [[Neither]] because ' + 'the title is on the exceptions list.', + ], pywikibot.bot.ui.pop_output()) + self._apply(bot, 'Hello 2', title='Allowed') + self.assertEqual([], pywikibot.bot.ui.pop_output()) + self._apply(bot, 'Hello 1', missing=True, title='Allowed Declined') + self.assertEqual([ + 'Skipping fix "no-msg-title-exceptions" on [[Allowed Declined]] ' + 'because the title is on the exceptions list.' + ], pywikibot.bot.ui.pop_output()) def test_fix_callable(self): """Test fix replacements using a callable.""" @@ -239,6 +298,12 @@ self._test_fix_replacement(bot.replacements[0]) self.assertTrue(callable(bot.replacements[0].new)) + self.assertEqual([ + 'The summary will not be used when the fix has one defined but ' + 'the following fix(es) do(es) not have a summary defined: ' + '"no-msg-callable" (all replacements)', + ], pywikibot.bot.ui.pop_output()) + if __name__ == '__main__': # pragma: no cover with suppress(SystemExit): diff --git a/tests/ui_tests.py b/tests/ui_tests.py index ac5c420..07e6974 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -22,7 +22,6 @@ STDOUT, VERBOSE, WARNING, - ui, ) from pywikibot.userinterfaces import ( terminal_interface_base, @@ -60,21 +59,6 @@ self._stream.seek(0) -def patched_print(text, target_stream): - try: - stream = patched_streams[target_stream] - except KeyError: - assert isinstance(target_stream, - pywikibot.userinterfaces.win32_unicode.UnicodeOutput) - assert target_stream._stream - stream = patched_streams[target_stream._stream] - org_print(text, stream) - - -def patched_input(): - return strin._stream.readline().strip() - - patched_streams = {} strout = Stream('out', patched_streams) strerr = Stream('err', patched_streams) @@ -84,25 +68,6 @@ newstderr = strerr._stream newstdin = strin._stream -org_print = ui._print -org_input = ui._raw_input - - -def patch(): - """Patch standard terminal files.""" - strout.reset() - strerr.reset() - strin.reset() - ui._print = patched_print - ui._raw_input = patched_input - - -def unpatch(): - """Un-patch standard terminal files.""" - ui._print = org_print - ui._raw_input = org_input - - logger = logging.getLogger('pywiki') loggingcontext = {'caller_name': 'ui_tests', 'caller_file': 'ui_tests', @@ -118,7 +83,18 @@ def setUp(self): super().setUp() - patch() + + pywikibot.bot.set_interface('terminal') + + self.org_print = pywikibot.bot.ui._print + self.org_input = pywikibot.bot.ui._raw_input + + pywikibot.bot.ui._print = self._patched_print + pywikibot.bot.ui._raw_input = self._patched_input + + strout.reset() + strerr.reset() + strin.reset() pywikibot.config.colorized_output = True pywikibot.config.transliterate = False @@ -127,7 +103,24 @@ def tearDown(self): super().tearDown() - unpatch() + + pywikibot.bot.ui._print = self.org_print + pywikibot.bot.ui._raw_input = self.org_input + + pywikibot.bot.set_interface('buffer') + + def _patched_print(self, text, target_stream): + try: + stream = patched_streams[target_stream] + except KeyError: + expected = pywikibot.userinterfaces.win32_unicode.UnicodeOutput + assert isinstance(target_stream, expected) + assert target_stream._stream + stream = patched_streams[target_stream._stream] + self.org_print(text, stream) + + def _patched_input(self): + return strin._stream.readline().strip() class TestTerminalOutput(UITestCase): @@ -152,7 +145,11 @@ logger.log(level, text, extra=loggingcontext) self.assertEqual(newstdout.getvalue(), out) self.assertEqual(newstderr.getvalue(), err) - patch() # reset terminal files + + # reset terminal files + strout.reset() + strerr.reset() + strin.reset() def test_output(self): pywikibot.output('output') @@ -360,7 +357,7 @@ """Terminal output transliteration tests.""" def testOutputTransliteratedUnicodeText(self): - pywikibot.ui.encoding = 'latin-1' + pywikibot.bot.ui.encoding = 'latin-1' pywikibot.config.transliterate = True pywikibot.output('abcd АБГД αβγδ あいうえお') self.assertEqual(newstdout.getvalue(), '') @@ -544,8 +541,5 @@ if __name__ == '__main__': # pragma: no cover - try: - with suppress(SystemExit): - unittest.main() - finally: - unpatch() + with suppress(SystemExit): + unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/678644 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: I2c204795e9ff8189f95eebf658f3aeffb741aba0 Gerrit-Change-Number: 678644 Gerrit-PatchSet: 27 Gerrit-Owner: Damian <atagar1(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm(a)debian.org> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

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

21 Jun '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/700506 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I26943d13a6706e17b04e96d6f99fe937032811d5 --- M checkimages/eu.json A thirdparty/scn.json 2 files changed, 11 insertions(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/checkimages/eu.json b/checkimages/eu.json index c76a737..c680d94 100644 --- a/checkimages/eu.json +++ b/checkimages/eu.json @@ -5,6 +5,8 @@ "Subi" ] }, + "checkimages-doubles-head": "Bikoiztutako fitxategia", "checkimages-source-tag-comment": "Bot: Etiketarik gabeko fitxategi igo berria markatzen", - "checkimages-source-notice-comment": "Bot: jatorriaren informazioa eskatzen da." + "checkimages-source-notice-comment": "Bot: jatorriaren informazioa eskatzen da.", + "checkimages-unknown-extension-head": "Luzapen ezezaguna!" } diff --git a/thirdparty/scn.json b/thirdparty/scn.json new file mode 100644 index 0000000..09c8204 --- /dev/null +++ b/thirdparty/scn.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Ajeje Brazorf" + ] + }, + "thirdparty-drtrigonbot-sum_disc-summary-head": "bot" +} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/700506 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: I26943d13a6706e17b04e96d6f99fe937032811d5 Gerrit-Change-Number: 700506 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Skip pages which does not exist on source site
by jenkins-bot (Code Review) 21 Jun '21

21 Jun '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/699701 ) Change subject: [IMPR] Skip pages which does not exist on source site ...................................................................... [IMPR] Skip pages which does not exist on source site Bug: T284414 Change-Id: I83863cff7a3915376ab8cb88a0c5faca24c2c764 --- M scripts/imagetransfer.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/imagetransfer.py b/scripts/imagetransfer.py index 5767ede..10cd9b0 100755 --- a/scripts/imagetransfer.py +++ b/scripts/imagetransfer.py @@ -42,7 +42,7 @@ import pywikibot from pywikibot import config, i18n, pagegenerators, textlib -from pywikibot.bot import SingleSiteBot +from pywikibot.bot import ExistingPageBot, SingleSiteBot from pywikibot.exceptions import IsRedirectPageError, NoPageError from pywikibot.specialbots import UploadRobot from pywikibot.tools.formatter import color_format @@ -134,7 +134,7 @@ } -class ImageTransferBot(SingleSiteBot): +class ImageTransferBot(SingleSiteBot, ExistingPageBot): """Image transfer bot.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/699701 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: I83863cff7a3915376ab8cb88a0c5faca24c2c764 Gerrit-Change-Number: 699701 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: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [deps] Fix "Double requirement given" error
by jenkins-bot (Code Review) 21 Jun '21

21 Jun '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/700475 ) Change subject: [deps] Fix "Double requirement given" error ...................................................................... [deps] Fix "Double requirement given" error https://ci.appveyor.com/project/Ladsgroup/pywikibot-g4xqx/builds/39674793/j… Change-Id: I9c12b8d324dae168b391026d31a25e49b0400425 --- M requirements.txt M setup.py 2 files changed, 8 insertions(+), 8 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/requirements.txt b/requirements.txt index 60156bd..fadaf2e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,8 +21,8 @@ requests>=2.20.1, < 2.26.0; python_version < '3.6' requests>=2.20.1 ; python_version >= '3.6' setuptools>=48.0.0 ; python_version >= '3.10' -setuptools>=38.5.2 ; python_version >= '3.7' -setuptools>=20.8.1 ; python_version >= '3.6' +setuptools>=38.5.2 ; python_version >= '3.7' and python_version < '3.10' +setuptools>=20.8.1 ; python_version >= '3.6' and python_version < '3.7' setuptools>=20.8.1, !=50.0.0, <50.2.0 ; python_version < '3.6' # MediaWiki markup parser diff --git a/setup.py b/setup.py index 17e3310..cd0bfa4 100644 --- a/setup.py +++ b/setup.py @@ -63,8 +63,8 @@ 'Graphviz': ['pydot>=1.2'], 'Google': ['google>=1.7'], 'mwparserfromhell': ['mwparserfromhell>=0.5.0'], - 'wikitextparser': ['wikitextparser>=0.47.5;python_version<"3.6"', - 'wikitextparser>=0.47.0'], + 'wikitextparser': ['wikitextparser>=0.47.5; python_version < "3.6"', + 'wikitextparser>=0.47.0; python_version >= "3.6"'], 'Tkinter': [ # vulnerability found in Pillow<8.1.1 'Pillow>=8.1.1;python_version>="3.6"', ], @@ -78,8 +78,8 @@ 'flake8-bugbear!=21.4.1', 'flake8-coding', 'flake8-colors>=0.1.9', - 'flake8-comprehensions>=3.1.4;python_version>="3.8"', - 'flake8-comprehensions>=2.2.0', + 'flake8-comprehensions>=3.1.4; python_version >= "3.8"', + 'flake8-comprehensions>=2.2.0; python_version < "3.8"', 'flake8-docstrings>=1.3.1', 'flake8-future-import', 'flake8-mock>=0.3', @@ -111,8 +111,8 @@ 'requests>=2.20.1;python_version>="3.6"', # PEP 440 'setuptools>=48.0.0 ; python_version >= "3.10"', - 'setuptools>=38.5.2 ; python_version >= "3.7"', - 'setuptools>=20.8.1 ; python_version >= "3.6"', + 'setuptools>=38.5.2 ; python_version >= "3.7" and python_version < "3.10"', + 'setuptools>=20.8.1 ; python_version >= "3.6" and python_version < "3.7"', 'setuptools>=20.8.1, !=50.0.0, <50.2.0 ; python_version < "3.6"', ] # in addition either mwparserfromhell or wikitextparser is required -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/700475 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: I9c12b8d324dae168b391026d31a25e49b0400425 Gerrit-Change-Number: 700475 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] use a sentinel variable to determine the end of an iterable
by jenkins-bot (Code Review) 20 Jun '21

20 Jun '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/700439 ) Change subject: [IMPR] use a sentinel variable to determine the end of an iterable ...................................................................... [IMPR] use a sentinel variable to determine the end of an iterable This enables None to be part of the iterables chain Change-Id: I76e770735fc1e92fa5cd448751d3da645123760a --- M pywikibot/tools/__init__.py 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved Matěj Suchánek: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index f81ee0b..52b40ff 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -1029,9 +1029,11 @@ :return: the combined generator of iterables :rtype: generator """ + sentinel = object() return (item - for item in itertools.chain.from_iterable(zip_longest(*iterables)) - if item is not None) + for item in itertools.chain.from_iterable( + zip_longest(*iterables, fillvalue=sentinel)) + if item is not sentinel) def filter_unique(iterable, container=None, key=None, add=None): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/700439 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: I76e770735fc1e92fa5cd448751d3da645123760a Gerrit-Change-Number: 700439 Gerrit-PatchSet: 4 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

1 0

[Gerrit] ...core[master]: [deps] update setuptools requirements
by jenkins-bot (Code Review) 20 Jun '21

20 Jun '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/700163 ) Change subject: [deps] update setuptools requirements ...................................................................... [deps] update setuptools requirements After backport of vendor package version.Version due to T284299 setuptools 49.4.0 is no longer necessary. Fall back to the very minimal version which 20.8.1 due to requirement.marker. Newer version of setuptools is recommended. - use 48.0.0 with python_version >= 3.10 because setuptools adopts distutils from the Python 3.9 standard library which is deprecated since Python 3.10 and will be dropped with Python 3.12 - use 38.5.2 with python_version >= 3.7 due to the fix of RuntimeError in pkg_resources.parse_requirements on Python 3.7 See also: https://setuptools.readthedocs.io/en/latest/history.html Bug: T284297 Change-Id: I35008f29735037dfe70392803e94551738572d66 --- M requirements.txt M setup.py 2 files changed, 8 insertions(+), 4 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/requirements.txt b/requirements.txt index d45bdae..60156bd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,8 +20,10 @@ # mandatory dependencies, others are optional requests>=2.20.1, < 2.26.0; python_version < '3.6' requests>=2.20.1 ; python_version >= '3.6' -setuptools>=49.4.0, !=50.0.0, <50.2.0 ; python_version < '3.6' -setuptools>=49.4.0 ; python_version >= '3.6' +setuptools>=48.0.0 ; python_version >= '3.10' +setuptools>=38.5.2 ; python_version >= '3.7' +setuptools>=20.8.1 ; python_version >= '3.6' +setuptools>=20.8.1, !=50.0.0, <50.2.0 ; python_version < '3.6' # MediaWiki markup parser # mwparserfromhell is default, wikitextparser can be used instead diff --git a/setup.py b/setup.py index 2d5438f..17e3310 100644 --- a/setup.py +++ b/setup.py @@ -110,8 +110,10 @@ 'requests>=2.20.1,<2.26.0;python_version<"3.6"', 'requests>=2.20.1;python_version>="3.6"', # PEP 440 - 'setuptools>=49.4.0, !=50.0.0, <50.2.0 ; python_version < "3.6"', - 'setuptools>=49.4.0 ; python_version >= "3.6"', + 'setuptools>=48.0.0 ; python_version >= "3.10"', + 'setuptools>=38.5.2 ; python_version >= "3.7"', + 'setuptools>=20.8.1 ; python_version >= "3.6"', + 'setuptools>=20.8.1, !=50.0.0, <50.2.0 ; python_version < "3.6"', ] # in addition either mwparserfromhell or wikitextparser is required -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/700163 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: I35008f29735037dfe70392803e94551738572d66 Gerrit-Change-Number: 700163 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] update DummyModule docstring
by jenkins-bot (Code Review) 20 Jun '21

20 Jun '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/700438 ) Change subject: [doc] update DummyModule docstring ...................................................................... [doc] update DummyModule docstring Change-Id: I41b36b7d6dfaa7cd339a01fa9c22e724d9ddb360 --- M scripts/version.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/version.py b/scripts/version.py index d8c889c..a4ce0a2 100755 --- a/scripts/version.py +++ b/scripts/version.py @@ -15,7 +15,7 @@ class DummyModule: - """Fake requests instance.""" + """Fake module instance.""" __version__ = 'n/a' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/700438 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: I41b36b7d6dfaa7cd339a01fa9c22e724d9ddb360 Gerrit-Change-Number: 700438 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

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits June 2021