Pywikibot-commits March 2021

pywikibot-commits@lists.wikimedia.org

1 participants
142 discussions

[Gerrit] ...core[master]: Added pt.vikidia to Vikidia Family

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/668521 ) Change subject: Added pt.vikidia to Vikidia Family ...................................................................... Added pt.vikidia to Vikidia Family Change-Id: Ibe1745487c73bf684813c3bb83b4b167ec7d1a89 --- M pywikibot/families/vikidia_family.py 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/vikidia_family.py b/pywikibot/families/vikidia_family.py index e2d4043..aa765ae 100755 --- a/pywikibot/families/vikidia_family.py +++ b/pywikibot/families/vikidia_family.py @@ -1,6 +1,6 @@ """Family module for Vikidia.""" # -# (C) Pywikibot team, 2010-2020 +# (C) Pywikibot team, 2010-2021 # # Distributed under the terms of the MIT license. # @@ -14,7 +14,10 @@ name = 'vikidia' domain = 'vikidia.org' - codes = ['ca', 'de', 'el', 'en', 'es', 'eu', 'fr', 'hy', 'it', 'ru', 'scn'] + codes = [ + 'ca', 'de', 'el', 'en', 'es', 'eu', 'fr', 'hy', 'it', 'pt', 'ru', + 'scn', + ] # Sites we want to edit but not count as real languages test_codes = ['central', 'test'] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/668521 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: Ibe1745487c73bf684813c3bb83b4b167ec7d1a89 Gerrit-Change-Number: 668521 Gerrit-PatchSet: 4 Gerrit-Owner: Linedwell <Linedwell(a)icloud.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 2 months

[Gerrit] ...core[master]: BuiltinNamespace IntEnum

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/236257 ) Change subject: BuiltinNamespace IntEnum ...................................................................... BuiltinNamespace IntEnum Move the hardcoded namespace identifiers to an IntEnum. Change-Id: I5576def03c834c0bc180ab4c3d290da746417201 --- M pywikibot/site/_namespace.py M tests/namespace_tests.py 2 files changed, 43 insertions(+), 21 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/_namespace.py b/pywikibot/site/_namespace.py index 8d5bee2..ebc7735 100644 --- a/pywikibot/site/_namespace.py +++ b/pywikibot/site/_namespace.py @@ -1,10 +1,11 @@ """Objects representing Namespaces of MediaWiki site.""" # -# (C) Pywikibot team, 2008-2020 +# (C) Pywikibot team, 2008-2021 # # Distributed under the terms of the MIT license. # from collections.abc import Iterable, Mapping +from enum import IntEnum from typing import Optional, Union from pywikibot.backports import List @@ -16,6 +17,30 @@ ) +class BuiltinNamespace(IntEnum): + + """Builtin namespace enum.""" + + MEDIA = -2 + SPECIAL = -1 + MAIN = 0 + TALK = 1 + USER = 2 + USER_TALK = 3 + PROJECT = 4 + PROJECT_TALK = 5 + FILE = 6 + FILE_TALK = 7 + MEDIAWIKI = 8 + MEDIAWIKI_TALK = 9 + TEMPLATE = 10 + TEMPLATE_TALK = 11 + HELP = 12 + HELP_TALK = 13 + CATEGORY = 14 + CATEGORY_TALK = 15 + + class Namespace(Iterable, ComparableMixin): """ @@ -36,25 +61,6 @@ properties will have the same value. """ - MEDIA = -2 - SPECIAL = -1 - MAIN = 0 - TALK = 1 - USER = 2 - USER_TALK = 3 - PROJECT = 4 - PROJECT_TALK = 5 - FILE = 6 - FILE_TALK = 7 - MEDIAWIKI = 8 - MEDIAWIKI_TALK = 9 - TEMPLATE = 10 - TEMPLATE_TALK = 11 - HELP = 12 - HELP_TALK = 13 - CATEGORY = 14 - CATEGORY_TALK = 15 - # These are the MediaWiki built-in names for MW 1.14+. # Namespace prefixes are always case-insensitive, but the # canonical forms are capitalized. @@ -299,6 +305,11 @@ return False +# Set Namespace.FOO to be BuiltinNamespace.FOO for each builtin namespace +for item in BuiltinNamespace: + setattr(Namespace, item.name, item) + + class NamespacesDict(Mapping, SelfCallMixin): """ diff --git a/tests/namespace_tests.py b/tests/namespace_tests.py index c7a834a..b6ea9ac 100644 --- a/tests/namespace_tests.py +++ b/tests/namespace_tests.py @@ -1,6 +1,6 @@ """Tests for the Namespace class.""" # -# (C) Pywikibot team, 2014-2020 +# (C) Pywikibot team, 2014-2021 # # Distributed under the terms of the MIT license. # @@ -8,6 +8,7 @@ from contextlib import suppress from pywikibot.site import Namespace, NamespacesDict +from pywikibot.site._namespace import BuiltinNamespace from tests.aspects import TestCase, unittest @@ -51,6 +52,16 @@ net = False + def test_enums(self): + """Test builtin namespace enum in Namespace.""" + self.assertEqual(BuiltinNamespace.MAIN, 0) + self.assertEqual(Namespace.MAIN, BuiltinNamespace.MAIN) + self.assertEqual(Namespace.MEDIA, -2) + self.assertGreater(Namespace.MAIN, Namespace.MEDIA) + self.assertLess(Namespace.MEDIA, Namespace.MAIN) + self.assertEqual(Namespace.CATEGORY, 14) + self.assertGreater(Namespace.CATEGORY, Namespace.HELP_TALK) + def testNamespaceTypes(self): """Test cases for methods manipulating Namespace names.""" ns = Namespace.builtin_namespaces() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/236257 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: I5576def03c834c0bc180ab4c3d290da746417201 Gerrit-Change-Number: 236257 Gerrit-PatchSet: 3 Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 2 months

[Gerrit] ...core[master]: [doc] fix autodoc importing _namespce module

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/668478 ) Change subject: [doc] fix autodoc importing _namespce module ...................................................................... [doc] fix autodoc importing _namespce module Change-Id: Ic527291b923bfa7b4d63dda2270d8f403aaaeeb2 --- M docs/api_ref/pywikibot.site.rst 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/docs/api_ref/pywikibot.site.rst b/docs/api_ref/pywikibot.site.rst index 53387f5..22e3b92 100644 --- a/docs/api_ref/pywikibot.site.rst +++ b/docs/api_ref/pywikibot.site.rst @@ -39,7 +39,7 @@ pywikibot.site.\_namespace module --------------------------------- -.. automodule:: pywikibot._namespace +.. automodule:: pywikibot.site._namespace pywikibot.site.\_obsoletesites module ------------------------------------- -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/668478 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: Ic527291b923bfa7b4d63dda2270d8f403aaaeeb2 Gerrit-Change-Number: 668478 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 2 months

[Gerrit] ...core[master]: [tests] use Python 3.7 instead of outdates Python 3.5 for tox-doc

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/668475 ) Change subject: [tests] use Python 3.7 instead of outdates Python 3.5 for tox-doc ...................................................................... [tests] use Python 3.7 instead of outdates Python 3.5 for tox-doc Change-Id: I3b147c3ce14e97d45bcaa34c1cebe3511828c8e9 --- M tox.ini 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index 3a7a19c..6a89ee0 100644 --- a/tox.ini +++ b/tox.ini @@ -64,7 +64,7 @@ commands = sphinx-build -M html ./docs ./docs/_build rstcheck --recursive --report warning --ignore-directives automodule,autoclass,autofunction . -basepython = python3.5 +basepython = python3 deps = -rrequirements.txt -rdocs/requirements-py3.txt -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/668475 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: I3b147c3ce14e97d45bcaa34c1cebe3511828c8e9 Gerrit-Change-Number: 668475 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 2 months

[Gerrit] ...core[master]: [IMPR] avois deeply nested flow control statements in ClaimCollection...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/668469 ) Change subject: [IMPR] avois deeply nested flow control statements in ClaimCollection.toJSON() ...................................................................... [IMPR] avois deeply nested flow control statements in ClaimCollection.toJSON() Change-Id: I7132e01141377a65842bcb55c6c83e4e114c5a56 --- M pywikibot/page/_collections.py 1 file changed, 34 insertions(+), 33 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/_collections.py b/pywikibot/page/_collections.py index 68fbc4a..fbc9a60 100644 --- a/pywikibot/page/_collections.py +++ b/pywikibot/page/_collections.py @@ -247,46 +247,47 @@ """ claims = {} for prop in self: - if len(self[prop]) > 0: + if self[prop]: claims[prop] = [claim.toJSON() for claim in self[prop]] - if diffto: - temp = defaultdict(list) - props_add = set(claims.keys()) - props_orig = set(diffto.keys()) - for prop in (props_orig | props_add): - if prop not in props_orig: - temp[prop].extend(claims[prop]) - continue - if prop not in props_add: - temp[prop].extend( - {'id': claim['id'], 'remove': ''} - for claim in diffto[prop] if 'id' in claim) + if not diffto: + return claims + + temp = defaultdict(list) + props_add = set(claims.keys()) + props_orig = set(diffto.keys()) + for prop in (props_orig | props_add): + if prop not in props_orig: + temp[prop].extend(claims[prop]) + continue + + if prop not in props_add: + temp[prop].extend({'id': claim['id'], 'remove': ''} + for claim in diffto[prop] if 'id' in claim) + continue + + claim_ids = set() + claim_map = {json['id']: json for json in diffto[prop] + if 'id' in json} + + for claim, json in zip(self[prop], claims[prop]): + if 'id' not in json: continue - claim_ids = set() - claim_map = { - json['id']: json for json in diffto[prop] - if 'id' in json} - - for claim, json in zip(self[prop], claims[prop]): - if 'id' not in json: + claim_ids.add(json['id']) + if json['id'] in claim_map: + other = pywikibot.page.Claim.fromJSON( + self.repo, claim_map[json['id']]) + if claim.same_as(other, ignore_rank=False, + ignore_refs=False): continue - claim_ids.add(json['id']) - if json['id'] in claim_map: - other = pywikibot.page.Claim.fromJSON( - self.repo, claim_map[json['id']]) - if claim.same_as(other, ignore_rank=False, - ignore_refs=False): - continue - temp[prop].append(json) + temp[prop].append(json) - for claim in diffto[prop]: - if 'id' in claim and claim['id'] not in claim_ids: - temp[prop].append({'id': claim['id'], 'remove': ''}) + for claim in diffto[prop]: + if 'id' in claim and claim['id'] not in claim_ids: + temp[prop].append({'id': claim['id'], 'remove': ''}) - claims = temp - + claims = temp return claims def set_on_item(self, item): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/668469 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: I7132e01141377a65842bcb55c6c83e4e114c5a56 Gerrit-Change-Number: 668469 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 2 months

[Gerrit] ...core[master]: api.py: buffer 'pageprops' in QueryGenerator

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/237113 ) Change subject: api.py: buffer 'pageprops' in QueryGenerator ...................................................................... api.py: buffer 'pageprops' in QueryGenerator Currently, 'pageprops' is only cached if found in the response. The API only returns this property if it's not empty, causing repetitive queries if accessed multiple times. This change caches 'pageprops' if it's requested, creating an empty dictionary to use if it's not present in the response. Change-Id: I30973b7479822ebc043f1d4db77522143e8c5652 --- M pywikibot/data/api.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index ff90b25..4c34108 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -3173,6 +3173,8 @@ if 'pageprops' in pagedict: page._pageprops = pagedict['pageprops'] + elif 'pageprops' in props: + page._pageprops = {} if 'preload' in pagedict: page._preloadedtext = pagedict['preload'] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/237113 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: I30973b7479822ebc043f1d4db77522143e8c5652 Gerrit-Change-Number: 237113 Gerrit-PatchSet: 7 Gerrit-Owner: Malafaya <malafaya(a)clix.pt> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Malafaya <malafaya(a)clix.pt> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 2 months

[Gerrit] ...core[master]: [FEAT] TestReplaceExcept: Test edge cases for faster-replace

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/235631 ) Change subject: [FEAT] TestReplaceExcept: Test edge cases for faster-replace ...................................................................... [FEAT] TestReplaceExcept: Test edge cases for faster-replace Change-Id: I31d73eff8c88f232a712a41b57e1824e6a5dbf68 --- M tests/textlib_tests.py 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index e57c953..f5fe77d 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -1198,6 +1198,11 @@ allowoverlap=True, site=self.site), '2221') + self.assertEqual(textlib.replaceExcept('1\n= 1 =\n', '1', ' \n= 1 =\n', + ['header'], + allowoverlap=True, + site=self.site), + ' \n= 1 =\n\n= 1 =\n') def test_replace_exception(self): """Test replacing not inside a specific regex.""" @@ -1208,6 +1213,11 @@ [re.compile(r'\w123')], site=self.site), '000x123') + self.assertEqual( + textlib.replaceExcept( + '1\n= 1 =\n', '1', 'verylongreplacement', ['header'], + site=self.site), + 'verylongreplacement\n= 1 =\n') def test_replace_tags(self): """Test replacing not inside various tags.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/235631 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: I31d73eff8c88f232a712a41b57e1824e6a5dbf68 Gerrit-Change-Number: 235631 Gerrit-PatchSet: 3 Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 2 months

[Gerrit] ...core[master]: [scripts] script to wrap Commons file descriptions in language templates

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/183266 ) Change subject: [scripts] script to wrap Commons file descriptions in language templates ...................................................................... [scripts] script to wrap Commons file descriptions in language templates inspired by: https://commons.wikimedia.org/wiki/Commons:Bots/Requests/Dexbot_5 Signed-off-by: xqt <info(a)gno.de> Change-Id: Ib8fde813a3da2e1cf7fc35c0a31a64c58ac210a6 --- M docs/scripts/scripts.rst M scripts/README.rst A scripts/commons_information.py 3 files changed, 190 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/scripts/scripts.rst b/docs/scripts/scripts.rst index f202aa4..b72acdf 100644 --- a/docs/scripts/scripts.rst +++ b/docs/scripts/scripts.rst @@ -61,6 +61,11 @@ .. automodule:: scripts.clean_sandbox +scripts.commons\_information script +----------------------------------- + +.. automodule:: scripts.commons_information + scripts.coordinate\_import script --------------------------------- diff --git a/scripts/README.rst b/scripts/README.rst index 5835fbf..ca5e9a7 100644 --- a/scripts/README.rst +++ b/scripts/README.rst @@ -40,6 +40,8 @@ +------------------------+---------------------------------------------------------+ | clean_sandbox.py | This bot makes the cleaned of the page of tests. | +------------------------+---------------------------------------------------------+ + | commons_information.py | Insert a language template into the description field | + +------------------------+---------------------------------------------------------+ | coordinate_import.py | Coordinate importing script. | +------------------------+---------------------------------------------------------+ | cosmetic_changes.py | Can do slight modifications to a wiki page source code | diff --git a/scripts/commons_information.py b/scripts/commons_information.py new file mode 100644 index 0000000..945fa1e --- /dev/null +++ b/scripts/commons_information.py @@ -0,0 +1,183 @@ +#!/usr/bin/python +"""Insert a language template into the description field.""" +# +# (C) Pywikibot team, 2015-2021 +# +# Distributed under the terms of the MIT license. +# +import copy + +import pywikibot + +from pywikibot import i18n, pagegenerators +from pywikibot.backports import Tuple +from pywikibot.bot import SingleSiteBot, ExistingPageBot +from pywikibot.tools.formatter import color_format + +try: + import mwparserfromhell +except ImportError as e: + mwparserfromhell = e + +try: + import langdetect +except ImportError: + langdetect = None + + +class InformationBot(SingleSiteBot, ExistingPageBot): + + """Bot for the Information template.""" + + lang_tmp_cat = 'Language templates' + desc_params = ('Description', 'description') + + comment = { + 'en': ('Bot: wrap the description parameter of Information in the ' + 'appropriate language template') + } + + def __init__(self, **kwargs): + """Initialzer.""" + super(InformationBot, self).__init__(**kwargs) + lang_tmp_cat = pywikibot.Category(self.site, self.lang_tmp_cat) + self.lang_tmps = lang_tmp_cat.articles(namespaces=[10]) + + def get_description(self, template): + """Get description parameter.""" + params = [param for param in template.params + if param.name.strip() in self.desc_params] + if len(params) > 1: + pywikibot.warning('multiple description parameters found') + elif len(params) == 1 and params[0].value.strip() != '': + return params[0] + return None + + @staticmethod + def detect_langs(text): + """Detect language from griven text.""" + if langdetect is not None: + return langdetect.detect_langs(text) + return None + + def process_desc_template(self, template): + """Process description template.""" + tmp_page = pywikibot.Page(self.site, template.name.strip(), ns=10) + if tmp_page in self.lang_tmps and len(template.params) == 1 \ + and template.has('1'): + lang_tmp_val = template.get('1').value.strip() + langs = self.detect_langs(lang_tmp_val) + if langs and langs[0].prob > 0.9: + tmp_page2 = pywikibot.Page(self.site, langs[0].lang, ns=10) + if tmp_page2 != tmp_page: + pywikibot.output( + '\03{{lightblue}}The language template {before!r} ' + 'was found, but langdetect thinks {after!r} is the ' + 'most appropriate with a probability of {prob}:' + '\03{{default}}\n{text}' + .format(before=tmp_page.title(withNamespace=False), + after=tmp_page2.title(withNamespace=False), + prob=langs[0].prob, + text=lang_tmp_val)) + choice = pywikibot.input_choice( + 'What to do?', + [('Replace it', 'r'), ('Do not replace it', 'n'), + ('Choose another', 'c')]) + if choice == 'r': + template.name = langs[0].lang + return True + + if choice == 'c': + newlang = pywikibot.input( + 'Enter the language of the displayed text:') + if newlang and newlang != template.name: + template.name = newlang + return True + return False + + @staticmethod + def replace_value(param, value): + """Replace param with given value.""" + lstrip = param.value.lstrip() + lspaces = param.value[:len(param.value) - len(lstrip)] + rspaces = lstrip[len(lstrip.rstrip()):] + param.value = '{}{}{}'.format(lspaces, value, rspaces) + + def setup(self): + """Raise exception if needed modules are missing.""" + if isinstance(mwparserfromhell, Exception): + raise mwparserfromhell + + def treat_page(self): + """Treat current page.""" + page = self.current_page + code = mwparserfromhell.parse(page.text) + edited = False # to prevent unwanted changes + for template in code.ifilter_templates(): + if not page.site.sametitle(template.name.strip(), 'Information'): + continue + desc = self.get_description(template) + if desc is None: + continue + for tmp in desc.value.filter_templates(recursive=False): + if self.process_desc_template(tmp): + edited = True + desc_clean = copy.deepcopy(desc.value) + for tmp in desc_clean.filter_templates(recursive=False): + # TODO: emit a debug item? + desc_clean.remove(tmp) + value = desc_clean.strip() + if value == '': + pywikibot.output('Empty description') + continue + pywikibot.output(value) + langs = self.detect_langs(value) + if langs: + pywikibot.output(color_format( + '{lightblue}Hints from langdetect:{default}')) + for language in langs: + pywikibot.output(color_format( + '{{lightblue}}{obj.lang}: {obj.prob}{{default}}', + obj=language)) + lang = pywikibot.input( + 'Enter the language of the displayed text:').strip() + if lang != '': + tmp_page = pywikibot.Page(page.site, lang, ns=10) + if tmp_page not in self.lang_tmps: + pywikibot.warning( + '"{lang}" is not a valid language template on {site}' + .format(lang=lang, site=page.site)) + new = mwparserfromhell.nodes.template.Template(lang, [value]) + self.replace_value(desc, new) + edited = True + if edited: + text = str(code) + summary = i18n.translate(page.site.lang, self.comment, + fallback=True) + self.put_current(text, summary=summary) + + +def main(*args: Tuple[str, ...]) -> None: + """ + Process command line arguments and invoke bot. + + If args is an empty list, sys.argv is used. + + @param args: command line arguments + """ + local_args = pywikibot.handle_args(args) + gen_factory = pagegenerators.GeneratorFactory() + + for arg in local_args: + gen_factory.handle_arg(arg) + + gen = gen_factory.getCombinedGenerator() + if gen: + bot = InformationBot(generator=gen) + bot.run() + else: + pywikibot.bot.suggest_help(missing_generator=True) + + +if __name__ == '__main__': + main() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/183266 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: Ib8fde813a3da2e1cf7fc35c0a31a64c58ac210a6 Gerrit-Change-Number: 183266 Gerrit-PatchSet: 9 Gerrit-Owner: Ricordisamoa <ricordisamoa(a)disroot.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)disroot.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 2 months

[Gerrit] ...core[master]: [cleanup] Remove deprecated Page.getMovedTarget() method

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/666878 ) Change subject: [cleanup] Remove deprecated Page.getMovedTarget() method ...................................................................... [cleanup] Remove deprecated Page.getMovedTarget() method Change-Id: I90f3d87f348e8465d27427ad2f2b6120b426a469 --- M pywikibot/page/__init__.py M tests/logentries_tests.py 2 files changed, 0 insertions(+), 52 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 925952e..46d6f9f 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -1557,24 +1557,6 @@ """ return self.site.getredirtarget(self) - @deprecated('moved_target()', since='20150524', future_warning=True) - def getMovedTarget(self): # pragma: no cover - """ - Return a Page object for the target this Page was moved to. - - DEPRECATED: Use Page.moved_target(). - - If this page was not moved, it will raise a NoPage exception. - This method also works if the source was already deleted. - - @rtype: pywikibot.page.Page - @raises pywikibot.exceptions.NoPage: this page was not moved - """ - try: - return self.moved_target() - except pywikibot.NoMoveTarget: - raise pywikibot.NoPage(self) - def moved_target(self): """ Return a Page object for the target this Page was moved to. diff --git a/tests/logentries_tests.py b/tests/logentries_tests.py index 5336497..e265212 100644 --- a/tests/logentries_tests.py +++ b/tests/logentries_tests.py @@ -318,40 +318,6 @@ self.assertDeprecation() # T271044 self._reset_messages() # T271044 - def test_get_moved_target(self, key): - """Test getMovedTarget method.""" - # main page was moved around - if self.sites[key]['target'] is None: - self.skipTest('No moved target') - mainpage = self.get_mainpage(self.site) - target = mainpage.getMovedTarget() - self.assertIsInstance(target, pywikibot.Page) - self.assertEqual(target.title(), - self.sites[key]['target']) - # main page was moved back again, we test it. - self.assertEqual(mainpage, target.getMovedTarget()) - - self.assertOneDeprecationParts( - 'pywikibot.page.BasePage.getMovedTarget', 'moved_target()', 2) - - def test_moved_target_fail_old(self): - """Test getMovedTarget method failing on older wiki.""" - site = self.get_site('old') - with self.assertRaises(pywikibot.NoPage): - self.get_mainpage(site).getMovedTarget() - - self.assertOneDeprecationParts( - 'pywikibot.page.BasePage.getMovedTarget', 'moved_target()') - - def test_moved_target_fail_de(self): - """Test getMovedTarget method failing on de-wiki.""" - page = pywikibot.Page(self.get_site('dewp'), 'Main Page') - with self.assertRaises(pywikibot.NoPage): - page.getMovedTarget() - - self.assertOneDeprecationParts( - 'pywikibot.page.BasePage.getMovedTarget', 'moved_target()') - if __name__ == '__main__': # pragma: no cover with suppress(SystemExit): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/666878 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: I90f3d87f348e8465d27427ad2f2b6120b426a469 Gerrit-Change-Number: 666878 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 2 months

[Gerrit] ...core[master]: [doc] LoginManager.getCookie() was renamed to login_to_site()

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/668368 ) Change subject: [doc] LoginManager.getCookie() was renamed to login_to_site() ...................................................................... [doc] LoginManager.getCookie() was renamed to login_to_site() Change-Id: Iea6b1d5c94653abdd8a0f891ccda620d9b8728c3 --- M ROADMAP.rst 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index b7f6c4d..c2a0752 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -47,7 +47,6 @@ * 5.6.0: pagenenerators.handleArg() method will be removed in favour of handle_arg() (T271437) * 5.5.0: Site.getuserinfo() method will be dropped in favour of userinfo property * 5.5.0: Site.getglobaluserinfo() method will be dropped in favour of globaluserinfo property -* 5.4.0: LoginManager.getCookie() is deprecated and will be removed * 5.4.0: tools.PY2 will be removed (T213287) * 5.0.0: OptionHandler.options dict will be removed in favour of OptionHandler.opt * 5.0.0: Methods deprecated for 5 years or longer will be removed -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/668368 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: Iea6b1d5c94653abdd8a0f891ccda620d9b8728c3 Gerrit-Change-Number: 668368 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits March 2021