Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13484 discussions

[Gerrit] ...core[master]: [doc] Fix typo in category_redirect.py
by jenkins-bot (Code Review) 04 Dec '23

04 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/979673 ) Change subject: [doc] Fix typo in category_redirect.py ...................................................................... [doc] Fix typo in category_redirect.py Bug: T351951 Change-Id: I78c5cc5c0ec888b5c6d3cc6dbbc01eddcb9ac227 --- M scripts/category_redirect.py 1 file changed, 13 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 04153a6..1b337c1 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -14,8 +14,8 @@ -always If used, the bot won't ask if it should add the specified text --delay:# Set an amount of days. If the category is edited more recenty - than given days, ignore it. Default is 7. +-delay:# Set an amount of days. If the category is edited more + recently than given days, ignore it. Default is 7. -tiny Only loops over Category:Non-empty_category_redirects and moves all images, pages and categories in redirect categories @@ -30,7 +30,7 @@ can be set within a settings file which is scripts.ini by default. """ # -# (C) Pywikibot team, 2008-2022 +# (C) Pywikibot team, 2008-2023 # # Distributed under the terms of the MIT license. # -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/979673 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: I78c5cc5c0ec888b5c6d3cc6dbbc01eddcb9ac227 Gerrit-Change-Number: 979673 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <dalangi-ctr(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: sort imports and upgrade syntax
by jenkins-bot (Code Review) 04 Dec '23

04 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/979482 ) Change subject: sort imports and upgrade syntax ...................................................................... sort imports and upgrade syntax using isort and pyupgrade Change-Id: I180a6a9d20e9a85730e2976e28d1359be17327a1 --- M scripts/maintenance/unidata.py M pywikibot/textlib.py M pywikibot/__init__.py M pywikibot/family.py M scripts/checkimages.py M tests/utils.py M MANIFEST.in M scripts/create_isbn_edition.py M scripts/dataextend.py M pywikibot/tools/itertools.py M pywikibot/scripts/preload_sites.py M pywikibot/tools/_deprecate.py M pywikibot/backports.py M pywikibot/_wbtypes.py M tests/sparql_tests.py M tests/file_tests.py M pywikibot/tools/collections.py M tests/site_decorators_tests.py 18 files changed, 68 insertions(+), 55 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/MANIFEST.in b/MANIFEST.in index a4f38b2..f5f1dd4 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ graft pywikibot/scripts/i18n/pywikibot include CODE_OF_CONDUCT.rst -include ROADMAP.rst \ No newline at end of file +include ROADMAP.rst diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index c532250..69bf268 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -76,6 +76,7 @@ from pywikibot.time import Timestamp from pywikibot.tools import PYTHON_VERSION, normalize_username + __all__ = ( '__copyright__', '__description__', '__download_url__', '__license__', '__maintainer__', '__maintainer_email__', '__name__', '__url__', diff --git a/pywikibot/_wbtypes.py b/pywikibot/_wbtypes.py index 09fb379..a39565b 100644 --- a/pywikibot/_wbtypes.py +++ b/pywikibot/_wbtypes.py @@ -19,6 +19,7 @@ from pywikibot.time import Timestamp from pywikibot.tools import remove_last_args + if TYPE_CHECKING: from pywikibot.site import APISite, BaseSite, DataSite diff --git a/pywikibot/backports.py b/pywikibot/backports.py index 02b59fe..a93a5e5 100644 --- a/pywikibot/backports.py +++ b/pywikibot/backports.py @@ -85,6 +85,7 @@ Type, ) else: + from collections import Counter from collections.abc import ( Container, Generator, @@ -93,7 +94,6 @@ Mapping, Sequence, ) - from collections import Counter from re import Match, Pattern Dict = dict # type: ignore[misc] FrozenSet = frozenset # type: ignore[misc] diff --git a/pywikibot/family.py b/pywikibot/family.py index 2e0a100..ac9d478 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -14,8 +14,8 @@ import warnings from importlib import import_module from itertools import chain -from textwrap import fill from os.path import basename, dirname, splitext +from textwrap import fill from typing import Optional import pywikibot diff --git a/pywikibot/scripts/preload_sites.py b/pywikibot/scripts/preload_sites.py index 4d4799e..1d1b775 100755 --- a/pywikibot/scripts/preload_sites.py +++ b/pywikibot/scripts/preload_sites.py @@ -30,6 +30,7 @@ from pywikibot.backports import Dict, List, Set, removeprefix from pywikibot.family import Family + try: # Python 3.13 from os import process_cpu_count # type: ignore[attr-defined] except ImportError: diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index f68e6a6..ab1e416 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -18,14 +18,13 @@ Container, Dict, Iterable, - Match, List, - Pattern, - Tuple, - pairwise, + Match, ) from pywikibot.backports import OrderedDict as OrderedDictType +from pywikibot.backports import Pattern from pywikibot.backports import Sequence as SequenceType +from pywikibot.backports import Tuple, pairwise from pywikibot.exceptions import InvalidTitleError, SiteDefinitionError from pywikibot.family import Family from pywikibot.time import TZoneFixedOffset diff --git a/pywikibot/tools/_deprecate.py b/pywikibot/tools/_deprecate.py index 8af5878..018e355 100644 --- a/pywikibot/tools/_deprecate.py +++ b/pywikibot/tools/_deprecate.py @@ -28,7 +28,6 @@ import re import sys import types - from contextlib import suppress from importlib import import_module from inspect import getfullargspec diff --git a/pywikibot/tools/collections.py b/pywikibot/tools/collections.py index b3e2bdf..8b217fa 100644 --- a/pywikibot/tools/collections.py +++ b/pywikibot/tools/collections.py @@ -11,8 +11,9 @@ from itertools import chain from typing import Any -from pywikibot.backports import Dict, List +from pywikibot.backports import Dict from pywikibot.backports import Generator as GeneratorType +from pywikibot.backports import List __all__ = ( diff --git a/pywikibot/tools/itertools.py b/pywikibot/tools/itertools.py index f1c2fb1..0c14c7e 100644 --- a/pywikibot/tools/itertools.py +++ b/pywikibot/tools/itertools.py @@ -14,7 +14,7 @@ from itertools import chain, zip_longest from typing import Any -from pywikibot.backports import batched, Generator, List +from pywikibot.backports import Generator, List, batched from pywikibot.logging import debug from pywikibot.tools import deprecated, issue_deprecation_warning diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 05b4b29..7058430 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -100,9 +100,9 @@ ) from pywikibot.family import Family from pywikibot.site import Namespace - from scripts.welcome import get_welcome_text + ############################################################################### # <--------------------------- Change only below! ---------------------------># ############################################################################### diff --git a/scripts/create_isbn_edition.py b/scripts/create_isbn_edition.py index 82b924b..8284dde 100755 --- a/scripts/create_isbn_edition.py +++ b/scripts/create_isbn_edition.py @@ -240,6 +240,7 @@ from pywikibot.config import verbose_output as verbose from pywikibot.data import api + try: import isbnlib except ImportError as e: diff --git a/scripts/dataextend.py b/scripts/dataextend.py index d9b24be..5a5eb97 100755 --- a/scripts/dataextend.py +++ b/scripts/dataextend.py @@ -2696,7 +2696,7 @@ if sectionname == 'Weitere Angaben' and sectionfound: continue section = self.findbyre( - r'(?s)<strong>{}</strong>(.*?)</tr>'.format(sectionname), html) + fr'(?s)<strong>{sectionname}</strong>(.*?)</tr>', html) if section: sectionfound = True result += self.findallbyre(r'(?s)[>;,]([^<>;,]*)', section, @@ -4647,7 +4647,7 @@ self.escapehtml = True def getvalue(self, field, html, dtype=None): - return self.findbyre(r'(?s)>{}<.*?<div[^<>]*>(.*?)<'.format(field), + return self.findbyre(fr'(?s)>{field}<.*?<div[^<>]*>(.*?)<', html, dtype) def findinstanceof(self, html: str): @@ -5523,7 +5523,7 @@ result = super().findnames(html) for sectionname in ['Osebno ime', 'Variante osebnega imena']: section = self.findbyre( - r'(?s)<td>{}</td>.*?<a[^<>]*>(.*?)<'.format(sectionname), html) + fr'(?s)<td>{sectionname}</td>.*?<a[^<>]*>(.*?)<', html) if section: result += [ ','.join(name.split(',')[:-1]) @@ -5618,7 +5618,7 @@ result = ConorAnalyzer.findnames(self, html) for sectionname in ['Име на лице', 'Вариант на име на лице']: section = self.findbyre( - r'(?s)<td>{}</td>.*?<a[^<>]*>(.*?)<'.format(sectionname), html) + fr'(?s)<td>{sectionname}</td>.*?<a[^<>]*>(.*?)<', html) if section: result += [ ','.join(name.split(',')[:-1]) @@ -5667,7 +5667,7 @@ result = ConorAnalyzer.findnames(self, html) for sectionname in ['Лично име', 'Варијанте личног имена']: section = self.findbyre( - r'(?s)<td>{}</td>.*?<a[^<>]*>(.*?)<'.format(sectionname), html) + fr'(?s)<td>{sectionname}</td>.*?<a[^<>]*>(.*?)<', html) if section: result += [ ','.join(name.split(',')[:-1]) @@ -6188,7 +6188,7 @@ self.language = 'en' def getvalue(self, field, html, dtype=None): - return self.findbyre(r'<meta name="{}" content="(.*?)"'.format(field), + return self.findbyre(fr'<meta name="{field}" content="(.*?)"', html, dtype) def findinstanceof(self, html: str): @@ -6597,7 +6597,7 @@ def getvalue(self, field, html, dtype=None): return self.findbyre( - r'(?s)<dt>\s*{}\s*</dt>\s*<dd>(.*?)</dd>'.format(field), html, + fr'(?s)<dt>\s*{field}\s*</dt>\s*<dd>(.*?)</dd>', html, dtype) def findinstanceof(self, html: str): @@ -6754,7 +6754,7 @@ def getsection(self, field, html, ntype=None): return self.findbyre( - r'(?s){}</h2>\s*</div></div>(.*?)<[bp][>\s]'.format(field), html, + fr'(?s){field}</h2>\s*</div></div>(.*?)<[bp][>\s]', html, ntype) def findlongtext(self, html: str): @@ -6988,7 +6988,7 @@ def getsecondvalue(self, field, html, dtype=None): section = self.findbyre( - r'(?s)"fieldname">(\s*{}\s*</span>.*?)</tr>'.format(field), html) + fr'(?s)"fieldname">(\s*{field}\s*</span>.*?)</tr>', html) if section: return self.findbyre( r'<td.*?</td>\s*<td[^<>]*>(?:<[^<>]*>)*([^<>]*?)<', section, @@ -7138,7 +7138,7 @@ def getvalue(self, field, html, dtype=None): return self.findbyre( - r'(?s)>{}</span><span[^<>]*>(?:<[^<>]*>)?([^<>]*)</'.format(field), + fr'(?s)>{field}</span><span[^<>]*>(?:<[^<>]*>)?([^<>]*)</', html, dtype) def getvalues(self, field, html, dtype=None, link=False) -> List[str]: @@ -9056,7 +9056,7 @@ self.language = 'en' def getvalue(self, field, html, dtype=None): - return self.findbyre(r'<strong>{}:</strong>(.*?)</td>'.format(field), + return self.findbyre(fr'<strong>{field}:</strong>(.*?)</td>', html, dtype) def getvalues(self, field, html, dtype=None) -> List[str]: @@ -9413,7 +9413,7 @@ def getvalue(self, field, html, dtype=None): return self.findbyre( - r'(?s)<strong>{}:</strong></td>\s*<td>(.*?)</td>'.format(field), + fr'(?s)<strong>{field}:</strong></td>\s*<td>(.*?)</td>', html, dtype) def findnames(self, html) -> List[str]: @@ -10113,7 +10113,7 @@ self.language = 'en' def getvalue(self, field, html, dtype=None): - return self.findbyre(r'(?s)</i>{}.*?(<ul.*?)</ul>'.format(field), html, + return self.findbyre(fr'(?s)</i>{field}.*?(<ul.*?)</ul>', html, dtype) def getvalues(self, field, html, dtype=None) -> List[str]: @@ -10736,7 +10736,7 @@ def findnames(self, html) -> List[str]: return [ - self.findbyre(r'href="[^"]*/{}/[^"]*">(.*?)<'.format(self.id), + self.findbyre(fr'href="[^"]*/{self.id}/[^"]*">(.*?)<', html), self.findbyre(r'<title>([^<>\|]*)', html) ] @@ -10973,7 +10973,7 @@ return html.replace(' ', ' ') def getvalue(self, field, html, dtype=None): - return self.findbyre(r'>{}:\s*(?:<[^<>]*>)*([^<>]+)<'.format(field), + return self.findbyre(fr'>{field}:\s*(?:<[^<>]*>)*([^<>]+)<', html, dtype) def findinstanceof(self, html: str): @@ -11666,7 +11666,7 @@ def getvalue(self, field, html, dtype=None): return self.findbyre( - r'(?s)<b>{}:</b>(?:\s|<[^<>]*>)*([^<>]+)'.format(field), html, + fr'(?s)<b>{field}:</b>(?:\s|<[^<>]*>)*([^<>]+)', html, dtype) def findinstanceof(self, html: str): @@ -11956,7 +11956,7 @@ if alt is None: alt = [] return self.findbyre( - r'(?s)<bdi>{}</bdi></strong>(.*?)</p>'.format(field), html, dtype, + fr'(?s)<bdi>{field}</bdi></strong>(.*?)</p>', html, dtype, alt=alt) def findnames(self, html) -> List[str]: @@ -12013,7 +12013,7 @@ def getvalue(self, field, html, dtype=None): return self.findbyre( - r'(?s)<td id="{}" title="([^"<>]+)">'.format(field), html, dtype) + fr'(?s)<td id="{field}" title="([^"<>]+)">', html, dtype) def getvalues(self, field, html, dtype=None) -> List[str]: section = self.getvalue(field, html) @@ -12068,7 +12068,7 @@ self.language = 'nl' def getvalue(self, field, html, category=None): - return self.findbyre(r'<dt>{}</dt><dd>(.*?)<'.format(field), html, + return self.findbyre(fr'<dt>{field}</dt><dd>(.*?)<', html, category) def findnames(self, html) -> List[str]: @@ -12575,7 +12575,7 @@ self.language = 'en' def getvalue(self, field, html, dtype=None): - return self.findbyre(r'<dt>{}:</dt><dd>(.*?)</dd>'.format(field), html, + return self.findbyre(fr'<dt>{field}:</dt><dd>(.*?)</dd>', html, dtype) def findnames(self, html) -> List[str]: @@ -12863,7 +12863,7 @@ def getvalue(self, field, html, dtype=None): return self.findbyre( - r'<SPAN[^<>]*>{}:\s*</SPAN>(?:\s|<[^<>]*>)*([^<>]*)'.format(field), + fr'<SPAN[^<>]*>{field}:\s*</SPAN>(?:\s|<[^<>]*>)*([^<>]*)', html, dtype) def getvalues(self, field, html, dtype=None) -> List[str]: @@ -14271,7 +14271,7 @@ def getvalue(self, field, html, dtype=None, alt=None): return self.findbyre( - '(?s)<strong>{}</strong><br>(.*?)</p>'.format(field), html, dtype, + f'(?s)<strong>{field}</strong><br>(.*?)</p>', html, dtype, alt=alt) def getvalues(self, field, html, dtype=None, alt=None) -> List[str]: @@ -14343,12 +14343,12 @@ def getvalue(self, field, html, dtype=None, alt=None): return self.findbyre( - '(?s)<th>{}</th><td>(?:<a[^<>]*>)?(.*?)<'.format(field), html, + f'(?s)<th>{field}</th><td>(?:<a[^<>]*>)?(.*?)<', html, dtype, alt=alt) def getvalues(self, field, html, dtype=None, alt=None) -> List[str]: return self.findallbyre( - '(?s)<th>{}</th><td>(?:<a[^<>]*>)?(.*?)<'.format(field), html, + f'(?s)<th>{field}</th><td>(?:<a[^<>]*>)?(.*?)<', html, dtype, alt=alt) def findinstanceof(self, html: str): @@ -14632,7 +14632,7 @@ self.language = 'pl' def getvalue(self, field, letter, html, dtype=None): - row = self.findbyre(r'(<tr><td[^<>]*>{}\s*<.*?</tr>)'.format(field), + row = self.findbyre(fr'(<tr><td[^<>]*>{field}\s*<.*?</tr>)', html) if row: return self.findbyre(r'<I>\s*{}\s*</TT></I>(.*?)<'.fomat(letter), @@ -14642,10 +14642,10 @@ def getvalues(self, field, letter, html, dtype=None) -> List[str]: result = [] rows = self.findallbyre( - r'(<tr><td[^<>]*>{}\s*<.*?</tr>)'.format(field), html) + fr'(<tr><td[^<>]*>{field}\s*<.*?</tr>)', html) for row in rows: result += self.findallbyre( - r'<I>\s*{}\s*</TT></I>(.*?)<'.format(letter), row, dtype) + fr'<I>\s*{letter}\s*</TT></I>(.*?)<', row, dtype) return result def findinstanceof(self, html: str): @@ -14705,7 +14705,7 @@ self.escapehtml = True def getvalue(self, field, html, dtype=None): - return self.findbyre(r'(?s)<b>{}</b>\s*:\s*([^<>]*)'.format(field), + return self.findbyre(fr'(?s)<b>{field}</b>\s*:\s*([^<>]*)', html, dtype) def getvalues(self, field, html, dtype=None) -> List[str]: @@ -14885,7 +14885,7 @@ def getvalue(self, field, html, dtype=None): return self.findbyre( - r'(?s)>{}:</td>\s*<td[^<>]*>(.*?)</td>'.format(field), html, dtype) + fr'(?s)>{field}:</td>\s*<td[^<>]*>(.*?)</td>', html, dtype) def findinstanceof(self, html: str): return 'Q5' @@ -14965,7 +14965,7 @@ if alt is None: alt = [] return self.findbyre( - r'(?s)<h3>\s*{}\s*</h3>\s*<div[^<>]*>(.*?)</div>'.format(field), + fr'(?s)<h3>\s*{field}\s*</h3>\s*<div[^<>]*>(.*?)</div>', html, dtype, alt=alt) def getvalues(self, field, html, dtype=None, alt=None) -> List[str]: @@ -16408,7 +16408,7 @@ def getvalue(self, field, html, dtype=None): return self.findbyre( - '(?s)<strong>{}</strong>.*?<td[^<>]*>(.*?)</td>'.format(field), + f'(?s)<strong>{field}</strong>.*?<td[^<>]*>(.*?)</td>', html, dtype) def getvalues(self, field, html, dtype=None) -> List[str]: @@ -16639,7 +16639,7 @@ def getvalue(self, field, html, dtype=None): return self.findbyre( - r'(?s)<h3>{}</h3>\s*<div>(.*?)</div>'.format(field), html, dtype) + fr'(?s)<h3>{field}</h3>\s*<div>(.*?)</div>', html, dtype) def instanceof(self, html: str): return self.findbyre('Category', html, 'instanceof') @@ -16837,7 +16837,7 @@ def getvalue(self, field, html, dtype=None): return self.findbyre( - r'<meta property=(?:\w+:)?{}" content="(.*?)"'.format(field), html, + fr'<meta property=(?:\w+:)?{field}" content="(.*?)"', html, dtype) def findinstanceof(self, html: str): diff --git a/scripts/maintenance/unidata.py b/scripts/maintenance/unidata.py old mode 100644 new mode 100755 index 2d6b03a..29c3444 --- a/scripts/maintenance/unidata.py +++ b/scripts/maintenance/unidata.py @@ -14,16 +14,16 @@ # # Distributed under the terms of the MIT license. # -from sys import maxunicode -from re import findall from json import dump, load from queue import Queue +from re import findall +from sys import maxunicode from threading import Thread -from scripts.maintenance.wikimedia_sites import families_list -from pywikibot.family import Family from pywikibot import Site from pywikibot.comms.http import session +from pywikibot.family import Family +from scripts.maintenance.wikimedia_sites import families_list NUMBER_OF_THREADS = 26 @@ -133,7 +133,7 @@ def load_json(path): """Load data from file.""" try: - with open(path, 'r', encoding='utf8') as f: + with open(path, encoding='utf8') as f: return load(f) except OSError: print('File not found:', path) # noqa: T001, T201 diff --git a/tests/file_tests.py b/tests/file_tests.py index 0f59774..adf1d92 100755 --- a/tests/file_tests.py +++ b/tests/file_tests.py @@ -12,6 +12,7 @@ from itertools import chain import pywikibot +from pywikibot import pagegenerators from pywikibot.exceptions import ( Error, NoPageError, @@ -19,7 +20,6 @@ PageRelatedError, UserRightsError, ) -from pywikibot import pagegenerators from tests import join_images_path from tests.aspects import TestCase diff --git a/tests/site_decorators_tests.py b/tests/site_decorators_tests.py index dfcfd3f..e556c45 100755 --- a/tests/site_decorators_tests.py +++ b/tests/site_decorators_tests.py @@ -10,7 +10,7 @@ from pywikibot.exceptions import UserRightsError from pywikibot.site._decorators import must_be, need_right, need_version from pywikibot.tools import deprecated -from tests.aspects import TestCase, DeprecationTestCase +from tests.aspects import DeprecationTestCase, TestCase class TestMustBe(TestCase): diff --git a/tests/sparql_tests.py b/tests/sparql_tests.py index a14f4f0..25f5aab 100755 --- a/tests/sparql_tests.py +++ b/tests/sparql_tests.py @@ -12,9 +12,9 @@ import pywikibot import pywikibot.data.sparql as sparql +from pywikibot.exceptions import NoUsernameError from tests.aspects import TestCase, WikidataTestCase from tests.utils import skipping -from pywikibot.exceptions import NoUsernameError # See: https://www.w3.org/TR/2013/REC-sparql11-results-json-20130321/ diff --git a/tests/utils.py b/tests/utils.py index 8c0ce06..2830ea4 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -20,10 +20,9 @@ from pywikibot.data.api import Request as _original_Request from pywikibot.exceptions import APIError from pywikibot.login import LoginStatus -from pywikibot.tools.collections import EMPTY_DEFAULT from pywikibot.site import Namespace from pywikibot.tools import PYTHON_VERSION - +from pywikibot.tools.collections import EMPTY_DEFAULT from tests import _pwb_py @@ -476,7 +475,7 @@ :param command: executable to run and arguments to use """ if PYTHON_VERSION < (3, 7): - command.insert(1, '-W ignore::FutureWarning:pywikibot:110') + command.insert(1, '-W ignore::FutureWarning:pywikibot:111') env = os.environ.copy() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/979482 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: I180a6a9d20e9a85730e2976e28d1359be17327a1 Gerrit-Change-Number: 979482 Gerrit-PatchSet: 2 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: proofreadpage.py: fetch URL of page scan via API
by jenkins-bot (Code Review) 03 Dec '23

03 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/969516 ) Change subject: proofreadpage.py: fetch URL of page scan via API ...................................................................... proofreadpage.py: fetch URL of page scan via API Fetch URL of Page image using new API for MW >= 1.40: - query+prop=imageforpage No more HTML page scraping is needed, except for MW version < 1.40. This should also fix bug T181913, tests are re-added. Change-Id: I374e878d0b321024903be8d5194b2878355667b6 Bug: T352524 Bug: T181913 Bug: T114318 --- M tests/proofreadpage_tests.py M pywikibot/page/_basepage.py M pywikibot/site/_extensions.py M pywikibot/data/api/_generators.py M pywikibot/proofreadpage.py 5 files changed, 82 insertions(+), 9 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api/_generators.py b/pywikibot/data/api/_generators.py index 902c561..07f0338 100644 --- a/pywikibot/data/api/_generators.py +++ b/pywikibot/data/api/_generators.py @@ -1038,3 +1038,8 @@ page._lintinfo.pop('pageid') page._lintinfo.pop('title') page._lintinfo.pop('ns') + + if 'imageforpage' in props and 'imagesforpage' in pagedict: + # proofreadpage will work always on dicts + # it serves also as workaround for T352482 + page._imageforpage = pagedict['imagesforpage'] or {} diff --git a/pywikibot/page/_basepage.py b/pywikibot/page/_basepage.py index 796eac5..caef2f3 100644 --- a/pywikibot/page/_basepage.py +++ b/pywikibot/page/_basepage.py @@ -73,7 +73,7 @@ '_contentmodel', '_langlinks', '_isredir', '_coords', '_preloadedtext', '_timestamp', '_applicable_protections', '_flowinfo', '_quality', '_pageprops', '_revid', '_quality_text', - '_pageimage', '_item', '_lintinfo', + '_pageimage', '_item', '_lintinfo', '_imageforpage', ) def __init__(self, source, title: str = '', ns=0) -> None: diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index a4ae60f..7157316 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -54,7 +54,7 @@ from pywikibot.data.api import ListGenerator, Request from pywikibot.exceptions import Error, InvalidTitleError, OtherPageSaveError from pywikibot.page import PageSourceType -from pywikibot.tools import cached +from pywikibot.tools import MediaWikiVersion, cached try: @@ -825,9 +825,7 @@ """ return f'/* {self.status} */ ' - @property - @cached - def url_image(self) -> str: + def __url_image_lt_140(self) -> str: """Get the file url of the scan of ProofreadPage. :return: file url of the scan ProofreadPage or None. @@ -864,6 +862,36 @@ return url_image + def __url_image(self) -> str: + """Get the file url of the scan of ProofreadPage. + + :return: file url of the scan of ProofreadPage or None. + :raises ValueError: in case of no image found for scan + """ + self.site.loadpageurls(self) + url = self._imageforpage.get('fullsize') + if url is not None: + return f'{self.site.family.protocol(self.site.code)}:{url}' + else: + raise ValueError(f'imagesforpage is empty for {self}.') + + @property + @cached + def url_image(self) -> str: + """Get the file url of the scan of ProofreadPage. + + :return: file url of the scan of ProofreadPage or None. + + For MW version < 1.40: + :raises Exception: in case of http errors + :raises ImportError: if bs4 is not installed, _bs4_soup() will raise + :raises ValueError: in case of no prp_page_image src found for scan + """ + if self.site.version() < MediaWikiVersion('1.40'): + return self.__url_image_lt_140() + else: + return self.__url_image() + def _ocr_callback(self, cmd_uri: str, parser_func: Optional[Callable[[str], str]] = None, ocr_tool: Optional[str] = None diff --git a/pywikibot/site/_extensions.py b/pywikibot/site/_extensions.py index f6c5859..4e6977e 100644 --- a/pywikibot/site/_extensions.py +++ b/pywikibot/site/_extensions.py @@ -141,6 +141,29 @@ self._cache_proofreadinfo() return self._proofread_levels + @need_extension('ProofreadPage') + def loadpageurls( + self, + page: 'pywikibot.page.BasePage' + ) -> None: + """Load URLs from api and store in page attributes. + + Load URLs to images for a given page in the "Page:" namespace. + No effect for pages in other namespaces. + + .. seealso:: :api:`imageforpage` + """ + title = page.title(with_section=False) + # responsiveimages: server would try to render the other images as well + # let's not load the server unless needed. + prppifpprop = 'filename|size|fullsize' + + query = self._generator(api.PropertyGenerator, + type_arg='imageforpage', + titles=title.encode(self.encoding()), + prppifpprop=prppifpprop) + self._update_page(page, query) + class GeoDataMixin: diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py index 40a1728..13534e1 100755 --- a/tests/proofreadpage_tests.py +++ b/tests/proofreadpage_tests.py @@ -26,7 +26,6 @@ BasePageLoadRevisionsCachingTestBase, BasePageMethodsTestBase, ) -from tests.utils import skipping class TestPagesTagParser(TestCase): @@ -250,7 +249,7 @@ 'footer': '\n{{smallrefs}}', 'url_image': ('https://upload.wikimedia.org/wikipedia/commons/' 'thumb/a/ac/Popular_Science_Monthly_Volume_1.djvu/' - 'page12-1024px-Popular_Science_Monthly_Volume_1.djvu' + 'page12-2267px-Popular_Science_Monthly_Volume_1.djvu' '.jpg'), } @@ -412,8 +411,7 @@ page.url_image page = ProofreadPage(self.site, self.valid_redlink['title']) - with skipping(ValueError, msg='T181913, T114318'): - self.assertEqual(page.url_image, self.valid_redlink['url_image']) + self.assertEqual(page.url_image, self.valid_redlink['url_image']) class TestPageQuality(TestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/969516 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: I374e878d0b321024903be8d5194b2878355667b6 Gerrit-Change-Number: 969516 Gerrit-PatchSet: 13 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Sohom Datta <sohomdatta1(a)gmail.com> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: proofreadpage: sort page names before loading pages
by jenkins-bot (Code Review) 03 Dec '23

03 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/978143 ) Change subject: proofreadpage: sort page names before loading pages ...................................................................... proofreadpage: sort page names before loading pages Sort the list of pages before converting to a preload generator. Otherwise the sorted() operation will tranform everything to a list, loading all pages, defeating the purpose of having a generator. Change-Id: Ie8ca5d7dd37b7dd9fadca42ed5dcf339164fc427 --- M pywikibot/proofreadpage.py 1 file changed, 22 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index e72b676..a4ae60f 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -1313,7 +1313,14 @@ filter_ql = list(self.site.proofread_levels) filter_ql.remove(ProofreadPage.WITHOUT_TEXT) - gen = (self.get_page(i) for i in range(start, end + 1)) + gen = [self.get_page(i) for i in range(start, end + 1)] + + # Decorate and sort by page number because preloadpages does not + # guarantee order. + # TODO: remove if preloadpages will guarantee order. + gen = [(self.get_number(p), p) for p in gen] + gen = [p for n, p in sorted(gen)] + if content: gen = self.site.preloadpages(gen) # Filter by QL. @@ -1321,11 +1328,6 @@ # Yield only existing. if only_existing: gen = (p for p in gen if p.exists()) - # Decorate and sort by page number because preloadpages does not - # guarantee order. - # TODO: remove if preloadpages will guarantee order. - gen = ((self.get_number(p), p) for p in gen) - gen = (p for n, p in sorted(gen)) return gen -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/978143 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: Ie8ca5d7dd37b7dd9fadca42ed5dcf339164fc427 Gerrit-Change-Number: 978143 Gerrit-PatchSet: 1 Gerrit-Owner: Mpaa <mpaa.wiki(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]: [tests] skip PetScanPageGeneratorTestCase if APIError occurred
by jenkins-bot (Code Review) 03 Dec '23

03 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/979467 ) Change subject: [tests] skip PetScanPageGeneratorTestCase if APIError occurred ...................................................................... [tests] skip PetScanPageGeneratorTestCase if APIError occurred petscan fails from time to time currently. Skip test in this case. Bug: T352482 Change-Id: Icf649670274ab461bfd964af56cdcb235b715950 --- M tests/pagegenerators_tests.py 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index f6b90b6..1b43633 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -16,6 +16,7 @@ import pywikibot from pywikibot import date, pagegenerators from pywikibot.exceptions import ( + APIError, NoPageError, ServerError, UnknownExtensionError, @@ -377,7 +378,8 @@ site = self.get_site() gen = pagegenerators.PetScanPageGenerator(['Pywikibot Protect Test'], True, None, site) - with skipping(ServerError): + with skipping(ServerError, + APIError): # (temporary) disabled due to T352482 self.assertPageTitlesEqual(gen, titles=( 'User:Sn1per/ProtectTest1', 'User:Sn1per/ProtectTest2'), site=site) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/979467 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: Icf649670274ab461bfd964af56cdcb235b715950 Gerrit-Change-Number: 979467 Gerrit-PatchSet: 5 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]: [FIX] fix typo in explanation of options
by JJMC89 (Code Review) 02 Dec '23

02 Dec '23

JJMC89 has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/979136 ) Change subject: [FIX] fix typo in explanation of options ...................................................................... [FIX] fix typo in explanation of options Change-Id: Idc396cbf2ecab8043da1740ae86a4ea817e1f1c8 --- M scripts/weblinkchecker.py 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Mpaa: Looks good to me, approved JJMC89: Verified; Looks good to me, approved diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py index a04d25d..02be28c 100755 --- a/scripts/weblinkchecker.py +++ b/scripts/weblinkchecker.py @@ -31,7 +31,7 @@ These command line parameters can be used to specify which pages to work on: --repeat Work on all pages were dead links were found before. This is +-repeat Work on all pages where dead links were found before. This is useful to confirm that the links are dead after some time (at least one week), which is required before the script will report the problem. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/979136 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: Idc396cbf2ecab8043da1740ae86a4ea817e1f1c8 Gerrit-Change-Number: 979136 Gerrit-PatchSet: 2 Gerrit-Owner: Mevo1961 <mevo1961(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <dalangi-ctr(a)wikimedia.org> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

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

23 Nov '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/977061 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: Id5205bf427f5209cda80edcf56e8c7c556637e24 --- M category/krc.json M protect/krc.json M protect/nl.json A replicate_wiki/krc.json M checkimages/nl.json M redirect/krc.json M redirect/nl.json M checkimages/krc.json M unprotect/nl.json M delinker/nl.json A replicate_wiki/nl.json M unprotect/krc.json M cosmetic_changes/krc.json 13 files changed, 54 insertions(+), 10 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category/krc.json b/category/krc.json index c18d416..3572c28 100644 --- a/category/krc.json +++ b/category/krc.json @@ -7,7 +7,7 @@ }, "category-adding": "робот: къошду category [[:Category:%(newcat)s|%(newcat)s]]", "category-also-in": "(%(alsocat)s категорияда да)", - "category-clean": "Бот: %(child)s бар болгъан %(category)s категория кетериледи", + "category-clean": "Бот: %(child)s бар болгъаны ючюн %(category)s категория кетериледи", "category-listifying": "Бот: %(fromcat)s бетден башлаб (%(num)d кирди) тизмеленеди", "category-removing": "Бот: %(oldcat)s категориясындан къоратылады", "category-renamed": "Бот: %(oldcat)s къоратылды. Авторла: %(authors)s", diff --git a/checkimages/krc.json b/checkimages/krc.json index 812fa91..98e77d8 100644 --- a/checkimages/krc.json +++ b/checkimages/krc.json @@ -8,6 +8,9 @@ "checkimages-doubles-file-comment": "Бот: Файл алайсыз да Викигёзендеди, кетерирге боллукъду", "checkimages-doubles-head": "Дубликат файл", "checkimages-doubles-talk-comment": "Бот: Файлны алайсыз да Викигёзенде болгъанын билдириу", + "checkimages-doubles-talk-text": "%(upload)s джюклегенигиз ючюн сау болугъуз. Алай а бу файл %(image)s файлны копиясыды. Бот, аз хайырланнган неда артда салыннган файлны дубликат этиб белгилегенди. Ажымсыз кетерилирге кереклиди деб белгиленнген файлны къояргъа излей эсегиз, файлланы дубликатларын кетерирге эмда къояргъа керек болгъан файлдан кетериу шаблонну кетерирге уялмагъыз. Бу билдириуню автомат халда %(bot)s джибергенди.", + "checkimages-forced-mode": "('''зорлу режим''')", + "checkimages-has-duplicates": "бу %(force)s дубликатлары барды:", "checkimages-log-comment": "Бот: Логну джангырт", "checkimages-no-license-head": "Лицензиясыз сурат", "checkimages-source-tag-comment": "Бот: Джангы джюкленнген белгисиз файлны белгилеу", diff --git a/checkimages/nl.json b/checkimages/nl.json index 7e8fbe6..aa990cf 100644 --- a/checkimages/nl.json +++ b/checkimages/nl.json @@ -11,6 +11,9 @@ "checkimages-doubles-file-comment": "Robot: bestand staat al op Commons, kan verwijderd worden", "checkimages-doubles-head": "Dubbel bestand", "checkimages-doubles-talk-comment": "Robot: kennisgeving dat een bestand al op Commons staat", + "checkimages-doubles-talk-text": "Bedankt voor het uploaden van %(upload)s. Dit bestand is echter een kopie van:%(image)sDe robot heeft het bestand dat het minst gebruikt of het meest recent is bevonden als duplicaat gemarkeerd. Als u het passender acht om het bestand als onmiddellijk te verwijderen gemarkeerd te laten, kunt u de dubbele bestanden verwijderen en het verwijderingssjabloon verwijderen van het bestand dat overblijft. Dit is een geautomatiseerd bericht van %(bot)s.", + "checkimages-forced-mode": "('''geforceerde modus''')", + "checkimages-has-duplicates": "heeft de volgende duplicaten%(force)s:", "checkimages-log-comment": "Robot: logboek bijgewerkt", "checkimages-no-license-head": "Bestand zonder licentie", "checkimages-source-tag-comment": "Robot: nieuw bestand zonder labels gemarkeerd", diff --git a/cosmetic_changes/krc.json b/cosmetic_changes/krc.json index 9297291..ddb5eda 100644 --- a/cosmetic_changes/krc.json +++ b/cosmetic_changes/krc.json @@ -4,5 +4,6 @@ "Къарачайлы" ] }, + "cosmetic_changes-append": "; косметик тюрлениуле", "cosmetic_changes-standalone": "Бот: Косметик тюрлениуле" } diff --git a/delinker/nl.json b/delinker/nl.json index accbab0..0e1b16a 100644 --- a/delinker/nl.json +++ b/delinker/nl.json @@ -1,6 +1,7 @@ { "@metadata": { "authors": [ + "Ciell", "HanV" ] }, diff --git a/protect/krc.json b/protect/krc.json index 9ba2120..af2250b 100644 --- a/protect/krc.json +++ b/protect/krc.json @@ -7,6 +7,6 @@ "protect-category": "Бот: %(cat)s категориядан бютеу бетни къоруулау", "protect-images": "Бот: %(page)s бетде бютеу суратланы къоруулау", "protect-links": "Бот: %(page)s бла байламлы бютеу бетлени къоруулау", - "protect-ref": "Бот: %(page)s' бетден джибериу болгъан бютеу бетлени къоруулау", + "protect-ref": "Бот: %(page)s' бетге джибериу болгъан бютеу бетлени къоруулау", "protect-simple": "Бот: Файлланы тизмесин къоруулау." } diff --git a/protect/nl.json b/protect/nl.json index 682e188..06f0f99 100644 --- a/protect/nl.json +++ b/protect/nl.json @@ -1,6 +1,7 @@ { "@metadata": { "authors": [ + "Ciell", "HanV", "McDutchie", "Siebrand" @@ -9,6 +10,6 @@ "protect-category": "Robot: alle pagina's uit categorie %(cat)s beveiligd", "protect-images": "Robot: alle op %(page)s gebruikte bestanden beveiligd", "protect-links": "Robot: alle pagina's met verwijzingen vanaf %(page)s beveiligd", - "protect-ref": "Bot: alle pagina's met een verwijzing naar %(page)s beveiligen", + "protect-ref": "Bot: alle pagina’s met een verwijzing naar %(page)s beveiligd", "protect-simple": "Robot: lijst met bestanden beveiligd" } diff --git a/redirect/krc.json b/redirect/krc.json index ac879a9..93ad878 100644 --- a/redirect/krc.json +++ b/redirect/krc.json @@ -8,5 +8,5 @@ "redirect-fix-double": "%(to)s бетге экили джолландырыуну тюзетиу", "redirect-fix-loop": "Ахырсыз джолландырыуну %(to)s тюзетилиую", "redirect-remove-broken": "Кетерилген неда бар болмагъан бетге джолландырыу", - "redirect-remove-loop": "Джолландырыу ахырсызл джолландырыуну формалашдырады" + "redirect-remove-loop": "Джолландырыу ахырсыз джолландырыуну формалашдырады" } diff --git a/redirect/nl.json b/redirect/nl.json index c575586..77adedf 100644 --- a/redirect/nl.json +++ b/redirect/nl.json @@ -1,6 +1,7 @@ { "@metadata": { "authors": [ + "Ciell", "HanV", "Krinkle", "McDutchie", @@ -8,9 +9,9 @@ ] }, "redirect-broken-redirect-template": "{{nuweg|Weesdoorverwijzing of doorverwijzing naar verwijderde pagina}}", - "redirect-fix-broken-moved": "kapotte doorverwijzing gecorrigeerd door aanpassing naar hernoemde doelpagina %(to)s", - "redirect-fix-double": "dubbele doorverwijzing gecorrigeerd naar %(to)s", - "redirect-fix-loop": "doorverwijs-lus naar %(to)s gecorrigeerd", + "redirect-fix-broken-moved": "Gebroken doorverwijzing gecorrigeerd door aanpassing naar hernoemde doelpagina %(to)s", + "redirect-fix-double": "Dubbele doorverwijzing gecorrigeerd tot %(to)s", + "redirect-fix-loop": "Doorverwijslus gecorrigeerd tot %(to)s", "redirect-remove-broken": "Doorverwijzing naar een verwijderde of niet-bestaande pagina", - "redirect-remove-loop": "het doel van de doorverwijzing vormt een doorverwijzingslus" + "redirect-remove-loop": "Het doel van de doorverwijzing vormt een doorverwijslus" } diff --git a/replicate_wiki/krc.json b/replicate_wiki/krc.json new file mode 100644 index 0000000..a84c388 --- /dev/null +++ b/replicate_wiki/krc.json @@ -0,0 +1,12 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "replicate_wiki-headline": "Оригиналдан башхалыкълары болгъан бет", + "replicate_wiki-missing-users": "Былайда болмагъан, оригиналдан администраторла", + "replicate_wiki-same-pages": "Бютеу магъаналы бетле бирчадыла", + "replicate_wiki-same-users": "Оригиналдагъы бютеу хайырланыучула, бу викиде да бардыла", + "replicate_wiki-summary": "Bot: %(source)s бла вики синхронизация" +} diff --git a/replicate_wiki/nl.json b/replicate_wiki/nl.json new file mode 100644 index 0000000..ff9d2a7 --- /dev/null +++ b/replicate_wiki/nl.json @@ -0,0 +1,13 @@ +{ + "@metadata": { + "authors": [ + "Ciell", + "McDutchie" + ] + }, + "replicate_wiki-headline": "Pagina’s die afwijken van het origineel", + "replicate_wiki-missing-users": "Moderators van het origineel die hier ontbreken", + "replicate_wiki-same-pages": "Alle belangrijke pagina’s zijn hetzelfde", + "replicate_wiki-same-users": "Alle gebruikers van het origineel zijn ook aanwezig op deze wiki", + "replicate_wiki-summary": "Bot: Wiki-synchronisatie van %(source)s" +} diff --git a/unprotect/krc.json b/unprotect/krc.json index 3303c4f..ebee5fe 100644 --- a/unprotect/krc.json +++ b/unprotect/krc.json @@ -7,6 +7,6 @@ "unprotect-category": "Бот: %(cat)s категориядан бютеу бетни къоруулаудан къоратыу", "unprotect-images": "Бот: %(page)s бетде бютеу бетлени къоруулауун къоратыу", "unprotect-links": "Бот: %(page)s бла байламлы бютеу бетлени къоруулаудан къоратыу", - "unprotect-ref": "Бот: %(page)s' бетден джибериу болгъан бютеу бетлени къоруулауун къоратыу", + "unprotect-ref": "Бот: %(page)s' бетге джибериу болгъан бютеу бетлени къоруулауун къоратыу", "unprotect-simple": "Бот: Файлланы тизмесин къоруулаудан къоратыу" } diff --git a/unprotect/nl.json b/unprotect/nl.json index e899300..689b5de 100644 --- a/unprotect/nl.json +++ b/unprotect/nl.json @@ -9,6 +9,6 @@ "unprotect-category": "Robot: beveiliging voor alle pagina's uit categorie %(cat)s opgeheven", "unprotect-images": "Robot: beveiliging van alle bestanden op pagina %(page)s opgeheven", "unprotect-links": "Robot: beveiliging van alle vanaf %(page)s gekoppelde pagina's opgeheven", - "unprotect-ref": "Bot: beveiliging van alle pagina's met een koppeling naar %(page)s opheffen", + "unprotect-ref": "Robot: beveiliging van alle pagina’s met een koppeling naar %(page)s opgeheven", "unprotect-simple": "Robot: beveiliging van een lijst met bestanden opgeheven" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/977061 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: Id5205bf427f5209cda80edcf56e8c7c556637e24 Gerrit-Change-Number: 977061 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [L10N] Update languages_by_size
by jenkins-bot (Code Review) 22 Nov '23

22 Nov '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/976333 ) Change subject: [L10N] Update languages_by_size ...................................................................... [L10N] Update languages_by_size Change-Id: I3396dd01bd31e5bea39fcfbb706aa8a83c048604 --- M pywikibot/families/wikisource_family.py M pywikibot/families/wikibooks_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wiktionary_family.py M pywikibot/families/wikipedia_family.py 5 files changed, 40 insertions(+), 31 deletions(-) Approvals: Meno25: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index f559fd9..1c8f52f 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -31,11 +31,11 @@ languages_by_size = [ 'en', 'vi', 'hu', 'de', 'fr', 'it', 'ja', 'pt', 'es', 'nl', 'pl', 'id', 'he', 'fi', 'zh', 'fa', 'az', 'ru', 'sq', 'lt', 'ca', 'eu', 'th', 'cs', - 'da', 'ko', 'hi', 'ba', 'sv', 'gl', 'sr', 'uk', 'hr', 'no', 'tr', 'sa', + 'da', 'ko', 'hi', 'ba', 'sv', 'gl', 'uk', 'sr', 'hr', 'no', 'tr', 'sa', 'ar', 'ta', 'bn', 'eo', 'is', 'sk', 'si', 'ro', 'bg', 'ms', 'mk', 'ka', 'tt', 'el', 'li', 'sl', 'tl', 'ur', 'km', 'la', 'mr', 'kk', 'te', 'shn', 'et', 'be', 'ia', 'ml', 'oc', 'ne', 'pa', 'hy', 'cv', 'tg', - 'ku', 'fy', 'af', 'bs', 'cy', 'mg', 'ky', + 'ku', 'fy', 'af', 'bs', 'mg', 'cy', 'ky', ] category_redirect_templates = { diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 1a727d5..dfedfd2 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -29,34 +29,34 @@ 'en', 'ceb', 'de', 'sv', 'fr', 'nl', 'ru', 'es', 'it', 'arz', 'pl', 'ja', 'zh', 'uk', 'vi', 'war', 'ar', 'pt', 'fa', 'ca', 'sr', 'id', 'ko', 'no', 'ce', 'fi', 'tr', 'cs', 'hu', 'tt', 'sh', 'ro', - 'zh-min-nan', 'eu', 'ms', 'eo', 'he', 'hy', 'da', 'bg', 'cy', 'sk', - 'uz', 'azb', 'simple', 'et', 'be', 'kk', 'el', 'min', 'hr', 'lt', 'gl', - 'ur', 'az', 'sl', 'lld', 'ka', 'nn', 'hi', 'th', 'ta', 'bn', 'mk', + 'zh-min-nan', 'eu', 'ms', 'eo', 'he', 'hy', 'da', 'bg', 'cy', 'uz', + 'sk', 'azb', 'simple', 'et', 'be', 'kk', 'el', 'min', 'hr', 'lt', 'gl', + 'ur', 'az', 'sl', 'lld', 'ka', 'nn', 'th', 'ta', 'hi', 'bn', 'mk', 'la', 'zh-yue', 'ast', 'lv', 'af', 'tg', 'my', 'mg', 'sq', 'mr', 'bs', - 'oc', 'te', 'ml', 'br', 'be-tarask', 'nds', 'ky', 'sw', 'lmo', 'jv', - 'new', 'pnb', 'vec', 'ht', 'pms', 'ku', 'ba', 'lb', 'su', 'ga', 'is', - 'szl', 'fy', 'ckb', 'cv', 'pa', 'tl', 'an', 'wuu', 'diq', 'io', 'vo', + 'oc', 'te', 'br', 'ml', 'be-tarask', 'nds', 'ky', 'sw', 'lmo', 'jv', + 'new', 'pnb', 'ku', 'vec', 'ht', 'pms', 'ba', 'lb', 'su', 'ga', 'is', + 'szl', 'fy', 'ckb', 'cv', 'pa', 'tl', 'an', 'wuu', 'io', 'diq', 'vo', 'sco', 'yo', 'ha', 'ne', 'kn', 'ia', 'gu', 'als', 'avk', 'crh', 'bar', 'scn', 'bpy', 'qu', 'mn', 'nv', 'ig', 'ban', 'xmf', 'si', 'frr', 'tum', - 'mzn', 'ps', 'os', 'or', 'bat-smg', 'sah', 'cdo', 'gd', 'bug', 'bcl', - 'sd', 'yi', 'ilo', 'am', 'li', 'nap', 'gor', 'fo', 'hsb', 'mai', + 'mzn', 'ps', 'os', 'or', 'bat-smg', 'sah', 'cdo', 'gd', 'bcl', 'bug', + 'sd', 'yi', 'ilo', 'am', 'li', 'nap', 'gor', 'fo', 'mai', 'hsb', 'map-bms', 'shn', 'eml', 'ace', 'zh-classical', 'as', 'sa', 'wa', 'ie', 'hyw', 'sn', 'mhr', 'lij', 'zu', 'hif', 'bjn', 'mrj', 'km', 'mni', - 'hak', 'sat', 'roa-tara', 'pam', 'rue', 'bh', 'nso', 'ary', 'dag', - 'so', 'mi', 'nds-nl', 'myv', 'se', 'co', 'vls', 'sc', 'bo', 'vep', - 'kw', 'glk', 'tk', 'kab', 'gan', 'rw', 'fiu-vro', 'gv', 'ab', 'zea', + 'hak', 'sat', 'pam', 'ary', 'roa-tara', 'rue', 'bh', 'nso', 'dag', + 'so', 'co', 'mi', 'nds-nl', 'vls', 'myv', 'se', 'sc', 'bo', 'kw', + 'vep', 'glk', 'tk', 'kab', 'gan', 'rw', 'fiu-vro', 'gv', 'zea', 'ab', 'ug', 'nah', 'skr', 'mt', 'frp', 'tly', 'udm', 'pcd', 'kv', 'gn', 'csb', 'smn', 'ay', 'nrm', 'ks', 'lez', 'olo', 'mwl', 'lfn', 'mdf', 'stq', 'ang', 'kaa', 'lo', 'fur', 'rm', 'lad', 'ext', 'gom', 'pap', - 'tw', 'tyv', 'koi', 'av', 'ln', 'dsb', 'dty', 'cbk-zam', 'dv', 'ksh', - 'za', 'lg', 'gag', 'bxr', 'pfl', 'szy', 'blk', 'tay', 'pag', 'pi', - 'haw', 'awa', 'inh', 'krc', 'xal', 'pdc', 'to', 'atj', 'tcy', 'arc', - 'mnw', 'shi', 'jam', 'kbp', 'wo', 'ff', 'nia', 'anp', 'xh', 'om', + 'tw', 'tyv', 'koi', 'av', 'ln', 'dsb', 'cbk-zam', 'dty', 'dv', 'ksh', + 'lg', 'za', 'gag', 'bxr', 'pfl', 'szy', 'blk', 'tay', 'pag', 'pi', + 'haw', 'awa', 'inh', 'krc', 'pdc', 'to', 'atj', 'tcy', 'arc', 'mnw', + 'xal', 'shi', 'jam', 'kbp', 'ff', 'wo', 'xh', 'nia', 'anp', 'om', 'kbd', 'nov', 'ki', 'nqo', 'bi', 'tpi', 'tet', 'roa-rup', 'jbo', 'tn', - 'fj', 'kg', 'lbe', 'guw', 'ty', 'cu', 'rmy', 'trv', 'ami', 'srn', - 'mad', 'alt', 'sm', 'ltg', 'gcr', 'chr', 'ny', 'pcm', 'st', 'zgh', - 'pih', 'gpe', 'got', 'ss', 'dga', 'kcg', 'gur', 'ee', 'bm', 'ts', 've', - 'bbc', 'chy', 'rn', 'ch', 'ady', 'ik', 'fon', 'guc', 'fat', 'pnt', + 'fj', 'kg', 'lbe', 'guw', 'ty', 'cu', 'rmy', 'trv', 'ami', 'mad', + 'srn', 'sm', 'alt', 'ltg', 'gcr', 'chr', 'ny', 'zgh', 'pcm', 'dga', + 'st', 'gpe', 'pih', 'got', 'ss', 'kcg', 'gur', 'ee', 'bm', 'ts', 've', + 'bbc', 'chy', 'rn', 'ik', 'ch', 'ady', 'fon', 'guc', 'fat', 'pnt', 'iu', 'pwn', 'sg', 'din', 'ti', 'kl', 'dz', 'cr', ] diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 32473bb..df49e6b 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -27,12 +27,12 @@ ] languages_by_size = [ - 'it', 'en', 'pl', 'ru', 'cs', 'et', 'pt', 'fa', 'uk', 'he', 'fr', 'de', + 'it', 'en', 'pl', 'ru', 'cs', 'et', 'pt', 'uk', 'fa', 'he', 'fr', 'de', 'es', 'tr', 'eo', 'sk', 'az', 'bs', 'ca', 'zh', 'sr', 'fi', 'lt', 'sl', 'ar', 'id', 'su', 'bg', 'hy', 'hr', 'el', 'nn', 'sv', 'li', 'hu', 'ko', 'sah', 'nl', 'ja', 'la', 'ta', 'ig', 'hi', 'as', 'gl', 'gu', 'ur', - 'bjn', 'tl', 'guw', 'be', 'te', 'vi', 'bn', 'cy', 'no', 'sq', 'ml', - 'kn', 'eu', 'ro', 'ku', 'uz', 'ka', 'da', 'sa', 'is', 'th', 'bcl', + 'bjn', 'tl', 'guw', 'te', 'be', 'vi', 'bn', 'cy', 'no', 'sq', 'ml', + 'kn', 'eu', 'ro', 'ku', 'uz', 'ka', 'da', 'th', 'sa', 'is', 'bcl', 'br', 'mr', 'af', 'ky', ] diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index d67e424..1ca8fae 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -27,9 +27,9 @@ languages_by_size = [ 'pl', 'en', 'ru', 'de', 'fr', 'zh', 'he', 'uk', 'it', 'ar', 'es', 'mul', 'gu', 'cs', 'sr', 'pt', 'bn', 'sv', 'fa', 'ko', 'ta', 'hu', - 'ml', 'sa', 'te', 'tr', 'be', 'sl', 'la', 'vi', 'hy', 'nl', 'el', 'ja', - 'ro', 'fi', 'nap', 'az', 'ca', 'hr', 'br', 'id', 'no', 'kn', 'th', - 'hi', 'cy', 'vec', 'eo', 'is', 'mr', 'ban', 'pms', 'lij', 'da', 'et', + 'ml', 'sa', 'te', 'be', 'tr', 'sl', 'la', 'vi', 'hy', 'nl', 'el', 'ja', + 'ro', 'fi', 'nap', 'az', 'ca', 'hr', 'br', 'id', 'th', 'no', 'kn', + 'hi', 'cy', 'vec', 'is', 'eo', 'mr', 'ban', 'pms', 'lij', 'da', 'et', 'as', 'mk', 'yi', 'bg', 'jv', 'wa', 'li', 'lt', 'pa', 'or', 'eu', 'gl', 'bs', 'sah', 'sk', 'su', 'zh-min-nan', 'fo', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index ebb8592..330346d 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -33,17 +33,17 @@ languages_by_size = [ 'en', 'fr', 'mg', 'zh', 'el', 'ru', 'de', 'ku', 'es', 'sh', 'sv', 'nl', - 'pl', 'lt', 'ca', 'it', 'hu', 'fi', 'pt', 'ta', 'tr', 'ja', 'io', 'hy', + 'pl', 'lt', 'ca', 'hu', 'it', 'fi', 'pt', 'ta', 'tr', 'ja', 'io', 'hy', 'ko', 'kn', 'vi', 'sr', 'th', 'hi', 'ro', 'id', 'no', 'et', 'skr', 'cs', 'ml', 'my', 'uz', 'li', 'eo', 'or', 'te', 'fa', 'gl', 'sg', 'oc', 'ar', 'jv', 'is', 'az', 'uk', 'ast', 'eu', 'br', 'bn', 'mnw', 'da', 'simple', 'lo', 'la', 'shn', 'hr', 'sk', 'fj', 'wa', 'ky', 'lmo', 'bg', - 'ur', 'cy', 'ps', 'tg', 'kbd', 'he', 'vo', 'om', 'sl', 'af', + 'ur', 'cy', 'kbd', 'ps', 'tg', 'he', 'vo', 'om', 'sl', 'af', 'zh-min-nan', 'ms', 'scn', 'tl', 'pa', 'fy', 'sw', 'kk', 'ka', 'nn', 'min', 'lv', 'nds', 'gor', 'sq', 'lb', 'bs', 'co', 'mn', 'pnb', 'nah', - 'yue', 'ckb', 'sa', 'diq', 'km', 'be', 'vec', 'nia', 'tk', 'mk', 'sm', + 'yue', 'ckb', 'diq', 'sa', 'km', 'be', 'vec', 'nia', 'tk', 'mk', 'sm', 'hsb', 'ks', 'shy', 'bcl', 'su', 'ga', 'btm', 'gd', 'an', 'gom', 'mr', - 'ha', 'wo', 'mni', 'ia', 'bjn', 'ang', 'mt', 'tt', 'sd', 'blk', 'fo', + 'ha', 'wo', 'mni', 'ia', 'bjn', 'ang', 'mt', 'blk', 'tt', 'sd', 'fo', 'so', 'si', 'gn', 'ie', 'mi', 'csb', 'ug', 'guw', 'st', 'hif', 'jbo', 'roa-rup', 'kl', 'zu', 'ay', 'ln', 'yi', 'gu', 'kcg', 'na', 'gv', 'kw', 'tpi', 'am', 'ne', 'rw', 'ts', 'ig', 'qu', 'ss', 'iu', 'chr', 'dv', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/976333 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: I3396dd01bd31e5bea39fcfbb706aa8a83c048604 Gerrit-Change-Number: 976333 Gerrit-PatchSet: 2 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

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

13 Nov '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/973757 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I03900d55f3f461523fe46472639cdac8d0768e40 --- A clean_sandbox/yue.json M category/yue.json M add_text/yue.json M checkimages/yue.json M interwiki/yue.json M welcome/yue.json M commonscat/hi.json 7 files changed, 30 insertions(+), 7 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/add_text/yue.json b/add_text/yue.json index aec9bb8..a61ffd7 100644 --- a/add_text/yue.json +++ b/add_text/yue.json @@ -1,8 +1,9 @@ { "@metadata": { "authors": [ + "H78c67c", "Winston Sung" ] }, - "add_text-adding": "機械人加 %(adding)s" + "add_text-adding": "機械人：加 %(adding)s" } diff --git a/category/yue.json b/category/yue.json index 7a5bb3b..f97af26 100644 --- a/category/yue.json +++ b/category/yue.json @@ -1,13 +1,14 @@ { "@metadata": { "authors": [ + "H78c67c", "Hello903hello", "Moon0319", "Winston Sung", "Xqt" ] }, - "category-adding": "機械人: 加 category [[:Category:%(newcat)s|%(newcat)s]]", + "category-adding": "機械人：加分類[[:Category:%(newcat)s|%(newcat)s]]", "category-was-disbanded": "機械人：呢個類唔再用", - "category-was-moved": "機械人：類經已畀人搬咗去[[:Category:%(newcat)s|%(title)s]]" + "category-was-moved": "機械人：個分類搬咗去[[:Category:%(newcat)s|%(title)s]]" } diff --git a/checkimages/yue.json b/checkimages/yue.json index 4376630..cbbca3e 100644 --- a/checkimages/yue.json +++ b/checkimages/yue.json @@ -1,9 +1,10 @@ { "@metadata": { "authors": [ + "H78c67c", "Winston Sung" ] }, "checkimages-log-comment": "機械人：更新日誌", - "checkimages-no-license-head": "冇拉臣嘅相" + "checkimages-no-license-head": "冇許可嘅圖" } diff --git a/clean_sandbox/yue.json b/clean_sandbox/yue.json new file mode 100644 index 0000000..9b3d7a4 --- /dev/null +++ b/clean_sandbox/yue.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "H78c67c" + ] + }, + "clean_sandbox-cleaned": "機械人：自動清理" +} diff --git a/commonscat/hi.json b/commonscat/hi.json index 71e9e41..182192c 100644 --- a/commonscat/hi.json +++ b/commonscat/hi.json @@ -1,8 +1,9 @@ { "@metadata": { "authors": [ + "Saurmandal", "Siddhartha Ghai" ] }, - "commonscat-msg_change": "बॉट: कॉमन्स श्रेणी को [[:Commons:Category:%(oldcat)s|%(oldcat)s]] से बदलकर [[:Commons:Category:%(newcat)s|%(newcat)s]] कर रहा है" + "commonscat-msg_change": "बॉट: कॉमन्स श्रेणी को [[:Commons:Category:%(oldcat)s|%(oldcat)s]] से बदलकर [[:Commons:Category:%(newcat)s|%(newcat)s]] किया जा रहा है" } diff --git a/interwiki/yue.json b/interwiki/yue.json index b1bf886..d50ce1d 100644 --- a/interwiki/yue.json +++ b/interwiki/yue.json @@ -1,6 +1,7 @@ { "@metadata": { "authors": [ + "H78c67c", "Ktchankt", "Winston Sung" ] @@ -10,7 +11,7 @@ "interwiki-adding-removing": "機械人加: %(adding)s 減: %(removing)s", "interwiki-adding-removing-modifying": "機械人加: %(adding)s 減: %(removing)s 改: %(modifying)s", "interwiki-modifying": "機械人改: %(modifying)s", - "interwiki-modifying-from": "機械人：改緊%(from)s到%(modifying)s", + "interwiki-modifying-from": "機械人：改緊%(from)s做%(modifying)s", "interwiki-removing": "機械人減: %(removing)s", "interwiki-removing-modifying": "機械人減: %(removing)s 改: %(modifying)s" } diff --git a/welcome/yue.json b/welcome/yue.json index 42edacf..ec3813c 100644 --- a/welcome/yue.json +++ b/welcome/yue.json @@ -1,6 +1,7 @@ { "@metadata": { "authors": [ + "H78c67c", "Ktchankt", "Shinjiman", "Winston Sung", @@ -8,6 +9,6 @@ ] }, "welcome-bad_username": "機械人：加緊需要檢查嘅用戶名", - "welcome-updating": "Bot: 更新日誌", + "welcome-updating": "機械人：更新日誌", "welcome-welcome": "歡迎！" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/973757 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: I03900d55f3f461523fe46472639cdac8d0768e40 Gerrit-Change-Number: 973757 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [fix] check for valid family and site option after -help is processed
by jenkins-bot (Code Review) 11 Nov '23

11 Nov '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/971559 ) Change subject: [fix] check for valid family and site option after -help is processed ...................................................................... [fix] check for valid family and site option after -help is processed pywikibot.handle_args() checks for a valid default site and prints an error if either the family or the site code is invalid. Make this test after -help option is processed to avoid unnecessary api call when -help option is used. This is a workaround unless the APISite.login(cookie_only=True) call no longer retrieves userinfo in an early state i.e. instantiating the site. Bug: T350272 Change-Id: I04a55c96a826c76b5bcf89893be92413985c6429 --- M pywikibot/bot.py 1 file changed, 27 insertions(+), 9 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index d364f6a..2d73000 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -991,15 +991,6 @@ # argument not global -> specific bot script will take care non_global_args.append(arg) - if calledModuleName() != 'generate_user_files': # T261771 - try: - pywikibot.Site() - except (UnknownFamilyError, UnknownSiteError): - pywikibot.exception(exc_info=False) - sys.exit(1) - if calledModuleName() == 'wrapper': - pywikibot._sites.clear() - if username: config.usernames[config.family][config.mylang] = username @@ -1014,6 +1005,15 @@ show_help(show_global=do_help_val == 'global') sys.exit(0) + if calledModuleName() != 'generate_user_files': # T261771 + try: + pywikibot.Site() + except (UnknownFamilyError, UnknownSiteError): + pywikibot.exception(exc_info=False) + sys.exit(1) + if calledModuleName() == 'wrapper': + pywikibot._sites.clear() + debug('handle_args() completed.') return non_global_args -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/971559 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: I04a55c96a826c76b5bcf89893be92413985c6429 Gerrit-Change-Number: 971559 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Martineznovo <martineznovo(a)gmail.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