Pywikibot-commits March 2021

pywikibot-commits@lists.wikimedia.org

1 participants
142 discussions

[Gerrit] ...core[master]: [IMPR] Enable extract_templates_and_params with wikitextparser package
by jenkins-bot (Code Review) 31 Mar '21

31 Mar '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675351 ) Change subject: [IMPR] Enable extract_templates_and_params with wikitextparser package ...................................................................... [IMPR] Enable extract_templates_and_params with wikitextparser package - rename extract_templates_and_params_mwpfh to _extract_templates_and_params_parser and check for the currently used wikitext parser. All different package behaviours ar handled there. Test for ImportError instead of generic Exception. - deprecate extract_templates_and_params_mwpfh but force to take mwparserfromhell as wikitextparser - the fallback path is: wikitextparser, mwparserfromhell, _ETP_REGEX - update documentation - add OrderedDict and nullcontext to backports.py - update tests accordingly Change-Id: Ibf4472b309672e7189042875c460b3665ec810ed --- M pywikibot/backports.py M pywikibot/textlib.py M scripts/i18n M tests/textlib_tests.py 4 files changed, 211 insertions(+), 101 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/backports.py b/pywikibot/backports.py index 487447a..32e2666 100644 --- a/pywikibot/backports.py +++ b/pywikibot/backports.py @@ -14,6 +14,25 @@ cache = _lru_cache(None) +# context +if PYTHON_VERSION < (3, 7): + + class nullcontext: # noqa: N801 + + """Dummy context manager for Python 3.5/3.6 that does nothing.""" + + def __init__(self, result=None): # noqa: D107 + self.result = result + + def __enter__(self): + return self.result + + def __exit__(self, *args): + pass +else: + from contextlib import nullcontext + + # typing if PYTHON_VERSION < (3, 5, 2): from typing import Dict as DefaultDict @@ -22,6 +41,15 @@ else: from collections import defaultdict as DefaultDict # noqa: N812 + +if PYTHON_VERSION < (3, 7, 2): + from typing import Dict as OrderedDict +elif PYTHON_VERSION < (3, 9): + from typing import OrderedDict +else: + from collections import OrderedDict + + if PYTHON_VERSION >= (3, 9): from collections.abc import Iterable, Sequence Dict = dict diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 204bd68..75ae916 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -22,15 +22,22 @@ import pywikibot from pywikibot.backports import List, Tuple +from pywikibot.backports import OrderedDict as OrderedDictType from pywikibot.exceptions import InvalidTitle, SiteDefinitionError from pywikibot.family import Family -from pywikibot.tools import deprecate_arg, issue_deprecation_warning +from pywikibot.tools import ( + deprecated, deprecate_arg, issue_deprecation_warning, +) try: - import mwparserfromhell -except ImportError as e: - mwparserfromhell = e + import wikitextparser +except ImportError: + try: + import mwparserfromhell as wikitextparser + except ImportError as e: + wikitextparser = e +ETPType = List[Tuple[str, OrderedDictType[str, str]]] # cache for replaceExcept to avoid recompile or regexes each call _regex_cache = {} @@ -1566,8 +1573,9 @@ # Functions dealing with templates # -------------------------------- -def extract_templates_and_params(text: str, remove_disabled_parts=None, - strip: Optional[bool] = None): +def extract_templates_and_params(text: str, + remove_disabled_parts: Optional[bool] = None, + strip: Optional[bool] = None) -> ETPType: """Return a list of templates found in text. Return value is a list of tuples. There is one tuple for each use of a @@ -1596,16 +1604,15 @@ @param text: The wikitext from which templates are extracted @param remove_disabled_parts: Remove disabled wikitext such as comments - and pre. If None (default), this is enabled when mwparserfromhell - is not available and disabled if mwparserfromhell is present. - @type remove_disabled_parts: bool or None + and pre. If None (default), this is enabled when neither + mwparserfromhell not wikitextparser package is available and + disabled otherwise. @param strip: if enabled, strip arguments and values of templates. - If None (default), this is enabled when mwparserfromhell - is not available and disabled if mwparserfromhell is present. + If None (default), this is enabled when neither mwparserfromhell + nor wikitextparser package is available and disabled otherwise. @return: list of template name and params - @rtype: list of tuple """ - use_regex = isinstance(mwparserfromhell, Exception) + use_regex = isinstance(wikitextparser, ImportError) if remove_disabled_parts is None: remove_disabled_parts = use_regex @@ -1617,41 +1624,58 @@ if use_regex: return extract_templates_and_params_regex(text, False, strip) - return extract_templates_and_params_mwpfh(text, strip) + return _extract_templates_and_params_parser(text, strip) -def extract_templates_and_params_mwpfh(text: str, strip=False): +def _extract_templates_and_params_parser(text: str, + strip: bool = False) -> ETPType: """ Extract templates with params using mwparserfromhell. This function should not be called directly. - Use extract_templates_and_params, which will select this - mwparserfromhell implementation if based on whether the - mwparserfromhell package is installed. + Use extract_templates_and_params, which will select this parser + implementation if the mwparserfromhell or wikitextparser package is + installed. @param text: The wikitext from which templates are extracted + @param strip: if enabled, strip arguments and values of templates @return: list of template name and params - @rtype: list of tuple """ - code = mwparserfromhell.parse(text) - result = [] + def explicit(param): + try: + attr = param.showkey + except AttributeError: + attr = not param.positional + return attr - for template in code.ifilter_templates( + parser_name = wikitextparser.__name__ + pywikibot.log('Using {!r} wikitext parser'.format(parser_name)) + + result = [] + parsed = wikitextparser.parse(text) + if parser_name == 'wikitextparser': + templates = parsed.templates + arguments = 'arguments' + else: + templates = parsed.ifilter_templates( matches=lambda x: not x.name.lstrip().startswith('#'), - recursive=True): + recursive=True) + arguments = 'params' + + for template in templates: params = OrderedDict() - for param in template.params: + for param in getattr(template, arguments): + value = str(param.value) # mwpfh needs upcast to str + if strip: - implicit_parameter = not param.showkey key = param.name.strip() - if not implicit_parameter: + if explicit(param): value = param.value.strip() else: value = str(param.value) else: key = str(param.name) - value = str(param.value) params[key] = value @@ -1659,9 +1683,22 @@ return result +@deprecated('extract_templates_and_params', since='20210329', + future_warning=True) +def extract_templates_and_params_mwpfh(text: str, + strip: bool = False) -> ETPType: + """Extract templates with params using mwparserfromhell.""" + global wikitextparser + saved_parser = wikitextparser + import mwparserfromhell as wikitextparser + result = _extract_templates_and_params_parser(text, strip) + wikitextparser = saved_parser + return result + + def extract_templates_and_params_regex(text: str, remove_disabled_parts: bool = True, - strip: bool = True): + strip: bool = True) -> ETPType: """ Extract templates with params using a regex with additional processing. @@ -1672,8 +1709,8 @@ is not used. @param text: The wikitext from which templates are extracted + @param strip: if enabled, strip arguments and values of templates @return: list of template name and params - @rtype: list of tuple """ # remove commented-out stuff etc. if remove_disabled_parts: diff --git a/scripts/i18n b/scripts/i18n index 362e42e..4591fe6 160000 --- a/scripts/i18n +++ b/scripts/i18n @@ -1 +1 @@ -Subproject commit 362e42e36ae45005e8019ae4107eac2adb736a55 +Subproject commit 4591fe605f89e29e14f730f1416542acfea135bd diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 139cb99..8b537b3 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -16,8 +16,10 @@ import pywikibot import pywikibot.textlib as textlib +from pywikibot.backports import nullcontext from pywikibot.site._interwikimap import _IWEntry from pywikibot.textlib import _MultiTemplateMatchBuilder, extract_sections +from pywikibot.tools import suppress_warnings from pywikibot import UnknownSite from tests.aspects import ( @@ -300,6 +302,10 @@ 'Invalid category title extracted: nasty{{{!}}') +WARNING_MSG = (r'.*extract_templates_and_params_mwpfh .*' + r'is deprecated for .*; use extract_templates_and_params') + + class TestTemplateParams(TestCase): """Test to verify that template params extraction works.""" @@ -308,67 +314,61 @@ def _common_results(self, func): """Common cases.""" - self.assertEqual(func('{{a}}'), [('a', OrderedDict())]) - self.assertEqual(func('{{ a}}'), [('a', OrderedDict())]) - self.assertEqual(func('{{a }}'), [('a', OrderedDict())]) - self.assertEqual(func('{{ a }}'), [('a', OrderedDict())]) + with suppress_warnings(WARNING_MSG, category=FutureWarning): + self.assertEqual(func('{{a}}'), [('a', OrderedDict())]) - self.assertEqual(func('{{a|b=c}}'), - [('a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{a|b|c=d}}'), - [('a', OrderedDict((('1', 'b'), ('c', 'd'))))]) - self.assertEqual(func('{{a|b=c|f=g|d=e|1=}}'), - [('a', OrderedDict((('b', 'c'), ('f', 'g'), - ('d', 'e'), ('1', ''))))]) - self.assertEqual(func('{{a|1=2|c=d}}'), - [('a', OrderedDict((('1', '2'), ('c', 'd'))))]) - self.assertEqual(func('{{a|c=d|1=2}}'), - [('a', OrderedDict((('c', 'd'), ('1', '2'))))]) - self.assertEqual(func('{{a|5=d|a=b}}'), - [('a', OrderedDict((('5', 'd'), ('a', 'b'))))]) - self.assertEqual(func('{{a|=2}}'), - [('a', OrderedDict((('', '2'), )))]) + with suppress_warnings(WARNING_MSG, category=FutureWarning): + self.assertEqual(func('{{ a}}'), [('a', OrderedDict())]) + self.assertEqual(func('{{a }}'), [('a', OrderedDict())]) + self.assertEqual(func('{{ a }}'), [('a', OrderedDict())]) + self.assertEqual(func('{{a|b=c}}'), + [('a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{a|b|c=d}}'), + [('a', OrderedDict((('1', 'b'), ('c', 'd'))))]) + self.assertEqual(func('{{a|b=c|f=g|d=e|1=}}'), + [('a', OrderedDict((('b', 'c'), ('f', 'g'), + ('d', 'e'), ('1', ''))))]) + self.assertEqual(func('{{a|1=2|c=d}}'), + [('a', OrderedDict((('1', '2'), ('c', 'd'))))]) + self.assertEqual(func('{{a|c=d|1=2}}'), + [('a', OrderedDict((('c', 'd'), ('1', '2'))))]) + self.assertEqual(func('{{a|5=d|a=b}}'), + [('a', OrderedDict((('5', 'd'), ('a', 'b'))))]) + self.assertEqual(func('{{a|=2}}'), + [('a', OrderedDict((('', '2'), )))]) + self.assertEqual(func('{{a|}}'), + [('a', OrderedDict((('1', ''), )))]) + self.assertEqual(func('{{a|=|}}'), + [('a', OrderedDict((('', ''), ('1', ''))))]) + self.assertEqual(func('{{a||}}'), + [('a', OrderedDict((('1', ''), ('2', ''))))]) + self.assertEqual(func('{{a|b={{{1}}}}}'), + [('a', OrderedDict((('b', '{{{1}}}'), )))]) + self.assertEqual(func('{{a|b=<noinclude>{{{1}}}</noinclude>}}'), + [('a', + OrderedDict((('b', + '<noinclude>{{{1}}}</noinclude>'), + )))]) + self.assertEqual(func('{{Template:a|b=c}}'), + [('Template:a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{template:a|b=c}}'), + [('template:a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{:a|b=c}}'), + [(':a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{a|b={{{1}}}|c={{{2}}}}}'), + [('a', OrderedDict((('b', '{{{1}}}'), + ('c', '{{{2}}}'))))]) + self.assertEqual(func('{{a|b=c}}{{d|e=f}}'), + [('a', OrderedDict((('b', 'c'), ))), + ('d', OrderedDict((('e', 'f'), )))]) - self.assertEqual(func('{{a|}}'), [('a', OrderedDict((('1', ''), )))]) - self.assertEqual(func('{{a|=|}}'), - [('a', OrderedDict((('', ''), ('1', ''))))]) - self.assertEqual(func('{{a||}}'), - [('a', OrderedDict((('1', ''), ('2', ''))))]) + # initial '{' and '}' should be ignored as outer wikitext + self.assertEqual(func('{{{a|b}}X}'), + [('a', OrderedDict((('1', 'b'), )))]) - self.assertEqual(func('{{a|b={{{1}}}}}'), - [('a', OrderedDict((('b', '{{{1}}}'), )))]) - self.assertEqual(func('{{a|b=<noinclude>{{{1}}}</noinclude>}}'), - [('a', OrderedDict( - (('b', '<noinclude>{{{1}}}</noinclude>'), )))]) - self.assertEqual(func('{{subst:a|b=c}}'), - [('subst:a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{safesubst:a|b=c}}'), - [('safesubst:a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{msgnw:a|b=c}}'), - [('msgnw:a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{Template:a|b=c}}'), - [('Template:a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{template:a|b=c}}'), - [('template:a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{:a|b=c}}'), - [(':a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{subst::a|b=c}}'), - [('subst::a', OrderedDict((('b', 'c'), )))]) - - self.assertEqual(func('{{a|b={{{1}}}|c={{{2}}}}}'), - [('a', OrderedDict((('b', '{{{1}}}'), - ('c', '{{{2}}}'))))]) - self.assertEqual(func('{{a|b=c}}{{d|e=f}}'), - [('a', OrderedDict((('b', 'c'), ))), - ('d', OrderedDict((('e', 'f'), )))]) - - # initial '{' and '}' should be ignored as outer wikitext - self.assertEqual(func('{{{a|b}}X}'), - [('a', OrderedDict((('1', 'b'), )))]) - - # sf.net bug 1575: unclosed template - self.assertEqual(func('{{a'), []) - self.assertEqual(func('{{a}}{{foo|'), [('a', OrderedDict())]) + # sf.net bug 1575: unclosed template + self.assertEqual(func('{{a'), []) + self.assertEqual(func('{{a}}{{foo|'), [('a', OrderedDict())]) def _unstripped(self, func): """Common cases of unstripped results.""" @@ -455,14 +455,69 @@ ('2', 'd')])), ('b', OrderedDict([('1', 'c')]))]) + def _mwpfh_passes(self, func, failing=False): + """Common cases failing with wikitextparser but passes with mwpfh. + + Probably the behaviour of regex or mwpfh is wrong. + """ + patterns = [ + '{{subst:a|b=c}}', + '{{safesubst:a|b=c}}', + '{{msgnw:a|b=c}}', + '{{subst::a|b=c}}' + ] + context = self.assertRaises(AssertionError) \ + if failing else nullcontext() + + for template in patterns: + with self.subTest(template=template, failing=failing): + name = template.strip('{}').split('|')[0] + with context: + self.assertEqual(func(template), + [(name, OrderedDict((('b', 'c'), )))]) + @require_modules('mwparserfromhell') def test_extract_templates_params_mwpfh(self): """Test using mwparserfromhell.""" func = textlib.extract_templates_and_params_mwpfh + with suppress_warnings(WARNING_MSG, category=FutureWarning): + self._common_results(func) + self._order_differs(func) + self._unstripped(func) + self._etp_regex_differs(func) + self._mwpfh_passes(func) + + self.assertCountEqual(func('{{a|{{c|{{d}}}}}}'), + [('c', OrderedDict((('1', '{{d}}'), ))), + ('a', OrderedDict([('1', '{{c|{{d}}}}')])), + ('d', OrderedDict()) + ]) + + self.assertCountEqual(func('{{a|{{c|{{d|}}}}}}'), + [('c', OrderedDict((('1', '{{d|}}'), ))), + ('a', OrderedDict([('1', '{{c|{{d|}}}}')])), + ('d', OrderedDict([('1', '')])) + ]) + + @require_modules('mwparserfromhell') + def test_extract_templates_params_parser_stripped(self): + """Test using mwparserfromhell with stripping.""" + func = functools.partial(textlib._extract_templates_and_params_parser, + strip=True) + + self._common_results(func) + self._order_differs(func) + self._stripped(func) + + @require_modules('wikitextparser') + def test_extract_templates_params_parser(self): + """Test using wikitextparser.""" + func = textlib.extract_templates_and_params self._common_results(func) self._order_differs(func) self._unstripped(func) self._etp_regex_differs(func) + self._mwpfh_passes(func, failing=True) self.assertCountEqual(func('{{a|{{c|{{d}}}}}}'), [('c', OrderedDict((('1', '{{d}}'), ))), @@ -476,16 +531,6 @@ ('d', OrderedDict([('1', '')])) ]) - @require_modules('mwparserfromhell') - def test_extract_templates_params_mwpfh_stripped(self): - """Test using mwparserfromhell with stripping.""" - func = functools.partial(textlib.extract_templates_and_params_mwpfh, - strip=True) - - self._common_results(func) - self._order_differs(func) - self._stripped(func) - def test_extract_templates_params_regex(self): """Test using many complex regexes.""" func = functools.partial(textlib.extract_templates_and_params_regex, @@ -660,7 +705,7 @@ net = False - @PatchingTestCase.patched(textlib, 'extract_templates_and_params_mwpfh') + @PatchingTestCase.patched(textlib, '_extract_templates_and_params_parser') def extract_mwpfh(self, text, *args, **kwargs): """Patched call to extract_templates_and_params_mwpfh.""" self._text = text @@ -676,7 +721,7 @@ def test_removing_disabled_parts_regex(self): """Test removing disabled parts when using the regex variant.""" - self.patch(textlib, 'mwparserfromhell', Exception()) + self.patch(textlib, 'wikitextparser', ImportError()) textlib.extract_templates_and_params('{{a}}', True) self.assertEqual(self._text, '{{a}}') self.assertFalse(self._mwpfh) @@ -702,7 +747,7 @@ def test_strip_regex(self): """Test stripping values when using the regex variant.""" - self.patch(textlib, 'mwparserfromhell', Exception()) + self.patch(textlib, 'wikitextparser', ImportError()) textlib.extract_templates_and_params('{{a| foo }}', False, True) self.assertEqual(self._args, (False, True)) self.assertFalse(self._mwpfh) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675351 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: Ibf4472b309672e7189042875c460b3665ec810ed Gerrit-Change-Number: 675351 Gerrit-PatchSet: 15 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] Fix isDone() method
by jenkins-bot (Code Review) 31 Mar '21

31 Mar '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675988 ) Change subject: [bugfix] Fix isDone() method ...................................................................... [bugfix] Fix isDone() method Change-Id: Ifa368f65ccee3320697892b9f41f9db5454150fc --- M scripts/interwiki.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/interwiki.py b/scripts/interwiki.py index 0096eab..684e2fd 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -2123,7 +2123,7 @@ def isDone(self): """Check whether there is still more work to do.""" - return self and self.pageGenerator is None + return not self and self.pageGenerator is None def plus(self, site, count=1): """Helper routine that the Subject class expects in a counter.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675988 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: Ifa368f65ccee3320697892b9f41f9db5454150fc Gerrit-Change-Number: 675988 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] Improvements for interwiki.py
by jenkins-bot (Code Review) 31 Mar '21

31 Mar '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675844 ) Change subject: [IMPR] Improvements for interwiki.py ...................................................................... [IMPR] Improvements for interwiki.py - simplify InterwikiBotConfig arg parsing for two items - [bugfix] exceptions must derive from BaseException - shorten comparing len - decrease nested flow statements - use defaultdict in interwiki_graph.Subject Change-Id: Ie559eb9063b52acf4d531819a4474c908b7d032e --- M scripts/interwiki.py 1 file changed, 162 insertions(+), 156 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/interwiki.py b/scripts/interwiki.py index 8cac302..0096eab 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -516,12 +516,10 @@ self.parenthesesonly = True elif arg == 'localright': self.followinterwiki = False - elif arg == 'array': - if value.isdigit(): - self.minsubjects = int(value) - elif arg == 'query': - if value.isdigit(): - self.maxquerysize = int(value) + elif arg == 'array' and value.isdigit(): + self.minsubjects = int(value) + elif arg == 'query' and value.isdigit(): + self.maxquerysize = int(value) elif arg == 'back': self.nobackonly = True elif arg == 'async': @@ -811,8 +809,9 @@ # Bug-check: Isn't there any work still in progress? We can't work on # different sites at a time! if self.pending: - raise "BUG: Can't start to work on {}; still working on {}".format( - site, self.pending) + raise RuntimeError( + "BUG: Can't start to work on {}; still working on {}" + .format(site, self.pending)) # Prepare a list of suitable pages result = [] for page in self.todo.filter(site): @@ -1262,7 +1261,7 @@ break if self.origin == page: - self.untranslated = (len(iw) == 0) + self.untranslated = not iw if self.conf.untranslatedonly: # Ignore the interwiki links. iw = () @@ -1307,13 +1306,12 @@ for link in iw: linkedPage = pywikibot.Page(link) - if self.conf.hintsareright: - if linkedPage.site in self.hintedsites: - pywikibot.output( - 'NOTE: {}: {} extra interwiki on hinted site ' - 'ignored {}' - .format(self.origin, page, linkedPage)) - break + if self.conf.hintsareright \ + and linkedPage.site in self.hintedsites: + pywikibot.output( + 'NOTE: {}: {} extra interwiki on hinted site ' + 'ignored {}'.format(self.origin, page, linkedPage)) + break if not self.skipPage(page, linkedPage, counter): if self.conf.followinterwiki or page == self.origin: @@ -1372,7 +1370,7 @@ errorCount = self.problemfound # Build up a dictionary of all pages found, with the site as key. # Each value will be a list of pages. - new = {} + new = defaultdict(list) for page in self.done: if page.exists() and not page.isRedirectPage() \ and not page.isCategoryRedirect(): @@ -1382,16 +1380,13 @@ # inhibit the forwarding families pages to be updated. continue - if site == self.origin.site: - if page != self.origin: - self.problem('Found link to ' + page) - self.whereReport(page) - errorCount += 1 - else: - if site in new: - new[site].append(page) - else: - new[site] = [page] + + if site != self.origin.site: + new[site].append(page) + elif page != self.origin: + self.problem('Found link to ' + page) + self.whereReport(page) + errorCount += 1 # See if new{} contains any problematic values result = {} @@ -1519,10 +1514,10 @@ # processing # TODO: should be move to assemble() # replaceLinks will skip the site it's working on. - if self.origin.site not in new: # TODO: make this possible as well. - if not self.origin.site.family.interwiki_forward: - new[self.origin.site] = self.origin + if self.origin.site not in new \ + and not self.origin.site.family.interwiki_forward: + new[self.origin.site] = self.origin updatedSites = [] notUpdatedSites = [] @@ -1607,21 +1602,23 @@ def replaceLinks(self, page, newPages): """Return True if saving was successful.""" - if self.conf.localonly: - # In this case only continue on the Page we started with - if page != self.origin: - raise SaveError('-localonly and page != origin') + # In this case only continue on the Page we started with + if self.conf.localonly and page != self.origin: + raise SaveError('-localonly and page != origin') + if page.section(): # This is not a page, but a subpage. Do not edit it. pywikibot.output('Not editing {}: not doing interwiki on subpages' .format(page)) raise SaveError('Link has a #section') + try: pagetext = page.get() except pywikibot.NoPage: pywikibot.output('Not editing {}: page does not exist' .format(page)) raise SaveError("Page doesn't exist") + if page_empty_check(page): pywikibot.output('Not editing {}: page is empty'.format(page)) raise SaveError('Page is empty.') @@ -1667,9 +1664,9 @@ # Do not add interwiki links to foreign families that page.site() does # not forward to for stmp in new.keys(): - if stmp.family != page.site.family: - if stmp.family.name != page.site.family.interwiki_forward: - del new[stmp] + if stmp.family != page.site.family \ + and stmp.family.name != page.site.family.interwiki_forward: + del new[stmp] # Put interwiki links into a map old = {} @@ -1751,87 +1748,86 @@ ask = False if self.conf.confirm and not self.conf.always: ask = True - # If we need to ask, do so - if ask: - if self.conf.autonomous: - # If we cannot ask, deny permission - answer = 'n' - else: - answer = pywikibot.input_choice('Submit?', - [('Yes', 'y'), ('No', 'n'), - ('open in Browser', 'b'), - ('Give up', 'g'), - ('Always', 'a')], - automatic_quit=False) - if answer == 'b': - pywikibot.bot.open_webbrowser(page) - return True - if answer == 'a': - # don't ask for the rest of this subject - self.conf.always = True - answer = 'y' - else: + + if not ask: # If we do not need to ask, allow answer = 'y' - - # If we got permission to submit, do so - if answer == 'y': - self.conf.note('Updating live wiki...') - timeout = 60 - page.text = newtext - while True: - try: - page.save(summary=mcomment, - asynchronous=self.conf.asynchronous, - nocreate=True) - except pywikibot.NoCreateError: - pywikibot.exception() - return False - except pywikibot.LockedPage: - pywikibot.output('Page {} is locked. Skipping.' - .format(page)) - raise SaveError('Locked') - except pywikibot.EditConflict: - pywikibot.output( - 'ERROR putting page: An edit conflict occurred. ' - 'Giving up.') - raise SaveError('Edit conflict') - except pywikibot.SpamblacklistError as error: - pywikibot.output( - 'ERROR putting page: {0} blacklisted by spamfilter. ' - 'Giving up.'.format(error.url)) - raise SaveError('Spam filter') - except pywikibot.PageSaveRelatedError as error: - pywikibot.output('ERROR putting page: {}' - .format(error.args,)) - raise SaveError('PageSaveRelatedError') - except (socket.error, IOError) as error: - if timeout > 3600: - raise - pywikibot.output('ERROR putting page: {}' - .format(error.args,)) - pywikibot.output('Sleeping {} seconds before trying again.' - .format(timeout,)) - timeout *= 2 - pywikibot.sleep(timeout) - except pywikibot.ServerError: - if timeout > 3600: - raise - pywikibot.output('ERROR putting page: ServerError.') - pywikibot.output('Sleeping {} seconds before trying again.' - .format(timeout,)) - timeout *= 2 - pywikibot.sleep(timeout) - else: - break - return True + elif self.conf.autonomous: + # If we cannot ask, deny permission + answer = 'n' + else: # If we need to ask, do so + answer = pywikibot.input_choice('Submit?', + [('Yes', 'y'), ('No', 'n'), + ('open in Browser', 'b'), + ('Give up', 'g'), + ('Always', 'a')], + automatic_quit=False) + if answer == 'b': + pywikibot.bot.open_webbrowser(page) + return True + if answer == 'a': + # don't ask for the rest of this subject + self.conf.always = True + answer = 'y' if answer == 'g': raise GiveUpOnPage('User asked us to give up') - raise LinkMustBeRemoved('Found incorrect link to {} in {}' - .format(', '.join(x.code for x in removing), - page)) + # If we got permission to submit, do so + if answer != 'y': + raise LinkMustBeRemoved( + 'Found incorrect link to {} in {}' + .format(', '.join(x.code for x in removing), page)) + + self.conf.note('Updating live wiki...') + timeout = 60 + page.text = newtext + while True: + try: + page.save(summary=mcomment, + asynchronous=self.conf.asynchronous, + nocreate=True) + except pywikibot.NoCreateError: + pywikibot.exception() + return False + except pywikibot.LockedPage: + pywikibot.output('Page {} is locked. Skipping.' + .format(page)) + raise SaveError('Locked') + except pywikibot.EditConflict: + pywikibot.output( + 'ERROR putting page: An edit conflict occurred. ' + 'Giving up.') + raise SaveError('Edit conflict') + except pywikibot.SpamblacklistError as error: + pywikibot.output( + 'ERROR putting page: {0} blacklisted by spamfilter. ' + 'Giving up.'.format(error.url)) + raise SaveError('Spam filter') + except pywikibot.PageSaveRelatedError as error: + pywikibot.output('ERROR putting page: {}' + .format(error.args,)) + raise SaveError('PageSaveRelatedError') + except (socket.error, IOError) as error: + if timeout > 3600: + raise + pywikibot.output('ERROR putting page: {}' + .format(error.args,)) + pywikibot.output('Sleeping {} seconds before trying again.' + .format(timeout,)) + timeout *= 2 + pywikibot.sleep(timeout) + except pywikibot.ServerError: + if timeout > 3600: + raise + pywikibot.output('ERROR putting page: ServerError.') + pywikibot.output('Sleeping {} seconds before trying again.' + .format(timeout,)) + timeout *= 2 + pywikibot.sleep(timeout) + else: + break + return True def reportBacklinks(self, new, updatedSites): """ @@ -1847,45 +1843,49 @@ try: for site in expectedSites - set(updatedSites): page = new[site] - if not page.section(): + if page.section(): + continue + + try: + linkedPages = {pywikibot.Page(link) + for link in page.iterlanglinks()} + except pywikibot.NoPage: + pywikibot.warning( + 'Page {} does no longer exist?!'.format(page)) + break + + # To speed things up, create a dictionary which maps sites + # to pages. This assumes that there is only one interwiki + # link per language. + linkedPagesDict = {} + for linkedPage in linkedPages: + linkedPagesDict[linkedPage.site] = linkedPage + for expectedPage in expectedPages - linkedPages: + if expectedPage == page: + continue try: - linkedPages = {pywikibot.Page(link) - for link in page.iterlanglinks()} - except pywikibot.NoPage: + linkedPage = linkedPagesDict[expectedPage.site] pywikibot.warning( - 'Page {} does no longer exist?!'.format(page)) - break - # To speed things up, create a dictionary which maps sites - # to pages. This assumes that there is only one interwiki - # link per language. - linkedPagesDict = {} - for linkedPage in linkedPages: - linkedPagesDict[linkedPage.site] = linkedPage - for expectedPage in expectedPages - linkedPages: - if expectedPage != page: - try: - linkedPage = linkedPagesDict[expectedPage.site] - pywikibot.warning( - '{}: {} does not link to {} but to {}' - .format(page.site.family.name, - page, expectedPage, linkedPage)) - except KeyError: - if not expectedPage.site.is_data_repository(): - pywikibot.warning( - '{}: {} does not link to {}' - .format(page.site.family.name, - page, expectedPage)) - # Check for superfluous links - for linkedPage in linkedPages: - if linkedPage not in expectedPages: - # Check whether there is an alternative page on - # that language. - # In this case, it was already reported above. - if linkedPage.site not in expectedSites: - pywikibot.warning( - '{}: {} links to incorrect {}' - .format(page.site.family.name, - page, linkedPage)) + '{}: {} does not link to {} but to {}' + .format(page.site.family.name, + page, expectedPage, linkedPage)) + except KeyError: + if not expectedPage.site.is_data_repository(): + pywikibot.warning('{}: {} does not link to {}' + .format(page.site.family.name, + page, expectedPage)) + # Check for superfluous links + for linkedPage in linkedPages: + if linkedPage in expectedPages: + continue + # Check whether there is an alternative page on + # that language. + # In this case, it was already reported above. + if linkedPage.site not in expectedSites: + pywikibot.warning('{}: {} links to incorrect {}' + .format(page.site.family.name, + page, linkedPage)) + except (socket.error, IOError): pywikibot.output('ERROR: could not report backlinks') @@ -2006,6 +2006,7 @@ """Return the first subject that is still being worked on.""" if self.subjects: return self.subjects[0] + return None def maxOpenSite(self): """ @@ -2014,7 +2015,7 @@ If there is nothing left, return None. Only languages that are TODO for the first Subject are returned. """ - max = 0 + max_ = 0 maxlang = None if not self.firstSubject(): return None @@ -2024,12 +2025,15 @@ # because we have to wait before submitting another modification to # go live. Select any language from counts. oc = self.counts - if pywikibot.Site() in oc: - return pywikibot.Site() + + default_site = pywikibot.Site() + if default_site in oc: + return default_site + for lang in oc: count = self.counts[lang] - if count > max: - max = count + if count > max_: + max_ = count maxlang = lang return maxlang @@ -2091,9 +2095,11 @@ if len(pageGroup) >= self.conf.maxquerysize: # We have found enough pages to fill the bandwidth. break - if len(pageGroup) == 0: + + if not pageGroup: pywikibot.output('NOTE: Nothing left to do 2') return False + # Get the content of the assembled list in one blow gen = site.preloadpages(pageGroup, templates=True, langlinks=True, pageprops=True) @@ -2117,7 +2123,7 @@ def isDone(self): """Check whether there is still more work to do.""" - return len(self) == 0 and self.pageGenerator is None + return self and self.pageGenerator is None def plus(self, site, count=1): """Helper routine that the Subject class expects in a counter.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675844 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: Ie559eb9063b52acf4d531819a4474c908b7d032e Gerrit-Change-Number: 675844 Gerrit-PatchSet: 2 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

[Gerrit] ...core[master]: [tests] Remove code duplication in link_tests.py
by jenkins-bot (Code Review) 31 Mar '21

31 Mar '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675829 ) Change subject: [tests] Remove code duplication in link_tests.py ...................................................................... [tests] Remove code duplication in link_tests.py Change-Id: Ifedf792dc5b6d7156952e31800d1aeb7d535beb8 --- M tests/link_tests.py 1 file changed, 22 insertions(+), 30 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/link_tests.py b/tests/link_tests.py index d3550bc..0ecd64b 100644 --- a/tests/link_tests.py +++ b/tests/link_tests.py @@ -795,37 +795,29 @@ config.mylang = 'en' config.family = 'wikipedia' - def test_fully_qualified_NS0_code(self): - """Test 'testwiki:wikidata:Q6' on enwp is namespace 0.""" - link = Link('testwiki:wikidata:Q6') - link.parse() - self.assertEqual(link.site, pywikibot.Site('wikidata', 'wikidata')) - self.assertEqual(link.title, 'Q6') - self.assertEqual(link.namespace, 0) + def test_fully_qualified_NS0(self): + """Test prefixed links with 'Q6' on enwp is namespace 0.""" + test = [('testwiki:wikidata', 'wikidata:wikidata'), + ('wikidata:testwiki', 'wikipedia:test')] + for linkprefix, sitetitle in test: + with self.subTest(pattern=linkprefix): + link = Link(linkprefix + ':Q6') + link.parse() + self.assertEqual(link.site, pywikibot.Site(sitetitle)) + self.assertEqual(link.title, 'Q6') + self.assertEqual(link.namespace, 0) - def test_fully_qualified_NS1_code(self): - """Test 'testwiki:wikidata:Talk:Q6' on enwp is namespace 1.""" - link = Link('testwiki:wikidata:Talk:Q6') - link.parse() - self.assertEqual(link.site, pywikibot.Site('wikidata', 'wikidata')) - self.assertEqual(link.title, 'Q6') - self.assertEqual(link.namespace, 1) - - def test_fully_qualified_NS0_family(self): - """Test 'wikidata:testwiki:Q6' on enwp is namespace 0.""" - link = Link('wikidata:testwiki:Q6') - link.parse() - self.assertEqual(link.site, pywikibot.Site('test', 'wikipedia')) - self.assertEqual(link.title, 'Q6') - self.assertEqual(link.namespace, 0) - - def test_fully_qualified_NS1_family(self): - """Test 'wikidata:testwiki:Talk:Q6' on enwp is namespace 1.""" - link = Link('wikidata:testwiki:Talk:Q6') - link.parse() - self.assertEqual(link.site, pywikibot.Site('test', 'wikipedia')) - self.assertEqual(link.title, 'Q6') - self.assertEqual(link.namespace, 1) + def test_fully_qualified_NS1(self): + """Test prefixed links with 'Talk:Q6' on enwp is namespace 1.""" + test = [('testwiki:wikidata', 'wikidata:wikidata'), + ('wikidata:testwiki', 'wikipedia:test')] + for linkprefix, sitetitle in test: + with self.subTest(pattern=linkprefix): + link = Link(linkprefix + ':Talk:Q6') + link.parse() + self.assertEqual(link.site, pywikibot.Site(sitetitle)) + self.assertEqual(link.title, 'Q6') + self.assertEqual(link.namespace, 1) class TestFullyQualifiedOneSiteFamilyImplicitLinkParser(LinkTestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675829 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: Ifedf792dc5b6d7156952e31800d1aeb7d535beb8 Gerrit-Change-Number: 675829 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: DannyS712 <dannys712.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Remove code duplication of Site.delete and Site.undelete
by jenkins-bot (Code Review) 31 Mar '21

31 Mar '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675446 ) Change subject: [IMPR] Remove code duplication of Site.delete and Site.undelete ...................................................................... [IMPR] Remove code duplication of Site.delete and Site.undelete - Site.deletepage and Site.deleteoldimage uses the same code. Drop both implementations and merge the code to Site.delete() method. - Site.undeletepage and Site.undelete_file_versions uses the same code. Drop both implementations and merge the code to Site.undelete() method. - update site_tests accordingly. Change-Id: I43e1d45566fc8f67e8352b062b44608106afce17 --- M pywikibot/page/__init__.py M pywikibot/site/_apisite.py M tests/site_tests.py 3 files changed, 89 insertions(+), 93 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 19fc629..1d3dea5 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -1736,7 +1736,7 @@ answer = 'y' self.site._noDeletePrompt = True if answer == 'y': - self.site.deletepage(self, reason) + self.site.delete(self, reason) return else: # Otherwise mark it for deletion @@ -1861,7 +1861,7 @@ pywikibot.output('Undeleting %s.' % (self.title(as_link=True))) reason = pywikibot.input( 'Please enter a reason for the undeletion:') - self.site.undelete_page(self, reason, undelete_revs) + self.site.undelete(self, reason, revision=undelete_revs) def protect(self, reason: Optional[str] = None, diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 1756a15..f9233c9 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -2050,21 +2050,37 @@ } # other errors shouldn't occur because of pre-submission checks @need_right('delete') - @deprecate_arg('summary', 'reason') - def deletepage(self, page, reason: str): - """Delete page from the wiki. Requires appropriate privilege level. + def delete(self, page, reason: str, *, oldimage: Optional[str] = None): + """Delete a page or a specific old version of a file from the wiki. + + Requires appropriate privileges. @see: U{https://www.mediawiki.org/wiki/API:Delete} Page to be deleted can be given either as Page object or as pageid. + To delete a specific version of an image the oldimage identifier + must be provided. + @param page: Page to be deleted or its pageid. @type page: L{pywikibot.page.BasePage} or, for pageid, int or str @param reason: Deletion reason. + @param oldimage: oldimage id of the file version to be deleted. + If a BasePage object is given with page parameter, it has to + be a FilePage. @raises TypeError, ValueError: page has wrong type/value. - """ + if oldimage and isinstance(page, pywikibot.page.BasePage) \ + and not isinstance(page, pywikibot.FilePage): + raise TypeError("'page' must be a FilePage not a '{}'" + .format(page.__class__.__name__)) + token = self.tokens['delete'] - params = {'action': 'delete', 'token': token, 'reason': reason} + params = { + 'action': 'delete', + 'token': token, + 'reason': reason, + 'oldimage': oldimage, + } if isinstance(page, pywikibot.page.BasePage): params['title'] = page @@ -2086,8 +2102,8 @@ } if err.code in self._dl_errors: raise Error(self._dl_errors[err.code] % errdata) - pywikibot.debug("delete: Unexpected error code '%s' received." - % err.code, + pywikibot.debug('delete: Unexpected error code {!r} received.' + .format(err.code), _logger) raise else: @@ -2095,8 +2111,24 @@ finally: self.unlock_page(page) - @need_right('delete') - def deleteoldimage(self, page, oldimage, reason: str): + @deprecate_arg('summary', 'reason') + @deprecated('delete()', since='20210330', future_warning=True) + def deletepage(self, page, reason: str): + """Delete page from the wiki. Requires appropriate privilege level. + + @see: U{https://www.mediawiki.org/wiki/API:Delete} + Page to be deleted can be given either as Page object or as pageid. + + @param page: Page to be deleted or its pageid. + @type page: L{pywikibot.page.BasePage} or, for pageid, int or str + @param reason: Deletion reason. + @raises TypeError, ValueError: page has wrong type/value. + """ + self.delete(page, reason) + + @deprecated('delete() with oldimage keyword parameter', since='20210330', + future_warning=True) + def deleteoldimage(self, page, oldimage: str, reason: str): """Delete a specific version of a file. Requires appropriate privileges. @see: U{https://www.mediawiki.org/wiki/API:Delete} @@ -2104,23 +2136,37 @@ provided. @param page: Page to be deleted or its pageid - @type page: Page or, in case of pageid, int or str + @type page: FilePage or, in case of pageid, int or str @param oldimage: oldimageid of the file version to be deleted. @param reason: Deletion reason. @raises TypeError, ValueError: page has wrong type/value. + """ + self.delete(page, reason, oldimage=oldimage) + @need_right('undelete') + def undelete(self, page, reason: str, *, revisions=None, fileids=None): + """Undelete page from the wiki. Requires appropriate privilege level. + + @see: U{https://www.mediawiki.org/wiki/API:Undelete} + + @param page: Page to be deleted. + @type page: pywikibot.BasePage + @param reason: Undeletion reason. + @param revisions: List of timestamps to restore. + If None, restores all revisions. + @type revisions: list + @param fileids: List of fileids to restore. + @type fileids: list """ token = self.tokens['delete'] - params = {'action': 'delete', 'oldimage': oldimage, - 'token': token, 'reason': reason} - - if isinstance(page, pywikibot.Page): - params['title'] = page - msg = page.title(with_section=False) - else: - pageid = int(page) - params['pageid'] = pageid - msg = pageid + params = { + 'action': 'undelete', + 'title': page, + 'reason': reason, + 'token': token, + 'timestamps': revisions, + 'fileids': fileids, + } req = self._simple_request(**params) self.lock_page(page) @@ -2129,24 +2175,22 @@ except api.APIError as err: errdata = { 'site': self, - 'title': msg, + 'title': page.title(with_section=False), 'user': self.user(), } if err.code in self._dl_errors: raise Error(self._dl_errors[err.code] % errdata) - pywikibot.debug("delete: Unexpected error code '%s' received." - % err.code, + pywikibot.debug('undelete: Unexpected error code {!r} received.' + .format(err.code), _logger) raise - else: - page.clear_cache() finally: self.unlock_page(page) - @need_right('undelete') @deprecate_arg('summary', 'reason') + @deprecated('undelete()', since='20210330', future_warning=True) def undelete_page(self, page, reason: str, revisions=None): - """Undelete page from the wiki. Requires appropriate privilege level. + """DEPRECATED. Undelete page from the wiki. @see: U{https://www.mediawiki.org/wiki/API:Undelete} @@ -2156,36 +2200,13 @@ If None, restores all revisions. @type revisions: list @param reason: Undeletion reason. - """ - token = self.tokens['delete'] - self.lock_page(page) + self.undelete(page, reason, revisions=revisions) - req = self._simple_request(action='undelete', - title=page, - reason=reason, - token=token, - timestamps=revisions) - try: - req.submit() - except api.APIError as err: - errdata = { - 'site': self, - 'title': page.title(with_section=False), - 'user': self.user(), - } - if err.code in self._dl_errors: - raise Error(self._dl_errors[err.code] % errdata) - pywikibot.debug("delete: Unexpected error code '%s' received." - % err.code, - _logger) - raise - finally: - self.unlock_page(page) - - @need_right('undelete') + @deprecated('undelete() with fileids parameter', since='20210330', + future_warning=True) def undelete_file_versions(self, page, reason: str, fileids=None): - """Undelete page from the wiki. Requires appropriate privilege level. + """DEPRECATED. Undelete page from the wiki. @see: U{https://www.mediawiki.org/wiki/API:Undelete} @@ -2195,30 +2216,7 @@ @param fileids: List of fileids to restore. @type fileids: list """ - token = self.tokens['delete'] - self.lock_page(page) - - req = self._simple_request(action='undelete', - title=page, - reason=reason, - token=token, - fileids=fileids) - try: - req.submit() - except api.APIError as err: - errdata = { - 'site': self, - 'title': page.title(with_section=False), - 'user': self.user(), - } - if err.code in self._dl_errors: - raise Error(self._dl_errors[err.code] % errdata) - pywikibot.debug("delete: Unexpected error code '%s' received." - % err.code, - _logger) - raise - finally: - self.unlock_page(page) + self.undelete(page, reason, fileids=fileids) _protect_errors = { 'noapiwrite': 'API editing not enabled on %(site)s wiki', diff --git a/tests/site_tests.py b/tests/site_tests.py index b6c42eb..1b81d5a 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -2137,28 +2137,28 @@ page=p1, reason='Pywikibot unit test') def test_delete(self): - """Test the site.deletepage() and site.undelete_page() methods.""" + """Test the site.delete() and site.undelete() methods.""" site = self.get_site() p = pywikibot.Page(site, 'User:Unicodesnowman/DeleteTestSite') # Verify state if not p.exists(): - site.undelete_page(p, 'pywikibot unit tests') + site.undelete(p, 'pywikibot unit tests') - site.deletepage(p, reason='pywikibot unit tests') + site.delete(p, reason='pywikibot unit tests') with self.assertRaises(pywikibot.NoPage): p.get(force=True) - site.undelete_page(p, 'pywikibot unit tests', - revisions=['2014-12-21T06:07:47Z', - '2014-12-21T06:07:31Z']) + site.undelete(p, 'pywikibot unit tests', + revisions=['2014-12-21T06:07:47Z', + '2014-12-21T06:07:31Z']) revs = list(p.revisions()) self.assertLength(revs, 2) self.assertEqual(revs[0].revid, 219995) self.assertEqual(revs[1].revid, 219994) - site.deletepage(p, reason='pywikibot unit tests') - site.undelete_page(p, 'pywikibot unit tests') + site.delete(p, reason='pywikibot unit tests') + site.undelete(p, 'pywikibot unit tests') revs = list(p.revisions()) self.assertGreater(len(revs), 2) @@ -2282,15 +2282,14 @@ break if fileid is not None: - site.undelete_file_versions(fp, 'pywikibot unit tests', - fileids=[fileid]) + site.undelete(fp, 'pywikibot unit tests', fileids=[fileid]) # Delete the older version of file hist = fp.get_file_history() ts = pywikibot.Timestamp(2021, 3, 8, 2, 38, 57) oldimageid = hist[ts]['archivename'] - site.deleteoldimage(fp, oldimageid, 'pywikibot unit tests') + site.delete(fp, 'pywikibot unit tests', oldimage=oldimageid) # Undelete the older revision of file gen = site.filearchive(start='T276725.png', end='T276725.pngg') @@ -2302,8 +2301,7 @@ self.assertIsNotNone(fileid) - site.undelete_file_versions(fp, 'pywikibot unit tests', - fileids=[fileid]) + site.undelet(fp, 'pywikibot unit tests', fileids=[fileid]) class TestUsernameInUsers(DefaultSiteTestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675446 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: I43e1d45566fc8f67e8352b062b44608106afce17 Gerrit-Change-Number: 675446 Gerrit-PatchSet: 6 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] Add support for PyMySQL 1.0.0+
by jenkins-bot (Code Review) 30 Mar '21

30 Mar '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/673462 ) Change subject: [bugfix] Add support for PyMySQL 1.0.0+ ...................................................................... [bugfix] Add support for PyMySQL 1.0.0+ - pymysql.Connection() postionial parameter order has been changed several times as is dopped since 1.0 where keyword only parameters are required. Therefore always use keyword parameters but use the renamed 'database' instead of 'db', 'password' instead 'passwd'; the latter are deprecated. - Require PyMySQ >= 0.6.6 due to Cursor context manager support; Python 3.5 is dropped with 1.0.0 - Require PyMySQ >= 1.0.0 due to Connection context manager support - use contextlib.closing() context manager for PyMySQ < 1.0.0 See: https://github.com/PyMySQL/PyMySQL/pull/930/commits/26a1370cc98eb8605a71e3c… Change-Id: Ida4e5edf2920b4302ff89ec1f4ea1e4e0a1da74d --- M pywikibot/data/mysql.py M requirements.txt 2 files changed, 13 insertions(+), 9 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/mysql.py b/pywikibot/data/mysql.py index 956b9d0..4ba0b5f 100644 --- a/pywikibot/data/mysql.py +++ b/pywikibot/data/mysql.py @@ -1,10 +1,9 @@ """Miscellaneous helper functions for mysql queries.""" # -# (C) Pywikibot team, 2016-2020 +# (C) Pywikibot team, 2016-2021 # # Distributed under the terms of the MIT license. # -from contextlib import closing from typing import Optional import pywikibot @@ -16,7 +15,7 @@ from pywikibot import config2 as config -from pywikibot.tools import deprecated_args +from pywikibot.tools import deprecated_args, PYTHON_VERSION @deprecated_args(encoding=None) @@ -52,16 +51,20 @@ if config.db_connect_file is None: credentials = {'user': config.db_username, - 'passwd': config.db_password} + 'password': config.db_password} else: credentials = {'read_default_file': config.db_connect_file} - with closing(pymysql.connect(config.db_hostname_format.format(dbname), - db=config.db_name_format.format(dbname), + connection = pymysql.connect(host=config.db_hostname_format.format(dbname), + database=config.db_name_format.format(dbname), port=config.db_port, charset='utf8', - **credentials)) as conn, \ - closing(conn.cursor()) as cursor: + **credentials) + if PYTHON_VERSION < (3, 6): + from contextlib import closing + connection = closing(connection) + + with connection as conn, conn.cursor() as cursor: if verbose: _query = cursor.mogrify(query, params) diff --git a/requirements.txt b/requirements.txt index de654f8..d99d263 100644 --- a/requirements.txt +++ b/requirements.txt @@ -45,7 +45,8 @@ mwparserfromhell>=0.3.3 # The mysql generator in pagegenerators depends on PyMySQL -PyMySQL +PyMySQL >= 0.6.6, < 1.0.0 ; python_version < '3.6' +PyMySQL >= 1.0.0 ; python_version >= '3.6' # core HTML comparison parser in diff module beautifulsoup4 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/673462 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: Ida4e5edf2920b4302ff89ec1f4ea1e4e0a1da74d Gerrit-Change-Number: 673462 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Hashar <hashar(a)free.fr> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(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] use sys.exit() instead of exit()
by jenkins-bot (Code Review) 30 Mar '21

30 Mar '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/673555 ) Change subject: [IMPR] use sys.exit() instead of exit() ...................................................................... [IMPR] use sys.exit() instead of exit() Change-Id: I4a6611ead6d361cd407567afeb022d6bf471af14 --- M scripts/archive/compat2core.py M scripts/harvest_template.py M scripts/maintenance/cache.py 3 files changed, 9 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/archive/compat2core.py b/scripts/archive/compat2core.py index 8fde419..f9ee6bc 100755 --- a/scripts/archive/compat2core.py +++ b/scripts/archive/compat2core.py @@ -25,13 +25,14 @@ python pwb.py compat2core <scriptname> -warnonly """ # -# (C) Pywikibot team, 2014-2020 +# (C) Pywikibot team, 2014-2021 # # Distributed under the terms of the MIT license. # import codecs import os import re +import sys import pywikibot @@ -155,7 +156,7 @@ 'Please input the .py file to convert ' '(no input to leave):') if not self.source: - exit() + sys.exit() if not self.source.endswith('.py'): self.source += '.py' if os.path.exists(self.source): @@ -174,7 +175,7 @@ 'Destination file is {}.'.format(self.dest), default=True, automatic_quit=False): pywikibot.output('Quitting...') - exit() + sys.exit() def convert(self): """Convert script.""" diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py index 85665c7..81f83de 100755 --- a/scripts/harvest_template.py +++ b/scripts/harvest_template.py @@ -92,6 +92,7 @@ # Distributed under the terms of MIT License. # import signal +import sys from typing import Any, Optional @@ -182,9 +183,7 @@ """Fetch redirects of the title, so we can check against them.""" temp = pywikibot.Page(pywikibot.Site(), title, ns=10) if not temp.exists(): - pywikibot.error('Template {} does not exist.' - .format(temp.title())) - exit() + sys.exit('Template {} does not exist.'.format(temp.title())) # Put some output here since it can take a while pywikibot.output('Finding redirects...') diff --git a/scripts/maintenance/cache.py b/scripts/maintenance/cache.py index 6a8b1b2..f7f4212 100755 --- a/scripts/maintenance/cache.py +++ b/scripts/maintenance/cache.py @@ -72,6 +72,7 @@ import hashlib import os import pickle +import sys import pywikibot @@ -418,13 +419,11 @@ command = 'has_password(entry)' elif arg == '-c': if command: - pywikibot.error('Only one command may be executed.') - exit(1) + sys.exit('Only one command may be executed.') command = '' elif arg == '-o': if output: - pywikibot.error('Only one output may be defined.') - exit(1) + sys.exit('Only one output may be defined.') output = '' else: if not cache_paths: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/673555 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: I4a6611ead6d361cd407567afeb022d6bf471af14 Gerrit-Change-Number: 673555 Gerrit-PatchSet: 2 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

[Gerrit] ...core[master]: [cleanup] remove dict entries of archived scripts in script_tests.py
by jenkins-bot (Code Review) 30 Mar '21

30 Mar '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675168 ) Change subject: [cleanup] remove dict entries of archived scripts in script_tests.py ...................................................................... [cleanup] remove dict entries of archived scripts in script_tests.py Change-Id: Ic3cb1e1cf9022b8b797fb1ee78d67926efa3ae62 --- M tests/script_tests.py 1 file changed, 0 insertions(+), 17 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/script_tests.py b/tests/script_tests.py index b168df3..b07c1a7 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -22,12 +22,6 @@ # These dependencies are not always the package name which is in setup.py. # Here, the name given to the module which will be imported is required. script_deps = { - 'flickrripper': ['flickrapi', 'PIL'], - 'imageharvest': ['bs4'], - 'isbn': ['stdnum'], - 'match_images': ['PIL.Image'], - 'states_redirect': ['pycountry'], - 'patrol': ['mwparserfromhell'], 'weblinkchecker': ['memento_client'], } @@ -67,12 +61,6 @@ ['login'] + sorted(set(script_list) - {'login'} - unrunnable_script_set)) script_input = { - 'catall': 'q\n', # q for quit - 'editarticle': 'Test page\n', - 'imageuncat': 'q\n', - 'imageharvest': - 'https://upload.wikimedia.org/wikipedia/commons/' - '8/80/Wikipedia-logo-v2.svg\n\n', 'interwiki': 'Test page that should not exist\n', 'misspelling': 'q\n', 'pagefromfile': 'q\n', @@ -107,14 +95,9 @@ # TODO: until done here, remember to set editor = None in user-config.py 'change_pagelang': 'No -setlang parameter given', 'checkimages': 'Execution time: 0 seconds', - 'editarticle': 'Nothing changed', - 'freebasemappingupload': 'Cannot find ', 'harvest_template': 'ERROR: Please specify', - 'imageuncat': - 'WARNING: This script is primarily written for Wikimedia Commons', # script_input['interwiki'] above lists a title that should not exist 'interwiki': 'does not exist. Skipping.', - 'imageharvest': 'From what URL should I get the images', 'login': 'Logged in on ', 'pagefromfile': 'Please enter the file name', 'parser_function_count': 'Hold on, this will need some time.', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675168 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: Ic3cb1e1cf9022b8b797fb1ee78d67926efa3ae62 Gerrit-Change-Number: 675168 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [cleanup] remove outdated code for old dumps format
by jenkins-bot (Code Review) 30 Mar '21

30 Mar '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675775 ) Change subject: [cleanup] remove outdated code for old dumps format ...................................................................... [cleanup] remove outdated code for old dumps format Pickle format is no longer supported for dumps Change-Id: I0d2c0c58266544bed55a5bd8eddb0d975dcb0ed5 --- M scripts/interwiki.py 1 file changed, 23 insertions(+), 43 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/interwiki.py b/scripts/interwiki.py index c46ef2d..8cac302 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -1995,9 +1995,8 @@ self.add(page, hints=self.conf.hints) self.generated += 1 - if self.generateNumber: - if self.generated >= self.generateNumber: - break + if self.generateNumber and self.generated >= self.generateNumber: + break else: return # for loop was exited by break statement @@ -2288,12 +2287,11 @@ with suppress(KeyError): self.restored_files.remove(filename) - def get_files(self, mode='txt'): + def get_files(self): """Get dump files from directory.""" - pattern = (r'(?P<file>\A(?P<fam>[a-z]+)-(?P<code>[a-z]+)\.{}\Z)' - .format(mode)) + pattern = r'(?P<file>(?P<fam>[a-z]+)-(?P<code>[a-z]+)\.txt)' for filename in os.listdir(self.path): - found = re.match(pattern, filename) + found = re.fullmatch(pattern, filename) if found: yield (found['file'], pywikibot.Site(found['code'], found['fam'])) @@ -2318,16 +2316,16 @@ if not os.path.exists(filename): pywikibot.output(tail + ' does not exist.') + continue + + pywikibot.output('Retrieving pages from dump file ' + tail) + for page in pagegenerators.TextfilePageGenerator(filename, site): + if site == self.site: + self._next_page = page.title(with_ns=False) + '!' + self._next_namespace = page.namespace() + yield page else: - pywikibot.output('Retrieving pages from dump file ' + tail) - for page in pagegenerators.TextfilePageGenerator( - filename, site): - if site == self.site: - self._next_page = page.title(with_ns=False) + '!' - self._next_namespace = page.namespace() - yield page - else: - self.restored_files.add(filename) + self.restored_files.add(filename) if self.opt.do_continue: yield from self.site.allpages(start=self.next_page, @@ -2358,29 +2356,15 @@ tail = os.path.split(filename)[-1] try: os.remove(filename) - pywikibot.output('Dumpfile {0} deleted'.format(tail)) except OSError as e: pywikibot.error('Cannot delete {} due to\n{}\nDo it manually.' .format(tail, e)) - - def old_dumps_found(self) -> bool: - """Check whether dumps are in old format. - - @return: True if there are dumps in pickle format, False otherwise - """ - try: - next(self.get_files(mode='pickle')) - except StopIteration: - return False - pywikibot.warning(fill( - 'The pickle format is deprecated. Use maintenance script ' - 'interwikidumps.py to convert pickle files into text files.')) - return True + else: + pywikibot.output('Dumpfile {} deleted'.format(tail)) def main(*args): - """ - Process command line arguments and invoke bot. + """Process command line arguments and invoke bot. If args is an empty list, sys.argv is used. @@ -2472,16 +2456,15 @@ restore_all=iwconf.restore_all) if newPages is not None: - if len(namespaces) == 0: + if not namespaces: ns = 0 elif len(namespaces) == 1: ns = namespaces[0] - if ns != 'all': - if isinstance(ns, str): - index = site.namespaces.lookup_name(ns) - if index is None: - raise ValueError('Unknown namespace: ' + ns) - ns = index.id + if isinstance(ns, str) and ns != 'all': + index = site.namespaces.lookup_name(ns) + if index is None: + raise ValueError('Unknown namespace: ' + ns) + ns = index.id namespaces = [] else: ns = 'all' @@ -2489,9 +2472,6 @@ namespaces=ns) elif optRestore or optContinue or iwconf.restore_all: - if dump.old_dumps_found(): - # There are dumps is pickle format; they must be converted first. - return hintlessPageGen = dump.read_dump() bot = InterwikiBot(iwconf) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675775 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: I0d2c0c58266544bed55a5bd8eddb0d975dcb0ed5 Gerrit-Change-Number: 675775 Gerrit-PatchSet: 4 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

[Gerrit] ...core[master]: [scripts] Recover interwiki.py
by jenkins-bot (Code Review) 30 Mar '21

30 Mar '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675765 ) Change subject: [scripts] Recover interwiki.py ...................................................................... [scripts] Recover interwiki.py Bug: T278675 Change-Id: I24e93a4cad87064e58fb6e326ef3a40fa0d3daf1 --- M docs/scripts/scripts.rst M scripts/README.rst R scripts/interwiki.py M scripts/interwikidata.py M tests/pwb_tests.py M tox.ini 6 files changed, 18 insertions(+), 13 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/scripts/scripts.rst b/docs/scripts/scripts.rst index 291246f..1fa7a03 100644 --- a/docs/scripts/scripts.rst +++ b/docs/scripts/scripts.rst @@ -106,6 +106,11 @@ .. automodule:: scripts.imagetransfer +scripts.interwiki script +------------------------ + +.. automodule:: scripts.interwiki + scripts.interwikidata script ---------------------------- diff --git a/scripts/README.rst b/scripts/README.rst index 36f1217..9f54ffe 100644 --- a/scripts/README.rst +++ b/scripts/README.rst @@ -61,6 +61,9 @@ | | images, and let the user choose among them for | | | images to upload. | +------------------------+---------------------------------------------------------+ + | interwiki.py | A robot to check interwiki links on all pages (or | + | | a range of pages) of a wiki. | + +------------------------+---------------------------------------------------------+ | interwikidata.py | Script to handle interwiki links based on Wikibase. | +------------------------+---------------------------------------------------------+ | listpages.py | listpages: report number of pages found | @@ -190,9 +193,6 @@ | imageuncat.py | Adds uncat template to images without categories at | | | Commons | +------------------------+---------------------------------------------------------+ - | interwiki.py | A robot to check interwiki links on all pages (or | - | | a range of pages) of a wiki. | - +------------------------+---------------------------------------------------------+ | isbn.py | Bot to convert all ISBN-10 codes to the ISBN-13 | | | format. | +------------------------+---------------------------------------------------------+ diff --git a/scripts/archive/interwiki.py b/scripts/interwiki.py similarity index 99% rename from scripts/archive/interwiki.py rename to scripts/interwiki.py index bd70ad0..c46ef2d 100755 --- a/scripts/archive/interwiki.py +++ b/scripts/interwiki.py @@ -328,7 +328,7 @@ """ # -# (C) Pywikibot team, 2003-2020 +# (C) Pywikibot team, 2003-2021 # # Distributed under the terms of the MIT license. # @@ -363,11 +363,12 @@ """An attempt to save a page with changed interwiki has failed.""" -class LinkMustBeRemoved(SaveError): # noqa: D205,D400 +class LinkMustBeRemoved(SaveError): - """ - An interwiki link has to be removed, but this can't be done because of user - preferences or because the user chose not to change the page. + """An interwiki link has to be removed manually. + + An interwiki link has to be removed, but this can't be done because + of user preferences or because the user chose not to change the page. """ @@ -375,8 +376,6 @@ """User chose not to work on this page and its linked pages any more.""" - pass - # A list of template names in different languages. # Pages which contain these shouldn't be changed. diff --git a/scripts/interwikidata.py b/scripts/interwikidata.py index 073ca0d..22f118c 100755 --- a/scripts/interwikidata.py +++ b/scripts/interwikidata.py @@ -61,8 +61,8 @@ }) super().__init__(**kwargs) if not self.site.has_data_repository: - raise ValueError('{site} does not have a data repository.' - .format(site=self.site)) + raise ValueError('{site} does not have a data repository, use ' + 'interwiki.py instead.'.format(site=self.site)) self.repo = self.site.data_repository() if not self.opt.summary: self.opt.summary = pywikibot.i18n.twtranslate( diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py index 2a59374..f542a67 100644 --- a/tests/pwb_tests.py +++ b/tests/pwb_tests.py @@ -112,7 +112,7 @@ '', 'The most similar scripts are:', '1 - interwikidata', - '2 - illustrate_wikidata', + '2 - interwiki', ] stderr = io.StringIO( execute_pwb(['inter_wikidata'], data_in='q')['stderr']) diff --git a/tox.ini b/tox.ini index 04b4e0c..13cc35a 100644 --- a/tox.ini +++ b/tox.ini @@ -157,6 +157,7 @@ scripts/cosmetic_changes.py : N816 scripts/fixing_redirects.py : N803, N806 scripts/harvest_template.py : N802, N816 + scripts/interwiki.py : N802, N803, N806, N815, N816 scripts/imagetransfer.py : N803, N806, N816 scripts/maintenance/make_i18n_dict.py : T001 scripts/misspelling.py : N802, N806 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675765 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: I24e93a4cad87064e58fb6e326ef3a40fa0d3daf1 Gerrit-Change-Number: 675765 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-MessageType: merged

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits March 2021