Pywikibot-commits December 2023

pywikibot-commits@lists.wikimedia.org

1 participants
65 discussions

[Gerrit] ...core[master]: pywikibot.time: add typing

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/986642 ) Change subject: pywikibot.time: add typing ...................................................................... pywikibot.time: add typing Change-Id: I260113b7dfa66918a019e6edce044272d341d408 --- M pywikibot/time.py 1 file changed, 33 insertions(+), 10 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/time.py b/pywikibot/time.py index 6314eb0..8a32bfc 100644 --- a/pywikibot/time.py +++ b/pywikibot/time.py @@ -14,6 +14,7 @@ import re import types from contextlib import suppress +from typing import overload import pywikibot from pywikibot.tools import classproperty, deprecated @@ -212,7 +213,7 @@ raise ValueError(f'time data {timestr!r} does not match any format.') - @deprecated('replace method', since='8.0.0') + @deprecated('replace method', since='8.0.0') # type: ignore[misc] def clone(self) -> Timestamp: """Clone this instance. @@ -250,7 +251,7 @@ # to create a clone. if isinstance(ts, cls): return ts.replace() - + assert isinstance(ts, str) return cls._from_iso8601(f'{ts[:10]}{sep}{ts[11:]}') @classmethod @@ -288,7 +289,7 @@ # to create a clone. if isinstance(ts, cls): return ts.replace() - + assert isinstance(ts, str) if len(ts) == 8 and not strict: # year, month and day are given only ts += '000000' @@ -344,10 +345,20 @@ return self._from_datetime(newdt) return newdt - def __sub__(self, other: datetime.timedelta # type: ignore[override] - ) -> Timestamp: + @overload # type: ignore[override] + def __sub__(self, other: datetime.timedelta) -> Timestamp: + ... + + @overload + def __sub__(self, other: datetime.datetime) -> datetime.timedelta: + ... + + def __sub__( + self, + other: datetime.datetime | datetime.timedelta, + ) -> datetime.timedelta | Timestamp: """Perform subtraction, returning a Timestamp instead of datetime.""" - newdt = super().__sub__(other) + newdt = super().__sub__(other) # type: ignore[operator] if isinstance(newdt, datetime.datetime): return self._from_datetime(newdt) return newdt @@ -367,15 +378,15 @@ self._offset = datetime.timedelta(minutes=offset) self._name = name - def utcoffset(self, dt): + def utcoffset(self, dt: datetime.datetime | None) -> datetime.timedelta: """Return the offset to UTC.""" return self._offset - def tzname(self, dt): + def tzname(self, dt: datetime.datetime | None) -> str: """Return the name of the timezone.""" return self._name - def dst(self, dt): + def dst(self, dt: datetime.datetime | None) -> datetime.timedelta: """Return no daylight savings time.""" return datetime.timedelta(0) @@ -388,7 +399,10 @@ ) -def str2timedelta(string: str, timestamp=None) -> datetime.timedelta: +def str2timedelta( + string: str, + timestamp: datetime.datetime | None = None, +) -> datetime.timedelta: """ Return a timedelta for a shorthand duration. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/986642 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: I260113b7dfa66918a019e6edce044272d341d408 Gerrit-Change-Number: 986642 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 months, 4 weeks

[Gerrit] ...core[master]: specify error code for blanket noqa

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/986637 ) Change subject: specify error code for blanket noqa ...................................................................... specify error code for blanket noqa Change-Id: If661830fa31237d4525c476b345937b92ab93e1a --- M pywikibot/editor.py 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/editor.py b/pywikibot/editor.py index 5ac038b..7b47078 100644 --- a/pywikibot/editor.py +++ b/pywikibot/editor.py @@ -24,7 +24,7 @@ try: - from pywikibot.userinterfaces import gui # noqa + from pywikibot.userinterfaces import gui # noqa: F401 GUI_ERROR = None except ImportError as e: GUI_ERROR = e -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/986637 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: If661830fa31237d4525c476b345937b92ab93e1a Gerrit-Change-Number: 986637 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 months, 4 weeks

[Gerrit] ...core[master]: update typing syntax for 3.7

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/986636 ) Change subject: update typing syntax for 3.7 ...................................................................... update typing syntax for 3.7 Follow-Up: I8864b90799373b442a3147b823cc5dd10eedf3a0 Change-Id: I60ba68d08f6170cace0ffc1ff685c3783ecbe57d --- M pwb.py M ROADMAP.rst M docs/conf.py M pywikibot/pagegenerators/_filters.py M pywikibot/pagegenerators/_generators.py M tests/tools_chars_tests.py M pywikibot/family.py M pywikibot/scripts/i18n/__init__.py M setup.py M pywikibot/page/_basepage.py M pywikibot/page/_wikibase.py M tests/tools_tests.py M tests/tests_tests.py M pywikibot/i18n.py M pywikibot/page/_links.py M pywikibot/userinterfaces/__init__.py M pywikibot/fixes.py M pywikibot/config.py M pywikibot/bot.py M tests/pwb/__init__.py M pywikibot/page/_collections.py M pywikibot/textlib.py M pywikibot/__init__.py M pywikibot/site/__init__.py M tests/i18n/__init__.py M pywikibot/plural.py M pywikibot/pagegenerators/__init__.py M pywikibot/pagegenerators/_factory.py M pywikibot/xmlreader.py M pywikibot/backports.py M scripts/userscripts/__init__.py M pywikibot/date.py M pywikibot/site/_apisite.py M pywikibot/_wbtypes.py M tests/diff_tests.py M scripts/__init__.py M tests/pagegenerators_tests.py M tox.ini M pywikibot/proofreadpage.py 39 files changed, 145 insertions(+), 147 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 5026fdf..22f6916 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -4,7 +4,7 @@ Improvements ^^^^^^^^^^^^ -* Add :meth:`site.APISite.ratelimit()<pywikibot.site._apisite.APISite.ratelimit>` method +* Add :meth:`site.APISite.ratelimit()<pywikibot.site._apisite.APISite.ratelimit>` method and :class:`tools.collections.RateLimit` NamedTuple (:phab:`T304808`) * L10N Updates * Add :class:`pagegenerators.PagePilePageGenerator` (:phab:`T353086`) diff --git a/docs/conf.py b/docs/conf.py index 029daec..5ca8569 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -15,6 +15,7 @@ # # All configuration values have a default; values that are commented out # serve to show the default. +from __future__ import annotations # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the diff --git a/pwb.py b/pwb.py index e62c0b8..809af16 100755 --- a/pwb.py +++ b/pwb.py @@ -11,6 +11,7 @@ import runpy import sys + VERSIONS_REQUIRED_MESSAGE = """ Pywikibot is not available on: {version} diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 93778ab..22002d8 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -40,11 +40,7 @@ WbTime, WbUnknown, ) -from pywikibot.backports import ( - Callable, - cache, - removesuffix, -) +from pywikibot.backports import Callable, cache, removesuffix from pywikibot.bot import ( Bot, CurrentPageBot, diff --git a/pywikibot/_wbtypes.py b/pywikibot/_wbtypes.py index e260de8..8a9f410 100644 --- a/pywikibot/_wbtypes.py +++ b/pywikibot/_wbtypes.py @@ -12,7 +12,7 @@ import math import re from decimal import Decimal -from typing import TYPE_CHECKING, Any, Union +from typing import TYPE_CHECKING, Any import pywikibot from pywikibot import exceptions @@ -24,8 +24,9 @@ if TYPE_CHECKING: from pywikibot.site import APISite, BaseSite, DataSite -ItemPageStrNoneType = Union[str, 'pywikibot.ItemPage', None] -ToDecimalType = Union[int, float, str, 'Decimal', None] + ItemPageStrNoneType = str | pywikibot.ItemPage | None + ToDecimalType = int | float | str | Decimal | None + __all__ = ( 'Coordinate', diff --git a/pywikibot/backports.py b/pywikibot/backports.py index 04a334e..61822ae 100644 --- a/pywikibot/backports.py +++ b/pywikibot/backports.py @@ -47,18 +47,13 @@ Container, Counter, Dict, - FrozenSet, Generator, Iterable, Iterator, - List, Mapping, Match, Pattern, Sequence, - Set, - Tuple, - Type, ) else: from collections import Counter @@ -72,11 +67,6 @@ ) from re import Match, Pattern Dict = dict # type: ignore[misc] - FrozenSet = frozenset # type: ignore[misc] - List = list # type: ignore[misc] - Set = set # type: ignore[misc] - Tuple = tuple # type: ignore[assignment] - Type = type if PYTHON_VERSION < (3, 9, 2): diff --git a/pywikibot/bot.py b/pywikibot/bot.py index d1827d4..59882ea 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -108,19 +108,12 @@ from importlib import import_module from pathlib import Path from textwrap import fill -from typing import TYPE_CHECKING, Any, Optional, Union +from typing import TYPE_CHECKING, Any from warnings import warn import pywikibot from pywikibot import config, daemonize, i18n, version -from pywikibot.backports import ( - Callable, - Dict, - Iterable, - Mapping, - Sequence, - Tuple, -) +from pywikibot.backports import Callable, Dict, Iterable, Mapping, Sequence from pywikibot.bot_choice import ( AlwaysChoice, Choice, @@ -182,8 +175,7 @@ from pywikibot.page import Link, Page from pywikibot.site import BaseSite - -AnswerType = Union[Iterable[Union[Tuple[str, str], Option]], Option] + AnswerType = Iterable[tuple[str, str] | Option] | Option _GLOBAL_HELP = """ GLOBAL OPTIONS @@ -701,14 +693,13 @@ self._default = default self._quit = automatic_quit - current_match_type = Optional[tuple[ # skipcq: PYL-W0612 + self._current_match: tuple[ Link | Page, str, Mapping[str, str], tuple[int, int] - ]] + ] | None = None - self._current_match: current_match_type = None self.context = 30 self.context_delta = 0 self.allow_skip_link = True diff --git a/pywikibot/config.py b/pywikibot/config.py index a64f21c..c6e170a 100644 --- a/pywikibot/config.py +++ b/pywikibot/config.py @@ -52,14 +52,13 @@ from os import environ, getenv from pathlib import Path from textwrap import fill -from typing import TypeVar +from typing import TYPE_CHECKING, TypeVar from warnings import warn from zipfile import ZipFile, is_zipfile from pywikibot.__metadata__ import __version__ as pwb_version from pywikibot.backports import ( DefaultDict, - Dict, Mapping, removeprefix, removesuffix, @@ -67,7 +66,9 @@ from pywikibot.logging import error, info, warning -_DabComDict = DefaultDict[str, Dict[str, str]] +if TYPE_CHECKING: + _DabComDict = DefaultDict[str, dict[str, str]] + _ValueType = TypeVar('_ValueType') diff --git a/pywikibot/date.py b/pywikibot/date.py index 74cf19b..d79aa47 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -13,24 +13,34 @@ from contextlib import suppress from functools import singledispatch from string import digits as _decimalDigits # noqa: N812 -from typing import Union +from typing import TYPE_CHECKING from pywikibot import Site from pywikibot.backports import ( Any, Callable, Iterator, - List, Mapping, Pattern, Sequence, - Tuple, ) from pywikibot.site import BaseSite from pywikibot.textlib import NON_LATIN_DIGITS from pywikibot.tools import first_lower, first_upper +if TYPE_CHECKING: + tuplst_type = list[tuple[Callable[[int | str], Any], + Callable[[int | str], bool]]] + encf_type = Callable[[int], int | Sequence[int]] + decf_type = Callable[[Sequence[int]], int] + # decoders are three value tuples, with an optional fourth to represent a + # required number of digits + decoder_type = ( + tuple[str, Callable[[int], str], Callable[[str], int]] + | tuple[str, Callable[[int], str], Callable[[str], int], int] + ) + # # Different collections of well known formats # @@ -55,18 +65,6 @@ yearFormats = ['YearAD', 'YearBC'] millFormats = ['MillenniumAD', 'MillenniumBC'] snglValsFormats = ['CurrEvents'] -tuplst_type = List[Tuple[Callable[[Union[int, str]], Any], - Callable[[Union[int, str]], bool]]] -encf_type = Callable[[int], Union[int, Sequence[int]]] -decf_type = Callable[[Sequence[int]], int] - -# decoders are three value tuples, with an optional fourth to represent a -# required number of digits - -decoder_type = Union[ - Tuple[str, Callable[[int], str], Callable[[str], int]], - Tuple[str, Callable[[int], str], Callable[[str], int], int] -] @singledispatch @@ -571,8 +569,7 @@ 'zh': lambda v: slh(v, makeMonthList('%d月')), } - def __getitem__(self, lang: str - ) -> Callable[[int], str]: + def __getitem__(self, lang: str) -> Callable[[int], str]: if lang not in self.months: site = Site() # may_long differs diff --git a/pywikibot/family.py b/pywikibot/family.py index 0d66239..fa48156 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -18,24 +18,19 @@ from itertools import chain from os.path import basename, dirname, splitext from textwrap import fill +from typing import TYPE_CHECKING import pywikibot from pywikibot import config -from pywikibot.backports import ( - DefaultDict, - Dict, - List, - Mapping, - Sequence, - removesuffix, -) +from pywikibot.backports import DefaultDict, Mapping, Sequence, removesuffix from pywikibot.exceptions import FamilyMaintenanceWarning, UnknownFamilyError from pywikibot.tools import classproperty, deprecated, remove_last_args logger = logging.getLogger('pywiki.wiki.family') -CrossnamespaceType = DefaultDict[str, Dict[str, List[int]]] +if TYPE_CHECKING: + CrossnamespaceType = DefaultDict[str, dict[str, list[int]]] # Legal characters for Family.name and Family.langs keys NAME_CHARACTERS = string.ascii_letters + string.digits diff --git a/pywikibot/fixes.py b/pywikibot/fixes.py index 259cb96..db65059 100644 --- a/pywikibot/fixes.py +++ b/pywikibot/fixes.py @@ -4,6 +4,8 @@ # # Distributed under the terms of the MIT license. # +from __future__ import annotations + import os.path from pywikibot import config diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 0d9fa27..675c87b 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -29,7 +29,6 @@ from contextlib import suppress from pathlib import Path from textwrap import fill -from typing import Union import pywikibot from pywikibot import __url__, config @@ -46,8 +45,6 @@ from pywikibot.plural import plural_rule -STR_OR_SITE_TYPE = Union[str, 'pywikibot.site.BaseSite'] - PLURAL_PATTERN = r'{{PLURAL:(?:%\()?([^\)]*?)(?:\)d)?\|(.*?)}}' # Package name for the translation messages. The messages data must loaded @@ -558,7 +555,7 @@ DEFAULT_FALLBACK = ('_default', ) -def translate(code: STR_OR_SITE_TYPE, +def translate(code: str | pywikibot.site.BaseSite, xdict: str | Mapping[str, str], parameters: Mapping[str, int] | None = None, fallback: bool | Iterable[str] = False) -> str | None: @@ -654,7 +651,10 @@ return trans -def get_bot_prefix(source: STR_OR_SITE_TYPE, use_prefix: bool) -> str: +def get_bot_prefix( + source: str | pywikibot.site.BaseSite, + use_prefix: bool +) -> str: """Get the bot prefix string like 'Bot: ' including space delimiter. .. note: If *source* is a str and ``config.bot_prefix`` is set to @@ -690,7 +690,7 @@ def twtranslate( - source: STR_OR_SITE_TYPE, + source: str | pywikibot.site.BaseSite, twtitle: str, parameters: Sequence[str] | Mapping[str, int] | None = None, *, @@ -822,7 +822,7 @@ return prefix + trans -def twhas_key(source: STR_OR_SITE_TYPE, twtitle: str) -> bool: +def twhas_key(source: str | pywikibot.site.BaseSite, twtitle: str) -> bool: """ Check if a message has a translation in the specified language code. diff --git a/pywikibot/page/_basepage.py b/pywikibot/page/_basepage.py index 9ff008c..f38eece 100644 --- a/pywikibot/page/_basepage.py +++ b/pywikibot/page/_basepage.py @@ -17,12 +17,7 @@ import pywikibot from pywikibot import Timestamp, config, date, i18n, textlib, tools -from pywikibot.backports import ( - Generator, - Iterable, - Iterator, - List, -) +from pywikibot.backports import Generator, Iterable, Iterator from pywikibot.cosmetic_changes import CANCEL, CosmeticChangesToolkit from pywikibot.exceptions import ( Error, @@ -1947,7 +1942,7 @@ timestamp, content: bool = False, **kwargs - ) -> List: + ) -> list: """ Return a particular deleted revision by timestamp. diff --git a/pywikibot/page/_collections.py b/pywikibot/page/_collections.py index 9a96f35..8f4ac1a 100644 --- a/pywikibot/page/_collections.py +++ b/pywikibot/page/_collections.py @@ -8,6 +8,7 @@ from collections import defaultdict from collections.abc import MutableMapping, MutableSequence +from typing import Any import pywikibot from pywikibot.site import BaseSite @@ -374,7 +375,11 @@ self._data[key] = val return val - def __setitem__(self, key, val) -> None: + def __setitem__( + self, + key: str | pywikibot.site.APISite, + val: str | dict[str, Any] | pywikibot.page.SiteLink, + ) -> None: """ Set the SiteLink for a given key. @@ -383,10 +388,8 @@ __getitem__ method. :param key: site key as Site instance or db key - :type key: pywikibot.Site or str :param val: page name as a string or JSON containing SiteLink data or a SiteLink object - :type val: Union[str, dict, SiteLink] """ key = self.getdbName(key) if isinstance(val, pywikibot.page.SiteLink): diff --git a/pywikibot/page/_links.py b/pywikibot/page/_links.py index d043a8f..a9a8601 100644 --- a/pywikibot/page/_links.py +++ b/pywikibot/page/_links.py @@ -15,6 +15,7 @@ import re import unicodedata from html.entities import name2codepoint +from typing import Any import pywikibot from pywikibot import textlib @@ -734,15 +735,17 @@ return list(self._badges) @classmethod - def fromJSON(cls, data: dict, site=None): # noqa: N802 + def fromJSON( # noqa: N802 + cls, + data: dict[str, Any], + site: pywikibot.site.DataSite | None = None, + ) -> SiteLink: """ Create a SiteLink object from JSON returned in the API call. :param data: JSON containing SiteLink data :param site: The Wikibase site :type site: pywikibot.site.DataSite - - :rtype: pywikibot.page.SiteLink """ sl = cls(data['title'], data['site']) repo = site or sl.site.data_repository() @@ -750,7 +753,7 @@ sl._badges.add(pywikibot.ItemPage(repo, badge)) return sl - def toJSON(self) -> dict: # noqa: N802 + def toJSON(self) -> dict[str, str | list[str]]: # noqa: N802 """ Convert the SiteLink to a JSON object for the Wikibase API. diff --git a/pywikibot/page/_wikibase.py b/pywikibot/page/_wikibase.py index 7711a9d..34607ce 100644 --- a/pywikibot/page/_wikibase.py +++ b/pywikibot/page/_wikibase.py @@ -20,10 +20,9 @@ from collections import OrderedDict, defaultdict from contextlib import suppress from itertools import chain -from typing import Any, Union +from typing import TYPE_CHECKING, Any import pywikibot -from pywikibot.backports import Dict, List from pywikibot.exceptions import ( APIError, EntityTypeUnknownError, @@ -65,13 +64,16 @@ 'WikibasePage', ) - -LANGUAGE_IDENTIFIER = Union[str, pywikibot.APISite] -ALIASES_TYPE = Dict[LANGUAGE_IDENTIFIER, List[str]] -LANGUAGE_TYPE = Dict[LANGUAGE_IDENTIFIER, str] -SITELINK_TYPE = Union['pywikibot.page.BasePage', 'pywikibot.page.BaseLink', - Dict[str, str]] -ENTITY_DATA_TYPE = Dict[str, Union[LANGUAGE_TYPE, ALIASES_TYPE, SITELINK_TYPE]] +if TYPE_CHECKING: + LANGUAGE_IDENTIFIER = str | pywikibot.APISite + ALIASES_TYPE = dict[LANGUAGE_IDENTIFIER, list[str]] + LANGUAGE_TYPE = dict[LANGUAGE_IDENTIFIER, str] + SITELINK_TYPE = ( + pywikibot.page.BasePage + | pywikibot.page.BaseLink + | dict[str, str] + ) + ENTITY_DATA_TYPE = dict[str, LANGUAGE_TYPE | ALIASES_TYPE | SITELINK_TYPE] class WikibaseEntity: diff --git a/pywikibot/pagegenerators/__init__.py b/pywikibot/pagegenerators/__init__.py index 35f2b87..eca2326 100644 --- a/pywikibot/pagegenerators/__init__.py +++ b/pywikibot/pagegenerators/__init__.py @@ -19,10 +19,10 @@ # from __future__ import annotations -from typing import Any +from typing import TYPE_CHECKING, Any import pywikibot -from pywikibot.backports import Callable, Dict, Iterable, Iterator, List +from pywikibot.backports import Callable, Iterable, Iterator from pywikibot.pagegenerators._factory import GeneratorFactory from pywikibot.pagegenerators._filters import ( CategoryFilterPageGenerator, @@ -58,9 +58,9 @@ MySQLPageGenerator, NewimagesPageGenerator, NewpagesPageGenerator, + PagePilePageGenerator, PagesFromPageidGenerator, PagesFromTitlesGenerator, - PagePilePageGenerator, PetScanPageGenerator, PrefixingPageGenerator, RandomPageGenerator, @@ -529,7 +529,9 @@ docuReplacements = {'&params;': parameterHelp} # noqa: N816 -PRELOAD_SITE_TYPE = Dict[pywikibot.site.BaseSite, List[pywikibot.page.Page]] +if TYPE_CHECKING: + PRELOAD_SITE_TYPE = dict[pywikibot.site.BaseSite, + list[pywikibot.page.Page]] # if a bot uses GeneratorFactory, the module should include the line # docuReplacements = {'&params;': pywikibot.pagegenerators.parameterHelp} diff --git a/pywikibot/pagegenerators/_factory.py b/pywikibot/pagegenerators/_factory.py index 79fec88..80c8081 100644 --- a/pywikibot/pagegenerators/_factory.py +++ b/pywikibot/pagegenerators/_factory.py @@ -12,18 +12,15 @@ from datetime import timedelta from functools import partial from itertools import zip_longest -from typing import TYPE_CHECKING, Any, Optional, Union +from typing import TYPE_CHECKING, Any import pywikibot from pywikibot import i18n from pywikibot.backports import ( Callable, - Dict, Iterable, Iterator, - List, Sequence, - Tuple, removeprefix, ) from pywikibot.bot import ShowingListOption @@ -69,10 +66,9 @@ if TYPE_CHECKING: from pywikibot.site import BaseSite, Namespace - -HANDLER_RETURN_TYPE = Union[None, bool, Iterable['pywikibot.page.BasePage']] -GEN_FACTORY_CLAIM_TYPE = List[Tuple[str, str, Dict[str, str], bool]] -OPT_GENERATOR_TYPE = Optional[Iterable['pywikibot.page.Page']] + HANDLER_RETURN_TYPE = bool, Iterable[pywikibot.page.BasePage] | None + GEN_FACTORY_CLAIM_TYPE = list[tuple[str, str, dict[str, str], bool]] + OPT_GENERATOR_TYPE = Iterable[pywikibot.page.Page] | None # This is the function that will be used to de-duplicate page iterators. diff --git a/pywikibot/pagegenerators/_filters.py b/pywikibot/pagegenerators/_filters.py index 500bc12..f85496d 100644 --- a/pywikibot/pagegenerators/_filters.py +++ b/pywikibot/pagegenerators/_filters.py @@ -9,18 +9,11 @@ import datetime import re from functools import partial -from typing import TYPE_CHECKING, NamedTuple, Union +from typing import TYPE_CHECKING, NamedTuple import pywikibot from pywikibot import config -from pywikibot.backports import ( - Dict, - Iterable, - Iterator, - List, - Pattern, - Sequence, -) +from pywikibot.backports import Iterable, Iterator, Pattern, Sequence from pywikibot.exceptions import NoPageError from pywikibot.proofreadpage import ProofreadPage from pywikibot.tools.itertools import filter_unique @@ -29,10 +22,14 @@ if TYPE_CHECKING: from pywikibot.site import BaseSite, Namespace - -PRELOAD_SITE_TYPE = Dict[pywikibot.site.BaseSite, List[pywikibot.page.Page]] -PATTERN_STR_OR_SEQ_TYPE = Union[str, Pattern[str], - Sequence[str], Sequence[Pattern[str]]] + PRELOAD_SITE_TYPE = dict[pywikibot.site.BaseSite, + list[pywikibot.page.Page]] + PATTERN_STR_OR_SEQ_TYPE = ( + str + | Pattern[str] + | Sequence[str] + | Sequence[Pattern[str]] + ) # This is the function that will be used to de-duplicate page iterators. diff --git a/pywikibot/pagegenerators/_generators.py b/pywikibot/pagegenerators/_generators.py index 296640b..80cc3ee 100644 --- a/pywikibot/pagegenerators/_generators.py +++ b/pywikibot/pagegenerators/_generators.py @@ -1281,7 +1281,7 @@ yield from raw_pages @property - def generator(self) -> Iterator['pywikibot.page.Page']: + def generator(self) -> Iterator[pywikibot.page.Page]: """Yield results from :meth:`query`.""" for raw_page in self.query(): page = pywikibot.Page(self.site, raw_page) diff --git a/pywikibot/plural.py b/pywikibot/plural.py index f5dd442..df526d5 100644 --- a/pywikibot/plural.py +++ b/pywikibot/plural.py @@ -6,10 +6,11 @@ # from __future__ import annotations -from typing import Dict, Callable, Union +from typing import TYPE_CHECKING, Callable -PluralRule = Dict[str, Union[int, Callable[[int], Union[bool, int]]]] +if TYPE_CHECKING: + PluralRule = dict[str, int | Callable[[int], bool | int]] plural_rules: dict[str, PluralRule] = { '_default': {'nplurals': 2, 'plural': lambda n: (n != 1)}, diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index 050c6e9..7e7c24e 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -42,12 +42,7 @@ import pywikibot from pywikibot import textlib -from pywikibot.backports import ( - Callable, - Iterable, - Sequence, - pairwise, -) +from pywikibot.backports import Callable, Iterable, Sequence, pairwise from pywikibot.comms import http from pywikibot.data.api import ListGenerator, Request from pywikibot.exceptions import Error, InvalidTitleError, OtherPageSaveError diff --git a/pywikibot/scripts/i18n/__init__.py b/pywikibot/scripts/i18n/__init__.py index 8bd476e..4b4df0e 100644 --- a/pywikibot/scripts/i18n/__init__.py +++ b/pywikibot/scripts/i18n/__init__.py @@ -3,6 +3,9 @@ This file exists to help pkgutil find the i18n data. There is no actual python code in this package. """ +from __future__ import annotations + + # # (C) Pywikibot team, 2011-2022 # diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index 8a7c5d4..6824eb1 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -6,8 +6,9 @@ # from __future__ import annotations + # to prevent ImportError exception due to circular imports -from pywikibot.site._namespace import Namespace, NamespacesDict +from pywikibot.site._namespace import Namespace, NamespacesDict # isort: split from pywikibot.site._apisite import APISite from pywikibot.site._basesite import BaseSite diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 380811b..9aa95d4 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -13,7 +13,7 @@ from collections import OrderedDict, defaultdict from contextlib import suppress from textwrap import fill -from typing import TYPE_CHECKING, Any, NamedTuple, TypeVar, Union +from typing import TYPE_CHECKING, Any, NamedTuple, TypeVar import pywikibot from pywikibot import login @@ -84,14 +84,14 @@ if TYPE_CHECKING: from pywikibot.page import BasePage + _CompType = int | str | pywikibot.page.Page | pywikibot.page.Revision + _RequestWrapperT = TypeVar('_RequestWrapperT', bound='api._RequestWrapper') + __all__ = ('APISite', ) _mw_msg_cache: DefaultDict[str, dict[str, str]] = defaultdict(dict) -_CompType = Union[int, str, 'pywikibot.page.Page', 'pywikibot.page.Revision'] -_RequestWrapperT = TypeVar('_RequestWrapperT', bound='api._RequestWrapper') - class _OnErrorExc(NamedTuple): exception: Exception diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index b6a0d45..75c3d87 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -15,12 +15,7 @@ from typing import NamedTuple import pywikibot -from pywikibot.backports import ( - Callable, - Container, - Iterable, - Match, -) +from pywikibot.backports import Callable, Container, Iterable, Match from pywikibot.backports import OrderedDict as OrderedDictType from pywikibot.backports import Pattern from pywikibot.backports import Sequence as SequenceType diff --git a/pywikibot/userinterfaces/__init__.py b/pywikibot/userinterfaces/__init__.py index b4f0f90..8d1b028 100644 --- a/pywikibot/userinterfaces/__init__.py +++ b/pywikibot/userinterfaces/__init__.py @@ -14,6 +14,9 @@ all of which are documented in the abstract class :class:`userinterfaces._interface_base.ABUIC`. """ +from __future__ import annotations + + # # (C) Pywikibot team, 2008-2022 # diff --git a/pywikibot/xmlreader.py b/pywikibot/xmlreader.py index a01c4d4..ea675a6 100644 --- a/pywikibot/xmlreader.py +++ b/pywikibot/xmlreader.py @@ -25,11 +25,8 @@ except ImportError: from xml.etree.ElementTree import iterparse, ParseError -from pywikibot.backports import Callable, Type -from pywikibot.tools import ( - issue_deprecation_warning, - open_archive, -) +from pywikibot.backports import Callable +from pywikibot.tools import issue_deprecation_warning, open_archive def parseRestrictions(restrictions): @@ -127,7 +124,7 @@ # when allrevisions removed, revisions can default to 'latest' revisions: str = 'first_found', on_error: None | ( - Callable[[Type[BaseException]], None]) = None) -> None: + Callable[[type[BaseException]], None]) = None) -> None: """Initializer.""" self.filename = filename self.on_error = on_error diff --git a/scripts/__init__.py b/scripts/__init__.py index b5d5586..d5724e1 100644 --- a/scripts/__init__.py +++ b/scripts/__init__.py @@ -24,6 +24,9 @@ - find a script even if given script name does not match a filename e.g. due to spelling mistake """ +from __future__ import annotations + + # # (C) Pywikibot team, 2021-2023 # diff --git a/scripts/userscripts/__init__.py b/scripts/userscripts/__init__.py index f36f2b9..604ed80 100644 --- a/scripts/userscripts/__init__.py +++ b/scripts/userscripts/__init__.py @@ -1 +1,3 @@ """THIS DIRECTORY IS TO HOLD USER-DEFINED BOT SCRIPTS.""" + +from __future__ import annotations diff --git a/setup.py b/setup.py index c5da297..487cb41 100755 --- a/setup.py +++ b/setup.py @@ -27,8 +27,10 @@ import os import re import sys + from setuptools import setup + if sys.version_info[:3] >= (3, 9): List = list else: diff --git a/tests/diff_tests.py b/tests/diff_tests.py index 2ff9eb8..70c0d06 100755 --- a/tests/diff_tests.py +++ b/tests/diff_tests.py @@ -4,6 +4,8 @@ # (C) Pywikibot team, 2016-2022 # # Distributed under the terms of the MIT license. +from __future__ import annotations + from contextlib import suppress from unittest.mock import patch diff --git a/tests/i18n/__init__.py b/tests/i18n/__init__.py index f1a0213..75a747e 100644 --- a/tests/i18n/__init__.py +++ b/tests/i18n/__init__.py @@ -1 +1,3 @@ """Test i18n data package.""" + +from __future__ import annotations diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 0b16821..c27ac84 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -4,13 +4,14 @@ # (C) Pywikibot team, 2009-2023 # # Distributed under the terms of the MIT license. +from __future__ import annotations + import calendar import datetime import logging import sys import unittest from contextlib import suppress -from typing import Optional from unittest import mock import pywikibot @@ -816,8 +817,7 @@ """Test item claim filter page generator generator.""" - def _simple_claim_test(self, prop: str, claim, qualifiers: Optional[dict], - valid: bool, negate: bool = False): + def _simple_claim_test(self, prop, claim, qualifiers, valid, negate=False): """ Test given claim on sample (India) page. diff --git a/tests/pwb/__init__.py b/tests/pwb/__init__.py index fb493b3..3d1d730 100644 --- a/tests/pwb/__init__.py +++ b/tests/pwb/__init__.py @@ -1 +1,3 @@ """Dummy package initialisation.""" + +from __future__ import annotations diff --git a/tests/tests_tests.py b/tests/tests_tests.py index eed24ef..a007a40 100755 --- a/tests/tests_tests.py +++ b/tests/tests_tests.py @@ -4,6 +4,8 @@ # (C) Pywikibot team, 2014-2023 # # Distributed under the terms of the MIT license. +from __future__ import annotations + import unittest from contextlib import suppress diff --git a/tests/tools_chars_tests.py b/tests/tools_chars_tests.py index 0f93120..6e25dff 100755 --- a/tests/tools_chars_tests.py +++ b/tests/tools_chars_tests.py @@ -4,6 +4,8 @@ # (C) Pywikibot team, 2015-2023 # # Distributed under the terms of the MIT license. +from __future__ import annotations + import unicodedata import unittest from contextlib import suppress diff --git a/tests/tools_tests.py b/tests/tools_tests.py index 8da9e24..4f3d41d 100755 --- a/tests/tools_tests.py +++ b/tests/tools_tests.py @@ -4,6 +4,8 @@ # (C) Pywikibot team, 2015-2023 # # Distributed under the terms of the MIT license. +from __future__ import annotations + import decimal import hashlib import os diff --git a/tox.ini b/tox.ini index 7eb046e..426168d 100644 --- a/tox.ini +++ b/tox.ini @@ -242,7 +242,7 @@ [isort] py_version = 37 -add_imports = ["from __future__ import annotations"] +add_imports = from __future__ import annotations atomic = true ensure_newline_before_comments = true force_grid_wrap = 0 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/986636 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: I60ba68d08f6170cace0ffc1ff685c3783ecbe57d Gerrit-Change-Number: 986636 Gerrit-PatchSet: 6 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 months, 4 weeks

[Gerrit] ...core[master]: [bugfix]: use only 'end' tags in ElementTree.iterparse

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/986537 ) Change subject: [bugfix]: use only 'end' tags in ElementTree.iterparse ...................................................................... [bugfix]: use only 'end' tags in ElementTree.iterparse See note in iterparse() official docs. Bug: T354095 Change-Id: Id3498ad90c266aff5e98c79ff08bcc8f14a0bfac --- M pywikibot/xmlreader.py 1 file changed, 18 insertions(+), 7 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/xmlreader.py b/pywikibot/xmlreader.py index 5d3575e..a01c4d4 100644 --- a/pywikibot/xmlreader.py +++ b/pywikibot/xmlreader.py @@ -18,7 +18,6 @@ from __future__ import annotations import re -from typing import Optional, Union try: @@ -124,11 +123,11 @@ """ def __init__(self, filename, *, - allrevisions: Union[bool, str] = None, + allrevisions: bool | str = None, # when allrevisions removed, revisions can default to 'latest' revisions: str = 'first_found', - on_error: Optional[ - Callable[[Type[BaseException]], None]] = None) -> None: + on_error: None | ( + Callable[[Type[BaseException]], None]) = None) -> None: """Initializer.""" self.filename = filename self.on_error = on_error @@ -237,10 +236,10 @@ def _parse_all(self, event, elem): """Parser that yields all revisions.""" - if event == 'start' and elem.tag == f'{{{self.uri}}}page': + if event == 'end' and elem.tag == f'{{{self.uri}}}page': self._headers(elem) - if event == 'end' and elem.tag == f'{{{self.uri}}}revision': - yield self._create_revision(elem) + for revision in elem.findall(f'{{{self.uri}}}revision'): + yield self._create_revision(revision) elem.clear() self.root.clear() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/986537 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: Id3498ad90c266aff5e98c79ff08bcc8f14a0bfac Gerrit-Change-Number: 986537 Gerrit-PatchSet: 1 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 months, 4 weeks

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/986447 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I461cbc1e909a2969044c076d52d7375a2862b2c7 --- M category_redirect/ku.json 1 file changed, 19 insertions(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category_redirect/ku.json b/category_redirect/ku.json index 4fb5294..1b1e663 100644 --- a/category_redirect/ku.json +++ b/category_redirect/ku.json @@ -17,5 +17,14 @@ "category_redirect-log-failed": "** Têk çû: %(error)s", "category_redirect-log-false-positive": "* Ne-beralîkirina nehêvîkirî: %(oldcat)s", "category_redirect-log-ignoring": "* %(oldcat)s tê tine hesibandin", - "category_redirect-log-loop": "* Çerxa beralîkirinê ji %(oldcat)s" + "category_redirect-log-loop": "* Çerxa beralîkirinê ji %(oldcat)s", + "category_redirect-log-moved": "* %(oldcat)s: %(found)d hat dîtin, li %(moved)d hat barkirin", + "category_redirect-log-move-error": "* %(oldcat)s: barkirina naverokê têk çû", + "category_redirect-log-new": "Beralîkirinên nû ji rapora dawî ve:", + "category_redirect-log-not-loaded": "* Barkirina %(oldcat)s têk çû; tine tê hesibandin", + "category_redirect-log-skipping": "* %(oldcat)s tê derbaskirin; wextê bêhnvedanê ye", + "category_redirect-older-logs": "'''[%(oldlogs)s Qeydên kevn]'''", + "category_redirect-problem-hard": "# %(oldcat)s beralîkirineke hişk ji bo %(page)s", + "category_redirect-problem-redirects": "# %(oldcat)s beralî dike %(redpage)s", + "category_redirect-problem-self-linked": "# %(oldcat)s ji xwe re beralî dike" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/986447 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: I461cbc1e909a2969044c076d52d7375a2862b2c7 Gerrit-Change-Number: 986447 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

4 months

[Gerrit] ...core[master]: Validate file path input for category_graph.py.

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/961275 ) Change subject: Validate file path input for category_graph.py. ...................................................................... Validate file path input for category_graph.py. Validate file path input for category_graph.py in order to handle nonexistent paths or undesired overwrites BEFORE the script runs. On nonexistent path, path will be created. If file exists, user will be given y/n prompt to override with "n" exiting bot and any other key overwriting. Switched from input() to pywikibot.input_choice(). Update logic for file path creation. Because the path specified by -to is not an actual file in that it has no file extension, special logic is required in order to create the directory appropriately. If the path does not contain '/' it is assumed to be at the top level, and no directory creation is necessary. Otherwise, the directory is created if it does not exist. Change to non-reserved word for input result. Change from "prompt" to "choice" for prompt variable name, as "prompt" is a part of the standard lib. Minor syntax changes to follow guidelines. Change to double quotes to single quotes.` Replace reserved word 'input'. Use pathlib to extract folder and file. The reserved word 'input' was still being used. This has been replaced by the word 'choice'. Pathlib is now being used to extract the folder and file in order to gracefully handle filepaths containing '/' or '\'. Revise exception handling. Use path.mkdir instead of os.mkdir. Bug: T346417 Change-Id: I637bc0ef0bc99d5a59095890cc6b5be99bfd34fb --- M scripts/category_graph.py M AUTHORS.rst 2 files changed, 61 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/AUTHORS.rst b/AUTHORS.rst index 636aa5a..1fad649 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -91,6 +91,7 @@ Ebrahim Byagowi Egon + Enag2000 Eranroz Erwin Evrifaessa diff --git a/scripts/category_graph.py b/scripts/category_graph.py index baf552c..c50a1dc 100755 --- a/scripts/category_graph.py +++ b/scripts/category_graph.py @@ -44,7 +44,10 @@ from __future__ import annotations import argparse +import glob +import sys from collections import defaultdict +from pathlib import Path import pywikibot from pywikibot import config @@ -205,6 +208,23 @@ local_args = pywikibot.handle_args() args, rest = ap.parse_known_args() + file_path = args.to + # If file exists, ask user if ok to overwrite. Otherwise, make + # the file, including directories unless it is top level. + if glob.glob(file_path + '.*'): + choice = pywikibot.input_yn(f'Files exist for {file_path}. Overwrite?', + 'n', automatic_quit=False) + if not choice: + pywikibot.info('Exiting...') + sys.exit(1) + else: + try: + dir_path = Path(file_path) + dir_path.parent.mkdir(parents=True, exist_ok=True) + # Except ValueError in the event that the directory is top level + # and does not contain any slashes. + except FileNotFoundError: + pass if not suggest_help(missing_action='from' not in args): import pydot bot = CategoryGraphBot(ap, args) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/961275 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: I637bc0ef0bc99d5a59095890cc6b5be99bfd34fb Gerrit-Change-Number: 961275 Gerrit-PatchSet: 10 Gerrit-Owner: Enag2000 <enag2000(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <dalangi-ctr(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

4 months

[Gerrit] ...core[master]: replace collections.namedtuple with typing.NamedTuple

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/985373 ) Change subject: replace collections.namedtuple with typing.NamedTuple ...................................................................... replace collections.namedtuple with typing.NamedTuple Change-Id: I1802458320777ba0aaa7e59d406ca3358981eed8 --- M pywikibot/textlib.py M scripts/blockpageschecker.py M pywikibot/pagegenerators/_filters.py M pywikibot/throttle.py M pywikibot/scripts/generate_user_files.py M pywikibot/site/_apisite.py 6 files changed, 98 insertions(+), 48 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators/_filters.py b/pywikibot/pagegenerators/_filters.py index 16af382..500bc12 100644 --- a/pywikibot/pagegenerators/_filters.py +++ b/pywikibot/pagegenerators/_filters.py @@ -8,9 +8,8 @@ import datetime import re -from collections import namedtuple from functools import partial -from typing import TYPE_CHECKING, Union +from typing import TYPE_CHECKING, NamedTuple, Union import pywikibot from pywikibot import config @@ -362,6 +361,12 @@ RegexBodyFilterPageGenerator = RegexFilter.contentfilter +class _Edit(NamedTuple): + do_edit: datetime.datetime + edit_start: datetime.datetime + edit_end: datetime.datetime + + def EdittimeFilterPageGenerator( generator: Iterable[pywikibot.page.Page], last_edit_start: datetime.datetime | None = None, @@ -380,9 +385,7 @@ :param first_edit_end: Only yield pages first edited before this time :param show_filtered: Output a message for each page not yielded """ - Edit = namedtuple('Edit', ['do_edit', 'edit_start', 'edit_end']) - - def to_be_yielded(edit: Edit, + def to_be_yielded(edit: _Edit, page: pywikibot.page.Page, rev: pywikibot.page.Revision, show_filtered: bool) -> bool: @@ -407,13 +410,13 @@ return True - latest_edit = Edit(last_edit_start or last_edit_end, - last_edit_start or datetime.datetime.min, - last_edit_end or datetime.datetime.max) + latest_edit = _Edit(last_edit_start or last_edit_end, + last_edit_start or datetime.datetime.min, + last_edit_end or datetime.datetime.max) - first_edit = Edit(first_edit_start or first_edit_end, - first_edit_start or datetime.datetime.min, - first_edit_end or datetime.datetime.max) + first_edit = _Edit(first_edit_start or first_edit_end, + first_edit_start or datetime.datetime.min, + first_edit_end or datetime.datetime.max) for page in generator or []: yield_for_last = to_be_yielded(latest_edit, page, diff --git a/pywikibot/scripts/generate_user_files.py b/pywikibot/scripts/generate_user_files.py index 440a5c2..6e03aae 100755 --- a/pywikibot/scripts/generate_user_files.py +++ b/pywikibot/scripts/generate_user_files.py @@ -18,9 +18,9 @@ import os import re import sys -from collections import namedtuple from pathlib import Path from textwrap import fill +from typing import NamedTuple from pywikibot.backports import Callable from pywikibot.scripts import _import_with_no_user_config @@ -228,7 +228,10 @@ {botpasswords}""" -ConfigSection = namedtuple('ConfigSection', 'head, info, section') +class _ConfigSection(NamedTuple): + head: str + info: str + section: str def parse_sections() -> list: @@ -237,7 +240,7 @@ config.py will be in the pywikibot/ directory whereas generate_user_files script is in pywikibot/scripts. - :return: a list of ConfigSection named tuples. + :return: a list of _ConfigSection named tuples. """ data = [] @@ -255,7 +258,7 @@ for section, head, comment in result: info = ' '.join(text.strip('# ') for text in comment.splitlines()) - data.append(ConfigSection(head, info, section)) + data.append(_ConfigSection(head, info, section)) return data @@ -290,7 +293,7 @@ def input_sections(variant: str, - sections: list[ConfigSection], + sections: list[_ConfigSection], skip: Callable | None = None, force: bool = False, default: str = 'n') -> None: @@ -339,10 +342,16 @@ return copies +class _UserItem(NamedTuple): + family: str + code: str + name: str + + def create_user_config( - main_family, - main_code, - main_username, + main_family: str, + main_code: str, + main_username: str, force: bool = False ): """ @@ -353,14 +362,13 @@ _fnc = os.path.join(base_dir, USER_BASENAME) _fncpass = os.path.join(base_dir, PASS_BASENAME) - useritem = namedtuple('useritem', 'family, code, name') userlist = [] if force and not config.verbose_output: if main_username: - userlist = [useritem(main_family, main_code, main_username)] + userlist = [_UserItem(main_family, main_code, main_username)] else: while True: - userlist += [useritem(*get_site_and_lang( + userlist += [_UserItem(*get_site_and_lang( main_family, main_code, main_username, force=force))] if not pywikibot.input_yn('Do you want to add any other projects?', force=force, diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 3c46cad..380811b 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -10,10 +10,10 @@ import re import time import typing -from collections import OrderedDict, defaultdict, namedtuple +from collections import OrderedDict, defaultdict from contextlib import suppress from textwrap import fill -from typing import TYPE_CHECKING, Any, TypeVar, Union +from typing import TYPE_CHECKING, Any, NamedTuple, TypeVar, Union import pywikibot from pywikibot import login @@ -93,6 +93,11 @@ _RequestWrapperT = TypeVar('_RequestWrapperT', bound='api._RequestWrapper') +class _OnErrorExc(NamedTuple): + exception: Exception + on_new_page: bool | None + + class APISite( BaseSite, EchoMixin, @@ -2173,8 +2178,6 @@ return False - OnErrorExc = namedtuple('OnErrorExc', 'exception on_new_page') - # catalog of merge history errors for use in error messages _mh_errors = { 'noapiwrite': 'API editing not enabled on {site} wiki', @@ -2283,7 +2286,7 @@ raise Error('mergehistory: unexpected response') # catalog of move errors for use in error messages - _mv_errors: dict[str, str | OnErrorExc] = { + _mv_errors: dict[str, str | _OnErrorExc] = { 'noapiwrite': 'API editing not enabled on {site} wiki', 'writeapidenied': 'User {user} is not authorized to edit on {site} wiki', @@ -2298,13 +2301,13 @@ 'immobilenamespace': 'Pages in {oldnamespace} namespace cannot be moved on {site} ' 'wiki', - 'articleexists': OnErrorExc(exception=ArticleExistsConflictError, - on_new_page=True), - # "protectedpage" can happen in both directions. - 'protectedpage': OnErrorExc(exception=LockedPageError, - on_new_page=None), - 'protectedtitle': OnErrorExc(exception=LockedNoPageError, + 'articleexists': _OnErrorExc(exception=ArticleExistsConflictError, on_new_page=True), + # "protectedpage" can happen in both directions. + 'protectedpage': _OnErrorExc(exception=LockedPageError, + on_new_page=None), + 'protectedtitle': _OnErrorExc(exception=LockedNoPageError, + on_new_page=True), 'nonfilenamespace': 'Cannot move a file to {newnamespace} namespace on {site} ' 'wiki', diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 0c5f80e..b6a0d45 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -8,7 +8,7 @@ import itertools import re -from collections import OrderedDict, namedtuple +from collections import OrderedDict from collections.abc import Sequence from contextlib import suppress from html.parser import HTMLParser @@ -940,7 +940,11 @@ HEAD_PATTERN = re.compile(r'(={1,6}).+\1', re.DOTALL) TITLE_PATTERN = re.compile("'{3}([^']+)'{3}") -_Heading = namedtuple('_Heading', ('text', 'start', 'end')) + +class _Heading(NamedTuple): + text: str + start: int + end: int class Section(NamedTuple): @@ -1947,11 +1951,20 @@ TIMEGROUPS = ('time', 'tzinfo', 'year', 'month', 'day', 'hour', 'minute') -#: Hold precompiled timestamp patterns for :class:`TimeStripper`. -#: Order of TimeStripperPatterns is important to avoid mismatch when searching. -#: -#: .. versionadded:: 8.0 -TimeStripperPatterns = namedtuple('TimeStripperPatterns', TIMEGROUPS[:-2]) + +class TimeStripperPatterns(NamedTuple): + """Hold precompiled timestamp patterns for :class:`TimeStripper`. + + Attribute order is important to avoid mismatch when searching. + + .. versionadded:: 8.0 + """ + + time: Pattern[str] + tzinfo: Pattern[str] + year: Pattern[str] + month: Pattern[str] + day: Pattern[str] class TimeStripper: diff --git a/pywikibot/throttle.py b/pywikibot/throttle.py index 3944d27..ec0cfba 100644 --- a/pywikibot/throttle.py +++ b/pywikibot/throttle.py @@ -10,9 +10,10 @@ import math import threading import time -from collections import Counter, namedtuple +from collections import Counter from contextlib import suppress from hashlib import blake2b +from typing import NamedTuple import pywikibot from pywikibot import config @@ -21,7 +22,6 @@ FORMAT_LINE = '{module_id} {pid} {time} {site}\n' -ProcEntry = namedtuple('ProcEntry', ['module_id', 'pid', 'time', 'site']) pid: bool | int = False """global process identifier @@ -32,6 +32,15 @@ """ +class ProcEntry(NamedTuple): + """ProcEntry namedtuple.""" + + module_id: str + pid: int + time: int + site: str + + class Throttle: """Control rate of access to wiki server. diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py index 9aa4f2c..438cbc8 100755 --- a/scripts/blockpageschecker.py +++ b/scripts/blockpageschecker.py @@ -52,8 +52,8 @@ import re import webbrowser -from collections import namedtuple from itertools import chain +from typing import NamedTuple import pywikibot from pywikibot import i18n, pagegenerators @@ -169,7 +169,12 @@ project_inserted = ['ar', 'cs', 'fr', 'it', 'ja', 'pt', 'sr', 'ur', 'zh'] # END PREFERENCES -ParsedTemplate = namedtuple('ParsedTemplate', 'blocktype, regex, msgtype') + + +class _ParsedTemplate(NamedTuple): + blocktype: str + regex: str + msgtype: str class CheckerBot(ConfigParserBot, ExistingPageBot, SingleSiteBot): @@ -260,25 +265,25 @@ for catch_regex in template: result_catch = re.findall(catch_regex, text) if result_catch: - return ParsedTemplate( + return _ParsedTemplate( results[index], catch_regex, 'modifying') if tsmp and ttmp and ttp != ttmp and tsp != tsmp: for catch_regex in ttmp: result_catch = re.findall(catch_regex, text) if result_catch: - return ParsedTemplate( + return _ParsedTemplate( 'sysop-move', catch_regex, 'modifying') for catch_regex in tsmp: result_catch = re.findall(catch_regex, text) if result_catch: - return ParsedTemplate( + return _ParsedTemplate( 'autoconfirmed-move', catch_regex, 'modifying') # If editable means that we have no regex, won't change anything # with this regex - return ParsedTemplate('editable', r'\A', 'adding') + return _ParsedTemplate('editable', r'\A', 'adding') tsp = i18n.translate(self.site, template_semi_protection) ttp = i18n.translate(self.site, template_total_protection) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/985373 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: I1802458320777ba0aaa7e59d406ca3358981eed8 Gerrit-Change-Number: 985373 Gerrit-PatchSet: 3 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

4 months

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/985629 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I5b1f124835e5c48579564e026beca654dbce99ca --- A cosmetic_changes/ku.json M category_redirect/ku.json M category/ku.json 3 files changed, 37 insertions(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category/ku.json b/category/ku.json index b06697e..3f37d03 100644 --- a/category/ku.json +++ b/category/ku.json @@ -10,7 +10,12 @@ }, "category-adding": "Bot: Kategorî tê zêdekirin [[:Category:%(newcat)s|%(newcat)s]]", "category-also-in": "(herwiha di %(alsocat)s)", + "category-clean": "Bot: Kategorî %(category)ş hat jêbirin ji ber ku ew binkategoriya %(child)s e", + "category-listifying": "Bot: Lîsteyeke rûpelan ({{Plural:%(num)d|1 gotar|%(num)d gotaran) ji %(fromcat)s hat çêkirin", "category-removing": "Bot: Ji kategoriya %(oldcat)s tê rakirin", + "category-renamed": "Bot: Ji %(oldcat)s hat barkirin. Çêker: %(authors)s", "category-replacing": "Bot: %(oldcat)s wek %(newcat)s biguherîne", + "category-section-title": "Dîroka rûpelê ya %(oldcat)s kevn", + "category-strip-cfd-templates": "Bot: Şablonên daxwazan ji bo aksiyonên temamkirî hat jêbirin", "category-was-disbanded": "Bot: Bikaranîna kategorîye hat dawîkirin" } diff --git a/category_redirect/ku.json b/category_redirect/ku.json index 3021952..4fb5294 100644 --- a/category_redirect/ku.json +++ b/category_redirect/ku.json @@ -1,8 +1,21 @@ { "@metadata": { "authors": [ + "Balyozxane", "Ghybu" ] }, - "category_redirect-fix-double": "Robot: Fixing double-redirect" + "category_redirect-add-template": "Bot: Şablona beralîkirina kategoriyê lê hat zêdekirin", + "category_redirect-change-category": "Bot: Kategorî ji [[:%(oldCatLink)s|%(oldCatTitle)s]] ber bi [[:%(newCatLink)s|%(newCatTitle)s]] ve hat beralîkirin", + "category_redirect-comment": "Bota sererastkirina beralîkirinên kategoriyan", + "category_redirect-edit-request": "Ev lîsteya rûpelên parastî hewce ne ku kategoriyan wan werin sererastkirin: %(itemlist)s", + "category_redirect-edit-request-item": "* %(title)s di kategoriya %(oldcat)s de ye lê ev kategorî beralî dike %(newcat)s", + "category_redirect-fix-double": "Bot: Beralîkirina ducarî hat sererastkirin", + "category_redirect-log-added": "* Şablona [[%(ns)s%(template)s]] li rûpela %(oldcat)s hat zêdekirin", + "category_redirect-log-add-failed": "* Zêdekirina şablona [[%(ns)s%(template)s]] rûpela li %(oldcat)s têk çû", + "category_redirect-log-double": "* Beralîkirina ducarî hat sererastkirin: %(oldcat)s -> %(newcat)s -> %(targetcat)s", + "category_redirect-log-failed": "** Têk çû: %(error)s", + "category_redirect-log-false-positive": "* Ne-beralîkirina nehêvîkirî: %(oldcat)s", + "category_redirect-log-ignoring": "* %(oldcat)s tê tine hesibandin", + "category_redirect-log-loop": "* Çerxa beralîkirinê ji %(oldcat)s" } diff --git a/cosmetic_changes/ku.json b/cosmetic_changes/ku.json new file mode 100644 index 0000000..eb26b62 --- /dev/null +++ b/cosmetic_changes/ku.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Balyozxane" + ] + }, + "cosmetic_changes-append": "; guhartinên kozmetîk", + "cosmetic_changes-standalone": "Bot: Guhartinên kozmetîk" +} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/985629 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: I5b1f124835e5c48579564e026beca654dbce99ca Gerrit-Change-Number: 985629 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

4 months

[Gerrit] ...core[master]: [doc] Update copyright year

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/985392 ) Change subject: [doc] Update copyright year ...................................................................... [doc] Update copyright year Change-Id: I57600289989815adfa973e2887e6f97db56c1208 --- M pywikibot/families/species_family.py M pywikibot/families/wikimania_family.py 2 files changed, 11 insertions(+), 2 deletions(-) Approvals: Meno25: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/species_family.py b/pywikibot/families/species_family.py index 8d120e8..42041d8 100644 --- a/pywikibot/families/species_family.py +++ b/pywikibot/families/species_family.py @@ -1,6 +1,6 @@ """Family module for Wikimedia species wiki.""" # -# (C) Pywikibot team, 2007-2021 +# (C) Pywikibot team, 2007-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/families/wikimania_family.py b/pywikibot/families/wikimania_family.py index 62877e5..d415b58 100644 --- a/pywikibot/families/wikimania_family.py +++ b/pywikibot/families/wikimania_family.py @@ -3,7 +3,7 @@ .. versionadded:: 3.0 """ # -# (C) Pywikibot team, 2017-2021 +# (C) Pywikibot team, 2017-2023 # # Distributed under the terms of the MIT license. # -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/985392 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: I57600289989815adfa973e2887e6f97db56c1208 Gerrit-Change-Number: 985392 Gerrit-PatchSet: 3 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

4 months

[Gerrit] ...core[master]: [doc] Update copyright year

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/985391 ) Change subject: [doc] Update copyright year ...................................................................... [doc] Update copyright year Change-Id: Id19d2dd884093f6ece4cdf8010b9cebc0677f418 --- M pywikibot/families/incubator_family.py M pywikibot/userinterfaces/terminal_interface.py M tests/data/fixes.py M pywikibot/families/outreach_family.py M tests/data/set-fixes.py M pywikibot/families/meta_family.py M pywikibot/families/mediawiki_family.py 7 files changed, 16 insertions(+), 7 deletions(-) Approvals: Meno25: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/incubator_family.py b/pywikibot/families/incubator_family.py index 827793c..9732345 100644 --- a/pywikibot/families/incubator_family.py +++ b/pywikibot/families/incubator_family.py @@ -1,6 +1,6 @@ """Family module for Incubator Wiki.""" # -# (C) Pywikibot team, 2006-2020 +# (C) Pywikibot team, 2006-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/families/mediawiki_family.py b/pywikibot/families/mediawiki_family.py index 3d01ef1..d1b89e2 100644 --- a/pywikibot/families/mediawiki_family.py +++ b/pywikibot/families/mediawiki_family.py @@ -1,6 +1,6 @@ """Family module for MediaWiki wiki.""" # -# (C) Pywikibot team, 2006-2020 +# (C) Pywikibot team, 2006-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/families/meta_family.py b/pywikibot/families/meta_family.py index 67de0bf..0aa07ae 100644 --- a/pywikibot/families/meta_family.py +++ b/pywikibot/families/meta_family.py @@ -1,6 +1,6 @@ """Family module for Meta Wiki.""" # -# (C) Pywikibot team, 2005-2020 +# (C) Pywikibot team, 2005-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/families/outreach_family.py b/pywikibot/families/outreach_family.py index faea98d..3fe6374 100644 --- a/pywikibot/families/outreach_family.py +++ b/pywikibot/families/outreach_family.py @@ -1,6 +1,6 @@ """Family module for Wikimedia outreach wiki.""" # -# (C) Pywikibot team, 2014-2020 +# (C) Pywikibot team, 2014-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/userinterfaces/terminal_interface.py b/pywikibot/userinterfaces/terminal_interface.py index cee5dc7..6c3d240 100644 --- a/pywikibot/userinterfaces/terminal_interface.py +++ b/pywikibot/userinterfaces/terminal_interface.py @@ -4,7 +4,7 @@ It imports the appropriate operating system specific implementation. """ # -# (C) Pywikibot team, 2003-2020 +# (C) Pywikibot team, 2003-2023 # # Distributed under the terms of the MIT license. # diff --git a/tests/data/fixes.py b/tests/data/fixes.py index 8530635..9708107 100644 --- a/tests/data/fixes.py +++ b/tests/data/fixes.py @@ -1,6 +1,6 @@ """Collection of fixes for tests.""" # -# (C) Pywikibot team, 2015-2020 +# (C) Pywikibot team, 2015-2023 # # Distributed under the terms of the MIT license. # diff --git a/tests/data/set-fixes.py b/tests/data/set-fixes.py index 8410b0f..0800174 100644 --- a/tests/data/set-fixes.py +++ b/tests/data/set-fixes.py @@ -1,6 +1,6 @@ """Fixes implementation which overwrites the variable.""" # -# (C) Pywikibot team, 2015-2020 +# (C) Pywikibot team, 2015-2023 # # Distributed under the terms of the MIT license. # -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/985391 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: Id19d2dd884093f6ece4cdf8010b9cebc0677f418 Gerrit-Change-Number: 985391 Gerrit-PatchSet: 2 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits December 2023