Pywikibot-commits January 2023

pywikibot-commits@lists.wikimedia.org

1 participants
84 discussions

[Gerrit] ...core[master]: Update for Moroccan Arabic (ary)
by jenkins-bot (Code Review) 24 Jan '23

24 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/883215 ) Change subject: Update for Moroccan Arabic (ary) ...................................................................... Update for Moroccan Arabic (ary) Change-Id: Ic1a29e0516ae95bdeb99fd9b774a2fbce091814a --- M scripts/clean_sandbox.py 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/clean_sandbox.py b/scripts/clean_sandbox.py index bd92d9d..467db45 100755 --- a/scripts/clean_sandbox.py +++ b/scripts/clean_sandbox.py @@ -79,6 +79,13 @@ 'ar': '{{عنوان الملعب}}\n', + 'ary': '{{عافاك خلي هاد سطر ف بلاصتو (راس تيران)}}' + '\n[[تصنيف:معاونة ف لكتابة علا ويكيپيديا]]', 'arz': '{{عنوان السبوره}}\n', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/883215 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: Ic1a29e0516ae95bdeb99fd9b774a2fbce091814a Gerrit-Change-Number: 883215 Gerrit-PatchSet: 2 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Move BasePage to page._basepage.py (part 3)
by Xqt (Code Review) 21 Jan '23

21 Jan '23

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882161 ) Change subject: [IMPR] Move BasePage to page._basepage.py (part 3) ...................................................................... [IMPR] Move BasePage to page._basepage.py (part 3) Move BasePage to its own module keeping his history Change-Id: I95b30c3332fc75a80fedbc91d607f09d54051cd5 --- M pywikibot/page/_basepage.py M pywikibot/CONTENT.rst M pywikibot/page/__init__.py M pywikibot/page/_page.py M tox.ini 5 files changed, 33 insertions(+), 2,401 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/pywikibot/CONTENT.rst b/pywikibot/CONTENT.rst index 337b855..d6ca773 100644 --- a/pywikibot/CONTENT.rst +++ b/pywikibot/CONTENT.rst @@ -116,6 +116,8 @@ +============================+======================================================+ | __init__.py | Interface representing MediaWiki pages | +----------------------------+------------------------------------------------------+ + | _basepage.py | Base object for MediaWiki pages | + +----------------------------+------------------------------------------------------+ | _category.py | Object representing MediaWiki categories | +----------------------------+------------------------------------------------------+ | _collections.py | Structures holding data for Wikibase entities | @@ -126,7 +128,7 @@ +----------------------------+------------------------------------------------------+ | _links.py | Objects representing link objects | +----------------------------+------------------------------------------------------+ - | _page.py | Objects representing MediaWiki pages | + | _page.py | Object representing MediaWiki pages | +----------------------------+------------------------------------------------------+ | _revision.py | Object representing page revision | +----------------------------+------------------------------------------------------+ diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 96b37aa..79297ba 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -6,10 +6,11 @@ # from typing import Union +from pywikibot.page._basepage import BasePage from pywikibot.page._category import Category from pywikibot.page._filepage import FileInfo, FilePage from pywikibot.page._links import BaseLink, Link, SiteLink, html2unicode -from pywikibot.page._page import BasePage, Page +from pywikibot.page._page import Page from pywikibot.page._revision import Revision from pywikibot.page._user import User from pywikibot.page._wikibase import ( diff --git a/pywikibot/page/_basepage.py b/pywikibot/page/_basepage.py index feee542..aa76b61 100644 --- a/pywikibot/page/_basepage.py +++ b/pywikibot/page/_basepage.py @@ -1,20 +1,6 @@ -"""Objects representing various types of MediaWiki pages. - -This module includes objects: - -- BasePage: Base object for a MediaWiki page -- Page: A MediaWiki page - -Various Wikibase pages are defined in ``page._wikibase.py``, -various pages for Proofread Extensions are defined in -``pywikibot.proofreadpage``. - -.. note:: `Link` objects represent a wiki-page's title, while - :class:`pywikibot.Page` objects (defined here) represent the page - itself, including its contents. -""" +"""Objects representing a base object for a MediaWiki page.""" # -# (C) Pywikibot team, 2008-2022 +# (C) Pywikibot team, 2008-2023 # # Distributed under the terms of the MIT license. # @@ -42,7 +28,6 @@ from pywikibot.cosmetic_changes import CANCEL, CosmeticChangesToolkit from pywikibot.exceptions import ( Error, - InterwikiRedirectPageError, InvalidPageError, IsNotRedirectPageError, IsRedirectPageError, @@ -52,11 +37,9 @@ OtherPageSaveError, PageSaveRelatedError, SectionError, - UnknownExtensionError, ) from pywikibot.page._decorators import allow_asynchronous from pywikibot.page._links import BaseLink, Link -from pywikibot.page._toolforge import WikiBlameMixin from pywikibot.site import Namespace, NamespaceArgType from pywikibot.tools import ( ComparableMixin, @@ -70,7 +53,7 @@ PROTOCOL_REGEX = r'\Ahttps?://' -__all__ = ('BasePage', 'Page') +__all__ = ['BasePage'] class BasePage(ComparableMixin): @@ -131,7 +114,7 @@ if isinstance(source, pywikibot.site.BaseSite): self._link = Link(title, source=source, default_namespace=ns) self._revisions = {} - elif isinstance(source, Page): + elif isinstance(source, BasePage): # copy all of source's attributes to this object # without overwriting non-None values self.__dict__.update((k, v) for k, v in source.__dict__.items() @@ -843,7 +826,7 @@ ns = self.namespace() return ns >= 0 and ns % 2 == 1 - def toggleTalkPage(self) -> Optional['Page']: + def toggleTalkPage(self) -> Optional['pywikibot.Page']: """ Return other member of the article-talk page pair for this Page. @@ -859,8 +842,8 @@ title = self.title(with_ns=False) new_ns = ns + (1, -1)[self.isTalkPage()] - return Page(self.site, - f'{self.site.namespace(new_ns)}:{title}') + return pywikibot.Page(self.site, + f'{self.site.namespace(new_ns)}:{title}') def is_categorypage(self): """Return True if the page is a Category, False otherwise.""" @@ -902,8 +885,8 @@ except KeyError: distl = None if distl is None: - disambigpages = Page(self.site, - 'MediaWiki:Disambiguationspage') + disambigpages = pywikibot.Page(self.site, + 'MediaWiki:Disambiguationspage') if disambigpages.exists(): disambigs = {link.title(with_ns=False) for link in disambigpages.linkedPages() @@ -2201,197 +2184,3 @@ elif with_protocol: return f'{wiki.protocol()}://{link}' return link - - -class Page(BasePage, WikiBlameMixin): - - """Page: A MediaWiki page.""" - - def __init__(self, source, title: str = '', ns=0) -> None: - """Instantiate a Page object.""" - if isinstance(source, pywikibot.site.BaseSite) and not title: - raise ValueError('Title must be specified and not empty ' - 'if source is a Site.') - super().__init__(source, title, ns) - - @property - @cached - def raw_extracted_templates(self): - """Extract templates and parameters. - - This method is using - :func:`textlib.extract_templates_and_params`. - Disabled parts and whitespace are stripped, except for - whitespace in anonymous positional arguments. - - :rtype: list of (str, OrderedDict) - """ - return textlib.extract_templates_and_params(self.text, True, True) - - def templatesWithParams(self): - """Return templates used on this Page. - - The templates are extracted by :meth:`raw_extracted_templates`, - with positional arguments placed first in order, and each named - argument appearing as 'name=value'. - - All parameter keys and values for each template are stripped of - whitespace. - - :return: a list of tuples with one tuple for each template invocation - in the page, with the template Page as the first entry and a list - of parameters as the second entry. - :rtype: list of (pywikibot.page.Page, list) - """ - # WARNING: may not return all templates used in particularly - # intricate cases such as template substitution - titles = {t.title() for t in self.templates()} - templates = self.raw_extracted_templates - # backwards-compatibility: convert the dict returned as the second - # element into a list in the format used by old scripts - result = [] - for template in templates: - try: - link = pywikibot.Link(template[0], self.site, - default_namespace=10) - if link.canonical_title() not in titles: - continue - except Error: - # this is a parser function or magic word, not template name - # the template name might also contain invalid parts - continue - args = template[1] - intkeys = {} - named = {} - positional = [] - for key in sorted(args): - try: - intkeys[int(key)] = args[key] - except ValueError: - named[key] = args[key] - - for i in range(1, len(intkeys) + 1): - # only those args with consecutive integer keys can be - # treated as positional; an integer could also be used - # (out of order) as the key for a named argument - # example: {{tmp|one|two|5=five|three}} - if i in intkeys: - positional.append(intkeys[i]) - continue - - for k in intkeys: - if k < 1 or k >= i: - named[str(k)] = intkeys[k] - break - - for item in named.items(): - positional.append('{}={}'.format(*item)) - result.append((pywikibot.Page(link, self.site), positional)) - return result - - def set_redirect_target( - self, - target_page, - create: bool = False, - force: bool = False, - keep_section: bool = False, - save: bool = True, - **kwargs - ): - """ - Change the page's text to point to the redirect page. - - :param target_page: target of the redirect, this argument is required. - :type target_page: pywikibot.Page or string - :param create: if true, it creates the redirect even if the page - doesn't exist. - :param force: if true, it set the redirect target even the page - doesn't exist or it's not redirect. - :param keep_section: if the old redirect links to a section - and the new one doesn't it uses the old redirect's section. - :param save: if true, it saves the page immediately. - :param kwargs: Arguments which are used for saving the page directly - afterwards, like 'summary' for edit summary. - """ - if isinstance(target_page, str): - target_page = pywikibot.Page(self.site, target_page) - elif self.site != target_page.site: - raise InterwikiRedirectPageError(self, target_page) - if not self.exists() and not (create or force): - raise NoPageError(self) - if self.exists() and not self.isRedirectPage() and not force: - raise IsNotRedirectPageError(self) - redirect_regex = self.site.redirect_regex - if self.exists(): - old_text = self.get(get_redirect=True) - else: - old_text = '' - result = redirect_regex.search(old_text) - if result: - oldlink = result[1] - if (keep_section and '#' in oldlink - and target_page.section() is None): - sectionlink = oldlink[oldlink.index('#'):] - target_page = pywikibot.Page( - self.site, - target_page.title() + sectionlink - ) - prefix = self.text[:result.start()] - suffix = self.text[result.end():] - else: - prefix = '' - suffix = '' - - target_link = target_page.title(as_link=True, textlink=True, - allow_interwiki=False) - target_link = f'#{self.site.redirect()} {target_link}' - self.text = prefix + target_link + suffix - if save: - self.save(**kwargs) - - def get_best_claim(self, prop: str): - """ - Return the first best Claim for this page. - - Return the first 'preferred' ranked Claim specified by Wikibase - property or the first 'normal' one otherwise. - - .. versionadded:: 3.0 - - :param prop: property id, "P###" - :return: Claim object given by Wikibase property number - for this page object. - :rtype: pywikibot.Claim or None - - :raises UnknownExtensionError: site has no Wikibase extension - """ - def find_best_claim(claims): - """Find the first best ranked claim.""" - index = None - for i, claim in enumerate(claims): - if claim.rank == 'preferred': - return claim - if index is None and claim.rank == 'normal': - index = i - if index is None: - index = 0 - return claims[index] - - if not self.site.has_data_repository: - raise UnknownExtensionError( - f'Wikibase is not implemented for {self.site}.') - - def get_item_page(func, *args): - try: - item_p = func(*args) - item_p.get() - return item_p - except NoPageError: - return None - except IsRedirectPageError: - return get_item_page(item_p.getRedirectTarget) - - item_page = get_item_page(pywikibot.ItemPage.fromPage, self) - if item_page and prop in item_page.claims: - return find_best_claim(item_page.claims[prop]) - return None diff --git a/pywikibot/page/_page.py b/pywikibot/page/_page.py index feee542..cbc4db7 100644 --- a/pywikibot/page/_page.py +++ b/pywikibot/page/_page.py @@ -1,9 +1,4 @@ -"""Objects representing various types of MediaWiki pages. - -This module includes objects: - -- BasePage: Base object for a MediaWiki page -- Page: A MediaWiki page +"""Objects representing a MediaWiki page. Various Wikibase pages are defined in ``page._wikibase.py``, various pages for Proofread Extensions are defined in @@ -14,2193 +9,27 @@ itself, including its contents. """ # -# (C) Pywikibot team, 2008-2022 +# (C) Pywikibot team, 2008-2023 # # Distributed under the terms of the MIT license. # -import itertools -import re -from collections import Counter -from contextlib import suppress -from itertools import islice -from textwrap import shorten, wrap -from typing import Optional -from urllib.parse import quote_from_bytes -from warnings import warn import pywikibot -from pywikibot import Timestamp, config, date, i18n, textlib, tools -from pywikibot.backports import ( - Dict, - Generator, - Iterable, - Iterator, - List, - Set, - Tuple, -) -from pywikibot.cosmetic_changes import CANCEL, CosmeticChangesToolkit +from pywikibot import textlib from pywikibot.exceptions import ( Error, InterwikiRedirectPageError, - InvalidPageError, IsNotRedirectPageError, IsRedirectPageError, - NoMoveTargetError, NoPageError, - NoUsernameError, - OtherPageSaveError, - PageSaveRelatedError, - SectionError, UnknownExtensionError, ) -from pywikibot.page._decorators import allow_asynchronous -from pywikibot.page._links import BaseLink, Link +from pywikibot.page._basepage import BasePage from pywikibot.page._toolforge import WikiBlameMixin -from pywikibot.site import Namespace, NamespaceArgType -from pywikibot.tools import ( - ComparableMixin, - cached, - deprecated, - first_upper, - issue_deprecation_warning, - remove_last_args, -) +from pywikibot.tools import cached -PROTOCOL_REGEX = r'\Ahttps?://' - -__all__ = ('BasePage', 'Page') - - -class BasePage(ComparableMixin): - - """ - BasePage: Base object for a MediaWiki page. - - This object only implements internally methods that do not require - reading from or writing to the wiki. All other methods are delegated - to the Site object. - - Will be subclassed by Page, WikibasePage, and FlowPage. - """ - - _cache_attrs = ( - '_text', '_pageid', '_catinfo', '_templates', '_protection', - '_contentmodel', '_langlinks', '_isredir', '_coords', - '_preloadedtext', '_timestamp', '_applicable_protections', - '_flowinfo', '_quality', '_pageprops', '_revid', '_quality_text', - '_pageimage', '_item', '_lintinfo', - ) - - def __init__(self, source, title: str = '', ns=0) -> None: - """ - Instantiate a Page object. - - Three calling formats are supported: - - - If the first argument is a Page, create a copy of that object. - This can be used to convert an existing Page into a subclass - object, such as Category or FilePage. (If the title is also - given as the second argument, creates a copy with that title; - this is used when pages are moved.) - - If the first argument is a Site, create a Page on that Site - using the second argument as the title (may include a section), - and the third as the namespace number. The namespace number is - mandatory, even if the title includes the namespace prefix. This - is the preferred syntax when using an already-normalized title - obtained from api.php or a database dump. WARNING: may produce - invalid objects if page title isn't in normal form! - - If the first argument is a BaseLink, create a Page from that link. - This is the preferred syntax when using a title scraped from - wikitext, URLs, or another non-normalized source. - - :param source: the source of the page - :type source: pywikibot.page.BaseLink (or subclass), - pywikibot.page.Page (or subclass), or pywikibot.page.Site - :param title: normalized title of the page; required if source is a - Site, ignored otherwise - :type title: str - :param ns: namespace number; required if source is a Site, ignored - otherwise - :type ns: int - """ - if title is None: - raise ValueError('Title cannot be None.') - - if isinstance(source, pywikibot.site.BaseSite): - self._link = Link(title, source=source, default_namespace=ns) - self._revisions = {} - elif isinstance(source, Page): - # copy all of source's attributes to this object - # without overwriting non-None values - self.__dict__.update((k, v) for k, v in source.__dict__.items() - if k not in self.__dict__ - or self.__dict__[k] is None) - if title: - # overwrite title - self._link = Link(title, source=source.site, - default_namespace=ns) - elif isinstance(source, BaseLink): - self._link = source - self._revisions = {} - else: - raise Error( - "Invalid argument type '{}' in Page initializer: {}" - .format(type(source), source)) - - @property - def site(self): - """Return the Site object for the wiki on which this Page resides. - - :rtype: pywikibot.Site - """ - return self._link.site - - def version(self): - """ - Return MediaWiki version number of the page site. - - This is needed to use @need_version() decorator for methods of - Page objects. - """ - return self.site.version() - - @property - def image_repository(self): - """Return the Site object for the image repository.""" - return self.site.image_repository() - - @property - def data_repository(self): - """Return the Site object for the data repository.""" - return self.site.data_repository() - - def namespace(self) -> Namespace: - """ - Return the namespace of the page. - - :return: namespace of the page - """ - return self._link.namespace - - @property - def content_model(self): - """ - Return the content model for this page. - - If it cannot be reliably determined via the API, - None is returned. - """ - if not hasattr(self, '_contentmodel'): - self.site.loadpageinfo(self) - return self._contentmodel - - @property - @cached - def depth(self) -> int: - """Return the depth/subpage level of the page. - - Check if the namespace allows subpages. - Not allowed subpages means depth is always 0. - """ - return self.title().count('/') if self.namespace().subpages else 0 - - @property - def pageid(self) -> int: - """ - Return pageid of the page. - - :return: pageid or 0 if page does not exist - """ - if not hasattr(self, '_pageid'): - self.site.loadpageinfo(self) - return self._pageid - - def title( - self, - *, - underscore: bool = False, - with_ns: bool = True, - with_section: bool = True, - as_url: bool = False, - as_link: bool = False, - allow_interwiki: bool = True, - force_interwiki: bool = False, - textlink: bool = False, - as_filename: bool = False, - insite=None, - without_brackets: bool = False - ) -> str: - """ - Return the title of this Page, as a string. - - :param underscore: (not used with as_link) if true, replace all ' ' - characters with '_' - :param with_ns: if false, omit the namespace prefix. If this - option is false and used together with as_link return a labeled - link like [[link|label]] - :param with_section: if false, omit the section - :param as_url: (not used with as_link) if true, quote title as if in an - URL - :param as_link: if true, return the title in the form of a wikilink - :param allow_interwiki: (only used if as_link is true) if true, format - the link as an interwiki link if necessary - :param force_interwiki: (only used if as_link is true) if true, always - format the link as an interwiki link - :param textlink: (only used if as_link is true) if true, place a ':' - before Category: and Image: links - :param as_filename: (not used with as_link) if true, replace any - characters that are unsafe in filenames - :param insite: (only used if as_link is true) a site object where the - title is to be shown. Default is the current family/lang given by - -family and -lang or -site option i.e. config.family and - config.mylang - :param without_brackets: (cannot be used with as_link) if true, remove - the last pair of brackets(usually removes disambiguation brackets). - """ - title = self._link.canonical_title() - label = self._link.title - if with_section and self.section(): - section = '#' + self.section() - else: - section = '' - if as_link: - if insite: - target_code = insite.code - target_family = insite.family.name - else: - target_code = config.mylang - target_family = config.family - if force_interwiki \ - or (allow_interwiki - and (self.site.family.name != target_family - or self.site.code != target_code)): - if self.site.family.name not in ( - target_family, self.site.code): - title = '{site.family.name}:{site.code}:{title}'.format( - site=self.site, title=title) - else: - # use this form for sites like commons, where the - # code is the same as the family name - title = f'{self.site.code}:{title}' - elif textlink and (self.is_filepage() or self.is_categorypage()): - title = f':{title}' - elif self.namespace() == 0 and not section: - with_ns = True - if with_ns: - return f'[[{title}{section}]]' - return f'[[{title}{section}|{label}]]' - if not with_ns and self.namespace() != 0: - title = label + section - else: - title += section - if without_brackets: - brackets_re = r'\s+$[^()]+?$$' - title = re.sub(brackets_re, '', title) - if underscore or as_url: - title = title.replace(' ', '_') - if as_url: - encoded_title = title.encode(self.site.encoding()) - title = quote_from_bytes(encoded_title, safe='') - if as_filename: - title = tools.as_filename(title) - return title - - def section(self) -> Optional[str]: - """ - Return the name of the section this Page refers to. - - The section is the part of the title following a '#' character, if - any. If no section is present, return None. - """ - try: - section = self._link.section - except AttributeError: - section = None - return section - - def __str__(self) -> str: - """Return a string representation.""" - return self.title(as_link=True, force_interwiki=True) - - def __repr__(self) -> str: - """Return a more complete string representation.""" - return f'{self.__class__.__name__}({self.title()!r})' - - def _cmpkey(self): - """ - Key for comparison of Page objects. - - Page objects are "equal" if and only if they are on the same site - and have the same normalized title, including section if any. - - Page objects are sortable by site, namespace then title. - """ - return (self.site, self.namespace(), self.title()) - - def __hash__(self): - """ - A stable identifier to be used as a key in hash-tables. - - This relies on the fact that the string - representation of an instance cannot change after the construction. - """ - return hash(self._cmpkey()) - - def full_url(self): - """Return the full URL.""" - return self.site.base_url( - self.site.articlepath.format(self.title(as_url=True))) - - @cached - def autoFormat(self): - """ - Return :py:obj:`date.getAutoFormat` dictName and value, if any. - - Value can be a year, date, etc., and dictName is 'YearBC', - 'Year_December', or another dictionary name. Please note that two - entries may have exactly the same autoFormat, but be in two - different namespaces, as some sites have categories with the - same names. Regular titles return (None, None). - """ - return date.getAutoFormat(self.site.lang, self.title(with_ns=False)) - - def isAutoTitle(self): - """Return True if title of this Page is in the autoFormat dict.""" - return self.autoFormat()[0] is not None - - def get(self, force: bool = False, get_redirect: bool = False) -> str: - """Return the wiki-text of the page. - - This will retrieve the page from the server if it has not been - retrieved yet, or if force is True. This can raise the following - exceptions that should be caught by the calling code: - - :exception pywikibot.exceptions.NoPageError: The page does not exist - :exception pywikibot.exceptions.IsRedirectPageError: The page is a - redirect. The argument of the exception is the title of the page - it redirects to. - :exception pywikibot.exceptions.SectionError: The section does not - exist on a page with a # link - - :param force: reload all page attributes, including errors. - :param get_redirect: return the redirect text, do not follow the - redirect, do not raise an exception. - """ - if force: - del self.latest_revision_id - if hasattr(self, '_bot_may_edit'): - del self._bot_may_edit - try: - self._getInternals() - except IsRedirectPageError: - if not get_redirect: - raise - - return self.latest_revision.text - - def has_content(self) -> bool: - """ - Page has been loaded. - - Not existing pages are considered loaded. - - .. versionadded:: 7.6 - """ - return not self.exists() or self._latest_cached_revision() is not None - - def _latest_cached_revision(self): - """Get the latest revision if cached and has text, otherwise None.""" - if (hasattr(self, '_revid') and self._revid in self._revisions - and self._revisions[self._revid].text is not None): - return self._revisions[self._revid] - return None - - def _getInternals(self): - """ - Helper function for get(). - - Stores latest revision in self if it doesn't contain it, doesn't think. - * Raises exceptions from previous runs. - * Stores new exceptions in _getexception and raises them. - """ - # Raise exceptions from previous runs - if hasattr(self, '_getexception'): - raise self._getexception - - # If not already stored, fetch revision - if self._latest_cached_revision() is None: - try: - self.site.loadrevisions(self, content=True) - except (NoPageError, SectionError) as e: - self._getexception = e - raise - - # self._isredir is set by loadrevisions - if self._isredir: - self._getexception = IsRedirectPageError(self) - raise self._getexception - - @remove_last_args(['get_redirect']) - def getOldVersion(self, oldid, force: bool = False) -> str: - """Return text of an old revision of this page. - - :param oldid: The revid of the revision desired. - """ - if force or oldid not in self._revisions \ - or self._revisions[oldid].text is None: - self.site.loadrevisions(self, content=True, revids=oldid) - return self._revisions[oldid].text - - def permalink(self, oldid=None, percent_encoded: bool = True, - with_protocol: bool = False) -> str: - """Return the permalink URL of an old revision of this page. - - :param oldid: The revid of the revision desired. - :param percent_encoded: if false, the link will be provided - without title uncoded. - :param with_protocol: if true, http or https prefixes will be - included before the double slash. - """ - if percent_encoded: - title = self.title(as_url=True) - else: - title = self.title(as_url=False).replace(' ', '_') - return '{}//{}{}/index.php?title={}&oldid={}'.format( - self.site.protocol() + ':' if with_protocol else '', - self.site.hostname(), - self.site.scriptpath(), - title, - oldid if oldid is not None else self.latest_revision_id) - - @property - def latest_revision_id(self): - """Return the current revision id for this page.""" - if not hasattr(self, '_revid'): - self.revisions() - return self._revid - - @latest_revision_id.deleter - def latest_revision_id(self) -> None: - """ - Remove the latest revision id set for this Page. - - All internal cached values specifically for the latest revision - of this page are cleared. - - The following cached values are not cleared: - - text property - - page properties, and page coordinates - - lastNonBotUser - - isDisambig and isCategoryRedirect status - - langlinks, templates and deleted revisions - """ - # When forcing, we retry the page no matter what: - # * Old exceptions do not apply any more - # * Deleting _revid to force reload - # * Deleting _redirtarget, that info is now obsolete. - for attr in ['_redirtarget', '_getexception', '_revid']: - if hasattr(self, attr): - delattr(self, attr) - - @latest_revision_id.setter - def latest_revision_id(self, value) -> None: - """Set the latest revision for this Page.""" - del self.latest_revision_id - self._revid = value - - @property - def latest_revision(self) -> 'pywikibot.page.Revision': - """Return the current revision for this page. - - **Example:** - - >>> site = pywikibot.Site() - >>> page = pywikibot.Page(site, 'Main Page') - ... # get the latest timestamp of that page - >>> edit_time = page.latest_revision.timestamp - >>> type(edit_time) - <class 'pywikibot.time.Timestamp'> - - .. seealso:: :attr:`oldest_revision` - """ - rev = self._latest_cached_revision() - if rev is not None: - return rev - - with suppress(StopIteration): - return next(self.revisions(content=True, total=1)) - raise InvalidPageError(self) - - @property - def text(self) -> str: - """ - Return the current (edited) wikitext, loading it if necessary. - - :return: text of the page - """ - if getattr(self, '_text', None) is not None: - return self._text - - try: - return self.get(get_redirect=True) - except NoPageError: - # TODO: what other exceptions might be returned? - return '' - - @text.setter - def text(self, value: Optional[str]): - """Update the current (edited) wikitext. - - :param value: New value or None - """ - try: - self.botMayEdit() # T262136, T267770 - except Exception as e: - # dry tests aren't able to make an API call - # but are rejected by an Exception; ignore it then. - if not str(e).startswith('DryRequest rejecting request:'): - raise - - del self.text - self._text = None if value is None else str(value) - - @text.deleter - def text(self) -> None: - """Delete the current (edited) wikitext.""" - if hasattr(self, '_text'): - del self._text - if hasattr(self, '_expanded_text'): - del self._expanded_text - if hasattr(self, '_raw_extracted_templates'): - del self._raw_extracted_templates - - def preloadText(self) -> str: - """ - The text returned by EditFormPreloadText. - - See API module "info". - - Application: on Wikisource wikis, text can be preloaded even if - a page does not exist, if an Index page is present. - """ - self.site.loadpageinfo(self, preload=True) - return self._preloadedtext - - def get_parsed_page(self, force: bool = False) -> str: - """Retrieve parsed text (via action=parse) and cache it. - - .. versionchanged:: 7.1 - `force` parameter was added; - `_get_parsed_page` becomes a public method - - :param force: force updating from the live site - - .. seealso:: - :meth:`APISite.get_parsed_page() - <pywikibot.site._apisite.APISite.get_parsed_page>` - """ - if not hasattr(self, '_parsed_text') or force: - self._parsed_text = self.site.get_parsed_page(self) - return self._parsed_text - - def extract(self, variant: str = 'plain', *, - lines: Optional[int] = None, - chars: Optional[int] = None, - sentences: Optional[int] = None, - intro: bool = True) -> str: - """Retrieve an extract of this page. - - .. versionadded:: 7.1 - - :param variant: The variant of extract, either 'plain' for plain - text, 'html' for limited HTML (both excludes templates and - any text formatting) or 'wiki' for bare wikitext which also - includes any templates for example. - :param lines: if not None, wrap the extract into lines with - width of 79 chars and return a string with that given number - of lines. - :param chars: How many characters to return. Actual text - returned might be slightly longer. - :param sentences: How many sentences to return - :param intro: Return only content before the first section - :raises NoPageError: given page does not exist - :raises NotImplementedError: "wiki" variant does not support - `sencence` parameter. - :raises ValueError: `variant` parameter must be "plain", "html" or - "wiki" - - .. seealso:: :meth:`APISite.extract() - <pywikibot.site._extensions.TextExtractsMixin.extract>`. - """ - if variant in ('plain', 'html'): - extract = self.site.extract(self, chars=chars, sentences=sentences, - intro=intro, - plaintext=variant == 'plain') - elif variant == 'wiki': - if not self.exists(): - raise NoPageError(self) - if sentences: - raise NotImplementedError( - "'wiki' variant of extract method does not support " - "'sencence' parameter") - - extract = self.text[:] - if intro: - pos = extract.find('\n=') - if pos: - extract = extract[:pos] - if chars: - extract = shorten(extract, chars, break_long_words=False, - placeholder='…') - else: - raise ValueError( - 'variant parameter must be "plain", "html" or "wiki", not "{}"' - .format(variant)) - - if not lines: - return extract - - text_lines = [] - for i, text in enumerate(extract.splitlines(), start=1): - text_lines += wrap(text, width=79) or [''] - if i >= lines: - break - - return '\n'.join(text_lines[:min(lines, len(text_lines))]) - - def properties(self, force: bool = False) -> dict: - """ - Return the properties of the page. - - :param force: force updating from the live site - """ - if not hasattr(self, '_pageprops') or force: - self._pageprops = {} # page may not have pageprops (see T56868) - self.site.loadpageprops(self) - return self._pageprops - - def defaultsort(self, force: bool = False) -> Optional[str]: - """ - Extract value of the {{DEFAULTSORT:}} magic word from the page. - - :param force: force updating from the live site - """ - return self.properties(force=force).get('defaultsort') - - def expand_text( - self, - force: bool = False, - includecomments: bool = False - ) -> str: - """Return the page text with all templates and parser words expanded. - - :param force: force updating from the live site - :param includecomments: Also strip comments if includecomments - parameter is not True. - """ - if not hasattr(self, '_expanded_text') or ( - self._expanded_text is None) or force: - if not self.text: - self._expanded_text = '' - return '' - - self._expanded_text = self.site.expand_text( - self.text, - title=self.title(with_section=False), - includecomments=includecomments) - return self._expanded_text - - def userName(self) -> str: - """Return name or IP address of last user to edit page.""" - return self.latest_revision.user - - def isIpEdit(self) -> bool: - """Return True if last editor was unregistered.""" - return self.latest_revision.anon - - @cached - def lastNonBotUser(self) -> str: - """ - Return name or IP address of last human/non-bot user to edit page. - - Determine the most recent human editor out of the last revisions. - If it was not able to retrieve a human user, returns None. - - If the edit was done by a bot which is no longer flagged as 'bot', - i.e. which is not returned by Site.botusers(), it will be returned - as a non-bot edit. - """ - for entry in self.revisions(): - if entry.user and (not self.site.isBot(entry.user)): - return entry.user - - return None - - @deprecated('latest_revision.timestamp', since='8.0.0') - def editTime(self) -> pywikibot.Timestamp: - """Return timestamp of last revision to page. - - .. deprecated:: 8.0.0 - Use :attr:`latest_revision.timestamp<latest_revision>` - instead. - """ - return self.latest_revision.timestamp - - def exists(self) -> bool: - """Return True if page exists on the wiki, even if it's a redirect. - - If the title includes a section, return False if this section isn't - found. - """ - with suppress(AttributeError): - return self.pageid > 0 - raise InvalidPageError(self) - - @property - def oldest_revision(self) -> 'pywikibot.page.Revision': - """Return the first revision of this page. - - **Example:** - - >>> site = pywikibot.Site() - >>> page = pywikibot.Page(site, 'Main Page') - ... # get the creation timestamp of that page - >>> creation_time = page.oldest_revision.timestamp - >>> type(creation_time) - <class 'pywikibot.time.Timestamp'> - - .. seealso:: :attr:`latest_revision` - """ - return next(self.revisions(reverse=True, total=1)) - - def isRedirectPage(self): - """Return True if this is a redirect, False if not or not existing.""" - return self.site.page_isredirect(self) - - def isStaticRedirect(self, force: bool = False) -> bool: - """Determine whether the page is a static redirect. - - A static redirect must be a valid redirect, and contain the magic - word __STATICREDIRECT__. - - .. versionchanged:: 7.0 - __STATICREDIRECT__ can be transcluded - - :param force: Bypass local caching - """ - return self.isRedirectPage() \ - and 'staticredirect' in self.properties(force=force) - - def isCategoryRedirect(self) -> bool: - """Return True if this is a category redirect page, False otherwise.""" - if not self.is_categorypage(): - return False - - if not hasattr(self, '_catredirect'): - self._catredirect = False - catredirs = self.site.category_redirects() - for template, args in self.templatesWithParams(): - if template.title(with_ns=False) not in catredirs: - continue - - if args: - # Get target (first template argument) - target_title = args[0].strip() - p = pywikibot.Page( - self.site, target_title, Namespace.CATEGORY) - try: - p.title() - except pywikibot.exceptions.InvalidTitleError: - target_title = self.site.expand_text( - text=target_title, title=self.title()) - p = pywikibot.Page(self.site, target_title, - Namespace.CATEGORY) - if p.namespace() == Namespace.CATEGORY: - self._catredirect = p.title() - else: - pywikibot.warning( - 'Category redirect target {} on {} is not a ' - 'category'.format(p.title(as_link=True), - self.title(as_link=True))) - else: - pywikibot.warning( - 'No target found for category redirect on ' - + self.title(as_link=True)) - break - - return bool(self._catredirect) - - def getCategoryRedirectTarget(self) -> 'pywikibot.Category': - """If this is a category redirect, return the target category title.""" - if self.isCategoryRedirect(): - return pywikibot.Category(Link(self._catredirect, self.site)) - raise IsNotRedirectPageError(self) - - def isTalkPage(self): - """Return True if this page is in any talk namespace.""" - ns = self.namespace() - return ns >= 0 and ns % 2 == 1 - - def toggleTalkPage(self) -> Optional['Page']: - """ - Return other member of the article-talk page pair for this Page. - - If self is a talk page, returns the associated content page; - otherwise, returns the associated talk page. The returned page need - not actually exist on the wiki. - - :return: Page or None if self is a special page. - """ - ns = self.namespace() - if ns < 0: # Special page - return None - - title = self.title(with_ns=False) - new_ns = ns + (1, -1)[self.isTalkPage()] - return Page(self.site, - f'{self.site.namespace(new_ns)}:{title}') - - def is_categorypage(self): - """Return True if the page is a Category, False otherwise.""" - return self.namespace() == 14 - - def is_filepage(self): - """Return True if this is a file description page, False otherwise.""" - return self.namespace() == 6 - - def isDisambig(self) -> bool: - """ - Return True if this is a disambiguation page, False otherwise. - - By default, it uses the Disambiguator extension's result. The - identification relies on the presence of the __DISAMBIG__ magic word - which may also be transcluded. - - If the Disambiguator extension isn't activated for the given site, - the identification relies on the presence of specific templates. - First load a list of template names from the Family file; - if the value in the Family file is None or no entry was made, look for - the list on [[MediaWiki:Disambiguationspage]]. If this page does not - exist, take the MediaWiki message. 'Template:Disambig' is always - assumed to be default, and will be appended regardless of its - existence. - """ - if self.site.has_extension('Disambiguator'): - # If the Disambiguator extension is loaded, use it - return 'disambiguation' in self.properties() - - if not hasattr(self.site, '_disambigtemplates'): - try: - default = set(self.site.family.disambig('_default')) - except KeyError: - default = {'Disambig'} - try: - distl = self.site.family.disambig(self.site.code, - fallback=False) - except KeyError: - distl = None - if distl is None: - disambigpages = Page(self.site, - 'MediaWiki:Disambiguationspage') - if disambigpages.exists(): - disambigs = {link.title(with_ns=False) - for link in disambigpages.linkedPages() - if link.namespace() == 10} - elif self.site.has_mediawiki_message('disambiguationspage'): - message = self.site.mediawiki_message( - 'disambiguationspage').split(':', 1)[1] - # add the default template(s) for default mw message - # only - disambigs = {first_upper(message)} | default - else: - disambigs = default - self.site._disambigtemplates = disambigs - else: - # Normalize template capitalization - self.site._disambigtemplates = {first_upper(t) for t in distl} - templates = {tl.title(with_ns=False) for tl in self.templates()} - disambigs = set() - # always use cached disambig templates - disambigs.update(self.site._disambigtemplates) - # see if any template on this page is in the set of disambigs - disambig_in_page = disambigs.intersection(templates) - return self.namespace() != 10 and bool(disambig_in_page) - - def getReferences(self, - follow_redirects: bool = True, - with_template_inclusion: bool = True, - only_template_inclusion: bool = False, - filter_redirects: bool = False, - namespaces=None, - total: Optional[int] = None, - content: bool = False): - """ - Return an iterator all pages that refer to or embed the page. - - If you need a full list of referring pages, use - ``pages = list(s.getReferences())`` - - :param follow_redirects: if True, also iterate pages that link to a - redirect pointing to the page. - :param with_template_inclusion: if True, also iterate pages where self - is used as a template. - :param only_template_inclusion: if True, only iterate pages where self - is used as a template. - :param filter_redirects: if True, only iterate redirects to self. - :param namespaces: only iterate pages in these namespaces - :param total: iterate no more than this number of pages in total - :param content: if True, retrieve the content of the current version - of each referring page (default False) - :rtype: typing.Iterable[pywikibot.Page] - """ - # N.B.: this method intentionally overlaps with backlinks() and - # embeddedin(). Depending on the interface, it may be more efficient - # to implement those methods in the site interface and then combine - # the results for this method, or to implement this method and then - # split up the results for the others. - return self.site.pagereferences( - self, - follow_redirects=follow_redirects, - filter_redirects=filter_redirects, - with_template_inclusion=with_template_inclusion, - only_template_inclusion=only_template_inclusion, - namespaces=namespaces, - total=total, - content=content - ) - - def backlinks(self, - follow_redirects: bool = True, - filter_redirects: Optional[bool] = None, - namespaces=None, - total: Optional[int] = None, - content: bool = False): - """ - Return an iterator for pages that link to this page. - - :param follow_redirects: if True, also iterate pages that link to a - redirect pointing to the page. - :param filter_redirects: if True, only iterate redirects; if False, - omit redirects; if None, do not filter - :param namespaces: only iterate pages in these namespaces - :param total: iterate no more than this number of pages in total - :param content: if True, retrieve the content of the current version - of each referring page (default False) - """ - return self.site.pagebacklinks( - self, - follow_redirects=follow_redirects, - filter_redirects=filter_redirects, - namespaces=namespaces, - total=total, - content=content - ) - - def embeddedin(self, - filter_redirects: Optional[bool] = None, - namespaces=None, - total: Optional[int] = None, - content: bool = False): - """ - Return an iterator for pages that embed this page as a template. - - :param filter_redirects: if True, only iterate redirects; if False, - omit redirects; if None, do not filter - :param namespaces: only iterate pages in these namespaces - :param total: iterate no more than this number of pages in total - :param content: if True, retrieve the content of the current version - of each embedding page (default False) - """ - return self.site.page_embeddedin( - self, - filter_redirects=filter_redirects, - namespaces=namespaces, - total=total, - content=content - ) - - def redirects( - self, - *, - filter_fragments: Optional[bool] = None, - namespaces: NamespaceArgType = None, - total: Optional[int] = None, - content: bool = False - ) -> 'Iterable[pywikibot.Page]': - """ - Return an iterable of redirects to this page. - - :param filter_fragments: If True, only return redirects with fragments. - If False, only return redirects without fragments. If None, return - both (no filtering). - :param namespaces: only return redirects from these namespaces - :param total: maximum number of redirects to retrieve in total - :param content: load the current content of each redirect - - .. versionadded:: 7.0 - """ - return self.site.page_redirects( - self, - filter_fragments=filter_fragments, - namespaces=namespaces, - total=total, - content=content, - ) - - def protection(self) -> Dict[str, Tuple[str, str]]: - """Return a dictionary reflecting page protections. - - **Example:** - - >>> site = pywikibot.Site('wikipedia:test') - >>> page = pywikibot.Page(site, 'Main Page') - >>> page.protection() - {'edit': ('sysop', 'infinity'), 'move': ('sysop', 'infinity')} - - .. seealso:: - - :meth:`Site.page_restrictions() - <pywikibot.site._apisite.APISite.page_restrictions>` - - :meth:`applicable_protections` - - :meth:`protect` - """ - return self.site.page_restrictions(self) - - def applicable_protections(self) -> Set[str]: - """Return the protection types allowed for that page. - - **Example:** - - >>> site = pywikibot.Site('wikipedia:test') - >>> page = pywikibot.Page(site, 'Main Page') - >>> sorted(page.applicable_protections()) - ['edit', 'move'] - - .. seealso:: - - :meth:`protect` - - :meth:`protection` - """ - self.site.loadpageinfo(self) - return self._applicable_protections - - def has_permission(self, action: str = 'edit') -> bool: - """Determine whether the page can be modified. - - Return True if the bot has the permission of needed restriction level - for the given action type: - - >>> site = pywikibot.Site('test') - >>> page = pywikibot.Page(site, 'Main Page') - >>> page.has_permission() - False - >>> page.has_permission('move') - False - >>> page.has_permission('invalid') - Traceback (most recent call last): - ... - ValueError: APISite.page_can_be_edited(): Invalid value "invalid" ... - - .. seealso:: :meth:`APISite.page_can_be_edited() - <pywikibot.site._apisite.APISite.page_can_be_edited>` - - - :param action: a valid restriction type like 'edit', 'move'; - default is ``edit``. - :raises ValueError: invalid action parameter - """ - return self.site.page_can_be_edited(self, action) - - def botMayEdit(self) -> bool: - """ - Determine whether the active bot is allowed to edit the page. - - This will be True if the page doesn't contain {{bots}} or {{nobots}} - or any other template from edit_restricted_templates list - in x_family.py file, or it contains them and the active bot is allowed - to edit this page. (This method is only useful on those sites that - recognize the bot-exclusion protocol; on other sites, it will always - return True.) - - The framework enforces this restriction by default. It is possible - to override this by setting ignore_bot_templates=True in - user cnfig file (user-config.py), or using page.put(force=True). - """ - if not hasattr(self, '_bot_may_edit'): - self._bot_may_edit = self._check_bot_may_edit() - return self._bot_may_edit - - def _check_bot_may_edit(self, module: Optional[str] = None) -> bool: - """A botMayEdit helper method. - - :param module: The module name to be restricted. Defaults to - :func:`pywikibot.calledModuleName`. - """ - if not hasattr(self, 'templatesWithParams'): - return True - - if config.ignore_bot_templates: # Check the "master ignore switch" - return True - - username = self.site.username() - try: - templates = self.templatesWithParams() - except (NoPageError, IsRedirectPageError, SectionError): - return True - - # go through all templates and look for any restriction - restrictions = set(self.site.get_edit_restricted_templates()) - - if module is None: - module = pywikibot.calledModuleName() - - # also add archive templates for non-archive bots - if module != 'archivebot': - restrictions.update(self.site.get_archived_page_templates()) - - # multiple bots/nobots templates are allowed - for template, params in templates: - title = template.title(with_ns=False) - - if title in restrictions: - return False - - if title not in ('Bots', 'Nobots'): - continue - - try: - key, sep, value = params[0].partition('=') - except IndexError: - key, sep, value = '', '', '' - names = set() - else: - if not sep: - key, value = value, key - key = key.strip() - names = {name.strip() for name in value.split(',')} - - if len(params) > 1: - pywikibot.warning( - '{{%s|%s}} has more than 1 parameter; taking the first.' - % (title.lower(), '|'.join(params))) - - if title == 'Nobots': - if not params: - return False - - if key: - pywikibot.error( - '%s parameter for {{nobots}} is not allowed. ' - 'Edit declined' % key) - return False - - if 'all' in names or module in names or username in names: - return False - - if title == 'Bots': - if value and not key: - pywikibot.warning( - '{{bots|%s}} is not valid. Ignoring.' % value) - continue - - if key and not value: - pywikibot.warning( - '{{bots|%s=}} is not valid. Ignoring.' % key) - continue - - if key == 'allow': - if not ('all' in names or username in names): - return False - - elif key == 'deny': - if 'all' in names or username in names: - return False - - elif key == 'allowscript': - if not ('all' in names or module in names): - return False - - elif key == 'denyscript': - if 'all' in names or module in names: - return False - - elif key: # ignore unrecognized keys with a warning - pywikibot.warning( - '{{bots|%s}} is not valid. Ignoring.' % params[0]) - - # no restricting template found - return True - - def save(self, - summary: Optional[str] = None, - watch: Optional[str] = None, - minor: bool = True, - botflag: Optional[bool] = None, - force: bool = False, - asynchronous: bool = False, - callback=None, - apply_cosmetic_changes: Optional[bool] = None, - quiet: bool = False, - **kwargs): - """ - Save the current contents of page's text to the wiki. - - .. versionchanged:: 7.0 - boolean watch parameter is deprecated - - :param summary: The edit summary for the modification (optional, but - most wikis strongly encourage its use) - :param watch: Specify how the watchlist is affected by this edit, set - to one of "watch", "unwatch", "preferences", "nochange": - * watch: add the page to the watchlist - * unwatch: remove the page from the watchlist - * preferences: use the preference settings (Default) - * nochange: don't change the watchlist - If None (default), follow bot account's default settings - :param minor: if True, mark this edit as minor - :param botflag: if True, mark this edit as made by a bot (default: - True if user has bot status, False if not) - :param force: if True, ignore botMayEdit() setting - :param asynchronous: if True, launch a separate thread to save - asynchronously - :param callback: a callable object that will be called after the - page put operation. This object must take two arguments: (1) a - Page object, and (2) an exception instance, which will be None - if the page was saved successfully. The callback is intended for - use by bots that need to keep track of which saves were - successful. - :param apply_cosmetic_changes: Overwrites the cosmetic_changes - configuration value to this value unless it's None. - :param quiet: enable/disable successful save operation message; - defaults to False. - In asynchronous mode, if True, it is up to the calling bot to - manage the output e.g. via callback. - """ - if not summary: - summary = config.default_edit_summary - - if isinstance(watch, bool): # pragma: no cover - issue_deprecation_warning( - 'boolean watch parameter', - '"watch", "unwatch", "preferences" or "nochange" value', - since='7.0.0') - watch = ('unwatch', 'watch')[watch] - - if not force and not self.botMayEdit(): - raise OtherPageSaveError( - self, 'Editing restricted by {{bots}}, {{nobots}} ' - "or site's equivalent of {{in use}} template") - self._save(summary=summary, watch=watch, minor=minor, botflag=botflag, - asynchronous=asynchronous, callback=callback, - cc=apply_cosmetic_changes, quiet=quiet, **kwargs) - - @allow_asynchronous - def _save(self, summary=None, watch=None, minor: bool = True, botflag=None, - cc=None, quiet: bool = False, **kwargs): - """Helper function for save().""" - link = self.title(as_link=True) - if cc or (cc is None and config.cosmetic_changes): - summary = self._cosmetic_changes_hook(summary) - - done = self.site.editpage(self, summary=summary, minor=minor, - watch=watch, bot=botflag, **kwargs) - if not done: - if not quiet: - pywikibot.warning(f'Page {link} not saved') - raise PageSaveRelatedError(self) - if not quiet: - pywikibot.info(f'Page {link} saved') - - def _cosmetic_changes_hook(self, summary: str) -> str: - """The cosmetic changes hook. - - :param summary: The current edit summary. - :return: Modified edit summary if cosmetic changes has been done, - else the old edit summary. - """ - if self.isTalkPage() or self.content_model != 'wikitext' or \ - pywikibot.calledModuleName() in config.cosmetic_changes_deny_script: - return summary - - # check if cosmetic_changes is enabled for this page - family = self.site.family.name - if config.cosmetic_changes_mylang_only: - cc = ((family == config.family and self.site.lang == config.mylang) - or self.site.lang in config.cosmetic_changes_enable.get( - family, [])) - else: - cc = True - cc = cc and self.site.lang not in config.cosmetic_changes_disable.get( - family, []) - cc = cc and self._check_bot_may_edit('cosmetic_changes') - if not cc: - return summary - - old = self.text - pywikibot.log('Cosmetic changes for {}-{} enabled.' - .format(family, self.site.lang)) - # cc depends on page directly and via several other imports - cc_toolkit = CosmeticChangesToolkit(self, ignore=CANCEL.MATCH) - self.text = cc_toolkit.change(old) - - if summary and old.strip().replace( - '\r\n', '\n') != self.text.strip().replace('\r\n', '\n'): - summary += i18n.twtranslate(self.site, - 'pywikibot-cosmetic-changes') - return summary - - def put(self, newtext: str, - summary: Optional[str] = None, - watch: Optional[str] = None, - minor: bool = True, - botflag: Optional[bool] = None, - force: bool = False, - asynchronous: bool = False, - callback=None, - show_diff: bool = False, - **kwargs) -> None: - """ - Save the page with the contents of the first argument as the text. - - This method is maintained primarily for backwards-compatibility. - For new code, using Page.save() is preferred. See save() method - docs for all parameters not listed here. - - .. versionadded:: 7.0 - The `show_diff` parameter - - :param newtext: The complete text of the revised page. - :param show_diff: show changes between oldtext and newtext - (default: False) - """ - if show_diff: - pywikibot.showDiff(self.text, newtext) - self.text = newtext - self.save(summary=summary, watch=watch, minor=minor, botflag=botflag, - force=force, asynchronous=asynchronous, callback=callback, - **kwargs) - - def watch(self, unwatch: bool = False) -> bool: - """ - Add or remove this page to/from bot account's watchlist. - - :param unwatch: True to unwatch, False (default) to watch. - :return: True if successful, False otherwise. - """ - return self.site.watch(self, unwatch) - - def clear_cache(self) -> None: - """Clear the cached attributes of the page.""" - self._revisions = {} - for attr in self._cache_attrs: - with suppress(AttributeError): - delattr(self, attr) - - def purge(self, **kwargs) -> bool: - """ - Purge the server's cache for this page. - - :keyword redirects: Automatically resolve redirects. - :type redirects: bool - :keyword converttitles: Convert titles to other variants if necessary. - Only works if the wiki's content language supports variant - conversion. - :type converttitles: bool - :keyword forcelinkupdate: Update the links tables. - :type forcelinkupdate: bool - :keyword forcerecursivelinkupdate: Update the links table, and update - the links tables for any page that uses this page as a template. - :type forcerecursivelinkupdate: bool - """ - self.clear_cache() - return self.site.purgepages([self], **kwargs) - - def touch(self, callback=None, botflag: bool = False, **kwargs): - """ - Make a touch edit for this page. - - See save() method docs for all parameters. - The following parameters will be overridden by this method: - - summary, watch, minor, force, asynchronous - - Parameter botflag is False by default. - - minor and botflag parameters are set to False which prevents hiding - the edit when it becomes a real edit due to a bug. - - .. note:: This discards content saved to self.text. - """ - if self.exists(): - # ensure always get the page text and not to change it. - del self.text - summary = i18n.twtranslate(self.site, 'pywikibot-touch') - self.save(summary=summary, watch='nochange', - minor=False, botflag=botflag, force=True, - asynchronous=False, callback=callback, - apply_cosmetic_changes=False, nocreate=True, **kwargs) - else: - raise NoPageError(self) - - def linkedPages( - self, *args, **kwargs - ) -> Generator['pywikibot.Page', None, None]: - """Iterate Pages that this Page links to. - - Only returns pages from "normal" internal links. Embedded - templates are omitted but links within them are returned. All - interwiki and external links are omitted. - - For the parameters refer - :py:mod:`APISite.pagelinks<pywikibot.site.APISite.pagelinks>` - - .. versionadded:: 7.0 - the `follow_redirects` keyword argument - .. deprecated:: 7.0 - the positional arguments - - .. seealso:: :api:`Links` - - :keyword namespaces: Only iterate pages in these namespaces - (default: all) - :type namespaces: iterable of str or Namespace key, - or a single instance of those types. May be a '|' separated - list of namespace identifiers. - :keyword follow_redirects: if True, yields the target of any redirects, - rather than the redirect page - :keyword total: iterate no more than this number of pages in total - :keyword content: if True, load the current content of each page - """ - # Deprecate positional arguments and synchronize with Site.pagelinks - keys = ('namespaces', 'total', 'content') - for i, arg in enumerate(args): # pragma: no cover - key = keys[i] - issue_deprecation_warning( - f'Positional argument {i + 1} ({arg})', - f'keyword argument "{key}={arg}"', - since='7.0.0') - if key in kwargs: - pywikibot.warning('{!r} is given as keyword argument {!r} ' - 'already; ignoring {!r}' - .format(key, arg, kwargs[key])) - else: - kwargs[key] = arg - - return self.site.pagelinks(self, **kwargs) - - def interwiki(self, expand: bool = True): - """ - Iterate interwiki links in the page text, excluding language links. - - :param expand: if True (default), include interwiki links found in - templates transcluded onto this page; if False, only iterate - interwiki links found in this page's own wikitext - :return: a generator that yields Link objects - :rtype: generator - """ - # This function does not exist in the API, so it has to be - # implemented by screen-scraping - if expand: - text = self.expand_text() - else: - text = self.text - for linkmatch in pywikibot.link_regex.finditer( - textlib.removeDisabledParts(text)): - linktitle = linkmatch['title'] - link = Link(linktitle, self.site) - # only yield links that are to a different site and that - # are not language links - try: - # initial ":" indicates not a language link - # link to a different family is not a language link - if link.site != self.site \ - and (linktitle.lstrip().startswith(':') - or link.site.family != self.site.family): - yield link - except Error: - # ignore any links with invalid contents - continue - - def langlinks(self, include_obsolete: bool = False) -> list: - """ - Return a list of all inter-language Links on this page. - - :param include_obsolete: if true, return even Link objects whose site - is obsolete - :return: list of Link objects. - """ - # Note: We preload a list of *all* langlinks, including links to - # obsolete sites, and store that in self._langlinks. We then filter - # this list if the method was called with include_obsolete=False - # (which is the default) - if not hasattr(self, '_langlinks'): - self._langlinks = set(self.iterlanglinks(include_obsolete=True)) - - if include_obsolete: - return list(self._langlinks) - return [i for i in self._langlinks if not i.site.obsolete] - - def iterlanglinks(self, - total: Optional[int] = None, - include_obsolete: bool = False): - """Iterate all inter-language links on this page. - - :param total: iterate no more than this number of pages in total - :param include_obsolete: if true, yield even Link object whose site - is obsolete - :return: a generator that yields Link objects. - :rtype: generator - """ - if hasattr(self, '_langlinks'): - return iter(self.langlinks(include_obsolete=include_obsolete)) - # XXX We might want to fill _langlinks when the Site - # method is called. If we do this, we'll have to think - # about what will happen if the generator is not completely - # iterated upon. - return self.site.pagelanglinks(self, total=total, - include_obsolete=include_obsolete) - - def data_item(self): - """ - Convenience function to get the Wikibase item of a page. - - :rtype: pywikibot.page.ItemPage - """ - return pywikibot.ItemPage.fromPage(self) - - def templates(self, content: bool = False) -> List['pywikibot.Page']: - """ - Return a list of Page objects for templates used on this Page. - - Template parameters are ignored. This method only returns embedded - templates, not template pages that happen to be referenced through - a normal link. - - :param content: if True, retrieve the content of the current version - of each template (default False) - :param content: bool - """ - # Data might have been preloaded - # Delete cache if content is needed and elements have no content - if (hasattr(self, '_templates') - and content - and not all(t.has_content() for t in self._templates)): - del self._templates - - if not hasattr(self, '_templates'): - self._templates = set(self.itertemplates(content=content)) - - return list(self._templates) - - def itertemplates(self, - total: Optional[int] = None, - content: bool = False): - """ - Iterate Page objects for templates used on this Page. - - Template parameters are ignored. This method only returns embedded - templates, not template pages that happen to be referenced through - a normal link. - - :param total: iterate no more than this number of pages in total - :param content: if True, retrieve the content of the current version - of each template (default False) - :param content: bool - """ - if hasattr(self, '_templates'): - return itertools.islice(self.templates(content=content), total) - - return self.site.pagetemplates(self, total=total, content=content) - - def imagelinks(self, total: Optional[int] = None, content: bool = False): - """ - Iterate FilePage objects for images displayed on this Page. - - :param total: iterate no more than this number of pages in total - :param content: if True, retrieve the content of the current version - of each image description page (default False) - :return: a generator that yields FilePage objects. - """ - return self.site.pageimages(self, total=total, content=content) - - def categories(self, - with_sort_key: bool = False, - total: Optional[int] = None, - content: bool = False) -> Iterator['pywikibot.Page']: - """ - Iterate categories that the article is in. - - :param with_sort_key: if True, include the sort key in each Category. - :param total: iterate no more than this number of pages in total - :param content: if True, retrieve the content of the current version - of each category description page (default False) - :return: a generator that yields Category objects. - :rtype: generator - """ - # FIXME: bug T75561: with_sort_key is ignored by Site.pagecategories - if with_sort_key: - raise NotImplementedError('with_sort_key is not implemented') - - # Data might have been preloaded - # Delete cache if content is needed and elements have no content - if hasattr(self, '_categories'): - if (content - and not all(c.has_content() for c in self._categories)): - del self._categories - else: - return itertools.islice(self._categories, total) - - return self.site.pagecategories(self, total=total, content=content) - - def extlinks(self, total: Optional[int] = None): - """ - Iterate all external URLs (not interwiki links) from this page. - - :param total: iterate no more than this number of pages in total - :return: a generator that yields str objects containing URLs. - :rtype: generator - """ - return self.site.page_extlinks(self, total=total) - - def coordinates(self, primary_only: bool = False): - """ - Return a list of Coordinate objects for points on the page. - - Uses the MediaWiki extension GeoData. - - :param primary_only: Only return the coordinate indicated to be primary - :return: A list of Coordinate objects or a single Coordinate if - primary_only is True - :rtype: list of Coordinate or Coordinate or None - """ - if not hasattr(self, '_coords'): - self._coords = [] - self.site.loadcoordinfo(self) - if primary_only: - for coord in self._coords: - if coord.primary: - return coord - return None - return list(self._coords) - - def page_image(self): - """ - Return the most appropriate image on the page. - - Uses the MediaWiki extension PageImages. - - :return: A FilePage object - :rtype: pywikibot.page.FilePage - """ - if not hasattr(self, '_pageimage'): - self._pageimage = None - self.site.loadpageimage(self) - - return self._pageimage - - def getRedirectTarget(self): - """ - Return a Page object for the target this Page redirects to. - - If this page is not a redirect page, will raise an - IsNotRedirectPageError. This method also can raise a NoPageError. - - :rtype: pywikibot.Page - """ - return self.site.getredirtarget(self) - - def moved_target(self): - """ - Return a Page object for the target this Page was moved to. - - If this page was not moved, it will raise a NoMoveTargetError. - This method also works if the source was already deleted. - - :rtype: pywikibot.page.Page - :raises pywikibot.exceptions.NoMoveTargetError: page was not moved - """ - gen = iter(self.site.logevents(logtype='move', page=self, total=1)) - try: - lastmove = next(gen) - except StopIteration: - raise NoMoveTargetError(self) - else: - return lastmove.target_page - - def revisions(self, - reverse: bool = False, - total: Optional[int] = None, - content: bool = False, - starttime=None, endtime=None): - """Generator which loads the version history as Revision instances.""" - # TODO: Only request uncached revisions - self.site.loadrevisions(self, content=content, rvdir=reverse, - starttime=starttime, endtime=endtime, - total=total) - - revs = self._revisions.values() - - if starttime or endtime: - t_min, t_max = Timestamp.min, Timestamp.max - - if reverse: - t0 = Timestamp.set_timestamp(starttime) if starttime else t_min - t1 = Timestamp.set_timestamp(endtime) if endtime else t_max - else: - t0 = Timestamp.set_timestamp(endtime) if endtime else t_min - t1 = Timestamp.set_timestamp(starttime) if starttime else t_max - - revs = [rev for rev in revs if t0 <= rev.timestamp <= t1] - - revs = sorted(revs, reverse=not reverse, key=lambda rev: rev.timestamp) - - return islice(revs, total) - - def getVersionHistoryTable(self, - reverse: bool = False, - total: Optional[int] = None): - """Return the version history as a wiki table.""" - result = '{| class="wikitable"\n' - result += '! oldid || date/time || username || edit summary\n' - for entry in self.revisions(reverse=reverse, total=total): - result += '|----\n' - result += ('| {r.revid} || {r.timestamp} || {r.user} || ' - '<nowiki>{r.comment}</nowiki>\n'.format(r=entry)) - result += '|}\n' - return result - - def contributors(self, - total: Optional[int] = None, - starttime=None, endtime=None): - """ - Compile contributors of this page with edit counts. - - :param total: iterate no more than this number of revisions in total - :param starttime: retrieve revisions starting at this Timestamp - :param endtime: retrieve revisions ending at this Timestamp - - :return: number of edits for each username - :rtype: :py:obj:`collections.Counter` - """ - return Counter(rev.user for rev in - self.revisions(total=total, - starttime=starttime, endtime=endtime)) - - def revision_count(self, contributors=None) -> int: - """Determine number of edits from contributors. - - :param contributors: contributor usernames - :type contributors: iterable of str or pywikibot.User, - a single pywikibot.User, a str or None - :return: number of edits for all provided usernames - """ - cnt = self.contributors() - - if not contributors: - return sum(cnt.values()) - - if isinstance(contributors, pywikibot.User): - contributors = contributors.username - - if isinstance(contributors, str): - return cnt[contributors] - - return sum(cnt[user.username] - if isinstance(user, pywikibot.User) else cnt[user] - for user in contributors) - - def merge_history(self, - dest: 'BasePage', - timestamp: Optional[pywikibot.Timestamp] = None, - reason: Optional[str] = None) -> None: - """Merge revisions from this page into another page. - - .. seealso:: :meth:`APISite.merge_history() - <pywikibot.site._apisite.APISite.merge_history>` for details. - - :param dest: Destination page to which revisions will be merged - :param timestamp: Revisions from this page dating up to this timestamp - will be merged into the destination page (if not given or False, - all revisions will be merged) - :param reason: Optional reason for the history merge - """ - self.site.merge_history(self, dest, timestamp, reason) - - def move(self, - newtitle: str, - reason: Optional[str] = None, - movetalk: bool = True, - noredirect: bool = False, - movesubpages: bool = True) -> None: - """ - Move this page to a new title. - - .. versionchanged:: 7.2 - The *movesubpages* parameter was added - - :param newtitle: The new page title. - :param reason: The edit summary for the move. - :param movetalk: If true, move this page's talk page (if it exists) - :param noredirect: if move succeeds, delete the old page - (usually requires sysop privileges, depending on wiki settings) - :param movesubpages: Rename subpages, if applicable. - """ - if reason is None: - pywikibot.info(f'Moving {self} to [[{newtitle}]].') - reason = pywikibot.input('Please enter a reason for the move:') - return self.site.movepage(self, newtitle, reason, - movetalk=movetalk, - noredirect=noredirect, - movesubpages=movesubpages) - - def delete( - self, - reason: Optional[str] = None, - prompt: bool = True, - mark: bool = False, - automatic_quit: bool = False, - *, - deletetalk: bool = False - ) -> int: - """ - Delete the page from the wiki. Requires administrator status. - - .. versionchanged:: 7.1 - keyword only parameter *deletetalk* was added. - - :param reason: The edit summary for the deletion, or rationale - for deletion if requesting. If None, ask for it. - :param deletetalk: Also delete the talk page, if it exists. - :param prompt: If true, prompt user for confirmation before deleting. - :param mark: If true, and user does not have sysop rights, place a - speedy-deletion request on the page instead. If false, non-sysops - will be asked before marking pages for deletion. - :param automatic_quit: show also the quit option, when asking - for confirmation. - - :return: the function returns an integer, with values as follows: - value meaning - 0 no action was done - 1 page was deleted - -1 page was marked for deletion - """ - if reason is None: - pywikibot.info(f'Deleting {self.title(as_link=True)}.') - reason = pywikibot.input('Please enter a reason for the deletion:') - - # If user has 'delete' right, delete the page - if self.site.has_right('delete'): - answer = 'y' - if prompt and not hasattr(self.site, '_noDeletePrompt'): - answer = pywikibot.input_choice( - 'Do you want to delete {}?'.format(self.title( - as_link=True, force_interwiki=True)), - [('Yes', 'y'), ('No', 'n'), ('All', 'a')], - 'n', automatic_quit=automatic_quit) - if answer == 'a': - answer = 'y' - self.site._noDeletePrompt = True - if answer == 'y': - self.site.delete(self, reason, deletetalk=deletetalk) - return 1 - return 0 - - # Otherwise mark it for deletion - if mark or hasattr(self.site, '_noMarkDeletePrompt'): - answer = 'y' - else: - answer = pywikibot.input_choice( - "Can't delete {}; do you want to mark it for deletion instead?" - .format(self), - [('Yes', 'y'), ('No', 'n'), ('All', 'a')], - 'n', automatic_quit=False) - if answer == 'a': - answer = 'y' - self.site._noMarkDeletePrompt = True - if answer == 'y': - template = '{{delete|1=%s}}\n' % reason - # We can't add templates in a wikidata item, so let's use its - # talk page - if isinstance(self, pywikibot.ItemPage): - target = self.toggleTalkPage() - else: - target = self - target.text = template + target.text - target.save(summary=reason) - return -1 - return 0 - - def has_deleted_revisions(self) -> bool: - """Return True if the page has deleted revisions. - - .. versionadded:: 4.2 - """ - if not hasattr(self, '_has_deleted_revisions'): - gen = self.site.deletedrevs(self, total=1, prop=['ids']) - self._has_deleted_revisions = bool(list(gen)) - return self._has_deleted_revisions - - def loadDeletedRevisions(self, total: Optional[int] = None, **kwargs): - """ - Retrieve deleted revisions for this Page. - - Stores all revisions' timestamps, dates, editors and comments in - self._deletedRevs attribute. - - :return: iterator of timestamps (which can be used to retrieve - revisions later on). - :rtype: generator - """ - if not hasattr(self, '_deletedRevs'): - self._deletedRevs = {} - for item in self.site.deletedrevs(self, total=total, **kwargs): - for rev in item.get('revisions', []): - self._deletedRevs[rev['timestamp']] = rev - yield rev['timestamp'] - - def getDeletedRevision( - self, - timestamp, - content: bool = False, - **kwargs - ) -> List: - """ - Return a particular deleted revision by timestamp. - - :return: a list of [date, editor, comment, text, restoration - marker]. text will be None, unless content is True (or has - been retrieved earlier). If timestamp is not found, returns - empty list. - """ - if hasattr(self, '_deletedRevs') \ - and timestamp in self._deletedRevs \ - and (not content or 'content' in self._deletedRevs[timestamp]): - return self._deletedRevs[timestamp] - - for item in self.site.deletedrevs(self, start=timestamp, - content=content, total=1, **kwargs): - # should only be one item with one revision - if item['title'] == self.title() and 'revisions' in item: - return item['revisions'][0] - return [] - - def markDeletedRevision(self, timestamp, undelete: bool = True): - """ - Mark the revision identified by timestamp for undeletion. - - :param undelete: if False, mark the revision to remain deleted. - """ - if not hasattr(self, '_deletedRevs'): - self.loadDeletedRevisions() - if timestamp not in self._deletedRevs: - raise ValueError( - 'Timestamp {} is not a deleted revision' - .format(timestamp)) - self._deletedRevs[timestamp]['marked'] = undelete - - def undelete(self, reason: Optional[str] = None) -> None: - """ - Undelete revisions based on the markers set by previous calls. - - If no calls have been made since loadDeletedRevisions(), everything - will be restored. - - Simplest case:: - - Page(...).undelete('This will restore all revisions') - - More complex:: - - pg = Page(...) - revs = pg.loadDeletedRevisions() - for rev in revs: - if ... #decide whether to undelete a revision - pg.markDeletedRevision(rev) #mark for undeletion - pg.undelete('This will restore only selected revisions.') - - :param reason: Reason for the action. - """ - if hasattr(self, '_deletedRevs'): - undelete_revs = [ts for ts, rev in self._deletedRevs.items() - if 'marked' in rev and rev['marked']] - else: - undelete_revs = [] - if reason is None: - warn('Not passing a reason for undelete() is deprecated.', - DeprecationWarning) - pywikibot.info(f'Undeleting {self.title(as_link=True)}.') - reason = pywikibot.input( - 'Please enter a reason for the undeletion:') - self.site.undelete(self, reason, revision=undelete_revs) - - def protect(self, - reason: Optional[str] = None, - protections: Optional[Dict[str, Optional[str]]] = None, - **kwargs) -> None: - """Protect or unprotect a wiki page. Requires *protect* right. - - Valid protection levels are ``''`` (equivalent to ``None``), - ``'autoconfirmed'``, ``'sysop'`` and ``'all'``. ``'all'`` means - everyone is allowed, i.e. that protection type will be - unprotected. - - In order to unprotect a type of permission, the protection level - shall be either set to ``'all'`` or ``''`` or skipped in the - protections dictionary. - - Expiry of protections can be set via *kwargs*, see - :meth:`Site.protect()<pywikibot.site._apisite.APISite.protect>` for - details. By default there is no expiry for the protection types. - - .. seealso:: - - :meth:`Site.protect() - <pywikibot.site._apisite.APISite.protect>` - - :meth:`applicable_protections` - - :param protections: A dict mapping type of protection to - protection level of that type. Allowed protection types for - a page can be retrieved by :meth:`applicable_protections`. - Defaults to protections is None, which means unprotect all - protection types. - - Example: ``{'move': 'sysop', 'edit': 'autoconfirmed'}`` - - :param reason: Reason for the action, default is None and will set an - empty string. - """ - protections = protections or {} # protections is converted to {} - reason = reason or '' # None is converted to '' - - self.site.protect(self, protections, reason, **kwargs) - - def change_category(self, old_cat, new_cat, - summary: Optional[str] = None, - sort_key=None, - in_place: bool = True, - include: Optional[List[str]] = None, - show_diff: bool = False) -> bool: - """ - Remove page from oldCat and add it to newCat. - - .. versionadded:: 7.0 - The `show_diff` parameter - - :param old_cat: category to be removed - :type old_cat: pywikibot.page.Category - :param new_cat: category to be added, if any - :type new_cat: pywikibot.page.Category or None - - :param summary: string to use as an edit summary - - :param sort_key: sortKey to use for the added category. - Unused if newCat is None, or if inPlace=True - If sortKey=True, the sortKey used for oldCat will be used. - - :param in_place: if True, change categories in place rather than - rearranging them. - - :param include: list of tags not to be disabled by default in relevant - textlib functions, where CategoryLinks can be searched. - :param show_diff: show changes between oldtext and newtext - (default: False) - - :return: True if page was saved changed, otherwise False. - """ - # get list of Category objects the article is in and remove possible - # duplicates - cats = [] - for cat in textlib.getCategoryLinks(self.text, site=self.site, - include=include or []): - if cat not in cats: - cats.append(cat) - - if not self.has_permission(): - pywikibot.info(f"Can't edit {self}, skipping it...") - return False - - if old_cat not in cats: - if self.namespace() != 10: - pywikibot.error('{} is not in category {}!' - .format(self, old_cat.title())) - else: - pywikibot.info('{} is not in category {}, skipping...' - .format(self, old_cat.title())) - return False - - # This prevents the bot from adding new_cat if it is already present. - if new_cat in cats: - new_cat = None - - oldtext = self.text - if in_place or self.namespace() == 10: - newtext = textlib.replaceCategoryInPlace(oldtext, old_cat, new_cat, - site=self.site) - else: - old_cat_pos = cats.index(old_cat) - if new_cat: - if sort_key is True: - # Fetch sort_key from old_cat in current page. - sort_key = cats[old_cat_pos].sortKey - cats[old_cat_pos] = pywikibot.Category(self.site, - new_cat.title(), - sort_key=sort_key) - else: - cats.pop(old_cat_pos) - - try: - newtext = textlib.replaceCategoryLinks(oldtext, cats) - except ValueError: - # Make sure that the only way replaceCategoryLinks() can return - # a ValueError is in the case of interwiki links to self. - pywikibot.info( - f'Skipping {self} because of interwiki link to self') - return False - - if oldtext != newtext: - try: - self.put(newtext, summary, show_diff=show_diff) - except PageSaveRelatedError as error: - pywikibot.info(f'Page {self} not saved: {error}') - except NoUsernameError: - pywikibot.info( - f'Page {self} not saved; sysop privileges required.') - else: - return True - - return False - - def is_flow_page(self) -> bool: - """Whether a page is a Flow page.""" - return self.content_model == 'flow-board' - - def create_short_link(self, - permalink: bool = False, - with_protocol: bool = True) -> str: - """ - Return a shortened link that points to that page. - - If shared_urlshortner_wiki is defined in family config, it'll use - that site to create the link instead of the current wiki. - - :param permalink: If true, the link will point to the actual revision - of the page. - :param with_protocol: If true, and if it's not already included, - the link will have http(s) protocol prepended. On Wikimedia wikis - the protocol is already present. - :return: The reduced link. - """ - wiki = self.site - if self.site.family.shared_urlshortner_wiki: - wiki = pywikibot.Site(*self.site.family.shared_urlshortner_wiki) - - url = self.permalink() if permalink else self.full_url() - - link = wiki.create_short_link(url) - if re.match(PROTOCOL_REGEX, link): - if not with_protocol: - return re.sub(PROTOCOL_REGEX, '', link) - elif with_protocol: - return f'{wiki.protocol()}://{link}' - return link +__all__ = ['Page'] class Page(BasePage, WikiBlameMixin): @@ -2228,7 +57,7 @@ """ return textlib.extract_templates_and_params(self.text, True, True) - def templatesWithParams(self): + def templatesWithParams(self): # noqa: N802 """Return templates used on this Page. The templates are extracted by :meth:`raw_extracted_templates`, diff --git a/tox.ini b/tox.ini index a5f454b..9648282 100644 --- a/tox.ini +++ b/tox.ini @@ -162,8 +162,8 @@ pywikibot/fixes.py: E241 pywikibot/interwiki_graph.py: N802, N803, N806 pywikibot/login.py: N802, N816 + pywikibot/page/_basepage.py: N802 pywikibot/page/_collections.py: N802 - pywikibot/page/_page.py: N802 pywikibot/page/_wikibase.py: N802 pywikibot/pagegenerators/__init__.py: N802 pywikibot/pagegenerators/_filters.py: N802 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882161 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: I95b30c3332fc75a80fedbc91d607f09d54051cd5 Gerrit-Change-Number: 882161 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Move BasePage to page._basepage.py (part 2)
by Xqt (Code Review) 21 Jan '23

21 Jan '23

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882160 ) Change subject: [IMPR] Move BasePage to page._basepage.py (part 2) ...................................................................... [IMPR] Move BasePage to page._basepage.py (part 2) Move BasePage to its own module keeping his history Change-Id: Ib5ee64532f22dbc127cda457e423c34255305f72 --- R pywikibot/page/_page.py 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/pywikibot/page/page.py b/pywikibot/page/_page.py similarity index 100% rename from pywikibot/page/page.py rename to pywikibot/page/_page.py -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882160 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: Ib5ee64532f22dbc127cda457e423c34255305f72 Gerrit-Change-Number: 882160 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Move BasePage to page._basepage.py (part 1)
by Xqt (Code Review) 21 Jan '23

21 Jan '23

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882159 ) Change subject: [IMPR] Move BasePage to page._basepage.py (part 1) ...................................................................... [IMPR] Move BasePage to page._basepage.py (part 1) Move BasePage to its own module keeping his history Change-Id: Ib76dfb207862a28070f0db40c21fc5073233eaca --- C pywikibot/page/_basepage.py R pywikibot/page/page.py 2 files changed, 11 insertions(+), 0 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/pywikibot/page/_page.py b/pywikibot/page/_basepage.py similarity index 100% copy from pywikibot/page/_page.py copy to pywikibot/page/_basepage.py diff --git a/pywikibot/page/_page.py b/pywikibot/page/page.py similarity index 100% rename from pywikibot/page/_page.py rename to pywikibot/page/page.py -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882159 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: Ib76dfb207862a28070f0db40c21fc5073233eaca Gerrit-Change-Number: 882159 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [CI] Update codecov file
by jenkins-bot (Code Review) 21 Jan '23

21 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882167 ) Change subject: [CI] Update codecov file ...................................................................... [CI] Update codecov file * win32_unicode.py was deleted in https://gerrit.wikimedia.org/r/c/pywikibot/core/+/834550 Change-Id: I12643bb1674cae2aa24b57f0292c929846296b1d --- M .codecov.yml 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.codecov.yml b/.codecov.yml index 8ee62e8..2096ac8 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -23,7 +23,6 @@ - pywikibot/families/__init__.py - pywikibot/scripts/preload_sites.py - pywikibot/scripts/version.py - - pywikibot/userinterfaces/win32_unicode.py - scripts/dataextend.py - scripts/maintenance/colors.py - scripts/maintenance/make_i18n_dict.py -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882167 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: I12643bb1674cae2aa24b57f0292c929846296b1d Gerrit-Change-Number: 882167 Gerrit-PatchSet: 2 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] Fix page._page.py documentation
by Xqt (Code Review) 21 Jan '23

21 Jan '23

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882157 ) Change subject: [doc] Fix page._page.py documentation ...................................................................... [doc] Fix page._page.py documentation Category page is declared in page._category.py Change-Id: I4a55daa1417d745d39676182d7e287fffd88afa8 --- M pywikibot/page/_page.py 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/pywikibot/page/_page.py b/pywikibot/page/_page.py index 2e9f734..feee542 100644 --- a/pywikibot/page/_page.py +++ b/pywikibot/page/_page.py @@ -4,7 +4,6 @@ - BasePage: Base object for a MediaWiki page - Page: A MediaWiki page -- Category: A page in the Category: namespace Various Wikibase pages are defined in ``page._wikibase.py``, various pages for Proofread Extensions are defined in -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882157 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: I4a55daa1417d745d39676182d7e287fffd88afa8 Gerrit-Change-Number: 882157 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [CI] Remove gitter notification
by jenkins-bot (Code Review) 21 Jan '23

21 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882153 ) Change subject: [CI] Remove gitter notification ...................................................................... [CI] Remove gitter notification gitter url no longer exists. Change-Id: I06a5b617b425b38f0b930efc0d04a44fd6f23efa --- M .codecov.yml 1 file changed, 12 insertions(+), 4 deletions(-) Approvals: Meno25: Looks good to me, approved jenkins-bot: Verified diff --git a/.codecov.yml b/.codecov.yml index 3995096..8ee62e8 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -4,6 +4,7 @@ strict_yaml_branch: master coverage: + precision: 1 round: up range: 75..95 status: @@ -35,7 +36,3 @@ default: server: libera.chat channel: pywikibot - - gitter: - default: - url: https://webhooks.gitter.im/e/f312b840da1c40d9f4be -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882153 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: I06a5b617b425b38f0b930efc0d04a44fd6f23efa Gerrit-Change-Number: 882153 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] Fix HISTORY.rst
by Xqt (Code Review) 21 Jan '23

21 Jan '23

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882151 ) Change subject: [doc] Fix HISTORY.rst ...................................................................... [doc] Fix HISTORY.rst Change-Id: I76c5dcb6ebdb55ab8e1b94b44427046b1f0a3a16 --- M HISTORY.rst 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/HISTORY.rst b/HISTORY.rst index 91d77f1..829a961 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -92,7 +92,6 @@ :class:`Wiktionary<families.wiktionary_family.Family>` family were removed (:phab:`T325426`) * ``alphabetic``, ``alphabetic_revised`` and ``fyinterwiki`` attributes of :class:`family.Family` were removed (:phab:`T325426`) -* *See also Deprecations below* 7.7.3 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882151 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: I76c5dcb6ebdb55ab8e1b94b44427046b1f0a3a16 Gerrit-Change-Number: 882151 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [8.1] Prepare next release
by jenkins-bot (Code Review) 21 Jan '23

21 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882004 ) Change subject: [8.1] Prepare next release ...................................................................... [8.1] Prepare next release Change-Id: I5a502d42e1d3dc261ceb4ba60d7d47ea95382d92 --- M .appveyor.yml M ROADMAP.rst M pywikibot/__metadata__.py M HISTORY.rst M scripts/__init__.py 5 files changed, 110 insertions(+), 93 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index e9544db..5437d37 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,7 @@ -image: Visual Studio 2019 +image: Visual Studio 2022 clone_depth: 50 skip_tags: true -version: 8.0.{build} +version: 8.1.{build} environment: PYWIKIBOT_DIR: "%appdata%\\Pywikibot" diff --git a/HISTORY.rst b/HISTORY.rst index dfa92df..91d77f1 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,100 @@ Release history =============== +8.0.0 +----- +*21 January 2023* + +Improvements +^^^^^^^^^^^^ + +* Allow copying timezone from timestamp in :class:`pywikibot.WbTime` (:phab:`T325864`) +* Support federated Wikibase (:phab:`T173195`) +* Improve warning if a Non-JSON response was received from server (:phab:`T326046`) +* Allow normalization of :class:`pywikibot.WbTime` objects (:phab:`T123888`) +* Add parser for ``<pages />`` tag to :mod:`proofreadpage` +* ``addOnly`` parameter of :func:`textlib.replaceLanguageLinks` and :func:`textlib.replaceCategoryLinks` + were renamed to ``add_only`` +* ``known_codes`` attribute was added to :class:`family.WikimediaFamily` (:phab:`T325426`) +* Unify representation for :class:`time.Timestamp` between CPython and Pypy (:phab:`T325905`) +* Implement comparison for :class:`pywikibot.WbTime` object (:phab:`T148280`, :phab:`T325863`) +* Create a cookie file for each account (:phab:`T324000`) +* Move data.api._login.LoginManager to :class:`login.ClientLoginManager` +* Let user the choice which section to be copied with :mod:`generate_user_files + <pywikibot.scripts.generate_user_files>` (:phab:`T145372`) +* use :func:`roundrobin_generators<tools.itertools.roundrobin_generators>` to combine generators + when limit option is given +* Ignore OSError if API cache cannot be written +* Update tools._unidata._category_cf from Unicodedata version 15.0.0 +* :meth:`Timestamp.set_timestamp()<pywikibot.time.Timestamp.set_timestamp>` raises TypeError + instead of ValueError if conversion fails +* Python 3.12 is supported +* All parameters of :meth:`APISite.categorymembers() + <pywikibot.site._generators.GeneratorsMixin.categorymembers>` are provided with + :meth:`Category.members()<page.Category.members>`, + :meth:`Category.subcategories()<page.Category.subcategories>` (*member_type* excluded) and + :meth:`Category.articles()<page.Category.articles>` (*member_type* excluded) +* Enable site-package installation from git repository (:phab:`T320851`) +* Enable 2FA login (:phab:`T186274`) +* :meth:`Page.editTime()<page.BasePage.editTime>` was replaced by + :attr:`Page.latest_revision.timestamp<page.BasePage.latest_revision>` +* Raise a generic ServerError if requests response is a ServerError (:phab:`T320590`) +* Add a new variable 'private_folder_permission' to config.py (:phab:`T315045`) +* L10N and i18n updates +* Adjust subprocess args in :mod:`tools.djvu` +* Short site value can be given if site code is equal to family like ``-site:meta`` or ``-site:commons`` + +Documentation improvements +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +* Add highlighting to targeted code snippet within documentation (:phab:`T323800`) +* Add previous, next, index, and modules links to documentation sidebar (:phab:`T323803`) +* Introduce standard colors (legacy palette) in Furo theme (:phab:`T323802`) +* Improve basic content structure and navigation of documentation (:phab:`T323812`) +* Use ``Furo`` sphinx theme instead of ``Natural`` and improve documentation look and feel (:phab:`T322212`) +* MediaWiki API cross reference was added to the documentation + +Bugfixes +^^^^^^^^ + +* Fix representation string for :class:`page.Claim` stub instances (:phab:`T326453`) +* Don't raise StopIteration in :meth:`login.LoginManager.check_user_exists` + if given user is behind the last user (:phab:`T326063`) +* Normalize :class:`WbTimes<pywikibot.WbTime>` sent to Wikidata (:phab:`T325860`) +* Fix :class:`pywikibot.WbTime` precision (:phab:`T324798`) +* Unquote title for red-links in class:`proofreadpage.IndexPage` +* Find month with first letter uppercase or lowercase with :class:`textlib.TimeStripper` (:phab:`T324310`) +* Fix disolving script_paths for site-package (:phab:`T320530`) +* Respect limit argument with Board.topics() (:phab:`T138215`, :phab:`T138307`) + +Breaking changes +^^^^^^^^^^^^^^^^ + +* ``mwparserfromhell`` package is mandatory (:phab:`T326498`) +* Several package dependencies were updated +* All parameters of :meth:`Category.members()<page.Category.members>`, + :meth:`Category.subcategories()<page.Category.subcategories>` and + :meth:`Category.articles()<page.Category.articles>` are keyword only +* The ``parent_id`` and ``content_model`` attributes of :class:`page.Revision` were removed in favour + of ``parentid`` and ``contentmodel`` +* Support for MediaWiki < 1.27 was dropped +* ListBoxWindows class of :mod:`userinterfaces.gui` was removed +* Require Python 3.6.1+ with Pywikibot and drop support for Python 3.6.0 (:phab:`T318912`) +* pymysql >= 0.9.3 is required (:phab:`T216741`) +* Python 3.5 support was dropped (:phab:`T301908`) +* *See also Code cleanups below* + +Code cleanups +^^^^^^^^^^^^^ + +* ``maintenance/sorting_order`` script was removed (:phab:`T325426`) +* ``alphabetic_sv`` and ``interwiki_putfirst`` attributes of + :class:`Wiktionary<families.wiktionary_family.Family>` family were removed (:phab:`T325426`) +* ``alphabetic``, ``alphabetic_revised`` and ``fyinterwiki`` attributes of :class:`family.Family` + were removed (:phab:`T325426`) +* *See also Deprecations below* + + 7.7.3 ----- *08 January 2023* diff --git a/ROADMAP.rst b/ROADMAP.rst index a1ed684..ee98ef9 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,94 +1,8 @@ -Current release 8.0.0 +Current release 8.1.0 --------------------- -Improvements -^^^^^^^^^^^^ +* *No changes yet* -* Allow copying timezone from timestamp in :class:`pywikibot.WbTime` (:phab:`T325864`) -* Support federated Wikibase (:phab:`T173195`) -* Improve warning if a Non-JSON response was received from server (:phab:`T326046`) -* Allow normalization of :class:`pywikibot.WbTime` objects (:phab:`T123888`) -* Add parser for ``<pages />`` tag to :mod:`proofreadpage` -* ``addOnly`` parameter of :func:`textlib.replaceLanguageLinks` and :func:`textlib.replaceCategoryLinks` - were renamed to ``add_only`` -* ``known_codes`` attribute was added to :class:`family.WikimediaFamily` (:phab:`T325426`) -* Unify representation for :class:`time.Timestamp` between CPython and Pypy (:phab:`T325905`) -* Implement comparison for :class:`pywikibot.WbTime` object (:phab:`T148280`, :phab:`T325863`) -* Create a cookie file for each account (:phab:`T324000`) -* Move data.api._login.LoginManager to :class:`login.ClientLoginManager` -* Let user the choice which section to be copied with :mod:`generate_user_files - <pywikibot.scripts.generate_user_files>` (:phab:`T145372`) -* use :func:`roundrobin_generators<tools.itertools.roundrobin_generators>` to combine generators - when limit option is given -* Ignore OSError if API cache cannot be written -* Update tools._unidata._category_cf from Unicodedata version 15.0.0 -* :meth:`Timestamp.set_timestamp()<pywikibot.time.Timestamp.set_timestamp>` raises TypeError - instead of ValueError if conversion fails -* Python 3.12 is supported -* All parameters of :meth:`APISite.categorymembers() - <pywikibot.site._generators.GeneratorsMixin.categorymembers>` are provided with - :meth:`Category.members()<page.Category.members>`, - :meth:`Category.subcategories()<page.Category.subcategories>` (*member_type* excluded) and - :meth:`Category.articles()<page.Category.articles>` (*member_type* excluded) -* Enable site-package installation from git repository (:phab:`T320851`) -* Enable 2FA login (:phab:`T186274`) -* :meth:`Page.editTime()<page.BasePage.editTime>` was replaced by - :attr:`Page.latest_revision.timestamp<page.BasePage.latest_revision>` -* Raise a generic ServerError if requests response is a ServerError (:phab:`T320590`) -* Add a new variable 'private_folder_permission' to config.py (:phab:`T315045`) -* L10N and i18n updates -* Adjust subprocess args in :mod:`tools.djvu` -* Short site value can be given if site code is equal to family like ``-site:meta`` or ``-site:commons`` - -Documentation improvements -^^^^^^^^^^^^^^^^^^^^^^^^^^ - -* Add highlighting to targeted code snippet within documentation (:phab:`T323800`) -* Add previous, next, index, and modules links to documentation sidebar (:phab:`T323803`) -* Introduce standard colors (legacy palette) in Furo theme (:phab:`T323802`) -* Improve basic content structure and navigation of documentation (:phab:`T323812`) -* Use ``Furo`` sphinx theme instead of ``Natural`` and improve documentation look and feel (:phab:`T322212`) -* MediaWiki API cross reference was added to the documentation - -Bugfixes -^^^^^^^^ - -* Fix representation string for :class:`page.Claim` stub instances (:phab:`T326453`) -* Don't raise StopIteration in :meth:`login.LoginManager.check_user_exists` - if given user is behind the last user (:phab:`T326063`) -* Normalize :class:`WbTimes<pywikibot.WbTime>` sent to Wikidata (:phab:`T325860`) -* Fix :class:`pywikibot.WbTime` precision (:phab:`T324798`) -* Unquote title for red-links in class:`proofreadpage.IndexPage` -* Find month with first letter uppercase or lowercase with :class:`textlib.TimeStripper` (:phab:`T324310`) -* Fix disolving script_paths for site-package (:phab:`T320530`) -* Respect limit argument with Board.topics() (:phab:`T138215`, :phab:`T138307`) - -Breaking changes -^^^^^^^^^^^^^^^^ - -* ``mwparserfromhell`` package is mandatory (:phab:`T326498`) -* Several package dependencies were updated -* All parameters of :meth:`Category.members()<page.Category.members>`, - :meth:`Category.subcategories()<page.Category.subcategories>` and - :meth:`Category.articles()<page.Category.articles>` are keyword only -* The ``parent_id`` and ``content_model`` attributes of :class:`page.Revision` were removed in favour - of ``parentid`` and ``contentmodel`` -* Support for MediaWiki < 1.27 was dropped -* ListBoxWindows class of :mod:`userinterfaces.gui` was removed -* Require Python 3.6.1+ with Pywikibot and drop support for Python 3.6.0 (:phab:`T318912`) -* pymysql >= 0.9.3 is required (:phab:`T216741`) -* Python 3.5 support was dropped (:phab:`T301908`) -* *See also Code cleanups below* - -Code cleanups -^^^^^^^^^^^^^ - -* ``maintenance/sorting_order`` script was removed (:phab:`T325426`) -* ``alphabetic_sv`` and ``interwiki_putfirst`` attributes of - :class:`Wiktionary<families.wiktionary_family.Family>` family were removed (:phab:`T325426`) -* ``alphabetic``, ``alphabetic_revised`` and ``fyinterwiki`` attributes of :class:`family.Family` - were removed (:phab:`T325426`) -* *See also Deprecations below* Deprecations ------------ diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index a9e6e99..4c139f8 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -11,7 +11,7 @@ __name__ = 'pywikibot' -__version__ = '8.0.0' +__version__ = '8.1.0.dev0' __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot(a)lists.wikimedia.org' diff --git a/scripts/__init__.py b/scripts/__init__.py index 192bebf..4be7d80 100644 --- a/scripts/__init__.py +++ b/scripts/__init__.py @@ -25,8 +25,8 @@ due to spelling mistake """ # -# (C) Pywikibot team, 2021-2022 +# (C) Pywikibot team, 2021-2023 # # Distributed under the terms of the MIT license. # -__version__ = '8.0.0' +__version__ = '8.1.0' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882004 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: I5a502d42e1d3dc261ceb4ba60d7d47ea95382d92 Gerrit-Change-Number: 882004 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[stable]: Merge branch 'master' into stable
by jenkins-bot (Code Review) 21 Jan '23

21 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882000 ) Change subject: Merge branch 'master' into stable ...................................................................... Merge branch 'master' into stable Bug: T308258 Change-Id: I5597702e0e005537b18ebb9bf39111b9ecd24095 --- M pywikibot/families/wikisource_family.py M pywikibot/textlib.py M tests/site_detect_tests.py M setup.py M pywikibot/__metadata__.py M docs/requirements.txt M pywikibot/families/wikiquote_family.py M pywikibot/bot.py M pywikibot/families/wiktionary_family.py M tox.ini M pywikibot/families/wikipedia_family.py 12 files changed, 458 insertions(+), 231 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/requirements.txt b/docs/requirements.txt index 4778783..61d54ac 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,12 +1,6 @@ # This is a PIP requirements file for building Sphinx documentation of pywikibot # requirements.txt is also needed -<<<<<<< HEAD (ad2a8a Update git submodules) - -sphinx == 5.1.1 -rstcheck >=3.5.0 -======= sphinx >= 5.2.3 rstcheck >=6.1.0 sphinxext-opengraph >= 0.7.2 furo >= 2022.9.29 ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index 6cffa86..a9e6e99 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -11,11 +11,7 @@ __name__ = 'pywikibot' -<<<<<<< HEAD (ad2a8a Update git submodules) -__version__ = '7.7.3' -======= __version__ = '8.0.0' ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot(a)lists.wikimedia.org' diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 47045b9..95dee26 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -708,7 +708,7 @@ self._default = default self._quit = automatic_quit - current_match_type = Optional[Tuple[ # noqa: F841 + current_match_type = Optional[Tuple[ # skipcq: PYL-W0612 PageLinkType, str, Mapping[str, str], diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 4444bb4..0a0603e 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -30,35 +30,6 @@ 'ja', 'zh', 'vi', 'war', 'uk', 'ar', 'pt', 'fa', 'ca', 'sr', 'id', 'ko', 'no', 'fi', 'tr', 'hu', 'cs', 'ce', 'tt', 'sh', 'ro', 'zh-min-nan', 'eu', 'ms', 'eo', 'he', 'hy', 'da', 'bg', 'cy', 'sk', -<<<<<<< HEAD (ad2a8a Update git submodules) - 'azb', 'et', 'kk', 'be', 'min', 'simple', 'uz', 'el', 'hr', 'lt', 'gl', - 'az', 'ur', 'sl', 'ka', 'nn', 'hi', 'th', 'ta', 'la', 'mk', 'bn', - 'ast', 'zh-yue', 'lv', 'tg', 'af', 'my', 'mg', 'bs', 'mr', 'oc', 'sq', - 'nds', 'ky', 'be-tarask', 'ml', 'te', 'br', 'sw', 'new', 'jv', 'lld', - 'vec', 'ht', 'pnb', 'pms', 'lb', 'ba', 'su', 'ku', 'ga', 'lmo', 'szl', - 'is', 'cv', 'fy', 'ckb', 'tl', 'an', 'wuu', 'diq', 'sco', 'pa', 'io', - 'vo', 'yo', 'ne', 'gu', 'als', 'kn', 'ia', 'bar', 'scn', 'avk', 'bpy', - 'qu', 'crh', 'mn', 'nv', 'ha', 'xmf', 'si', 'ban', 'bat-smg', 'ps', - 'os', 'frr', 'or', 'sah', 'gd', 'bug', 'cdo', 'yi', 'ilo', 'sd', 'am', - 'nap', 'li', 'fo', 'hsb', 'gor', 'map-bms', 'mai', 'mzn', 'ig', 'bcl', - 'eml', 'ace', 'shn', 'zh-classical', 'sa', 'wa', 'ie', 'lij', 'as', - 'zu', 'mhr', 'mrj', 'hyw', 'hif', 'bjn', 'mni', 'sn', 'hak', 'km', - 'roa-tara', 'so', 'pam', 'rue', 'nso', 'bh', 'tum', 'se', 'mi', 'myv', - 'sat', 'vls', 'nds-nl', 'nah', 'sc', 'vep', 'kab', 'tk', 'gan', 'kw', - 'glk', 'co', 'dag', 'fiu-vro', 'ary', 'bo', 'ab', 'gv', 'frp', 'zea', - 'skr', 'ug', 'kv', 'pcd', 'udm', 'csb', 'mt', 'ay', 'gn', 'smn', 'nrm', - 'lez', 'lfn', 'stq', 'olo', 'lo', 'rw', 'mwl', 'ang', 'fur', 'rm', - 'lad', 'gom', 'koi', 'ext', 'tyv', 'dsb', 'av', 'dty', 'ln', 'cbk-zam', - 'pap', 'dv', 'kaa', 'ksh', 'gag', 'bxr', 'pfl', 'pag', 'pi', 'ks', - 'szy', 'haw', 'awa', 'tay', 'mdf', 'za', 'tw', 'blk', 'inh', 'krc', - 'xal', 'pdc', 'atj', 'to', 'arc', 'tcy', 'lg', 'mnw', 'kbp', 'jam', - 'na', 'wo', 'kbd', 'nia', 'nov', 'ki', 'bi', 'nqo', 'tpi', 'tet', - 'shi', 'jbo', 'roa-rup', 'fj', 'lbe', 'kg', 'xh', 'ty', 'cu', 'guw', - 'om', 'trv', 'srn', 'sm', 'gcr', 'alt', 'chr', 'ltg', 'tn', 'ny', 'st', - 'pih', 'mad', 'got', 'ami', 'rmy', 'bm', 've', 'ts', 'ff', 'chy', 'ss', - 'rn', 'kcg', 'ak', 'iu', 'ch', 'ee', 'pnt', 'ady', 'ik', 'pcm', 'sg', - 'pwn', 'din', 'ti', 'kl', 'dz', 'cr', -======= 'azb', 'et', 'kk', 'be', 'simple', 'min', 'uz', 'el', 'hr', 'lt', 'gl', 'az', 'ur', 'sl', 'ka', 'nn', 'hi', 'th', 'ta', 'la', 'bn', 'mk', 'ast', 'zh-yue', 'lv', 'tg', 'af', 'my', 'mg', 'bs', 'mr', 'oc', 'sq', @@ -86,7 +57,6 @@ 'st', 'mad', 'pih', 'got', 'ami', 'rmy', 'bm', 've', 'ts', 'ff', 'chy', 'ss', 'rn', 'kcg', 'ak', 'iu', 'ee', 'ch', 'pnt', 'ik', 'ady', 'pcm', 'sg', 'pwn', 'din', 'ti', 'kl', 'dz', 'cr', ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) ] # Sites we want to edit but not count as real languages diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 2ee90fa..8f93dcc 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -30,17 +30,10 @@ 'it', 'en', 'pl', 'ru', 'cs', 'et', 'pt', 'fa', 'uk', 'de', 'he', 'fr', 'es', 'eo', 'tr', 'sk', 'bs', 'az', 'ca', 'fi', 'sr', 'sl', 'zh', 'lt', 'ar', 'bg', 'hy', 'hr', 'su', 'el', 'nn', 'id', 'sv', 'li', 'hu', 'ko', -<<<<<<< HEAD (ad2a8a Update git submodules) - 'nl', 'ja', 'sah', 'la', 'ta', 'gl', 'gu', 'ur', 'hi', 'ig', 'be', - 'te', 'guw', 'tl', 'vi', 'cy', 'no', 'sq', 'ml', 'bn', 'kn', 'ro', - 'eu', 'ku', 'as', 'uz', 'ka', 'da', 'sa', 'is', 'bcl', 'br', 'mr', - 'af', 'wo', 'th', 'ky', -======= 'nl', 'sah', 'ja', 'la', 'ta', 'gl', 'gu', 'hi', 'ur', 'ig', 'be', 'te', 'guw', 'tl', 'vi', 'cy', 'no', 'sq', 'ml', 'bn', 'kn', 'ro', 'eu', 'ku', 'as', 'uz', 'ka', 'da', 'sa', 'is', 'bcl', 'br', 'mr', 'af', 'th', 'wo', 'ky', ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) ] category_redirect_templates = { diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index 92ff162..984a277 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -29,11 +29,7 @@ 'mul', 'cs', 'gu', 'sr', 'pt', 'fa', 'sv', 'bn', 'hu', 'ko', 'ta', 'ml', 'sa', 'te', 'sl', 'tr', 'hy', 'la', 'vi', 'el', 'ja', 'ro', 'fi', 'nap', 'nl', 'be', 'az', 'ca', 'br', 'kn', 'no', 'hr', 'id', 'th', -<<<<<<< HEAD (ad2a8a Update git submodules) - 'eo', 'hi', 'is', 'vec', 'pms', 'ban', 'cy', 'mr', 'lij', 'da', 'et', -======= 'eo', 'hi', 'is', 'vec', 'pms', 'cy', 'ban', 'mr', 'lij', 'da', 'et', ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) 'mk', 'as', 'yi', 'bg', 'wa', 'li', 'jv', 'lt', 'pa', 'eu', 'or', 'gl', 'bs', 'sah', 'sk', 'zh-min-nan', 'fo', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index daebbf2..45ba4d9 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -36,32 +36,17 @@ 'ku', 'lt', 'ca', 'it', 'fi', 'ta', 'hu', 'tr', 'ja', 'io', 'hy', 'ko', 'pt', 'kn', 'vi', 'sr', 'th', 'hi', 'ro', 'no', 'id', 'et', 'cs', 'ml', 'my', 'skr', 'uz', 'li', 'or', 'eo', 'te', 'fa', 'gl', 'ar', 'oc', -<<<<<<< HEAD (ad2a8a Update git submodules) - 'jv', 'az', 'eu', 'uk', 'ast', 'br', 'sg', 'is', 'bn', 'da', 'lo', - 'simple', 'la', 'mnw', 'hr', 'fj', 'sk', 'shn', 'tg', 'ky', 'bg', 'wa', - 'ur', 'ps', 'cy', 'vo', 'he', 'om', 'sl', 'lmo', 'af', 'zh-min-nan', - 'scn', 'tl', 'pa', 'ms', 'sw', 'fy', 'nn', 'ka', 'lv', 'min', 'sq', -======= 'jv', 'az', 'eu', 'uk', 'ast', 'br', 'is', 'sg', 'bn', 'da', 'lo', 'simple', 'mnw', 'la', 'hr', 'shn', 'fj', 'sk', 'tg', 'ky', 'bg', 'wa', 'ur', 'ps', 'cy', 'vo', 'he', 'lmo', 'om', 'sl', 'af', 'zh-min-nan', 'scn', 'tl', 'pa', 'ms', 'fy', 'sw', 'nn', 'ka', 'lv', 'min', 'sq', ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) 'nds', 'lb', 'co', 'mn', 'pnb', 'bs', 'nah', 'yue', 'sa', 'kk', 'km', 'vec', 'be', 'diq', 'tk', 'mk', 'nia', 'sm', 'hsb', 'ks', 'shy', 'su', -<<<<<<< HEAD (ad2a8a Update git submodules) - 'gd', 'ga', 'bcl', 'an', 'gom', 'mr', 'wo', 'mni', 'ia', 'ang', 'mt', - 'bjn', 'fo', 'sd', 'tt', 'gn', 'so', 'ie', 'mi', 'csb', 'ug', 'si', - 'ha', 'st', 'roa-rup', 'hif', 'tpi', 'guw', 'jbo', 'kl', 'zu', 'ay', - 'yi', 'ln', 'gu', 'na', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'ig', 'qu', - 'ss', 'iu', 'chr', 'dv', 'gor', 'ti', 'tn', -======= 'gd', 'ga', 'bcl', 'an', 'gom', 'mr', 'gor', 'wo', 'mni', 'ia', 'ang', 'bjn', 'mt', 'fo', 'sd', 'tt', 'gn', 'so', 'ie', 'mi', 'csb', 'ug', 'si', 'ha', 'st', 'roa-rup', 'hif', 'guw', 'tpi', 'jbo', 'kl', 'zu', 'ay', 'yi', 'ln', 'gu', 'na', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'ig', 'qu', 'ss', 'iu', 'chr', 'dv', 'ti', 'tn', ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) ] category_redirect_templates = { diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index ecc0a90..3079c22 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -26,10 +26,7 @@ from pywikibot.tools import ( ModuleDeprecationWrapper, deprecated, -<<<<<<< HEAD (ad2a8a Update git submodules) -======= deprecated_args, ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) first_lower, first_upper, ) @@ -1870,12 +1867,6 @@ # site.months_names do not. if short.endswith('.'): self.origNames2monthNum[func(short[:-1])] = n -<<<<<<< HEAD (ad2a8a Update git submodules) - - self.groups = ['year', 'month', 'hour', 'time', 'day', 'minute', - 'tzinfo'] -======= ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) timeR = (r'(?P<time>(?P<hour>([0-1]\d|2[0-3]))[:\.h]' r'(?P<minute>[0-5]\d))') diff --git a/setup.py b/setup.py index c6f6f45..1f9e32f 100755 --- a/setup.py +++ b/setup.py @@ -48,11 +48,7 @@ # vulnerability found in Pillow<8.1.1 but toolforge uses 5.4.1 'Tkinter': ['Pillow>=8.1.1'], 'mwoauth': ['mwoauth!=0.3.1,>=0.2.4'], -<<<<<<< HEAD (ad2a8a Update git submodules) - 'html': ['BeautifulSoup4'], -======= 'html': ['beautifulsoup4>=4.7.1'], ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) 'http': [ 'fake_useragent<0.1.14; python_version < "3.7"', 'fake_useragent>1.0.1; python_version >= "3.7"', @@ -63,34 +59,18 @@ 'pydocstyle>=6.2.3', 'flake8-bugbear!=23.1.14', 'flake8-coding', -<<<<<<< HEAD (ad2a8a Update git submodules) - 'flake8-comprehensions>=3.1.4; python_version >= "3.8"', - 'flake8-comprehensions>=2.2.0; python_version < "3.8"', - 'flake8-docstrings>=1.3.1', - 'verve-flake8-mock>=0.4', - 'flake8-print>=2.0.1', - # flake8-quotes is incompatible with flake8 6 (T323752), - # jenkins CI ignores "3.8.1" - 'flake8-quotes>=3.3.0; python_version < "3.8"', -======= 'flake8-comprehensions', 'flake8-docstrings>=1.4.0', 'flake8-mock-x2', 'flake8-print>=4.0.1', 'flake8-quotes>=3.3.2', ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) 'flake8-string-format', 'flake8-tuple>=0.4.1', 'flake8-no-u-prefixed-strings>=0.2', 'pep8-naming>=0.12.1, <0.13.0; python_version < "3.7"', 'pep8-naming>=0.13.3; python_version >= "3.7"', ], - 'hacking': [ - 'hacking', - # importlib-metadata module already installed with hacking 4.1.0 - # but importlib-metadata 5 fails, so adjust it - 'importlib-metadata<5.0.0; python_version < "3.8"', - ], + 'hacking': ['hacking'], } diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index 8ec8b25..3b56837 100755 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -129,137 +129,11 @@ with self.subTest(url=urlparse(url).netloc): self.assertNoSite(url) -<<<<<<< HEAD (ad2a8a Update git submodules) - def test_gentoo(self): - """Test detection of MediaWiki sites for wiki.gentoo.org.""" - self.assertSite('https://wiki.gentoo.org/wiki/$1') - - def test_arabeyes(self): - """Test detection of MediaWiki sites for www.arabeyes.org.""" - self.assertSite('https://www.arabeyes.org/$1') - - def test_tfwiki(self): - """Test detection of MediaWiki sites for tfwiki.net.""" - self.assertNoSite('http://tfwiki.net/wiki/$1') # 1.19.5-1+deb7u1 - - -class Pre119SiteTestCase(SiteDetectionTestCase): - - """Test pre 1.19 sites which should be detected as unsupported.""" - - def test_hrwiki(self): - """Test detection of MediaWiki sites for www.hrwiki.org.""" - self.assertNoSite('http://www.hrwiki.org/index.php/$1') # v 1.15.4 - - def test_wikifon(self): - """Test detection of MediaWiki sites for www.wikifon.org.""" - self.assertNoSite('http://www.wikifon.org/$1') # v1.11.0 - - -class PreAPISiteTestCase(SiteDetectionTestCase): - - """Test detection of MediaWiki sites prior to the API.""" - - def test_thelemapedia(self): - """Test detection of MediaWiki sites for www.thelemapedia.org.""" - self.assertNoSite('http://www.thelemapedia.org/index.php/$1') - - def test_werelate(self): - """Test detection of MediaWiki sites for www.werelate.org.""" - self.assertNoSite('http://www.werelate.org/wiki/$1') - - def test_otterstedt(self): - """Test detection of MediaWiki sites for www.otterstedt.de.""" - self.assertNoSite('http://www.otterstedt.de/wiki/index.php/$1') - - -class APIHiddenTestCase(SiteDetectionTestCase): - - """Test MediaWiki sites with a hidden enabled API.""" - - def test_wikisophia(self): - """Test wikisophia.org which has redirect problems. - - /index.php?title=$1 reports 404, however a wiki exists there, - but the API is also hidden. - """ - self.assertNoSite('http://wikisophia.org/index.php?title=$1') - - -class FailingSiteTestCase(SiteDetectionTestCase): - - """Test detection failure for MediaWiki sites with an API.""" - - def test_animutationportal(self): - """Test detection of MediaWiki sites for wiki.animutationportal.com. - - SSL certificate verification fails. - """ - self.assertNoSite('http://wiki.animutationportal.com/index.php/$1') - - -class NoSiteTestCase(SiteDetectionTestCase): - - """Test detection of non-wiki sites.""" - - def test_imdb(self): - """Test detection of MediaWiki sites for www.imdb.com.""" - self.assertNoSite('http://www.imdb.com/name/nm$1/') - - def test_ecyrd(self): - """Test detection of MediaWiki sites for www.ecyrd.com.""" - self.assertNoSite('http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=$1') - - def test_tvtropes(self): - """Test detection of MediaWiki sites for www.tvtropes.org.""" - self.assertNoSite('http://www.tvtropes.org/pmwiki/pmwiki.php/Main/$1') - - def test_c2(self): - """Test detection of MediaWiki sites for c2.com.""" - self.assertNoSite('http://c2.com/cgi/wiki?$1') - - def test_phabricator(self): - """Test detection of MediaWiki sites for phabricator.wikimedia.org.""" - self.assertNoSite('https://phabricator.wikimedia.org/$1') - - def test_merriam_webster(self): - """Test detection of MediaWiki sites for www.merriam-webster.com.""" - self.assertNoSite( - 'http://www.merriam-webster.com/' - 'cgi-bin/dictionary?book=Dictionary&va=$1') - - def test_arxiv(self): - """Test detection of MediaWiki sites for arxiv.org.""" - self.assertNoSite('http://arxiv.org/abs/$1') - - -class OfflineSiteTestCase(SiteDetectionTestCase): - - """Test offline sites.""" - - def test_opensprints_wiki(self): - """Test detection of MediaWiki sites for wiki.opensprints.org.""" - self.assertNoSite('http://wiki.opensprints.org/index.php?title=$1') - - -class OtherSiteTestCase(SiteDetectionTestCase): - - """Test other non-MediaWiki sites.""" - - def test_musicbrainz(self): - """Test http://musicbrainz.org/doc/ which has a page 'api.php'. - - Possible false positive caused by the existence of a page called - http://musicbrainz.org/doc/api.php. - """ - self.assertNoSite('http://musicbrainz.org/doc/$1') -======= def test_failing_sites(self): """Test detection of failing MediaWiki sites.""" for url, reason in self.failing_sites: with self.subTest(url=urlparse(url).netloc, reason=reason): self.assertNoSite(url) ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) class PrivateWikiTestCase(PatchingTestCase): diff --git a/tox.ini b/tox.ini index 5ec5400..a5f454b 100644 --- a/tox.ini +++ b/tox.ini @@ -77,10 +77,6 @@ deps = pytest >= 7.0.1 .[eventstreams] -<<<<<<< HEAD (ad2a8a Update git submodules) - .[mwparserfromhell] -======= ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) .[mysql] [testenv:venv] @@ -135,11 +131,7 @@ # DARXXX: Darglint docstring issues to be solved -<<<<<<< HEAD (ad2a8a Update git submodules) -ignore = B007,C103,D105,D211,D401,D413,D412,DAR003,DAR101,DAR102,DAR201,DAR202,DAR301,DAR401,DAR402,DAR501,F401,H101,H238,H301,H306,H404,H405,H903,P101,P102,P103,P205,W503 -======= ignore = B007,D105,D211,D401,D413,D412,DAR003,DAR101,DAR102,DAR201,DAR202,DAR301,DAR401,DAR402,DAR501,H101,H238,H301,H306,H404,H405,H903,P101,P102,P103,P205,W503 ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) enable-extensions = H203,H204,H205,N818 color = always -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882000 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: stable Gerrit-Change-Id: I5597702e0e005537b18ebb9bf39111b9ecd24095 Gerrit-Change-Number: 882000 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2023