Pywikibot-commits January 2022

pywikibot-commits@lists.wikimedia.org

1 participants
115 discussions

[Gerrit] ...core[master]: [IMPR] recurse with depth for CategoryListifyRobot

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/748696 ) Change subject: [IMPR] recurse with depth for CategoryListifyRobot ...................................................................... [IMPR] recurse with depth for CategoryListifyRobot Add options dict with intention to move all properties there def articles(self, recurse: Union[int, bool] = False, ... :param recurse: if not False or 0, also iterate subcategories of subcategories. If an int, limit recursion to this number of levels. (Example: recurse=1 will iterate direct subcats and first-level sub-sub-cats, but no deeper.) Change-Id: I39b2d8ef5aeba16a5bb64bfa50c409a7f5e99ec3 --- M scripts/category.py 1 file changed, 8 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/category.py b/scripts/category.py index 6de36bd..5e5c3bd 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -83,7 +83,9 @@ -summary: - Pick a custom edit summary for the bot. -inplace - Use this flag to change categories in place rather than rearranging them. - -recurse - Recurse through all subcategories of categories. + -recurse[:<depth>] + - Recurse through subcategories of the category to + optional depth. -pagesonly - While removing pages from a category, keep the subpage links and do not remove them. -match - Only work on pages whose titles match the given regex (for @@ -909,7 +911,7 @@ overwrite: bool = False, show_images: bool = False, *, talk_pages: bool = False, - recurse: bool = False, + recurse: Union[int, bool] = False, prefix: str = '*', namespaces=None) -> None: """Initializer.""" @@ -1326,6 +1328,7 @@ :param args: command line arguments. """ + options = {} from_given = False to_given = False batch = False @@ -1335,7 +1338,6 @@ overwrite = False showimages = False talkpages = False - recurse = False title_regex = None pagesonly = False wikibase = True @@ -1403,7 +1405,7 @@ elif option == 'talkpages': talkpages = True elif option == 'recurse': - recurse = True + options[option] = True if value == '' else int(value) elif option == 'pagesonly': pagesonly = True elif option == 'nowb': @@ -1514,7 +1516,8 @@ 'Please enter the name of the list to create:') bot = CategoryListifyRobot(old_cat_title, new_cat_title, summary, append, overwrite, showimages, - talk_pages=talkpages, recurse=recurse, + talk_pages=talkpages, + recurse=options.get('recurse', False), prefix=prefix, namespaces=gen_factory.namespaces) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/748696 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: I39b2d8ef5aeba16a5bb64bfa50c409a7f5e99ec3 Gerrit-Change-Number: 748696 Gerrit-PatchSet: 20 Gerrit-Owner: Costa Shul <constantine.shulyupin(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-MessageType: merged

2 years, 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/+/752643 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I70ae18c9894549e132b33348a0f9eb95cb2fbfcd --- M blockpageschecker/zh.json M delete/or.json M pywikibot/ca.json 3 files changed, 7 insertions(+), 2 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/blockpageschecker/zh.json b/blockpageschecker/zh.json index e3e1a40..6df3b75 100644 --- a/blockpageschecker/zh.json +++ b/blockpageschecker/zh.json @@ -1,9 +1,12 @@ { "@metadata": { "authors": [ + "GuoPC", "Liuxinyu970226", "Yfdyh000" ] }, + "blockpageschecker-adding": "机器人：添加页面锁定模板", + "blockpageschecker-modifying": "机器人：修改过时模板", "blockpageschecker-deleting": "机器人：删除过时模板" } diff --git a/delete/or.json b/delete/or.json index 2d3d412..4c69b2f 100644 --- a/delete/or.json +++ b/delete/or.json @@ -1,6 +1,7 @@ { "@metadata": { "authors": [ + "Psubhashish", "Shisir 1945" ] }, @@ -8,5 +9,5 @@ "delete-from-file": "ରୋବଟ୍‌: ଗୋଟିଏ ଫାଇଲ୍‌ ତାଲିକା କଟା ହେଉଛି", "delete-images": "ରୋବଟ୍‌: %(page)s ର ସବୁ ଛବି କଟା ହେଉଛି", "delete-linked-pages": "ରୋବଟ୍‌: %(page)s ସହ ସଂଯୁକ୍ତ ସବୁ ପୃଷ୍ଟା କଟା ହେଉଛି", - "delete-referring-pages": "ରୋବଟ୍‌: %(page)s ରୁ ଉଦ୍ଧୃତ ସବୁ ପୃଷ୍ଟା କଟା ହେଉଛି" + "delete-referring-pages": "ବଟ୍‌: %(ପୃଷ୍ଠା) ସହ ଯୋଡ଼ା ସବୁ ପୃଷ୍ଠା ଲିଭାଉଛି" } diff --git a/pywikibot/ca.json b/pywikibot/ca.json index 410c5d7..bda963c 100644 --- a/pywikibot/ca.json +++ b/pywikibot/ca.json @@ -1,6 +1,7 @@ { "@metadata": { "authors": [ + "Alan Mena", "Alvaro Vidal-Abarca", "Fitoschido", "Grondin", @@ -11,7 +12,7 @@ "XVEC" ] }, - "pywikibot-cosmetic-changes": "; canvis superficials", + "pywikibot-cosmetic-changes": "; canvis estètics", "pywikibot-enter-category-name": "Si us plau introdueix el nom de la categoria :", "pywikibot-enter-file-links-processing": "Els enllaços a quina pàgina del fitxer s'haurien de processar?", "pywikibot-enter-finished-browser": "Premeu Retorn quan hàgiu acabat amb el navegador.", -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/752643 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: I70ae18c9894549e132b33348a0f9eb95cb2fbfcd Gerrit-Change-Number: 752643 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

2 years, 4 months

[Gerrit] ...core[master]: cleanup typing now that python 3.5.3+ is required

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752359 ) Change subject: cleanup typing now that python 3.5.3+ is required ...................................................................... cleanup typing now that python 3.5.3+ is required Change-Id: If21e4267e8b661ac56728fe43a905c52b3c11f32 --- M mypy.ini M pywikibot/__init__.py M pywikibot/_wbtypes.py M pywikibot/bot.py M pywikibot/bot_choice.py M pywikibot/exceptions.py M pywikibot/flow.py M pywikibot/interwiki_graph.py M pywikibot/logentries.py M pywikibot/logging.py M pywikibot/login.py M pywikibot/page/__init__.py M pywikibot/proofreadpage.py 13 files changed, 158 insertions(+), 193 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/mypy.ini b/mypy.ini index 228fda5..34102e5 100644 --- a/mypy.ini +++ b/mypy.ini @@ -1,4 +1,5 @@ [mypy] +python_version = 3.5 check_untyped_defs = true disallow_any_generics = true disallow_incomplete_defs = true diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 53e4c7f..04799fd 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -1,6 +1,6 @@ """The initialization file for the Pywikibot framework.""" # -# (C) Pywikibot team, 2008-2021 +# (C) Pywikibot team, 2008-2022 # # Distributed under the terms of the MIT license. # @@ -15,7 +15,7 @@ from contextlib import suppress from decimal import Decimal from queue import Queue -from typing import Any, Optional, Union +from typing import Any, Optional, Type, Union from urllib.parse import urlparse from warnings import warn @@ -71,24 +71,9 @@ from pywikibot.tools import normalize_username from pywikibot.tools.formatter import color_format -TO_DECIMAL_TYPE = Union[int, float, str, 'Decimal', None] -# TODO: replace these after T286867 - -STR_OR_TIMESTAMP = Any # Union[str, 'Timestamp'] -OPT_STR_OR_SITE = Any # Union[str, 'pywikibot.site.BaseSite', None] -OPT_STR_OR_ITEM_PAGE = Any # Union[str, 'pywikibot.page.ItemPage', None] -OPT_STR_OR_FAMILY = Any # Union[str, 'pywikibot.family.Family', None] - -TIMESTAMP_CLASS = Any # Type['Timestamp'] -COORDINATE_CLASS = Any # Type['Coordinate'] -WB_TIME_CLASS = Any # Type['WbTime'] -WB_QUANTITY_CLASS = Any # Type['WbQuantity'] -WB_MONOLINGUAL_TEXT_CLASS = Any # Type['WbMonolingualText'] -WB_DATA_PAGE_CLASS = Any # Type['_WbDataPage'] -WB_GEO_SHAPE_CLASS = Any # Type['WbGeoShape'] -WB_TABULAR_DATA_CLASS = Any # Type['WbTabularData'] -WB_UNKNOWN_CLASS = Any # Type['WbUnknown'] +ItemPageStrNoneType = Union[str, 'ItemPage', None] +ToDecimalType = Union[int, float, str, 'Decimal', None] __all__ = ( '__copyright__', '__description__', '__download_url__', '__license__', @@ -138,12 +123,12 @@ return self.replace(microsecond=self.microsecond) @classproperty - def ISO8601Format(cls: TIMESTAMP_CLASS) -> str: + def ISO8601Format(cls: Type['Timestamp']) -> str: """ISO8601 format string class property for compatibility purpose.""" return cls._ISO8601Format() @classmethod - def _ISO8601Format(cls: TIMESTAMP_CLASS, sep: str = 'T') -> str: + def _ISO8601Format(cls: Type['Timestamp'], sep: str = 'T') -> str: """ISO8601 format string. :param sep: one-character separator, placed between the date and time @@ -153,7 +138,7 @@ return '%Y-%m-%d{}%H:%M:%SZ'.format(sep) @classmethod - def fromISOformat(cls: TIMESTAMP_CLASS, ts: STR_OR_TIMESTAMP, + def fromISOformat(cls: Type['Timestamp'], ts: Union[str, 'Timestamp'], sep: str = 'T') -> 'Timestamp': """Convert an ISO 8601 timestamp to a Timestamp object. @@ -168,7 +153,7 @@ return cls.strptime(ts, cls._ISO8601Format(sep)) @classmethod - def fromtimestampformat(cls: TIMESTAMP_CLASS, ts: STR_OR_TIMESTAMP + def fromtimestampformat(cls: Type['Timestamp'], ts: Union[str, 'Timestamp'] ) -> 'Timestamp': """Convert a MediaWiki internal timestamp to a Timestamp object.""" # If inadvertently passed a Timestamp object, use replace() @@ -228,7 +213,7 @@ globe: Optional[str] = None, typ: str = '', name: str = '', dim: Optional[int] = None, site: Optional[DataSite] = None, - globe_item: OPT_STR_OR_ITEM_PAGE = None, + globe_item: ItemPageStrNoneType = None, primary: bool = False) -> None: """ Represent a geo coordinate. @@ -295,7 +280,7 @@ } @classmethod - def fromWikibase(cls: COORDINATE_CLASS, data: Dict[str, Any], + def fromWikibase(cls: Type['Coordinate'], data: Dict[str, Any], site: Optional[DataSite] = None) -> 'Coordinate': """ Constructor to create an object from Wikibase's JSON output. @@ -537,7 +522,7 @@ raise ValueError('Invalid precision: "{}"'.format(precision)) @classmethod - def fromTimestr(cls: WB_TIME_CLASS, + def fromTimestr(cls: Type['WbTime'], datetimestr: str, precision: Union[int, str] = 14, before: int = 0, @@ -575,7 +560,7 @@ precision, before, after, timezone, calendarmodel, site) @classmethod - def fromTimestamp(cls: WB_TIME_CLASS, timestamp: 'Timestamp', + def fromTimestamp(cls: Type['WbTime'], timestamp: 'Timestamp', precision: Union[int, str] = 14, before: int = 0, after: int = 0, timezone: int = 0, calendarmodel: Optional[str] = None, @@ -643,7 +628,7 @@ return json @classmethod - def fromWikibase(cls: WB_TIME_CLASS, data: Dict[str, Any], + def fromWikibase(cls: Type['WbTime'], data: Dict[str, Any], site: Optional[DataSite] = None) -> 'WbTime': """ Create a WbTime from the JSON data given by the Wikibase API. @@ -679,7 +664,7 @@ return site.mw_version < '1.29.0-wmf.2' @staticmethod - def _todecimal(value: TO_DECIMAL_TYPE) -> Optional[Decimal]: + def _todecimal(value: ToDecimalType) -> Optional[Decimal]: """ Convert a string to a Decimal for use in WbQuantity. @@ -704,10 +689,10 @@ """ return format(value, '+g') if value is not None else None - def __init__(self, amount: TO_DECIMAL_TYPE, - unit: OPT_STR_OR_ITEM_PAGE = None, - error: Union[TO_DECIMAL_TYPE, - Tuple[TO_DECIMAL_TYPE, TO_DECIMAL_TYPE]] = None, + def __init__(self, amount: ToDecimalType, + unit: ItemPageStrNoneType = None, + error: Union[ToDecimalType, + Tuple[ToDecimalType, ToDecimalType]] = None, site: Optional[DataSite] = None) -> None: """ Create a new WbQuantity object. @@ -791,7 +776,7 @@ return json @classmethod - def fromWikibase(cls: WB_QUANTITY_CLASS, data: Dict[str, Any], + def fromWikibase(cls: Type['WbQuantity'], data: Dict[str, Any], site: Optional[DataSite] = None) -> 'WbQuantity': """ Create a WbQuantity from the JSON data given by the Wikibase API. @@ -842,7 +827,7 @@ return json @classmethod - def fromWikibase(cls: WB_MONOLINGUAL_TEXT_CLASS, data: Dict[str, Any], + def fromWikibase(cls: Type['WbMonolingualText'], data: Dict[str, Any], site: Optional[DataSite] = None) -> 'WbMonolingualText': """ Create a WbMonolingualText from the JSON data given by Wikibase API. @@ -865,7 +850,7 @@ _items = ('page', ) @classmethod - def _get_data_site(cls: WB_DATA_PAGE_CLASS, repo_site: DataSite + def _get_data_site(cls: Type['_WbDataPage'], repo_site: DataSite ) -> APISite: """ Return the site serving as a repository for a given data type. @@ -877,7 +862,7 @@ raise NotImplementedError @classmethod - def _get_type_specifics(cls: WB_DATA_PAGE_CLASS, site: DataSite + def _get_type_specifics(cls: Type['_WbDataPage'], site: DataSite ) -> Dict[str, Any]: """ Return the specifics for a given data type. @@ -962,7 +947,7 @@ return self.page.title() @classmethod - def fromWikibase(cls: WB_DATA_PAGE_CLASS, page_name: str, + def fromWikibase(cls: Type['_WbDataPage'], page_name: str, site: Optional[DataSite]) -> '_WbDataPage': """ Create a _WbDataPage from the JSON data given by the Wikibase API. @@ -983,7 +968,7 @@ """A Wikibase geo-shape representation.""" @classmethod - def _get_data_site(cls: WB_GEO_SHAPE_CLASS, site: DataSite) -> APISite: + def _get_data_site(cls: Type['WbGeoShape'], site: DataSite) -> APISite: """ Return the site serving as a geo-shape repository. @@ -992,7 +977,7 @@ return site.geo_shape_repository() @classmethod - def _get_type_specifics(cls: WB_GEO_SHAPE_CLASS, site: DataSite + def _get_type_specifics(cls: Type['WbGeoShape'], site: DataSite ) -> Dict[str, Any]: """ Return the specifics for WbGeoShape. @@ -1011,7 +996,7 @@ """A Wikibase tabular-data representation.""" @classmethod - def _get_data_site(cls: WB_TABULAR_DATA_CLASS, site: DataSite) -> APISite: + def _get_data_site(cls: Type['WbTabularData'], site: DataSite) -> APISite: """ Return the site serving as a tabular-data repository. @@ -1020,7 +1005,7 @@ return site.tabular_data_repository() @classmethod - def _get_type_specifics(cls: WB_TABULAR_DATA_CLASS, site: DataSite + def _get_type_specifics(cls: Type['WbTabularData'], site: DataSite ) -> Dict[str, Any]: """ Return the specifics for WbTabularData. @@ -1066,7 +1051,7 @@ return self.json @classmethod - def fromWikibase(cls: WB_UNKNOWN_CLASS, data: Dict[str, Any], + def fromWikibase(cls: Type['WbUnknown'], data: Dict[str, Any], site: Optional[DataSite] = None) -> 'WbUnknown': """ Create a WbUnknown from the JSON data given by the Wikibase API. @@ -1112,9 +1097,9 @@ def Site(code: Optional[str] = None, - fam: OPT_STR_OR_FAMILY = None, + fam: Union[str, 'Family', None] = None, user: Optional[str] = None, *, - interface: OPT_STR_OR_SITE = None, + interface: Union[str, 'BaseSite', None] = None, url: Optional[str] = None) -> BaseSite: """A factory method to obtain a Site object. diff --git a/pywikibot/_wbtypes.py b/pywikibot/_wbtypes.py index 641484f..863fad8 100644 --- a/pywikibot/_wbtypes.py +++ b/pywikibot/_wbtypes.py @@ -1,18 +1,17 @@ """Wikibase data type classes.""" # -# (C) Pywikibot team, 2013-2020 +# (C) Pywikibot team, 2013-2022 # # Distributed under the terms of the MIT license. # import abc import json -from typing import Any +from typing import Any, Optional from pywikibot.backports import Dict -# TODO: replace these after T286867 - -OPT_SITE = Any # Optional['pywikibot.site.DataSite'] +if False: # typing.TYPE_CHECKING + from pywikibot.site import DataSite class WbRepresentation(abc.ABC): @@ -20,27 +19,30 @@ """Abstract class for Wikibase representations.""" @abc.abstractmethod - def __init__(self): + def __init__(self) -> None: """Constructor.""" raise NotImplementedError @abc.abstractmethod - def toWikibase(self): + def toWikibase(self) -> Any: """Convert representation to JSON for the Wikibase API.""" raise NotImplementedError @classmethod @abc.abstractmethod - def fromWikibase(cls, data: Dict[str, Any], site: OPT_SITE = None - ) -> 'WbRepresentation': + def fromWikibase( + cls, + data: Dict[str, Any], + site: Optional['DataSite'] = None + ) -> 'WbRepresentation': """Create a representation object based on JSON from Wikibase API.""" raise NotImplementedError - def __str__(self): + def __str__(self) -> str: return json.dumps(self.toWikibase(), indent=4, sort_keys=True, separators=(',', ': ')) - def __repr__(self): + def __repr__(self) -> str: assert isinstance(self._items, tuple) assert all(isinstance(item, str) for item in self._items) @@ -49,13 +51,13 @@ for attr, value in values) return '{}({})'.format(self.__class__.__name__, attrs) - def __eq__(self, other): + def __eq__(self, other: object) -> bool: if isinstance(other, self.__class__): return self.toWikibase() == other.toWikibase() return NotImplemented - def __hash__(self): + def __hash__(self) -> int: return hash(frozenset(self.toWikibase().items())) - def __ne__(self, other): + def __ne__(self, other: object) -> bool: return not self.__eq__(other) diff --git a/pywikibot/bot.py b/pywikibot/bot.py index a3026d6..7181014 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -57,7 +57,7 @@ ``put_current`` is used. """ # -# (C) Pywikibot team, 2008-2021 +# (C) Pywikibot team, 2008-2022 # # Distributed under the terms of the MIT license. # @@ -181,18 +181,14 @@ from pywikibot.tools._logging import LoggingFormatter from pywikibot.tools.formatter import color_format -ANSWER = Union[ - Tuple[str, str], - 'pywikibot.bot_choice.Option'] +if False: # typing.TYPE_CHECKING + from pywikibot.site import BaseSite -ANSWER_TYPE = Union[Iterable[ANSWER], 'pywikibot.bot_choice.Option'] - -# TODO: We should change this to the following after T286867... - -PAGE_OR_LINK_TYPE = Any # Union['pywikibot.page.Link', 'pywikibot.page.Page'] -OPT_SITE_TYPE = Any # Optional['pywikibot.site.BaseSite'] -OPT_CLAIM_TYPE = Any # Optional['pywikibot.page.Claim'] -OPT_ITEM_PAGE_TYPE = Any # Optional['pywikibot.page.ItemPage'] +AnswerType = Union[ + Iterable[Union[Tuple[str, str], 'pywikibot.bot_choice.Option']], + 'pywikibot.bot_choice.Option', +] +PageLinkType = Union['pywikibot.page.Link', 'pywikibot.page.Page'] # Note: all output goes through python std library "logging" module _logger = 'bot' @@ -573,7 +569,7 @@ @initialize_handlers def input_choice(question: str, - answers: ANSWER_TYPE, + answers: AnswerType, default: Optional[str] = None, return_shortcut: bool = True, automatic_quit: bool = True, @@ -634,7 +630,7 @@ @initialize_handlers def input_list_choice(question: str, - answers: ANSWER_TYPE, + answers: AnswerType, default: Union[int, str, None] = None, force: bool = False) -> str: """ @@ -678,8 +674,8 @@ """ def __init__(self, - old_link: PAGE_OR_LINK_TYPE, - new_link: Union[PAGE_OR_LINK_TYPE, bool], + old_link: PageLinkType, + new_link: Union[PageLinkType, bool], default: Optional[str] = None, automatic_quit: bool = True) -> None: """ @@ -707,7 +703,7 @@ self._quit = automatic_quit current_match_type = Optional[Tuple[ - PAGE_OR_LINK_TYPE, + PageLinkType, str, Mapping[str, str], Tuple[int, int] @@ -749,7 +745,7 @@ raise ValueError('Invalid choice "{}"'.format(choice)) - def __call__(self, link: PAGE_OR_LINK_TYPE, + def __call__(self, link: PageLinkType, text: str, groups: Mapping[str, str], rng: Tuple[int, int]) -> Any: """Ask user how the selected link should be replaced.""" @@ -815,7 +811,7 @@ return self.handle_answer(choice) @property - def current_link(self) -> PAGE_OR_LINK_TYPE: + def current_link(self) -> PageLinkType: """Get the current link when it's handling one currently.""" if self._current_match is None: raise ValueError('No current link') @@ -1011,7 +1007,7 @@ module = import_module(module_name) # type: ignore help_text = module.__doc__ # type: str # type: ignore[assignment] if hasattr(module, 'docuReplacements'): - for key, value in module.docuReplacements.items(): # type: ignore + for key, value in module.docuReplacements.items(): help_text = help_text.replace(key, value.strip('\n\r')) except Exception: if module_name: @@ -1113,7 +1109,7 @@ i18n.input('pywikibot-enter-finished-browser') -class _OptionDict(dict): +class _OptionDict(Dict[str, Any]): """The option dict which holds the options of OptionHandler. @@ -1621,7 +1617,7 @@ instead which specifically handle multiple or single sites. """ - def __init__(self, site: OPT_SITE_TYPE = None, + def __init__(self, site: Optional['BaseSite'] = None, **kwargs: Any) -> None: """Create a Bot instance and initialize cached sites.""" # TODO: add warning if site is specified and generator @@ -1632,7 +1628,7 @@ super().__init__(**kwargs) @property - def site(self) -> 'pywikibot.site.BaseSite': + def site(self) -> Optional['BaseSite']: """Get the current site.""" if not self._site: warning('Bot.site was not set before being retrieved.') @@ -1642,7 +1638,7 @@ return self._site @site.setter - def site(self, site: OPT_SITE_TYPE) -> None: + def site(self, site: Optional['BaseSite']) -> None: """ Set the Site that the bot is using. @@ -1704,7 +1700,7 @@ """ def __init__(self, - site: Union[OPT_SITE_TYPE, bool] = True, + site: Union['BaseSite', bool, None] = True, **kwargs: Any) -> None: """ Create a SingleSiteBot instance. @@ -1713,7 +1709,7 @@ pywikibot.Site. """ if site is True: - self._site = pywikibot.Site() + self._site = pywikibot.Site() # type: Optional[BaseSite] elif site is False: raise ValueError("'site' must be a site, True, or None") else: @@ -1721,14 +1717,14 @@ super().__init__(**kwargs) @property - def site(self) -> OPT_SITE_TYPE: + def site(self) -> 'BaseSite': """Site that the bot is using.""" if not self._site: raise ValueError('The site has not been defined yet.') return self._site @site.setter - def site(self, value: OPT_SITE_TYPE) -> None: + def site(self, value: Optional['BaseSite']) -> None: """Set the current site but warns if different.""" if self._site: # Warn in any case where the site is (probably) changed after @@ -2108,7 +2104,7 @@ def user_add_claim(self, item: 'pywikibot.page.ItemPage', claim: 'pywikibot.page.Claim', - source: OPT_SITE_TYPE = None, + source: Optional['BaseSite'] = None, bot: bool = True, **kwargs: Any) -> bool: """ Add a claim to an item, with user confirmation as required. @@ -2134,8 +2130,7 @@ claim.getTarget())) return self._save_page(item, item.addClaim, claim, bot=bot, **kwargs) - def getSource(self, site: 'pywikibot.site.BaseSite' - ) -> OPT_CLAIM_TYPE: + def getSource(self, site: 'BaseSite') -> Optional['pywikibot.page.Claim']: """ Create a Claim usable as a source for Wikibase statements. @@ -2154,7 +2149,7 @@ self, item: 'pywikibot.page.ItemPage', claim: 'pywikibot.page.Claim', exists_arg: str = '', - source: OPT_SITE_TYPE = None, + source: Optional['BaseSite'] = None, logger_callback: Callable[[str], Any] = log, **kwargs: Any) -> bool: """ @@ -2227,7 +2222,7 @@ data: Optional[Dict[str, Any]] = None, summary: Optional[str] = None, **kwargs: Any - ) -> OPT_ITEM_PAGE_TYPE: + ) -> Optional['pywikibot.page.ItemPage']: """ Create an ItemPage with the provided page as the sitelink. diff --git a/pywikibot/bot_choice.py b/pywikibot/bot_choice.py index 822fe9d..9fb1660 100755 --- a/pywikibot/bot_choice.py +++ b/pywikibot/bot_choice.py @@ -1,6 +1,6 @@ """Options and Choices for :py:meth:`pywikibot.input_choice`.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # @@ -16,10 +16,6 @@ from pywikibot.tools import deprecated, issue_deprecation_warning -# TODO: replace these after T286867 - -OPT_REPLACE_TYPE = Any # Optional['pywikibot.bot.InteractiveReplace'] - class Option(ABC): @@ -281,14 +277,18 @@ """A simple choice consisting of an option, shortcut and handler.""" - def __init__(self, option: str, shortcut: str, - replacer: OPT_REPLACE_TYPE) -> None: + def __init__( + self, + option: str, + shortcut: str, + replacer: Optional['pywikibot.bot.InteractiveReplace'] + ) -> None: """Initializer.""" super().__init__(option, shortcut) self._replacer = replacer @property - def replacer(self) -> OPT_REPLACE_TYPE: + def replacer(self) -> Optional['pywikibot.bot.InteractiveReplace']: """The replacer.""" return self._replacer @@ -320,8 +320,14 @@ """A choice returning a mix of the link new and current link.""" - def __init__(self, option: str, shortcut: str, replacer: OPT_REPLACE_TYPE, - replace_section: bool, replace_label: bool) -> None: + def __init__( + self, + option: str, + shortcut: str, + replacer: Optional['pywikibot.bot.InteractiveReplace'], + replace_section: bool, + replace_label: bool + ) -> None: """Initializer.""" super().__init__(option, shortcut, replacer) self._section = replace_section @@ -361,7 +367,7 @@ """Add an option to always apply the default.""" - def __init__(self, replacer: OPT_REPLACE_TYPE, + def __init__(self, replacer: Optional['pywikibot.bot.InteractiveReplace'], option: str = 'always', shortcut: str = 'a') -> None: """Initializer.""" super().__init__(option, shortcut, replacer) diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index ce08846..211c6c1 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -281,7 +281,7 @@ # Override this in subclasses. message = '' - def __init__(self, page: 'pywikibot.page.Page', + def __init__(self, page: 'pywikibot.page.BasePage', message: Optional[str] = None) -> None: """ Initializer. diff --git a/pywikibot/flow.py b/pywikibot/flow.py index 855a45e..88f7082 100644 --- a/pywikibot/flow.py +++ b/pywikibot/flow.py @@ -1,13 +1,13 @@ """Objects representing Flow entities, like boards, topics, and posts.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # import abc import datetime import logging -from typing import Any, Union +from typing import Any, Type, Union from urllib.parse import parse_qs, urlparse import pywikibot @@ -17,20 +17,11 @@ NoPageError, UnknownExtensionError, ) -from pywikibot.page import BasePage, User +from pywikibot.page import BasePage, PageSourceType, User logger = logging.getLogger('pywiki.wiki.flow') -# TODO: replace these after T286867 - -TOPIC_CLASS_TYPE = Any # Type['Topic'] - -# Union['pywikibot.site.BaseSite', 'pywikibot.page.Link', -# 'pywikibot.page.Page'] - -SOURCE_TYPE = Any - # Flow page-like objects (boards and topics) class FlowPage(BasePage, abc.ABC): @@ -40,7 +31,7 @@ It cannot be instantiated directly. """ - def __init__(self, source: SOURCE_TYPE, title: str = '') -> None: + def __init__(self, source: PageSourceType, title: str = '') -> None: """Initializer. :param source: A Flow-enabled site or a Link or Page on such a site @@ -178,7 +169,7 @@ self.root._load(load_from_topic=True) @classmethod - def create_topic(cls: TOPIC_CLASS_TYPE, board: 'Board', title: str, + def create_topic(cls: Type['Topic'], board: 'Board', title: str, content: str, content_format: str = 'wikitext' ) -> 'Topic': """Create and return a Topic object for a new topic on a Board. @@ -195,7 +186,7 @@ return cls(board.site, data['topic-page']) @classmethod - def from_topiclist_data(cls: TOPIC_CLASS_TYPE, board: 'Board', + def from_topiclist_data(cls: Type['Topic'], board: 'Board', root_uuid: str, topiclist_data: Dict[str, Any]) -> 'Topic': """Create a Topic object from API data. @@ -422,7 +413,7 @@ return self._current_revision['isModerated'] @property - def creator(self) -> str: + def creator(self) -> User: """The creator of this post.""" if not hasattr(self, '_current_revision'): self._load() diff --git a/pywikibot/interwiki_graph.py b/pywikibot/interwiki_graph.py index 8d8e50d..e9ca5c6 100644 --- a/pywikibot/interwiki_graph.py +++ b/pywikibot/interwiki_graph.py @@ -1,24 +1,18 @@ """Module with the Graphviz drawing calls.""" # -# (C) Pywikibot team, 2006-2021 +# (C) Pywikibot team, 2006-2022 # # Distributed under the terms of the MIT license. # import itertools import threading from collections import Counter -from typing import Any, Optional +from typing import Optional import pywikibot from pywikibot import config from pywikibot.backports import Dict, List, Set -FOUND_IN_TYPE = Dict['pywikibot.page.Page', List['pywikibot.page.Page']] - -# TODO: replace these after T286867 - -OPT_PAGE_TYPE = Any # Optional['pywikibot.page.Page'] - try: import pydot PYDOT_ERROR = None @@ -26,6 +20,9 @@ PYDOT_ERROR = e +FoundInType = Dict['pywikibot.page.Page', List['pywikibot.page.Page']] + + class GraphSavingThread(threading.Thread): """ @@ -61,7 +58,7 @@ """Data about a page with translations on multiple wikis.""" - def __init__(self, origin: OPT_PAGE_TYPE = None) -> None: + def __init__(self, origin: Optional['pywikibot.page.Page'] = None) -> None: """Initializer. :param origin: the page on the 'origin' wiki @@ -73,17 +70,17 @@ # pages are values. It stores where we found each page. # As we haven't yet found a page that links to the origin page, we # start with an empty list for it. - self.found_in = {} # type: FOUND_IN_TYPE + self.found_in = {} # type: FoundInType if origin: self.found_in = {origin: []} @property - def origin(self) -> OPT_PAGE_TYPE: + def origin(self) -> Optional['pywikibot.page.Page']: """Page on the origin wiki.""" return self._origin @origin.setter - def origin(self, value: OPT_PAGE_TYPE) -> None: + def origin(self, value: Optional['pywikibot.page.Page']) -> None: self._origin = value diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py index f2c356d..3df2838 100644 --- a/pywikibot/logentries.py +++ b/pywikibot/logentries.py @@ -1,13 +1,13 @@ """Objects representing Mediawiki log entries.""" # -# (C) Pywikibot team, 2007-2021 +# (C) Pywikibot team, 2007-2022 # # Distributed under the terms of the MIT license. # from collections import UserDict from contextlib import suppress import datetime -from typing import Any, Optional +from typing import Any, Optional, Type, Union import pywikibot from pywikibot.backports import Dict, List, Tuple @@ -16,14 +16,6 @@ _logger = 'wiki' -# TODO: replace these after T286867 - -PAGE_OR_INT_TYPE = Any # Union[int, 'pywikibot.page.Page'] -OPT_TIMESTAMP_TYPE = Any # Optional['pywikibot.Timestamp'] - -LOG_ENTRY_CLASS = Any # Type['LogEntry'] -LOG_ENTRY_FACTORY_CLASS = Any # Type['LogEntryFactory'] - class LogEntry(UserDict): @@ -107,7 +99,7 @@ return self[self._expected_type] - def page(self) -> PAGE_OR_INT_TYPE: + def page(self) -> Union[int, 'pywikibot.page.Page']: """ Page on which action was performed. @@ -169,7 +161,7 @@ if self.isAutoblockRemoval: self._blockid = int(self['title'][pos + 1:]) - def page(self) -> PAGE_OR_INT_TYPE: + def page(self) -> Union[int, 'pywikibot.page.Page']: """ Return the blocked account or IP. @@ -217,7 +209,7 @@ self._duration = self.expiry() - self.timestamp() return self._duration - def expiry(self) -> OPT_TIMESTAMP_TYPE: + def expiry(self) -> Optional['pywikibot.Timestamp']: """Return a Timestamp representing the block expiry date.""" if not hasattr(self, '_expiry'): details = self._params.get('expiry') @@ -374,7 +366,7 @@ """ return self._creator(logdata) - def get_valid_entry_class(self, logtype: str) -> LOG_ENTRY_CLASS: + def get_valid_entry_class(self, logtype: str) -> 'LogEntry': """ Return the class corresponding to the @logtype string parameter. @@ -387,8 +379,8 @@ return LogEntryFactory.get_entry_class(logtype) @classmethod - def get_entry_class(cls: LOG_ENTRY_FACTORY_CLASS, - logtype: str) -> LOG_ENTRY_CLASS: + def get_entry_class(cls: Type['LogEntryFactory'], + logtype: str) -> 'LogEntry': """ Return the class corresponding to the @logtype string parameter. @@ -398,7 +390,7 @@ or use the get_valid_entry_class instance method instead. """ if logtype not in cls._logtypes: - bases = (OtherLogEntry, ) # type: Tuple[LOG_ENTRY_CLASS, ...] + bases = (OtherLogEntry, ) # type: Tuple['LogEntry', ...] if logtype in ('newusers', 'thanks'): bases = (UserTargetLogEntry, OtherLogEntry) diff --git a/pywikibot/logging.py b/pywikibot/logging.py index 31a8726..7c2edab 100644 --- a/pywikibot/logging.py +++ b/pywikibot/logging.py @@ -11,7 +11,7 @@ # logging levels from logging import CRITICAL, DEBUG, ERROR, INFO, WARNING -from typing import AnyStr, Optional +from typing import Optional from pywikibot.backports import Callable, List @@ -62,7 +62,7 @@ # string indicating the debugging layer. -def logoutput(text: Any, decoder: Optional[str] = None, +def logoutput(text: object, decoder: Optional[str] = None, newline: bool = True, _level: int = INFO, _logger: str = '', **kwargs: Any) -> None: """Format output and send to the logging module. @@ -108,7 +108,7 @@ logger.log(_level, decoded_text, extra=context, **kwargs) -def output(text: AnyStr, decoder: Optional[str] = None, newline: bool = True, +def output(text: object, decoder: Optional[str] = None, newline: bool = True, **kwargs: Any) -> None: r"""Output a message to the user via the userinterface. @@ -133,7 +133,7 @@ logoutput(text, decoder, newline, INFO, **kwargs) -def stdout(text: AnyStr, decoder: Optional[str] = None, newline: bool = True, +def stdout(text: object, decoder: Optional[str] = None, newline: bool = True, **kwargs: Any) -> None: """Output script results to the user via the userinterface. @@ -151,7 +151,7 @@ logoutput(text, decoder, newline, STDOUT, **kwargs) -def warning(text: AnyStr, decoder: Optional[str] = None, +def warning(text: object, decoder: Optional[str] = None, newline: bool = True, **kwargs: Any) -> None: """Output a warning message to the user via the userinterface. @@ -165,7 +165,7 @@ logoutput(text, decoder, newline, WARNING, **kwargs) -def error(text: AnyStr, decoder: Optional[str] = None, newline: bool = True, +def error(text: object, decoder: Optional[str] = None, newline: bool = True, **kwargs: Any) -> None: """Output an error message to the user via the userinterface. @@ -179,7 +179,7 @@ logoutput(text, decoder, newline, ERROR, **kwargs) -def log(text: AnyStr, decoder: Optional[str] = None, newline: bool = True, +def log(text: object, decoder: Optional[str] = None, newline: bool = True, **kwargs: Any) -> None: """Output a record to the log file. @@ -193,7 +193,7 @@ logoutput(text, decoder, newline, VERBOSE, **kwargs) -def critical(text: AnyStr, decoder: Optional[str] = None, newline: bool = True, +def critical(text: object, decoder: Optional[str] = None, newline: bool = True, **kwargs: Any) -> None: """Output a critical record to the user via the userinterface. @@ -207,7 +207,7 @@ logoutput(text, decoder, newline, CRITICAL, **kwargs) -def debug(text: AnyStr, layer: str, decoder: Optional[str] = None, +def debug(text: object, layer: str, decoder: Optional[str] = None, newline: bool = True, **kwargs: Any) -> None: """Output a debug record to the log file. diff --git a/pywikibot/login.py b/pywikibot/login.py index 5be39a1..c52568f 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -28,10 +28,6 @@ except ImportError as e: mwoauth = e -# TODO: replace these after T286867 - -OPT_SITE_TYPE = Any # Optional['pywikibot.site.BaseSite'] - class _PasswordFileWarning(UserWarning): @@ -86,7 +82,7 @@ """Site login manager.""" def __init__(self, password: Optional[str] = None, - site: OPT_SITE_TYPE = None, + site: Optional['pywikibot.site.BaseSite'] = None, user: Optional[str] = None) -> None: """ Initializer. @@ -364,7 +360,7 @@ # authentication process def __init__(self, password: Optional[str] = None, - site: OPT_SITE_TYPE = None, + site: Optional['pywikibot.site.BaseSite'] = None, user: Optional[str] = None) -> None: """ Initializer. diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index eeb2d6f..69df5ea 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -11,7 +11,7 @@ """ # -# (C) Pywikibot team, 2008-2021 +# (C) Pywikibot team, 2008-2022 # # Distributed under the terms of the MIT license. # @@ -101,6 +101,12 @@ 'url2unicode', ) +PageSourceType = Union[ + 'pywikibot.site.BaseLink', + 'pywikibot.page.BaseSite', + 'pywikibot.page.Page', +] + logger = logging.getLogger('pywiki.wiki.page') diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index 7c1eed4..7096f32 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -33,7 +33,7 @@ from http import HTTPStatus from typing import Any, Optional, Union -from requests.exceptions import ReadTimeout # type: ignore[import] +from requests.exceptions import ReadTimeout import pywikibot from pywikibot import textlib @@ -49,16 +49,7 @@ from pywikibot.comms import http from pywikibot.data.api import Request from pywikibot.exceptions import Error, OtherPageSaveError - -PAGES_FROM_LABEL_TYPE = Dict[str, Set['pywikibot.page.Page']] - -# TODO: replace these after T286867 - -OPT_INDEX_PAGE_TYPE = Any # Optional['IndexPage'] -OPT_INDEX_PAGE_LIST_TYPE = Any # Optional[List['IndexPage']] - -INDEX_TYPE = Optional[Tuple[OPT_INDEX_PAGE_TYPE, - OPT_INDEX_PAGE_LIST_TYPE]] +from pywikibot.page import PageSourceType try: from bs4 import BeautifulSoup @@ -81,6 +72,10 @@ _logger = 'proofreadpage' +PagesFromLabelType = Dict[str, Set['pywikibot.page.Page']] +_IndexType = Tuple[Optional['IndexPage'], List['IndexPage']] + + def decompose(fn: Callable) -> Callable: # type: ignore # noqa: N805 """Decorator for ProofreadPage. @@ -198,7 +193,7 @@ } _OCR_METHODS = list(_OCR_CMDS.keys()) - def __init__(self, source, title: str = '') -> None: + def __init__(self, source: PageSourceType, title: str = '') -> None: """Instantiate a ProofreadPage object. :raise UnknownExtensionError: source Site has no ProofreadPage @@ -263,7 +258,7 @@ return base, ext, num @property - def index(self) -> OPT_INDEX_PAGE_TYPE: + def index(self) -> Optional['IndexPage']: """Get the Index page which contains ProofreadPage. If there are many Index pages link to this ProofreadPage, and @@ -281,7 +276,7 @@ set(self.getReferences(namespaces=index_ns))] if not what_links_here: - self._index = (None, []) + self._index = (None, []) # type: _IndexType elif len(what_links_here) == 1: self._index = (what_links_here.pop(), []) else: @@ -294,28 +289,28 @@ self._index = (page, what_links_here) break - page, others = self._index + index_page, others = self._index if others: pywikibot.warning('{} linked to several Index pages.'.format(self)) - pywikibot.output('{}{!s}'.format(' ' * 9, [page] + others)) + pywikibot.output('{}{!s}'.format(' ' * 9, [index_page] + others)) - if page: + if index_page: pywikibot.output( - '{}Selected Index: {}'.format(' ' * 9, page)) + '{}Selected Index: {}'.format(' ' * 9, index_page)) pywikibot.output('{}remaining: {!s}'.format(' ' * 9, others)) - if not page: + if not index_page: pywikibot.warning('Page {} is not linked to any Index page.' .format(self)) - return page + return index_page @index.setter def index(self, value: 'IndexPage') -> None: if not isinstance(value, IndexPage): raise TypeError('value {} must be an IndexPage object.' .format(value)) - self._index = (value, None) + self._index = (value, []) @index.deleter def index(self) -> None: @@ -453,7 +448,7 @@ """ # Text is already cached. if getattr(self, '_text', None) is not None: - return self._text + return self._text # type: ignore[return-value] if self.exists(): # If page exists, load it. @@ -547,13 +542,12 @@ def save(self, *args: Any, **kwargs: Any) -> None: # See Page.save(). """Save page content after recomposing the page.""" - summary = kwargs.pop('summary', '') - summary = self.pre_summary + summary + kwargs['summary'] = self.pre_summary + kwargs.get('summary', '') # Save using contentformat='application/json'. kwargs['contentformat'] = 'application/json' kwargs['contentmodel'] = 'proofread-page' text = self._page_to_json() - super().save(*args, text=text, summary=summary, **kwargs) + super().save(*args, text=text, **kwargs) @property def pre_summary(self) -> str: @@ -649,7 +643,7 @@ pywikibot.warning('retrying in {} seconds ...'.format(retry)) time.sleep(retry) else: - return True, ReadTimeout + return True, ReadTimeout('ReadTimeout: Could not perform OCR') if HTTPStatus.BAD_REQUEST <= response.status_code < 600: return True, 'Http response status {}'.format(response.status_code) @@ -797,7 +791,7 @@ INDEX_TEMPLATE = ':MediaWiki:Proofreadpage_index_template' - def __init__(self, source, title: str = '') -> None: + def __init__(self, source: PageSourceType, title: str = '') -> None: """Instantiate an IndexPage object. In this class: @@ -900,7 +894,7 @@ self._page_from_numbers = {} self._numbers_from_page = {} # type: Dict[pywikibot.page.Page, int] self._page_numbers_from_label = {} # type: Dict[str, Set[int]] - self._pages_from_label = {} # type: PAGES_FROM_LABEL_TYPE + self._pages_from_label = {} # type: PagesFromLabelType self._labels_from_page_number = {} # type: Dict[int, str] self._labels_from_page = {} # type: Dict[pywikibot.page.Page, str] if hasattr(self, '_parsed_text'): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752359 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: If21e4267e8b661ac56728fe43a905c52b3c11f32 Gerrit-Change-Number: 752359 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

2 years, 4 months

[Gerrit] ...core[master]: [tests] Movw long running jobs on top

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752603 ) Change subject: [tests] Movw long running jobs on top ...................................................................... [tests] Movw long running jobs on top Change-Id: Iabfefa0c4bdbc275cbb7679587484275f42c220e --- M .github/workflows/pywikibot-ci.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 731f2b8..4eaef12 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -23,7 +23,7 @@ max-parallel: 7 matrix: - python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"] + python-version: ["pypy3", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"] site: ["wikipedia:en", "wikisource:zh"] test_prod_only: [true] include: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752603 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: Iabfefa0c4bdbc275cbb7679587484275f42c220e Gerrit-Change-Number: 752603 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-CC: jenkins-bot Gerrit-MessageType: merged

2 years, 4 months

[Gerrit] ...core[master]: [tests] limit github action parallel tasks

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752602 ) Change subject: [tests] limit github action parallel tasks ...................................................................... [tests] limit github action parallel tasks PyPy almost need 1 hour for checks. CPython needs 1/4 of that time. we have 22 tests now and we can set max-parallel without increasing total test time. Change-Id: I05d1358589e80dc67a476fc274711fd6963a1e42 --- M .github/workflows/pywikibot-ci.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 854b345..731f2b8 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -20,6 +20,7 @@ strategy: fail-fast: false + max-parallel: 7 matrix: python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752602 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: I05d1358589e80dc67a476fc274711fd6963a1e42 Gerrit-Change-Number: 752602 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

2 years, 4 months

[Gerrit] ...core[master]: [bugfix] raise ConnectionError if NewConnectionError Errno 8 occurs

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752598 ) Change subject: [bugfix] raise ConnectionError if NewConnectionError Errno 8 occurs ...................................................................... [bugfix] raise ConnectionError if NewConnectionError Errno 8 occurs Bug: T298859 Change-Id: Idd66fb5991183849faa0d3f72340160a973380da --- M pywikibot/comms/http.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index 08099a0..6a99a24 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -294,7 +294,7 @@ if isinstance(response, requests.ConnectionError): msg = str(response) if 'NewConnectionError' in msg \ - and re.search(r'\[Errno (-2|11001)\]', msg): + and re.search(r'\[Errno (-2|8|11001)\]', msg): raise ConnectionError(response) if isinstance(response, Exception): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752598 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: Idd66fb5991183849faa0d3f72340160a973380da Gerrit-Change-Number: 752598 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 4 months

[Gerrit] ...core[master]: [bugfix] Enable -interwiki option with pagegenerators.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/700383 ) Change subject: [bugfix] Enable -interwiki option with pagegenerators.py ...................................................................... [bugfix] Enable -interwiki option with pagegenerators.py - pagegenerators -interwiki is decribed to work on the given page and all equivalent pages in other languages. But the called generator is InterwikiPageGenerator which does not yield pages as expected and the result is mostly empty. Use LanguageLinksPageGenerator instead. - Together with add_text this option can be used to put the same text on the same page in other wikis. Bug: T57099 Change-Id: Iac4d7405fb954df83d4bf60711c57728e999bc56 --- M pywikibot/pagegenerators.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Matěj Suchánek: Looks good to me, but someone else must approve JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 5be66b9..072ef0a 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -882,7 +882,7 @@ 'pywikibot-enter-page-processing', fallback_prompt='Which page should be processed?') page = pywikibot.Page(pywikibot.Link(value, self.site)) - return InterwikiPageGenerator(page) + return LanguageLinksPageGenerator(page) def _handle_randomredirect(self, value): """Handle `-randomredirect` argument.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/700383 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: Iac4d7405fb954df83d4bf60711c57728e999bc56 Gerrit-Change-Number: 700383 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 4 months

[Gerrit] ...core[master]: [IMPR] Update hash bang from python to python3

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752337 ) Change subject: [IMPR] Update hash bang from python to python3 ...................................................................... [IMPR] Update hash bang from python to python3 - python is associated with Python 2 (except with Python 3.8+ but Pywikibot supports Python 3.5.3+); therefore change hash bang from python to python3 - add hash bang to scripts if needed, especially for test scripts - remove hash bang from modules which aren't used as script - remove warning message in pagegenerators.py; it is recommended to use listpages.py instead for 14 years - update last change year except the change was made by script Change-Id: Ie3281d84e1dc112a12cf418a217743f64de4e190 --- M pywikibot/cosmetic_changes.py M pywikibot/editor.py M pywikibot/login.py M pywikibot/pagegenerators.py M pywikibot/scripts/generate_family_file.py M pywikibot/scripts/generate_user_files.py M pywikibot/scripts/shell.py M pywikibot/scripts/version.py M pywikibot/specialbots/__init__.py M pywikibot/specialbots/_unlink.py M pywikibot/specialbots/_upload.py M pywikibot/tools/djvu.py M scripts/add_text.py M scripts/archive/capitalize_redirects.py M scripts/archive/casechecker.py M scripts/archive/catall.py M scripts/archive/commons_link.py M scripts/archive/create_categories.py M scripts/archive/data_ingestion.py M scripts/archive/disambredir.py M scripts/archive/editarticle.py M scripts/archive/flickrripper.py M scripts/archive/followlive.py M scripts/archive/freebasemappingupload.py M scripts/archive/imagecopy.py M scripts/archive/imagecopy_self.py M scripts/archive/imageharvest.py M scripts/archive/imagerecat.py M scripts/archive/imageuncat.py M scripts/archive/isbn.py M scripts/archive/lonelypages.py M scripts/archive/makecat.py M scripts/archive/match_images.py M scripts/archive/ndashredir.py M scripts/archive/piper.py M scripts/archive/selflink.py M scripts/archive/spamremove.py M scripts/archive/standardize_interwiki.py M scripts/archive/states_redirect.py M scripts/archive/surnames_redirects.py M scripts/archive/table2wiki.py M scripts/archive/unlink.py M scripts/archive/wikisourcetext.py M scripts/archivebot.py M scripts/basic.py M scripts/blockpageschecker.py M scripts/category.py M scripts/category_redirect.py M scripts/change_pagelang.py M scripts/checkimages.py M scripts/claimit.py M scripts/clean_sandbox.py M scripts/commons_information.py M scripts/commonscat.py M scripts/coordinate_import.py M scripts/cosmetic_changes.py M scripts/delete.py M scripts/djvutext.py M scripts/download_dump.py M scripts/fixing_redirects.py M scripts/harvest_template.py M scripts/illustrate_wikidata.py M scripts/image.py M scripts/imagetransfer.py M scripts/interwiki.py M scripts/interwikidata.py M scripts/listpages.py M scripts/login.py M scripts/maintenance/cache.py M scripts/maintenance/colors.py M scripts/maintenance/make_i18n_dict.py M scripts/maintenance/preload_sites.py M scripts/maintenance/sorting_order.py M scripts/maintenance/update_linktrails.py M scripts/maintenance/update_script.py M scripts/maintenance/wikimedia_sites.py M scripts/misspelling.py M scripts/movepages.py M scripts/newitem.py M scripts/noreferences.py M scripts/nowcommons.py M scripts/pagefromfile.py M scripts/parser_function_count.py M scripts/patrol.py M scripts/protect.py M scripts/redirect.py M scripts/reflinks.py M scripts/replace.py M scripts/replicate_wiki.py M scripts/revertbot.py M scripts/solve_disambiguation.py M scripts/speedy_delete.py M scripts/template.py M scripts/templatecount.py M scripts/touch.py M scripts/transferbot.py M scripts/unusedfiles.py M scripts/upload.py M scripts/watchlist.py M scripts/weblinkchecker.py M scripts/welcome.py M setup.py M tests/add_text_tests.py M tests/api_tests.py M tests/archive/data_ingestion_tests.py M tests/archive/disambredir_tests.py M tests/archive/imagecopy_tests.py M tests/archive/isbn_tests.py M tests/archivebot_tests.py M tests/basepage.py M tests/basesite_tests.py M tests/bot_tests.py M tests/cache_tests.py M tests/category_bot_tests.py M tests/category_tests.py M tests/checkimages_tests.py M tests/collections_tests.py M tests/cosmetic_changes_tests.py M tests/datasite_tests.py M tests/date_tests.py M tests/deletionbot_tests.py M tests/deprecation_tests.py M tests/diff_tests.py M tests/djvu_tests.py M tests/dry_api_tests.py M tests/dry_site_tests.py M tests/echo_tests.py M tests/edit_failure_tests.py M tests/edit_tests.py M tests/eventstreams_tests.py M tests/family_tests.py M tests/file_tests.py M tests/fixes_tests.py M tests/fixing_redirects_tests.py M tests/flow_edit_tests.py M tests/flow_tests.py M tests/flow_thanks_tests.py M tests/generate_family_file_tests.py M tests/generate_user_files_tests.py M tests/http_tests.py M tests/i18n_tests.py M tests/interwiki_graph_tests.py M tests/interwiki_link_tests.py M tests/interwikidata_tests.py M tests/interwikimap_tests.py M tests/l10n_tests.py M tests/link_tests.py M tests/linter_tests.py M tests/logentries_tests.py M tests/login_tests.py M tests/mediawikiversion_tests.py M tests/mysql_tests.py M tests/namespace_tests.py M tests/noreferences_tests.py M tests/oauth_tests.py M tests/page_tests.py M tests/pagegenerators_tests.py M tests/paraminfo_tests.py M tests/patrolbot_tests.py M tests/plural_tests.py M tests/proofreadpage_tests.py M tests/protectbot_tests.py M tests/pwb/print_argv.py M tests/pwb/print_env.py M tests/pwb/print_locals.py M tests/pwb/print_unicode.py M tests/pwb_tests.py M tests/redirect_bot_tests.py M tests/reflinks_tests.py M tests/replacebot_tests.py M tests/script_tests.py M tests/site_decorators_tests.py M tests/site_detect_tests.py M tests/site_tests.py M tests/siteinfo_tests.py M tests/sparql_tests.py M tests/template_bot_tests.py M tests/tests_tests.py M tests/textlib_tests.py M tests/thanks_tests.py M tests/thread_tests.py M tests/timestamp_tests.py M tests/timestripper_tests.py M tests/titletranslate_tests.py M tests/tk_tests.py M tests/token_tests.py M tests/tools_chars_tests.py M tests/tools_formatter_tests.py M tests/tools_tests.py M tests/ui_options_tests.py M tests/ui_tests.py M tests/update_script_tests.py M tests/upload_tests.py M tests/uploadbot_tests.py M tests/uploadscript_tests.py M tests/user_tests.py M tests/weblinkchecker_tests.py M tests/wikibase_edit_tests.py M tests/wikibase_tests.py M tests/wikistats_tests.py M tests/xmlreader_tests.py 201 files changed, 282 insertions(+), 211 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index b3bb6f8..621da14 100755 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -1,4 +1,3 @@ -#!/usr/bin/python """ This module can do slight modifications to tidy a wiki page's source code. diff --git a/pywikibot/editor.py b/pywikibot/editor.py index 600522c..ab1f447 100644 --- a/pywikibot/editor.py +++ b/pywikibot/editor.py @@ -1,7 +1,6 @@ -#!/usr/bin/python """Text editor class for your favourite editor.""" # -# (C) Pywikibot team, 2004-2021 +# (C) Pywikibot team, 2004-2022 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/login.py b/pywikibot/login.py index 79782ae..5be39a1 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -1,7 +1,6 @@ -#!/usr/bin/python """Library to log the bot in to a wiki account.""" # -# (C) Pywikibot team, 2003-2021 +# (C) Pywikibot team, 2003-2022 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 96298db..65747be 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -3089,8 +3089,3 @@ page = pywikibot.Page(self.site, raw_page['title'], int(raw_page['namespace'])) yield page - - -if __name__ == '__main__': # pragma: no cover - pywikibot.output('Pagegenerators cannot be run as script - are you ' - 'looking for listpages.py?') diff --git a/pywikibot/scripts/generate_family_file.py b/pywikibot/scripts/generate_family_file.py index f86e655..98a681f 100755 --- a/pywikibot/scripts/generate_family_file.py +++ b/pywikibot/scripts/generate_family_file.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """This script generates a family file from a given URL. This script must be invoked with the pwb wrapper script/code entry point. diff --git a/pywikibot/scripts/generate_user_files.py b/pywikibot/scripts/generate_user_files.py index f5d3752..16dcd10 100755 --- a/pywikibot/scripts/generate_user_files.py +++ b/pywikibot/scripts/generate_user_files.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Script to create user-config.py. .. versionchanged:: 7.0 diff --git a/pywikibot/scripts/shell.py b/pywikibot/scripts/shell.py index 58143ba..46cdb3f 100755 --- a/pywikibot/scripts/shell.py +++ b/pywikibot/scripts/shell.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Spawns an interactive Python shell and imports the pywikibot library. diff --git a/pywikibot/scripts/version.py b/pywikibot/scripts/version.py index 77faad0..58fbbec 100755 --- a/pywikibot/scripts/version.py +++ b/pywikibot/scripts/version.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Script to determine the Pywikibot version (tag, revision and date). .. versionchanged:: 7.0 diff --git a/pywikibot/specialbots/__init__.py b/pywikibot/specialbots/__init__.py index 0af9098..9388248 100644 --- a/pywikibot/specialbots/__init__.py +++ b/pywikibot/specialbots/__init__.py @@ -1,7 +1,6 @@ -#!/usr/bin/python """Module containing special bots reusable by scripts.""" # -# (C) Pywikibot team, 2020-2021 +# (C) Pywikibot team, 2020-2022 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/specialbots/_unlink.py b/pywikibot/specialbots/_unlink.py index a1a6157..ad79349 100644 --- a/pywikibot/specialbots/_unlink.py +++ b/pywikibot/specialbots/_unlink.py @@ -1,10 +1,9 @@ -#!/usr/bin/python """Special bot library containing BaseUnlinkBot. Do not import classes directly from here but from specialbots. """ # -# (C) Pywikibot team, 2003-2021 +# (C) Pywikibot team, 2003-2022 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/specialbots/_upload.py b/pywikibot/specialbots/_upload.py index 69d5239..20d9bb0 100644 --- a/pywikibot/specialbots/_upload.py +++ b/pywikibot/specialbots/_upload.py @@ -1,10 +1,9 @@ -#!/usr/bin/python """Special bot library containing UploadRobot. Do not import classes directly from here but from specialbots. """ # -# (C) Pywikibot team, 2003-2021 +# (C) Pywikibot team, 2003-2022 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/tools/djvu.py b/pywikibot/tools/djvu.py index 657ec11..e4f7c65 100644 --- a/pywikibot/tools/djvu.py +++ b/pywikibot/tools/djvu.py @@ -1,7 +1,6 @@ -#!/usr/bin/python """Wrapper around djvulibre to access djvu files properties and content.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/scripts/add_text.py b/scripts/add_text.py index a0a1cf9..dfe01c4 100755 --- a/scripts/add_text.py +++ b/scripts/add_text.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 r""" This is a Bot to add text to the top or bottom of a page. diff --git a/scripts/archive/capitalize_redirects.py b/scripts/archive/capitalize_redirects.py index 4c97651..8312f30 100755 --- a/scripts/archive/capitalize_redirects.py +++ b/scripts/archive/capitalize_redirects.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Bot to create capitalized redirects. diff --git a/scripts/archive/casechecker.py b/scripts/archive/casechecker.py index 417a654..627ee6d 100755 --- a/scripts/archive/casechecker.py +++ b/scripts/archive/casechecker.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Bot to find all pages on the wiki with mixed latin and cyrilic alphabets.""" # # (C) Pywikibot team, 2006-2021 diff --git a/scripts/archive/catall.py b/scripts/archive/catall.py index 10c349a..a709fe2 100755 --- a/scripts/archive/catall.py +++ b/scripts/archive/catall.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This script shows the categories on each page and lets you change them. diff --git a/scripts/archive/commons_link.py b/scripts/archive/commons_link.py index b80e444..84db448 100755 --- a/scripts/archive/commons_link.py +++ b/scripts/archive/commons_link.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Include Commons template in home wiki. diff --git a/scripts/archive/create_categories.py b/scripts/archive/create_categories.py index 5097594..ef3cf06 100755 --- a/scripts/archive/create_categories.py +++ b/scripts/archive/create_categories.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 r""" Program to batch create categories. diff --git a/scripts/archive/data_ingestion.py b/scripts/archive/data_ingestion.py index 1a7f8b4..2516881 100755 --- a/scripts/archive/data_ingestion.py +++ b/scripts/archive/data_ingestion.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 r""" A generic bot to do data ingestion (batch uploading) of photos or other files. diff --git a/scripts/archive/disambredir.py b/scripts/archive/disambredir.py index 2d560ff..30d14c3 100755 --- a/scripts/archive/disambredir.py +++ b/scripts/archive/disambredir.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ User assisted updating redirect links on disambiguation pages. diff --git a/scripts/archive/editarticle.py b/scripts/archive/editarticle.py index 484e80b..88478c3 100755 --- a/scripts/archive/editarticle.py +++ b/scripts/archive/editarticle.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Edit a Wikipedia article with your favourite editor. diff --git a/scripts/archive/flickrripper.py b/scripts/archive/flickrripper.py index 2bbb132..472c561 100755 --- a/scripts/archive/flickrripper.py +++ b/scripts/archive/flickrripper.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ A tool to transfer flickr photos to Wikimedia Commons. diff --git a/scripts/archive/followlive.py b/scripts/archive/followlive.py index 5cebb48..5da4adb 100755 --- a/scripts/archive/followlive.py +++ b/scripts/archive/followlive.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Periodically grab list of new articles and analyze to blank or flag them. diff --git a/scripts/archive/freebasemappingupload.py b/scripts/archive/freebasemappingupload.py index 0ee67a5..112c3e7 100755 --- a/scripts/archive/freebasemappingupload.py +++ b/scripts/archive/freebasemappingupload.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Script to upload the mappings of Freebase to Wikidata. diff --git a/scripts/archive/imagecopy.py b/scripts/archive/imagecopy.py index 3b36af9..d4646b4 100755 --- a/scripts/archive/imagecopy.py +++ b/scripts/archive/imagecopy.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 """ Script to copy files from a local Wikimedia wiki to Wikimedia Commons. @@ -56,7 +57,7 @@ By default the bot works on your home wiki (set in user-config) """ # -# (C) Pywikibot team, 2003-2021 +# (C) Pywikibot team, 2003-2022 # # Distributed under the terms of the MIT license. # diff --git a/scripts/archive/imagecopy_self.py b/scripts/archive/imagecopy_self.py index 8a604e8..44a9b5a 100755 --- a/scripts/archive/imagecopy_self.py +++ b/scripts/archive/imagecopy_self.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 """ Script to copy self published files from English Wikipedia to Commons. @@ -31,7 +32,7 @@ check it yourself. """ # -# (C) Pywikibot team, 2003-2021 +# (C) Pywikibot team, 2003-2022 # # Distributed under the terms of the MIT license. # diff --git a/scripts/archive/imageharvest.py b/scripts/archive/imageharvest.py index 75052e5..e57d9a3 100755 --- a/scripts/archive/imageharvest.py +++ b/scripts/archive/imageharvest.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 """ Bot for getting multiple images from an external site. @@ -17,7 +18,7 @@ -justshown Choose _only_ images shown on the page, not those linked """ # -# (C) Pywikibot team, 2004-2020 +# (C) Pywikibot team, 2004-2022 # # Distributed under the terms of the MIT license. # diff --git a/scripts/archive/imagerecat.py b/scripts/archive/imagerecat.py index 8928e3a..e79e0c1 100755 --- a/scripts/archive/imagerecat.py +++ b/scripts/archive/imagerecat.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Program to re-categorize images at commons. diff --git a/scripts/archive/imageuncat.py b/scripts/archive/imageuncat.py index f0225b7..ef1c52f 100755 --- a/scripts/archive/imageuncat.py +++ b/scripts/archive/imageuncat.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Program to add uncat template to images without categories at commons. diff --git a/scripts/archive/isbn.py b/scripts/archive/isbn.py index 2207d28..e68f0c5 100755 --- a/scripts/archive/isbn.py +++ b/scripts/archive/isbn.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This script reports and fixes invalid ISBN numbers. diff --git a/scripts/archive/lonelypages.py b/scripts/archive/lonelypages.py index 68b59ff..15eb4f3 100755 --- a/scripts/archive/lonelypages.py +++ b/scripts/archive/lonelypages.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This is a script written to add the template "orphan" to pages. diff --git a/scripts/archive/makecat.py b/scripts/archive/makecat.py index fdafbc2..2d9682d 100755 --- a/scripts/archive/makecat.py +++ b/scripts/archive/makecat.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Bot to add new or existing categories to pages. diff --git a/scripts/archive/match_images.py b/scripts/archive/match_images.py index 25c270c..6104271 100755 --- a/scripts/archive/match_images.py +++ b/scripts/archive/match_images.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Program to match two images based on histograms. diff --git a/scripts/archive/ndashredir.py b/scripts/archive/ndashredir.py index c6cf349..8359c31 100755 --- a/scripts/archive/ndashredir.py +++ b/scripts/archive/ndashredir.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ A script to create hyphenated redirects for n or m dash pages. diff --git a/scripts/archive/piper.py b/scripts/archive/piper.py index fef5ffd..ef1d7b1 100755 --- a/scripts/archive/piper.py +++ b/scripts/archive/piper.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 r""" This bot uses external filtering programs for munging text. diff --git a/scripts/archive/selflink.py b/scripts/archive/selflink.py index f842836..7f8a44e 100755 --- a/scripts/archive/selflink.py +++ b/scripts/archive/selflink.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This bot searches for selflinks and allows removing them. diff --git a/scripts/archive/spamremove.py b/scripts/archive/spamremove.py index 5c36fdc..f0b01ab 100755 --- a/scripts/archive/spamremove.py +++ b/scripts/archive/spamremove.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Script to remove links that are being or have been spammed. diff --git a/scripts/archive/standardize_interwiki.py b/scripts/archive/standardize_interwiki.py index 1ff12ed..79a8679 100755 --- a/scripts/archive/standardize_interwiki.py +++ b/scripts/archive/standardize_interwiki.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Loop over all pages in the home wiki, standardizing the interwiki links. diff --git a/scripts/archive/states_redirect.py b/scripts/archive/states_redirect.py index d564921..acd812d 100755 --- a/scripts/archive/states_redirect.py +++ b/scripts/archive/states_redirect.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Create country sub-division redirect pages. Check if they are in the form Something, State, and if so, create a redirect diff --git a/scripts/archive/surnames_redirects.py b/scripts/archive/surnames_redirects.py index 9f58052..d945ebd 100755 --- a/scripts/archive/surnames_redirects.py +++ b/scripts/archive/surnames_redirects.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Bot to create redirects based on name order. diff --git a/scripts/archive/table2wiki.py b/scripts/archive/table2wiki.py index 4f70d92..c509a07 100755 --- a/scripts/archive/table2wiki.py +++ b/scripts/archive/table2wiki.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Nifty script to convert HTML-tables to MediaWiki's own syntax. diff --git a/scripts/archive/unlink.py b/scripts/archive/unlink.py index 3adb09f..3dc35b0 100755 --- a/scripts/archive/unlink.py +++ b/scripts/archive/unlink.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This bot unlinks a page on every page that links to it. diff --git a/scripts/archive/wikisourcetext.py b/scripts/archive/wikisourcetext.py index cc6f813..6604c31 100755 --- a/scripts/archive/wikisourcetext.py +++ b/scripts/archive/wikisourcetext.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This bot applies to Wikisource sites to upload text. diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 82246de..5c12659 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ archivebot.py - discussion page archiving bot. diff --git a/scripts/basic.py b/scripts/basic.py index e8695da..b11b772 100755 --- a/scripts/basic.py +++ b/scripts/basic.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ An incomplete sample script. diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py index 4ef04c6..45c7ba8 100755 --- a/scripts/blockpageschecker.py +++ b/scripts/blockpageschecker.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ A bot to remove stale protection templates from pages that are not protected. diff --git a/scripts/category.py b/scripts/category.py index fc3cfa1..6de36bd 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Script to manage categories. diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 67b94bc..48adf49 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """This bot will move pages out of redirected categories. The bot will look for categories that are marked with a category redirect diff --git a/scripts/change_pagelang.py b/scripts/change_pagelang.py index 5a3c6e6..a8fb485 100755 --- a/scripts/change_pagelang.py +++ b/scripts/change_pagelang.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This script changes the content language of pages. diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 70c59d1..9ded779 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Script to check recently uploaded files. diff --git a/scripts/claimit.py b/scripts/claimit.py index 2435615..8ca70de 100755 --- a/scripts/claimit.py +++ b/scripts/claimit.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ A script that adds claims to Wikidata items based on a list of pages. diff --git a/scripts/clean_sandbox.py b/scripts/clean_sandbox.py index e27b729..b9098d1 100755 --- a/scripts/clean_sandbox.py +++ b/scripts/clean_sandbox.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This bot resets a (user) sandbox with predefined text. diff --git a/scripts/commons_information.py b/scripts/commons_information.py index d9cdda4..1367448 100755 --- a/scripts/commons_information.py +++ b/scripts/commons_information.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Insert a language template into the description field.""" # # (C) Pywikibot team, 2015-2022 diff --git a/scripts/commonscat.py b/scripts/commonscat.py index 6bb6c96..f935393 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ With this tool you can add the template {{commonscat}} to categories. diff --git a/scripts/coordinate_import.py b/scripts/coordinate_import.py index 49cb745..364e86a 100755 --- a/scripts/coordinate_import.py +++ b/scripts/coordinate_import.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 r""" Coordinate importing script. diff --git a/scripts/cosmetic_changes.py b/scripts/cosmetic_changes.py index d7d4c04..296ea02 100755 --- a/scripts/cosmetic_changes.py +++ b/scripts/cosmetic_changes.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This module can do slight modifications to tidy a wiki page's source code. diff --git a/scripts/delete.py b/scripts/delete.py index dc217d1..ead90aa 100755 --- a/scripts/delete.py +++ b/scripts/delete.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This script can be used to delete and undelete pages en masse. diff --git a/scripts/djvutext.py b/scripts/djvutext.py index 5fcf2f1..5c65787 100755 --- a/scripts/djvutext.py +++ b/scripts/djvutext.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This bot uploads text from djvu files onto pages in the "Page" namespace. diff --git a/scripts/download_dump.py b/scripts/download_dump.py index 6d19b34..e33d4cf 100755 --- a/scripts/download_dump.py +++ b/scripts/download_dump.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This bot downloads dump from dumps.wikimedia.org. diff --git a/scripts/fixing_redirects.py b/scripts/fixing_redirects.py index d0118c7..fac33f6 100755 --- a/scripts/fixing_redirects.py +++ b/scripts/fixing_redirects.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Correct all redirect links in featured pages or only one page of each wiki. diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py index c740470..3c72f17 100755 --- a/scripts/harvest_template.py +++ b/scripts/harvest_template.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 r""" Template harvesting script. diff --git a/scripts/illustrate_wikidata.py b/scripts/illustrate_wikidata.py index 2429f71..1a19d41 100755 --- a/scripts/illustrate_wikidata.py +++ b/scripts/illustrate_wikidata.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Bot to add images to Wikidata items. diff --git a/scripts/image.py b/scripts/image.py index 4b55d1d..73f417a 100755 --- a/scripts/image.py +++ b/scripts/image.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This script can be used to change one image to another or remove an image. diff --git a/scripts/imagetransfer.py b/scripts/imagetransfer.py index 4dbfcce..98743a2 100755 --- a/scripts/imagetransfer.py +++ b/scripts/imagetransfer.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Script to copy images to Wikimedia Commons, or to another wiki. diff --git a/scripts/interwiki.py b/scripts/interwiki.py index ea51ffb..1f222fe 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Script to check language links for general pages. diff --git a/scripts/interwikidata.py b/scripts/interwikidata.py index 2b6fc90..e56a1bf 100755 --- a/scripts/interwikidata.py +++ b/scripts/interwikidata.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Script to handle interwiki links based on Wikibase. diff --git a/scripts/listpages.py b/scripts/listpages.py index d3b5f6c..6d2aa0e 100755 --- a/scripts/listpages.py +++ b/scripts/listpages.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 r""" Print a list of pages, as defined by page generator parameters. diff --git a/scripts/login.py b/scripts/login.py index 4f4761b..6462206 100755 --- a/scripts/login.py +++ b/scripts/login.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Script to log the bot in to a wiki account. diff --git a/scripts/maintenance/cache.py b/scripts/maintenance/cache.py index 2cb3321..91b1ad3 100755 --- a/scripts/maintenance/cache.py +++ b/scripts/maintenance/cache.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 r""" This script runs commands on each entry in the API caches. diff --git a/scripts/maintenance/colors.py b/scripts/maintenance/colors.py index aa863e2..4bd6fcf 100755 --- a/scripts/maintenance/colors.py +++ b/scripts/maintenance/colors.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Utility to show pywikibot colors.""" # # (C) Pywikibot team, 2016-2020 diff --git a/scripts/maintenance/make_i18n_dict.py b/scripts/maintenance/make_i18n_dict.py index 9fe0f56..40a9cc1 100755 --- a/scripts/maintenance/make_i18n_dict.py +++ b/scripts/maintenance/make_i18n_dict.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Generate an i18n file from a given script. diff --git a/scripts/maintenance/preload_sites.py b/scripts/maintenance/preload_sites.py index c4914d0..6c790e0 100755 --- a/scripts/maintenance/preload_sites.py +++ b/scripts/maintenance/preload_sites.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Script that preloads site and user info for all sites of given family. The following parameters are supported: diff --git a/scripts/maintenance/sorting_order.py b/scripts/maintenance/sorting_order.py index 68ea584..1d80e2e 100755 --- a/scripts/maintenance/sorting_order.py +++ b/scripts/maintenance/sorting_order.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Script that updates interwiki sorting order in family.py file.""" # # (C) Pywikibot team, 2020-2021 diff --git a/scripts/maintenance/update_linktrails.py b/scripts/maintenance/update_linktrails.py index b0ac04a..abfeddd 100755 --- a/scripts/maintenance/update_linktrails.py +++ b/scripts/maintenance/update_linktrails.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Script that updates the linktrails in family.py file. linktrails contains a regex for each site code which holds letters that diff --git a/scripts/maintenance/update_script.py b/scripts/maintenance/update_script.py index cc245e5..9c39ada 100755 --- a/scripts/maintenance/update_script.py +++ b/scripts/maintenance/update_script.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ A helper script to update scripts and replace deprecated parts. diff --git a/scripts/maintenance/wikimedia_sites.py b/scripts/maintenance/wikimedia_sites.py index d209dbd..eb4aa6a 100755 --- a/scripts/maintenance/wikimedia_sites.py +++ b/scripts/maintenance/wikimedia_sites.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Script that updates the language lists in Wikimedia family files. Usage: diff --git a/scripts/misspelling.py b/scripts/misspelling.py index d8cd4d6..34f615f 100755 --- a/scripts/misspelling.py +++ b/scripts/misspelling.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This script fixes links that contain common spelling mistakes. diff --git a/scripts/movepages.py b/scripts/movepages.py index 676ac76..dcacaff 100755 --- a/scripts/movepages.py +++ b/scripts/movepages.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This script can move pages. diff --git a/scripts/newitem.py b/scripts/newitem.py index 76255c4..d828cad 100755 --- a/scripts/newitem.py +++ b/scripts/newitem.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This script creates new items on Wikidata based on certain criteria. diff --git a/scripts/noreferences.py b/scripts/noreferences.py index de7ea9a..036f1d2 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This script adds a missing references section to pages. diff --git a/scripts/nowcommons.py b/scripts/nowcommons.py index 7229c3b..c89fb25 100755 --- a/scripts/nowcommons.py +++ b/scripts/nowcommons.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 r""" Script to delete files that are also present on Wikimedia Commons. diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py index f79297b..f8c2145 100755 --- a/scripts/pagefromfile.py +++ b/scripts/pagefromfile.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 r""" Bot to upload pages from a text file. diff --git a/scripts/parser_function_count.py b/scripts/parser_function_count.py index 31f8ecc..08ce8d9 100755 --- a/scripts/parser_function_count.py +++ b/scripts/parser_function_count.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 """ Used to find expensive templates that are subject to be converted to Lua. @@ -43,7 +44,7 @@ functions will be listed. """ # -# (C) Pywikibot team, 2013-2021 +# (C) Pywikibot team, 2013-2022 # # Distributed under the terms of the MIT license. # diff --git a/scripts/patrol.py b/scripts/patrol.py index 0d18317..80959e3 100755 --- a/scripts/patrol.py +++ b/scripts/patrol.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ The bot is meant to mark the edits based on info obtained by whitelist. diff --git a/scripts/protect.py b/scripts/protect.py index ce119f6..a65fb4b 100755 --- a/scripts/protect.py +++ b/scripts/protect.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This script can be used to protect and unprotect pages en masse. diff --git a/scripts/redirect.py b/scripts/redirect.py index 0923db5..ec74455 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Script to resolve double redirects, and to delete broken redirects. diff --git a/scripts/reflinks.py b/scripts/reflinks.py index 3623aec..9cf0a51 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Fetch and add titles for bare links in references. diff --git a/scripts/replace.py b/scripts/replace.py index d1826b8..4d7f372 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 r""" This bot will make direct text replacements. diff --git a/scripts/replicate_wiki.py b/scripts/replicate_wiki.py index 8b01f39..e4dd498 100755 --- a/scripts/replicate_wiki.py +++ b/scripts/replicate_wiki.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This bot replicates pages in a wiki to a second wiki within one family. diff --git a/scripts/revertbot.py b/scripts/revertbot.py index b5e63b4..0616401 100755 --- a/scripts/revertbot.py +++ b/scripts/revertbot.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 r""" This script can be used for reverting certain edits. diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index 162bec9..88abc43 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Script to help a human solve disambiguations by presenting a set of options. diff --git a/scripts/speedy_delete.py b/scripts/speedy_delete.py index 9ac8fb7..ad68da2 100755 --- a/scripts/speedy_delete.py +++ b/scripts/speedy_delete.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 """ Help sysops to quickly check and/or delete pages listed for speedy deletion. diff --git a/scripts/template.py b/scripts/template.py index f2d7b84..cf3252c 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 r""" Very simple script to replace a template with another one. diff --git a/scripts/templatecount.py b/scripts/templatecount.py index b5101f7..f4c7ace 100755 --- a/scripts/templatecount.py +++ b/scripts/templatecount.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Display the list of pages transcluding a given list of templates. diff --git a/scripts/touch.py b/scripts/touch.py index dd3e68d..292f8ad 100755 --- a/scripts/touch.py +++ b/scripts/touch.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This bot goes over multiple pages of a wiki, and edits them without changes. diff --git a/scripts/transferbot.py b/scripts/transferbot.py index 261618a..ea13014 100755 --- a/scripts/transferbot.py +++ b/scripts/transferbot.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 r""" This script transfers pages from a source wiki to a target wiki. diff --git a/scripts/unusedfiles.py b/scripts/unusedfiles.py index 947ba18..8836224 100755 --- a/scripts/unusedfiles.py +++ b/scripts/unusedfiles.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This bot appends some text to all unused images and notifies uploaders. diff --git a/scripts/upload.py b/scripts/upload.py index d83d3fa..f40d829 100755 --- a/scripts/upload.py +++ b/scripts/upload.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Script to upload images to Wikipedia. diff --git a/scripts/watchlist.py b/scripts/watchlist.py index c6f53f4..5bfef5b 100755 --- a/scripts/watchlist.py +++ b/scripts/watchlist.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Allows access to the bot account's watchlist. diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py index 53753af..9130775 100755 --- a/scripts/weblinkchecker.py +++ b/scripts/weblinkchecker.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ This bot is used for checking external links found at the wiki. diff --git a/scripts/welcome.py b/scripts/welcome.py index c0e7747..7714301 100755 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Script to welcome new users. diff --git a/setup.py b/setup.py index 840534a..6c2323f 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 # -*- coding: utf-8 -*- """Installer script for Pywikibot framework. @@ -27,7 +28,7 @@ - upload this patchset to Gerrit and merge it. """ # -# (C) Pywikibot team, 2009-2021 +# (C) Pywikibot team, 2009-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/add_text_tests.py b/tests/add_text_tests.py index a79c72f..a323f82 100644 --- a/tests/add_text_tests.py +++ b/tests/add_text_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test add_text bot module.""" # -# (C) Pywikibot team, 2016-2021 +# (C) Pywikibot team, 2016-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/api_tests.py b/tests/api_tests.py index 13a81d5..2464186 100644 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 """API test module.""" # # (C) Pywikibot team, 2007-2022 diff --git a/tests/archive/data_ingestion_tests.py b/tests/archive/data_ingestion_tests.py index 5e8c0da..7693619 100644 --- a/tests/archive/data_ingestion_tests.py +++ b/tests/archive/data_ingestion_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Unit tests for data_ingestion.py script.""" # # (C) Pywikibot team, 2012-2021 diff --git a/tests/archive/disambredir_tests.py b/tests/archive/disambredir_tests.py index 7e118e0..5512c8e 100644 --- a/tests/archive/disambredir_tests.py +++ b/tests/archive/disambredir_tests.py @@ -1,10 +1,11 @@ +#!/usr/bin/python3 """ DisambigurationRedirectBot test. These tests write to the wiki. """ # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/archive/imagecopy_tests.py b/tests/archive/imagecopy_tests.py index c958da4..0183108 100644 --- a/tests/archive/imagecopy_tests.py +++ b/tests/archive/imagecopy_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for imagecopy script.""" # -# (C) Pywikibot team, 2018-2020 +# (C) Pywikibot team, 2018-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/archive/isbn_tests.py b/tests/archive/isbn_tests.py index b159370..866fa14 100644 --- a/tests/archive/isbn_tests.py +++ b/tests/archive/isbn_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for isbn script.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/archivebot_tests.py b/tests/archivebot_tests.py index 03df558..fc84942 100644 --- a/tests/archivebot_tests.py +++ b/tests/archivebot_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for archivebot scripts.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/basepage.py b/tests/basepage.py index 7b1b01a..8a3fa70 100644 --- a/tests/basepage.py +++ b/tests/basepage.py @@ -1,12 +1,9 @@ -"""Tests for BasePage subclasses.""" +"""BasePage tests subclasses.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # -import unittest -from contextlib import suppress - from pywikibot.page import BasePage from tests.aspects import TestCase @@ -137,8 +134,3 @@ self.assertEqual(self._page.templates(), []) self.assertFalse(self._page.isCategoryRedirect()) self.assertTrue(self._page.botMayEdit()) - - -if __name__ == '__main__': # pragma: no cover - with suppress(SystemExit): - unittest.main() diff --git a/tests/basesite_tests.py b/tests/basesite_tests.py index 93acd02..7d3f3e3 100644 --- a/tests/basesite_tests.py +++ b/tests/basesite_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the site module.""" # -# (C) Pywikibot team, 2008-2021 +# (C) Pywikibot team, 2008-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/bot_tests.py b/tests/bot_tests.py index 06ad46f..d950ab5 100644 --- a/tests/bot_tests.py +++ b/tests/bot_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Bot tests.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/cache_tests.py b/tests/cache_tests.py index 4767907..e5d489e 100644 --- a/tests/cache_tests.py +++ b/tests/cache_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """API Request cache tests.""" # -# (C) Pywikibot team, 2012-2021 +# (C) Pywikibot team, 2012-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/category_bot_tests.py b/tests/category_bot_tests.py index 98926a7..aa58282 100644 --- a/tests/category_bot_tests.py +++ b/tests/category_bot_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the category bot script.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/category_tests.py b/tests/category_tests.py index a39a684..fedad53 100644 --- a/tests/category_tests.py +++ b/tests/category_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the Category class.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/checkimages_tests.py b/tests/checkimages_tests.py index da52de4..b0da988 100644 --- a/tests/checkimages_tests.py +++ b/tests/checkimages_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Unit tests for checkimages script.""" # # (C) Pywikibot team, 2015-2021 diff --git a/tests/collections_tests.py b/tests/collections_tests.py index 2bfec55..f2b80ec 100644 --- a/tests/collections_tests.py +++ b/tests/collections_tests.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 """Tests for the Wikidata parts of the page module.""" # # (C) Pywikibot team, 2019-2021 diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py index b0f8fed..7907f83 100644 --- a/tests/cosmetic_changes_tests.py +++ b/tests/cosmetic_changes_tests.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 """Test cosmetic_changes module.""" # # (C) Pywikibot team, 2015-2022 diff --git a/tests/datasite_tests.py b/tests/datasite_tests.py index 595e5e8..25c2a0d 100644 --- a/tests/datasite_tests.py +++ b/tests/datasite_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the site module.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/date_tests.py b/tests/date_tests.py index d76989f..00fe072 100644 --- a/tests/date_tests.py +++ b/tests/date_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the date module.""" # -# (C) Pywikibot team, 2012-2021 +# (C) Pywikibot team, 2012-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/deletionbot_tests.py b/tests/deletionbot_tests.py index 2e08ace..d871c89 100644 --- a/tests/deletionbot_tests.py +++ b/tests/deletionbot_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for scripts/delete.py.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/deprecation_tests.py b/tests/deprecation_tests.py index a802401..649fb42 100644 --- a/tests/deprecation_tests.py +++ b/tests/deprecation_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for deprecation tools.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/diff_tests.py b/tests/diff_tests.py index 6fdea61..5e7ecfb 100644 --- a/tests/diff_tests.py +++ b/tests/diff_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Test diff module.""" # # (C) Pywikibot team, 2016-2021 diff --git a/tests/djvu_tests.py b/tests/djvu_tests.py index 7fc867a..867d34c 100644 --- a/tests/djvu_tests.py +++ b/tests/djvu_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Unit tests for djvu.py.""" # diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index 9b998ac..9fc9175 100644 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """API tests which do not interact with a site.""" # -# (C) Pywikibot team, 2012-2021 +# (C) Pywikibot team, 2012-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/dry_site_tests.py b/tests/dry_site_tests.py index 76a8c62..9f27752 100644 --- a/tests/dry_site_tests.py +++ b/tests/dry_site_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests against a fake Site object.""" # -# (C) Pywikibot team, 2012-2021 +# (C) Pywikibot team, 2012-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/echo_tests.py b/tests/echo_tests.py index af5e924..9f48901 100644 --- a/tests/echo_tests.py +++ b/tests/echo_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test echo module.""" # -# (C) Pywikibot team, 2019-2021 +# (C) Pywikibot team, 2019-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/edit_failure_tests.py b/tests/edit_failure_tests.py index fa7997d..cb927c9 100644 --- a/tests/edit_failure_tests.py +++ b/tests/edit_failure_tests.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 """ Tests for edit failures. @@ -7,7 +8,7 @@ These tests use special code 'write = -1' for edit failures. """ # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/edit_tests.py b/tests/edit_tests.py index 152747d..32c1a4e 100644 --- a/tests/edit_tests.py +++ b/tests/edit_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for editing pages.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/eventstreams_tests.py b/tests/eventstreams_tests.py index 4be75b5..61262b6 100644 --- a/tests/eventstreams_tests.py +++ b/tests/eventstreams_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the eventstreams module.""" # -# (C) Pywikibot team, 2017-2021 +# (C) Pywikibot team, 2017-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/family_tests.py b/tests/family_tests.py index bcaea49..d048431 100644 --- a/tests/family_tests.py +++ b/tests/family_tests.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 """Tests for the family module.""" # # (C) Pywikibot team, 2014-2022 diff --git a/tests/file_tests.py b/tests/file_tests.py index bee9347..d01d93b 100644 --- a/tests/file_tests.py +++ b/tests/file_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """FilePage tests.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/fixes_tests.py b/tests/fixes_tests.py index a4a49e9..8bff0ca 100644 --- a/tests/fixes_tests.py +++ b/tests/fixes_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for fixes module.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/fixing_redirects_tests.py b/tests/fixing_redirects_tests.py index 2fd1b72..8c7272f 100644 --- a/tests/fixing_redirects_tests.py +++ b/tests/fixing_redirects_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test fixing redirects bot module.""" # -# (C) Pywikibot team, 2018-2020 +# (C) Pywikibot team, 2018-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/flow_edit_tests.py b/tests/flow_edit_tests.py index 1560f74..74333f0 100644 --- a/tests/flow_edit_tests.py +++ b/tests/flow_edit_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Edit tests for the flow module.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/flow_tests.py b/tests/flow_tests.py index 01eb922..8083358 100644 --- a/tests/flow_tests.py +++ b/tests/flow_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the flow module.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/flow_thanks_tests.py b/tests/flow_thanks_tests.py index 57c6f93..d26d123 100644 --- a/tests/flow_thanks_tests.py +++ b/tests/flow_thanks_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for thanks-related code.""" # -# (C) Pywikibot team, 2016-2021 +# (C) Pywikibot team, 2016-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/generate_family_file_tests.py b/tests/generate_family_file_tests.py index 9026f69..079fe7f 100644 --- a/tests/generate_family_file_tests.py +++ b/tests/generate_family_file_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test generate_family_file script.""" # -# (C) Pywikibot team, 2018-2021 +# (C) Pywikibot team, 2018-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/generate_user_files_tests.py b/tests/generate_user_files_tests.py index 2824de5..982eeab 100644 --- a/tests/generate_user_files_tests.py +++ b/tests/generate_user_files_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test generate_user_files script.""" # -# (C) Pywikibot team, 2018-2021 +# (C) Pywikibot team, 2018-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/http_tests.py b/tests/http_tests.py index 36f07f9..e1096cf 100644 --- a/tests/http_tests.py +++ b/tests/http_tests.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 """Tests for http module.""" # # (C) Pywikibot team, 2014-2022 diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 946c0c3..616147f 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test i18n module.""" # -# (C) Pywikibot team, 2007-2021 +# (C) Pywikibot team, 2007-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/interwiki_graph_tests.py b/tests/interwiki_graph_tests.py index 19321a4..a89e110 100644 --- a/tests/interwiki_graph_tests.py +++ b/tests/interwiki_graph_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Test Interwiki Graph functionality.""" # # (C) Pywikibot team, 2015-2022 diff --git a/tests/interwiki_link_tests.py b/tests/interwiki_link_tests.py index bc30396..aa07bfa 100644 --- a/tests/interwiki_link_tests.py +++ b/tests/interwiki_link_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test Interwiki Link functionality.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/interwikidata_tests.py b/tests/interwikidata_tests.py index a2bbeba..21d317b 100644 --- a/tests/interwikidata_tests.py +++ b/tests/interwikidata_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for scripts/interwikidata.py.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/interwikimap_tests.py b/tests/interwikimap_tests.py index a96597c..971f9fd 100644 --- a/tests/interwikimap_tests.py +++ b/tests/interwikimap_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the site module.""" # -# (C) Pywikibot team, 2018-2021 +# (C) Pywikibot team, 2018-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/l10n_tests.py b/tests/l10n_tests.py index b4fc367..e52e5ba 100644 --- a/tests/l10n_tests.py +++ b/tests/l10n_tests.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 """Test valid templates.""" # # (C) Pywikibot team, 2015-2022 diff --git a/tests/link_tests.py b/tests/link_tests.py index f8e9dbb..f1c132f 100644 --- a/tests/link_tests.py +++ b/tests/link_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test Link functionality.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/linter_tests.py b/tests/linter_tests.py index a304d88..9a402a5 100644 --- a/tests/linter_tests.py +++ b/tests/linter_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the site module.""" # -# (C) Pywikibot team, 2018-2021 +# (C) Pywikibot team, 2018-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/logentries_tests.py b/tests/logentries_tests.py index 990acf2..bcacfdb 100644 --- a/tests/logentries_tests.py +++ b/tests/logentries_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test logentries module.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/login_tests.py b/tests/login_tests.py index c1f60dd..be4e8c5 100644 --- a/tests/login_tests.py +++ b/tests/login_tests.py @@ -1,10 +1,11 @@ +#!/usr/bin/python3 """ Tests for LoginManager classes. e.g. used to test password-file based login. """ # -# (C) Pywikibot team, 2012-2021 +# (C) Pywikibot team, 2012-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/mediawikiversion_tests.py b/tests/mediawikiversion_tests.py index 3e13cc7..b183148 100644 --- a/tests/mediawikiversion_tests.py +++ b/tests/mediawikiversion_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the tools.MediaWikiVersion class.""" # -# (C) Pywikibot team, 2008-2021 +# (C) Pywikibot team, 2008-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/mysql_tests.py b/tests/mysql_tests.py index aeb986f..fac64cb 100644 --- a/tests/mysql_tests.py +++ b/tests/mysql_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for mysql module.""" # -# (C) Pywikibot team, 2021 +# (C) Pywikibot team, 2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/namespace_tests.py b/tests/namespace_tests.py index e1cb2d7..401e502 100644 --- a/tests/namespace_tests.py +++ b/tests/namespace_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the Namespace class.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/noreferences_tests.py b/tests/noreferences_tests.py index eec24fe..8cb112b 100644 --- a/tests/noreferences_tests.py +++ b/tests/noreferences_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test noreferences bot module.""" # -# (C) Pywikibot team, 2018-2021 +# (C) Pywikibot team, 2018-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/oauth_tests.py b/tests/oauth_tests.py index 7dc8556..2885c98 100644 --- a/tests/oauth_tests.py +++ b/tests/oauth_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test OAuth functionality.""" # -# (C) Pywikibot team, 2015-2020 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/page_tests.py b/tests/page_tests.py index 2bf2674..9a37684 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the page module.""" # -# (C) Pywikibot team, 2008-2021 +# (C) Pywikibot team, 2008-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 6129d5e..e235662 100644 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Test pagegenerators module.""" # # (C) Pywikibot team, 2009-2021 diff --git a/tests/paraminfo_tests.py b/tests/paraminfo_tests.py index 92f257b..0f26e3d 100644 --- a/tests/paraminfo_tests.py +++ b/tests/paraminfo_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test confirming paraminfo contains expected values.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/patrolbot_tests.py b/tests/patrolbot_tests.py index 9521da8..b69d404 100644 --- a/tests/patrolbot_tests.py +++ b/tests/patrolbot_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the patrol script.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/plural_tests.py b/tests/plural_tests.py index 46a77b1..6ee7891 100644 --- a/tests/plural_tests.py +++ b/tests/plural_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test plural module.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py index 4c20284..33f29f3 100644 --- a/tests/proofreadpage_tests.py +++ b/tests/proofreadpage_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the proofreadpage module.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/protectbot_tests.py b/tests/protectbot_tests.py index b1cde94..6b3dda9 100644 --- a/tests/protectbot_tests.py +++ b/tests/protectbot_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for scripts/protect.py.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/pwb/print_argv.py b/tests/pwb/print_argv.py index 76d1adb..85c47c9 100644 --- a/tests/pwb/print_argv.py +++ b/tests/pwb/print_argv.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Script that forms part of pwb_tests. .. versionadded:: 7.0 diff --git a/tests/pwb/print_env.py b/tests/pwb/print_env.py index 29e364c..e1cac4a 100644 --- a/tests/pwb/print_env.py +++ b/tests/pwb/print_env.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Script that forms part of pwb_tests.""" # # (C) Pywikibot team, 2015-2021 diff --git a/tests/pwb/print_locals.py b/tests/pwb/print_locals.py index 4560441..04024d4 100644 --- a/tests/pwb/print_locals.py +++ b/tests/pwb/print_locals.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Script that forms part of pwb_tests.""" # # (C) Pywikibot team, 2013-2021 diff --git a/tests/pwb/print_unicode.py b/tests/pwb/print_unicode.py index 3f93dc7..97b70a1 100644 --- a/tests/pwb/print_unicode.py +++ b/tests/pwb/print_unicode.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Script that forms part of pwb_tests.""" # # (C) Pywikibot team, 2018-2021 diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py index 2d59c6b..b1afeff 100644 --- a/tests/pwb_tests.py +++ b/tests/pwb_tests.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 """ Test pwb.py. @@ -6,7 +7,7 @@ https://bitbucket.org/ned/coveragepy/src/default/tests/test_execfile.py """ # -# (C) Pywikibot team, 2007-2021 +# (C) Pywikibot team, 2007-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/redirect_bot_tests.py b/tests/redirect_bot_tests.py index d8fb021..f7aa2a9 100644 --- a/tests/redirect_bot_tests.py +++ b/tests/redirect_bot_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the redirect.py script.""" # -# (C) Pywikibot team, 2017-2021 +# (C) Pywikibot team, 2017-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/reflinks_tests.py b/tests/reflinks_tests.py index 7b2642e..0098d16 100644 --- a/tests/reflinks_tests.py +++ b/tests/reflinks_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for reflinks script.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/replacebot_tests.py b/tests/replacebot_tests.py index 863ab1f..9ee153b 100644 --- a/tests/replacebot_tests.py +++ b/tests/replacebot_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the replace script and ReplaceRobot class.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/script_tests.py b/tests/script_tests.py index 18a9e8e..fa02e3e 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test that each script can be compiled and executed.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/site_decorators_tests.py b/tests/site_decorators_tests.py index 4ff9dbf..bc4df9c 100644 --- a/tests/site_decorators_tests.py +++ b/tests/site_decorators_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests against a fake Site object.""" # -# (C) Pywikibot team, 2012-2021 +# (C) Pywikibot team, 2012-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index fd9d397..b675b51 100644 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test for site detection.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/site_tests.py b/tests/site_tests.py index ce5b703..d8c1e06 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 """Tests for the site module.""" # # (C) Pywikibot team, 2008-2022 diff --git a/tests/siteinfo_tests.py b/tests/siteinfo_tests.py index 51136ee..9b0e099 100644 --- a/tests/siteinfo_tests.py +++ b/tests/siteinfo_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the site module.""" # -# (C) Pywikibot team, 2008-2021 +# (C) Pywikibot team, 2008-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/sparql_tests.py b/tests/sparql_tests.py index 784d3e6..15724d8 100644 --- a/tests/sparql_tests.py +++ b/tests/sparql_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test cases for the SPARQL API.""" # -# (C) Pywikibot team, 2016-2021 +# (C) Pywikibot team, 2016-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/template_bot_tests.py b/tests/template_bot_tests.py index 48b4e1b..96aa4a3 100644 --- a/tests/template_bot_tests.py +++ b/tests/template_bot_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test template bot module.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/tests_tests.py b/tests/tests_tests.py index 4f46030..b868d47 100644 --- a/tests/tests_tests.py +++ b/tests/tests_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Tests for the tests package.""" # # (C) Pywikibot team, 2014-2021 diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index d72da99..f52dc4d 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 """Test textlib module.""" # # (C) Pywikibot team, 2011-2022 diff --git a/tests/thanks_tests.py b/tests/thanks_tests.py index dda33b7..c7a1422 100644 --- a/tests/thanks_tests.py +++ b/tests/thanks_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for thanks-related code.""" # -# (C) Pywikibot team, 2016-2021 +# (C) Pywikibot team, 2016-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/thread_tests.py b/tests/thread_tests.py index 329017f..61c313b 100644 --- a/tests/thread_tests.py +++ b/tests/thread_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for threading tools.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/timestamp_tests.py b/tests/timestamp_tests.py index 18b8bd7..04692a8 100644 --- a/tests/timestamp_tests.py +++ b/tests/timestamp_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the Timestamp class.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/timestripper_tests.py b/tests/timestripper_tests.py index 05fc8d7..45c4eca 100644 --- a/tests/timestripper_tests.py +++ b/tests/timestripper_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for archivebot.py/Timestripper.""" # -# (C) Pywikibot team, 2014-2020 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/titletranslate_tests.py b/tests/titletranslate_tests.py index 2a722bb..6189ce5 100644 --- a/tests/titletranslate_tests.py +++ b/tests/titletranslate_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for titletranslate module.""" # -# (C) Pywikibot team, 2021 +# (C) Pywikibot team, 2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/tk_tests.py b/tests/tk_tests.py index 6696c9f..c35a998 100644 --- a/tests/tk_tests.py +++ b/tests/tk_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the Tk UI.""" # -# (C) Pywikibot team, 2008-2021 +# (C) Pywikibot team, 2008-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/token_tests.py b/tests/token_tests.py index 3189343..e31d9ec 100644 --- a/tests/token_tests.py +++ b/tests/token_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for tokens.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/tools_chars_tests.py b/tests/tools_chars_tests.py index abe9f51..f42e4b5 100644 --- a/tests/tools_chars_tests.py +++ b/tests/tools_chars_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Test tools.chars package.""" # # (C) Pywikibot team, 2015-2021 diff --git a/tests/tools_formatter_tests.py b/tests/tools_formatter_tests.py index 84e6b9b..20f0cdb 100644 --- a/tests/tools_formatter_tests.py +++ b/tests/tools_formatter_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the ``pywikibot.tools.formatter`` module.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/tools_tests.py b/tests/tools_tests.py index e091aeb..4b073a5 100644 --- a/tests/tools_tests.py +++ b/tests/tools_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """Test tools package alone which don't fit into other tests.""" # # (C) Pywikibot team, 2015-2022 diff --git a/tests/ui_options_tests.py b/tests/ui_options_tests.py index a9804ee..fed1970 100644 --- a/tests/ui_options_tests.py +++ b/tests/ui_options_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Bot tests for input_choice options.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/ui_tests.py b/tests/ui_tests.py index e9af702..20fcf87 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the user interface.""" # -# (C) Pywikibot team, 2008-2021 +# (C) Pywikibot team, 2008-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/update_script_tests.py b/tests/update_script_tests.py index 9047031..539828c 100644 --- a/tests/update_script_tests.py +++ b/tests/update_script_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """update_script.py tests.""" # -# (C) Pywikibot team, 2019-2021 +# (C) Pywikibot team, 2019-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/upload_tests.py b/tests/upload_tests.py index 9616b4b..77740ce 100644 --- a/tests/upload_tests.py +++ b/tests/upload_tests.py @@ -1,10 +1,11 @@ +#!/usr/bin/python3 """ Site upload test. These tests write to the wiki. """ # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/uploadbot_tests.py b/tests/uploadbot_tests.py index e18d6ff..c0ca484 100644 --- a/tests/uploadbot_tests.py +++ b/tests/uploadbot_tests.py @@ -1,10 +1,11 @@ +#!/usr/bin/python3 """ UploadRobot test. These tests write to the wiki. """ # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/uploadscript_tests.py b/tests/uploadscript_tests.py index ce2b8f9..89c7309 100644 --- a/tests/uploadscript_tests.py +++ b/tests/uploadscript_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """upload.py script test.""" # -# (C) Pywikibot team, 2019-2021 +# (C) Pywikibot team, 2019-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/user_tests.py b/tests/user_tests.py index 7485349..67b1479 100644 --- a/tests/user_tests.py +++ b/tests/user_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the User page.""" # -# (C) Pywikibot team, 2016-2021 +# (C) Pywikibot team, 2016-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/weblinkchecker_tests.py b/tests/weblinkchecker_tests.py index 9ae1e67..9dd1109 100644 --- a/tests/weblinkchecker_tests.py +++ b/tests/weblinkchecker_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """weblinkchecker test module.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py index c59b0a6..40cd4d3 100644 --- a/tests/wikibase_edit_tests.py +++ b/tests/wikibase_edit_tests.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 """ Tests for editing Wikibase items. @@ -5,7 +6,7 @@ class in edit_failiure_tests.py """ # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 1231120..b60a18b 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for the Wikidata parts of the page module.""" # -# (C) Pywikibot team, 2008-2021 +# (C) Pywikibot team, 2008-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/wikistats_tests.py b/tests/wikistats_tests.py index 79e4fe2..778a80e 100644 --- a/tests/wikistats_tests.py +++ b/tests/wikistats_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Test cases for the WikiStats dataset.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # diff --git a/tests/xmlreader_tests.py b/tests/xmlreader_tests.py index ad968b3..bcb4a32 100644 --- a/tests/xmlreader_tests.py +++ b/tests/xmlreader_tests.py @@ -1,6 +1,7 @@ +#!/usr/bin/python3 """Tests for xmlreader module.""" # -# (C) Pywikibot team, 2009-2021 +# (C) Pywikibot team, 2009-2022 # # Distributed under the terms of the MIT license. # -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752337 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: Ie3281d84e1dc112a12cf418a217743f64de4e190 Gerrit-Change-Number: 752337 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Hashar <hashar(a)free.fr> Gerrit-MessageType: merged

2 years, 4 months

[Gerrit] ...core[master]: [mysql] Revert deprecation warning when using PyMySQL < 0.7.11

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/750799 ) Change subject: [mysql] Revert deprecation warning when using PyMySQL < 0.7.11 ...................................................................... [mysql] Revert deprecation warning when using PyMySQL < 0.7.11 This partially reverts Change-Id: I550b7c56fcce1a5a50f8ea6d5a0c47b781f80dc3 The revert is made because current Toolforge installation supports PyMySQL 0.7.10 currently and no warning should be printed in that case. Bug: T216741 Change-Id: I0d436c4b5eca670c5ddfc86f3421528a72048160 --- M pywikibot/data/mysql.py 1 file changed, 3 insertions(+), 12 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/mysql.py b/pywikibot/data/mysql.py index da74f75..87117cd 100644 --- a/pywikibot/data/mysql.py +++ b/pywikibot/data/mysql.py @@ -1,8 +1,4 @@ -"""Miscellaneous helper functions for mysql queries. - -.. deprecated:: 7.0 - Support of pymysql < 0.7.11 -""" +"""Miscellaneous helper functions for mysql queries.""" # # (C) Pywikibot team, 2016-2021 # @@ -16,7 +12,6 @@ import pywikibot from pywikibot import config from pywikibot.backports import removesuffix -from pywikibot.tools import issue_deprecation_warning try: @@ -32,11 +27,10 @@ """Representation of a socket with a mysql server. - This class is used to patch close() method for pymysql<0.7.11 (T216741). + This class is used to patch close() method for pymysql<0.7.11 on + toolforge (T216741). .. versionadded:: 7.0 - .. deprecated:: 7.0 - Update your pymysql package """ def close(self): @@ -100,9 +94,6 @@ } if pymysql_version < pkg_resources.parse_version('0.7.11'): - issue_deprecation_warning( - 'pymysql package release {}'.format(pymysql_version), - instead='pymysql >= 0.7.11', since='7.0.0') connection = _OldConnection(**args, **credentials) else: connection = pymysql.connect(**args, **credentials) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/750799 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: I0d436c4b5eca670c5ddfc86f3421528a72048160 Gerrit-Change-Number: 750799 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 4 months

[Gerrit] ...core[master]: [cleanup] Remove pagegenerators deprecated for 4 years

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/751945 ) Change subject: [cleanup] Remove pagegenerators deprecated for 4 years ...................................................................... [cleanup] Remove pagegenerators deprecated for 4 years Remove AllpagesPageGenerator, UnconnectedPageGenerator, CombinedPageGenerator, WantedPagesPageGenerator and update pagegenerators_tests.py Change-Id: I17c55e3eb22c393497e12b38f04291e804a76f80 --- M pywikibot/pagegenerators.py M tests/pagegenerators_tests.py 2 files changed, 1 insertion(+), 107 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 96298db..c75d184 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -1326,37 +1326,6 @@ return None if not v else int(v) -@deprecated('Site.allpages()', since='20180512') -def AllpagesPageGenerator( - start: str = '!', - namespace: int = 0, - includeredirects: Union[str, bool] = True, - site: OPT_SITE_TYPE = None, - total: Optional[int] = None, content: bool = False -) -> Iterable['pywikibot.page.Page']: # pragma: no cover - """ - Iterate Page objects for all titles in a single namespace. - - If includeredirects is False, redirects are not included. If - includeredirects equals the string 'only', only redirects are added. - - :param total: Maximum number of pages to retrieve in total - :param content: If True, load current version of each page (default False) - :param site: Site for generator results. - """ - if site is None: - site = pywikibot.Site() - - filterredir = None # type: Optional[bool] - if not includeredirects: - filterredir = False - elif includeredirects == 'only': - filterredir = True - - return site.allpages(start=start, namespace=namespace, - filterredir=filterredir, total=total, content=content) - - def PrefixingPageGenerator(prefix: str, namespace: NAMESPACE_OR_INT_TYPE = None, includeredirects: Union[None, bool, str] = True, @@ -1477,23 +1446,6 @@ return gen -@deprecated('site.unconnected_pages()', since='20180512') -def UnconnectedPageGenerator(site: OPT_SITE_TYPE = None, - total: Optional[int] = None - ) -> Iterable['pywikibot.page.Page']: - """ - Iterate Page objects for all unconnected pages to a Wikibase repository. - - :param total: Maximum number of pages to retrieve in total - :param site: Site for generator results. - """ - if site is None: - site = pywikibot.Site() - if not site.data_repository(): - raise ValueError('The given site does not have Wikibase repository.') - return site.unconnected_pages(total=total) - - @deprecated('File.usingPages()', since='20200515') def FileLinksGenerator(referredFilePage: 'pywikibot.page.FilePage', total: Optional[int] = None, @@ -2145,13 +2097,6 @@ pywikibot.output('Skipping {}'.format(page.title(as_link=True))) -@deprecated('itertools.chain(*iterables)', since='20180513') -def CombinedPageGenerator(generators: Sequence[Iterable['pywikibot.page.Page']] - ) -> Iterator['pywikibot.page.Page']: - """Yield from each iterable until exhausted, then proceed with the next.""" - return itertools.chain(*generators) # pragma: no cover - - def PageClassGenerator(generator: Iterable['pywikibot.page.Page'] ) -> Iterator['pywikibot.page.Page']: """ @@ -2512,21 +2457,6 @@ return site.pages_with_property(name, total=total) -@deprecated('Site.wantedpages', since='20180803') -def WantedPagesPageGenerator(total: int = 100, # pragma: no cover - site: OPT_SITE_TYPE = None - ) -> Iterable['pywikibot.page.Page']: - """ - Wanted page generator. - - :param total: Maximum number of pages to retrieve in total - :param site: Site for generator results. - """ - if site is None: - site = pywikibot.Site() - return site.wantedpages(total=total) - - def AncientPagesPageGenerator(total: int = 100, # pragma: no cover site: OPT_SITE_TYPE = None ) -> Iterator['pywikibot.page.Page']: diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 6129d5e..3cde8b0 100644 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python """Test pagegenerators module.""" # -# (C) Pywikibot team, 2009-2021 +# (C) Pywikibot team, 2009-2022 # # Distributed under the terms of the MIT license. import calendar @@ -1671,42 +1671,6 @@ self.assertIn(key, rcinfo.keys()) -class TestUnconnectedPageGenerator(DefaultSiteTestCase): - - """Test UnconnectedPageGenerator.""" - - cached = True - - def test_unconnected_with_repo(self): - """Test UnconnectedPageGenerator.""" - if not self.site.data_repository(): - self.skipTest('Site is not using a Wikibase repository') - with suppress_warnings( - 'pywikibot.pagegenerators.UnconnectedPageGenerator is ' - 'deprecated', FutureWarning): - upgen = pagegenerators.UnconnectedPageGenerator(self.site, 3) - self.assertDictEqual( - upgen.request._params, { - 'gqppage': ['UnconnectedPages'], - 'prop': ['info', 'imageinfo', 'categoryinfo'], - 'inprop': ['protection'], - 'iilimit': ['max'], - 'iiprop': ['timestamp', 'user', 'comment', 'url', 'size', - 'sha1', 'metadata'], - 'generator': ['querypage'], 'action': ['query'], - 'indexpageids': [True], 'continue': [True]}) - self.assertLessEqual(len(tuple(upgen)), 3) - - def test_unconnected_without_repo(self): - """Test that it raises a ValueError on sites without repository.""" - if self.site.data_repository(): - self.skipTest('Site is using a Wikibase repository') - with self.assertRaises(ValueError): - for _ in pagegenerators.UnconnectedPageGenerator(self.site, - total=5): - raise AssertionError("this shouldn't be reached") - - class TestLinksearchPageGenerator(TestCase): """Tests for pagegenerators.LinksearchPageGenerator.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/751945 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: I17c55e3eb22c393497e12b38f04291e804a76f80 Gerrit-Change-Number: 751945 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 4 months

← Newer
1
...
4
5
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2022