Pywikibot-commits September 2023

pywikibot-commits@lists.wikimedia.org

1 participants
47 discussions

[Gerrit] ...core[master]: [cleanup] cleanup redirect methods

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/960172 ) Change subject: [cleanup] cleanup redirect methods ...................................................................... [cleanup] cleanup redirect methods - add a new redirects method to BaseSite that returns the generic redirect tag list (previously returned by BaseSite.redirect() - add a new redirects method to APISite that returns the redirect tag list extracted from getmagicwords('redirect') - return the default redirect tag with BaseSite.redirect() instead of a list. This enables to get the default tag also from APISite if APISite.redirects is defined - move redirect_regex method from APISite to BaseSite but simplify the implementation. It is not necessary to assume that getmagicwords('redirect') does not exists; it was a guess of of the very first 2.0 implemetation and was implemented as the redirect tags were part of the family files sometime in 2008. - remove deprecated redirectRegex Bug: T347226 Change-Id: I3647cf8cb154686f075bc53a054b937675d74765 --- M ROADMAP.rst M pywikibot/site/_apisite.py M pywikibot/site/_basesite.py 3 files changed, 65 insertions(+), 46 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 9814645..d91c5b4 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -76,4 +76,3 @@ * 6.2.0: Throttle.multiplydelay attribute is deprecated * 6.2.0: SequenceOutputter.format_list() is deprecated in favour of 'out' property * 6.0.0: config.register_family_file() is deprecated -* 5.5.0: APISite.redirectRegex() will be removed in favour of APISite.redirect_regex() diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 33d1752..ba3e8ca 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -17,7 +17,7 @@ from pywikibot import login from pywikibot.backports import DefaultDict, Dict, List, Match from pywikibot.backports import OrderedDict as OrderedDictType -from pywikibot.backports import Iterable, Pattern, Set, Tuple, removesuffix +from pywikibot.backports import Iterable, Set, Tuple, removesuffix from pywikibot.comms import http from pywikibot.data import api from pywikibot.exceptions import ( @@ -1036,32 +1036,18 @@ return self._magicwords[word] return [word] - def redirect(self) -> str: - """Return the localized #REDIRECT keyword.""" - # return the magic word without the preceding '#' character - return self.getmagicwords('redirect')[0].lstrip('#') + def redirects(self) -> List[str]: + """Return a list of localized tags for the site without preceding '#'. - @deprecated('redirect_regex', since='5.5.0') - def redirectRegex(self) -> Pattern[str]: # noqa: N802 - """Return a compiled regular expression matching on redirect pages.""" - return self.redirect_regex + .. seealso:: + :meth:`BaseSite.redirect() + <pywikibot.site._basesite.BaseSite.redirect>` and + :meth:`BaseSite.redirects() + <pywikibot.site._basesite.BaseSite.redirects>` - @property - def redirect_regex(self) -> Pattern[str]: - """Return a compiled regular expression matching on redirect pages. - - Group 1 in the regex match object will be the target title. - + .. versionadded:: 8.4 """ - # NOTE: this is needed, since the API can give false positives! - try: - keywords = {s.lstrip('#') for s in self.getmagicwords('redirect')} - keywords.add('REDIRECT') # just in case - pattern = '(?:' + '|'.join(keywords) + ')' - except KeyError: - # no localized keyword for redirects - pattern = None - return super().redirectRegex(pattern) + return [s.lstrip('#') for s in self.getmagicwords('redirect')] def pagenamecodes(self) -> List[str]: """Return list of localized PAGENAME tags for the site.""" diff --git a/pywikibot/site/_basesite.py b/pywikibot/site/_basesite.py index 7292efc..ea47b94 100644 --- a/pywikibot/site/_basesite.py +++ b/pywikibot/site/_basesite.py @@ -11,7 +11,7 @@ from warnings import warn import pywikibot -from pywikibot.backports import Pattern +from pywikibot.backports import List, Pattern from pywikibot.exceptions import ( Error, FamilyMaintenanceWarning, @@ -242,26 +242,36 @@ """Return dict of valid namespaces on this wiki.""" return NamespacesDict(self._build_namespaces()) - def ns_normalize(self, value): - """ - Return canonical local form of namespace name. + def ns_normalize(self, value: str): + """Return canonical local form of namespace name. :param value: A namespace name - :type value: str - """ index = self.namespaces.lookup_name(value) return self.namespace(index) - def redirect(self): - """Return list of localized redirect tags for the site.""" + def redirect(self) -> str: + """Return a default redirect tag for the site. + + .. versionchanged:: 8.4 + return a single generic redirect tag instead of a list of + tags. For the list use :meth:`redirects` instead. + """ + return self.redirects()[0] + + def redirects(self) -> List[str]: + """Return list of generic redirect tags for the site. + + .. seealso:: :meth:`redirect` for the default redirect tag. + .. versionadded:: 8.4 + """ return ['REDIRECT'] - def pagenamecodes(self): + def pagenamecodes(self) -> List[str]: """Return list of localized PAGENAME tags for the site.""" return ['PAGENAME'] - def pagename2codes(self): + def pagename2codes(self) -> List[str]: """Return list of localized PAGENAMEE tags for the site.""" return ['PAGENAMEE'] @@ -337,22 +347,22 @@ linkfam, linkcode = pywikibot.Link(text, self).parse_site() return linkfam != self.family.name or linkcode != self.code - def redirectRegex( # noqa: N802 - self, - pattern: Optional[str] = None - ) -> Pattern[str]: + @property + def redirect_regex(self) -> Pattern[str]: """Return a compiled regular expression matching on redirect pages. Group 1 in the regex match object will be the target title. + A redirect starts with hash (#), followed by a keyword, then + arbitrary stuff, then a wikilink. The wikilink may contain a + label, although this is not useful. + + .. versionadded:: 8.4 + moved from class:`APISite<pywikibot.site._apisite.APISite>` """ - if pattern is None: - pattern = 'REDIRECT' - # A redirect starts with hash (#), followed by a keyword, then - # arbitrary stuff, then a wikilink. The wikilink may contain - # a label, although this is not useful. - return re.compile(r'\s*#{pattern}\s*:?\s*\[\[(.+?)(?:\|.*?)?\]\]' - .format(pattern=pattern), re.IGNORECASE | re.DOTALL) + tags = '|'.join(self.redirects()) + return re.compile(fr'\s*#(?:{tags})\s*:?\s*\[\[(.+?)(?:\|.*?)?\]\]', + re.IGNORECASE | re.DOTALL) def sametitle(self, title1: str, title2: str) -> bool: """ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/960172 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: I3647cf8cb154686f075bc53a054b937675d74765 Gerrit-Change-Number: 960172 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

7 months

[Gerrit] ...core[master]: [cleanup] remove mw 1.14 and mw 1.22 Siteinfo fallback implementation

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/959678 ) Change subject: [cleanup] remove mw 1.14 and mw 1.22 Siteinfo fallback implementation ...................................................................... [cleanup] remove mw 1.14 and mw 1.22 Siteinfo fallback implementation Siteinfo._get_default was introduced to support defaults for 'restrictions' (introduced with mw 1.23) and 'fileextensions' (introduces with mw 1.15). These fallbacks can be dropped. This partly reverts 0f1c546 and f7a399e Change-Id: I961c25bf06d7608f51af98e50a94431f0b475075 --- M tests/utils.py M pywikibot/site/_siteinfo.py M tests/siteinfo_tests.py 3 files changed, 30 insertions(+), 45 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/_siteinfo.py b/pywikibot/site/_siteinfo.py index 4aa01df..6585c3e 100644 --- a/pywikibot/site/_siteinfo.py +++ b/pywikibot/site/_siteinfo.py @@ -12,6 +12,7 @@ from typing import Any, Optional, Union import pywikibot +from pywikibot.backports import Dict, List from pywikibot.exceptions import APIError from pywikibot.tools.collections import EMPTY_DEFAULT @@ -58,7 +59,7 @@ def __init__(self, site) -> None: """Initialise it with an empty cache.""" self._site = site - self._cache = {} + self._cache: Dict[str, Any] = {} def clear(self) -> None: """Remove all items from Siteinfo. @@ -68,37 +69,6 @@ self._cache.clear() @staticmethod - def _get_default(key: str): - """ - Return the default value for different properties. - - If the property is 'restrictions' it returns a dictionary with: - - 'cascadinglevels': 'sysop' - - 'semiprotectedlevels': 'autoconfirmed' - - 'levels': '' (everybody), 'autoconfirmed', 'sysop' - - 'types': 'create', 'edit', 'move', 'upload' - Otherwise it returns :py:obj:`tools.EMPTY_DEFAULT`. - - :param key: The property name - :return: The default value - :rtype: dict or :py:obj:`tools.EmptyDefault` - """ - if key == 'restrictions': - # implemented in b73b5883d486db0e9278ef16733551f28d9e096d - return { - 'cascadinglevels': ['sysop'], - 'semiprotectedlevels': ['autoconfirmed'], - 'levels': ['', 'autoconfirmed', 'sysop'], - 'types': ['create', 'edit', 'move', 'upload'] - } - - if key == 'fileextensions': - # the default file extensions in MediaWiki - return [{'ext': ext} for ext in ['png', 'gif', 'jpg', 'jpeg']] - - return EMPTY_DEFAULT - - @staticmethod def _post_process(prop, data) -> None: """Do some default handling of data. Directly modifies data.""" # Be careful with version tests inside this here as it might need to @@ -150,7 +120,7 @@ if not props: raise ValueError('At least one property name must be provided.') - invalid_properties = [] + invalid_properties: List[str] = [] request = self._site._request( expiry=pywikibot.config.API_config_expiry if expiry is False else expiry, @@ -168,7 +138,7 @@ if len(props) == 1: pywikibot.log( f"Unable to get siprop '{props[0]}'") - return {props[0]: (Siteinfo._get_default(props[0]), False)} + return {props[0]: (EMPTY_DEFAULT, False)} pywikibot.log('Unable to get siteinfo, because at least ' "one property is unknown: '{}'".format( "', '".join(props))) @@ -181,7 +151,7 @@ result = {} if invalid_properties: for prop in invalid_properties: - result[prop] = (Siteinfo._get_default(prop), False) + result[prop] = (EMPTY_DEFAULT, False) pywikibot.log("Unable to get siprop(s) '{}'".format( "', '".join(invalid_properties))) if 'query' in data: diff --git a/tests/siteinfo_tests.py b/tests/siteinfo_tests.py index 020cf2e..f39a6c5 100755 --- a/tests/siteinfo_tests.py +++ b/tests/siteinfo_tests.py @@ -53,20 +53,17 @@ self.assertIsInstance(mysite.namespaces[0].subpages, bool) self.assertIsInstance(mysite.namespaces[0].content, bool) - def test_properties_with_defaults(self): - """Test the siteinfo properties with defaults.""" - # This does not test that the defaults work correct, - # unless the default site is a version needing these defaults + def test_properties(self): + """Test the siteinfo properties.""" # 'fileextensions' introduced in v1.15: - self.assertIsInstance(self.site.siteinfo.get('fileextensions'), list) self.assertIn('fileextensions', self.site.siteinfo) fileextensions = self.site.siteinfo.get('fileextensions') + self.assertIsInstance(fileextensions, list) self.assertIn({'ext': 'png'}, fileextensions) # 'restrictions' introduced in v1.23: - mysite = self.site - self.assertIsInstance(mysite.siteinfo.get('restrictions'), dict) - self.assertIn('restrictions', mysite.siteinfo) + self.assertIn('restrictions', self.site.siteinfo) restrictions = self.site.siteinfo.get('restrictions') + self.assertIsInstance(restrictions, dict) self.assertIn('cascadinglevels', restrictions) def test_no_cache(self): diff --git a/tests/utils.py b/tests/utils.py index 6d76c97..8c0ce06 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -20,6 +20,7 @@ from pywikibot.data.api import Request as _original_Request from pywikibot.exceptions import APIError from pywikibot.login import LoginStatus +from pywikibot.tools.collections import EMPTY_DEFAULT from pywikibot.site import Namespace from pywikibot.tools import PYTHON_VERSION @@ -277,7 +278,7 @@ return loaded[0] if get_default: - default = pywikibot.site.Siteinfo._get_default(key) + default = EMPTY_DEFAULT if cache: self._cache[key] = (default, False) return default @@ -342,7 +343,9 @@ super().__init__(code, fam, user) self._userinfo = pywikibot.tools.collections.EMPTY_DEFAULT self._paraminfo = DryParamInfo() - self._siteinfo = DummySiteinfo({}) + # setup a default siteinfo used by dry tests + default_siteinfo = {'fileextensions': [{'ext': 'jpg'}]} + self._siteinfo = DummySiteinfo(default_siteinfo) self._siteinfo._cache['lang'] = (code, True) self._siteinfo._cache['case'] = ( 'case-sensitive' if self.family.name == 'wiktionary' else -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/959678 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: I961c25bf06d7608f51af98e50a94431f0b475075 Gerrit-Change-Number: 959678 Gerrit-PatchSet: 7 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

7 months

[Gerrit] ...core[master]: [IMPR] Show a warning if Pywikibot is running with Python 3.6

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/960007 ) Change subject: [IMPR] Show a warning if Pywikibot is running with Python 3.6 ...................................................................... [IMPR] Show a warning if Pywikibot is running with Python 3.6 Also add an admonition item to documentation and a desupport warning to ROADMAP.rst Bug: T347139 Change-Id: Ifa78b3d632d27d39ffc9eeafb3ae5fec21fc6eec --- M pywikibot/__init__.py M ROADMAP.rst M docs/index.rst M tests/utils.py 4 files changed, 36 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 9814645..b7b3650 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,6 +1,9 @@ Current release --------------- +* Python 3.6 support will be discontinued and probably this is the last version supporting it +* Upcast to :class:`pywikibot.FilePage` for a proper extension only (:phab:`T346889`) +* Handle missing SDC mediainfo (:phab:`T345038`) * *modules_only_mode* parameter of :class:`data.api.ParamInfo`, its *paraminfo_keys* class attribute and its *preloaded_modules* property was deprecated, the :meth:`data.api.ParamInfo.normalize_paraminfo` method became a staticmethod (:phab:`T306637`) @@ -19,6 +22,7 @@ Deprecations ------------ +* 8.4.0: Python 3.6 support is deprecated and will be dropped with Pywikibot 9 * 8.4.0: *modules_only_mode* parameter of :class:`data.api.ParamInfo`, its *paraminfo_keys* class attribute and its preloaded_modules property will be removed * 8.4.0: *dropdelay* and *releasepid* attributes of :class:`throttle.Throttle` will be removed diff --git a/docs/index.rst b/docs/index.rst index 828c52a..f81d4a8 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -24,6 +24,9 @@ Python 3.6.1 or higher is currently required to run the bot, but Python 3.7 or higher is recommended. Python 3.6 support will be dropped with Pywikibot 9. +.. attention:: Due to a security vulnerability it is strictly recommended to + use Python 3.7 or higher. Python 3.6 support will be dropped soon. + Pywikibot and this documentation are licensed under the :ref:`MIT license`; manual pages on mediawiki.org are licensed under the `CC-BY-SA 3.0`_ license. diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 3e14eb0..b2e7ad8 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -74,7 +74,7 @@ ) from pywikibot.site import APISite, BaseSite from pywikibot.time import Timestamp -from pywikibot.tools import normalize_username +from pywikibot.tools import PYTHON_VERSION, normalize_username __all__ = ( '__copyright__', '__description__', '__download_url__', '__license__', @@ -99,6 +99,16 @@ _sites: Dict[str, APISite] = {} +if PYTHON_VERSION < (3, 7): + warn(""" + + Python {version} will be dropped soon with Pywikibot 9.0 + due to vulnerability security alerts. + It is recommended to use Python 3.7 or above. + See T347026 for further information. +""".format(version=sys.version.split(maxsplit=1)[0]), + FutureWarning) # adjust this line no in utils.execute() + @cache def _code_fam_from_url(url: str, name: Optional[str] = None diff --git a/tests/utils.py b/tests/utils.py index 5f93270..6d76c97 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -21,6 +21,8 @@ from pywikibot.exceptions import APIError from pywikibot.login import LoginStatus from pywikibot.site import Namespace +from pywikibot.tools import PYTHON_VERSION + from tests import _pwb_py @@ -470,6 +472,9 @@ :param command: executable to run and arguments to use """ + if PYTHON_VERSION < (3, 7): + command.insert(1, '-W ignore::FutureWarning:pywikibot:110') + env = os.environ.copy() # Prevent output by test package; e.g. 'max_retries reduced from x to y' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/960007 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: Ifa78b3d632d27d39ffc9eeafb3ae5fec21fc6eec Gerrit-Change-Number: 960007 Gerrit-PatchSet: 6 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

7 months

[Gerrit] ...core[master]: [L10N] Update languages_by_size

by jenkins-bot (Code Review)

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

7 months

[Gerrit] ...core[master]: [mypy] solve typing issue in date.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/961501 ) Change subject: [mypy] solve typing issue in date.py ...................................................................... [mypy] solve typing issue in date.py Change-Id: I434e98efd9327c25f04f2428361fdda1c80a9146 --- M pywikibot/date.py 1 file changed, 22 insertions(+), 7 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/date.py b/pywikibot/date.py index c344cba..38d9565 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -69,17 +69,23 @@ @singledispatch -def multi(value: int, tuplst: tuplst_type) -> Any: - """ - Run multiple pattern checks for the same entry. +def multi(value, tuplst: tuplst_type) -> Any: + """Run multiple pattern checks for the same entry. For example: 1st century, 2nd century, etc. - The tuplst is a list of tuples. Each tuple must contain two functions: - first to encode/decode a single value (e.g. simpleInt), second is a - predicate function with an integer parameter that returns true or false. - When the 2nd function evaluates to true, the 1st function is used. + The tuplst is a list of tuples. Each tuple must contain two + functions: first to encode/decode a single value (e.g. simpleInt), + second is a predicate function with an integer parameter that + returns true or false. When the 2nd function evaluates to true, the + 1st function is used. """ + raise NotImplementedError( + f'multi funtion is not implemented for type {type(value).__name__}') + + +(a)multi.register(int) +def _(value: int, tuplst: tuplst_type) -> Any: # Find a predicate that gives true for this int value, and run a # function for func, pred in tuplst: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/961501 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: I434e98efd9327c25f04f2428361fdda1c80a9146 Gerrit-Change-Number: 961501 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

7 months

[Gerrit] ...core[master]: [mypy] fix some typing issues in cosmetic_changes

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/961417 ) Change subject: [mypy] fix some typing issues in cosmetic_changes ...................................................................... [mypy] fix some typing issues in cosmetic_changes Change-Id: I4c9cedbee99ce61d66079d84e4e20f2a0ab6181f --- M pywikibot/textlib.py 1 file changed, 12 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index b8ac31f..375146c 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -19,11 +19,11 @@ Iterable, Match, List, + Pattern, + Tuple, ) from pywikibot.backports import OrderedDict as OrderedDictType -from pywikibot.backports import Pattern from pywikibot.backports import Sequence as SequenceType -from pywikibot.backports import Tuple from pywikibot.exceptions import InvalidTitleError, SiteDefinitionError from pywikibot.family import Family from pywikibot.time import TZoneFixedOffset @@ -382,7 +382,7 @@ def replaceExcept(text: str, old: Union[str, Pattern[str]], new: Union[str, Callable[[Match[str]], str]], - exceptions: List[Union[str, Pattern[str]]], + exceptions: SequenceType[Union[str, Pattern[str]]], caseInsensitive: bool = False, allowoverlap: bool = False, marker: str = '', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/961417 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: I4c9cedbee99ce61d66079d84e4e20f2a0ab6181f Gerrit-Change-Number: 961417 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

7 months

[Gerrit] ...core[master]: [mypy] Fix some typing issues in family.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/961416 ) Change subject: [mypy] Fix some typing issues in family.py ...................................................................... [mypy] Fix some typing issues in family.py Change-Id: I3b7a32545a1dacc7ef999e014f590df00dbb20ab --- M pywikibot/family.py 1 file changed, 14 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/family.py b/pywikibot/family.py index 198b649..52c6d3a 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -25,6 +25,7 @@ FrozenSet, List, Mapping, + Sequence, Set, Tuple, removesuffix, @@ -95,7 +96,7 @@ # Allocator will override this classproperty. return cls() - name = None + name: Optional[str] = None #: Not open for edits; stewards can still edit. closed_wikis: List[str] = [] @@ -113,7 +114,7 @@ langs: Dict[str, str] = {} # A list of category redirect template names in different languages - category_redirect_templates = { + category_redirect_templates: Dict[str, Sequence[str]] = { '_default': [] } @@ -121,7 +122,7 @@ use_hard_category_redirects = [] # A list of disambiguation template names in different languages - disambiguationTemplates = { + disambiguationTemplates: Dict[str, Sequence[str]] = { '_default': [] } @@ -187,7 +188,7 @@ # forward interlanguage links to another family (wikipedia). # These families can set this variable to the name of the target # family. - interwiki_forward = None + interwiki_forward: Optional[str] = None # Language codes of the largest wikis. They should be roughly sorted # by size. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/961416 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: I3b7a32545a1dacc7ef999e014f590df00dbb20ab Gerrit-Change-Number: 961416 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

7 months

[Gerrit] ...core[master]: Revert "[tests] update continue-on-error settings"

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/961207 ) Change subject: Revert "[tests] update continue-on-error settings" ...................................................................... Revert "[tests] update continue-on-error settings" This reverts commit 15425c33eadd32f56c6457f7aaf4985abca556f1. Reason for revert: wrong „or“ token Change-Id: I8a24968750ac873906d282125f620e6e55894a4c --- M .github/workflows/write_tests-ci.yml M .github/workflows/pywikibot-ci.yml 2 files changed, 15 insertions(+), 2 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index d9f3829..bb71e70 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -176,5 +176,5 @@ uses: codecov/codecov-action@v3 - name: Check on failure - if: steps.ci_test.outcome == 'failure' or steps.ci_test_no_cover.outcome == 'failure' + if: steps.ci_test.outcome == 'failure' run: exit 1 diff --git a/.github/workflows/write_tests-ci.yml b/.github/workflows/write_tests-ci.yml index b7a2747..34a2f56 100644 --- a/.github/workflows/write_tests-ci.yml +++ b/.github/workflows/write_tests-ci.yml @@ -96,5 +96,5 @@ uses: codecov/codecov-action@v3 - name: Check on failure - if: steps.ci_test.outcome == 'failure' or steps.ci_test_no_cover.outcome == 'failure' + if: steps.ci_test.outcome == 'failure' run: exit 1 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/961207 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: I8a24968750ac873906d282125f620e6e55894a4c Gerrit-Change-Number: 961207 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

7 months

[Gerrit] ...core[master]: [bugfix] Site.file_extension is a property not a method

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/961178 ) Change subject: [bugfix] Site.file_extension is a property not a method ...................................................................... [bugfix] Site.file_extension is a property not a method Change-Id: Icbb6cc971ebde786d42827abbcc541aab1a6dec0 --- M pywikibot/specialbots/_upload.py M scripts/checkimages.py 2 files changed, 11 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/specialbots/_upload.py b/pywikibot/specialbots/_upload.py index 045ac27..3fd8a76 100644 --- a/pywikibot/specialbots/_upload.py +++ b/pywikibot/specialbots/_upload.py @@ -240,7 +240,7 @@ # FIXME: these 2 belong somewhere else, presumably in family # forbidden characters are handled by pywikibot/page.py forbidden = ':*/\\' # to be extended - allowed_formats = self.target_site.file_extensions() + allowed_formats = self.target_site.file_extensions # ask until it's valid first_check = True diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 06fafe9..05b4b29 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -1429,7 +1429,7 @@ # Don't put "}}" here, please. Useless and can give problems. something = ['{{'] - allowed_formats = self.site.file_extensions() # Allowed extensions + allowed_formats = self.site.file_extensions # Allowed extensions brackets = False delete = False notification = None -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/961178 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: Icbb6cc971ebde786d42827abbcc541aab1a6dec0 Gerrit-Change-Number: 961178 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <dalangi-ctr(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

7 months

[Gerrit] ...core[master]: [tests] update continue-on-error settings

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/961107 ) Change subject: [tests] update continue-on-error settings ...................................................................... [tests] update continue-on-error settings Change-Id: I2bbdac73d615776135038036441d4621f1e8e378 --- M .github/workflows/write_tests-ci.yml M .github/workflows/pywikibot-ci.yml 2 files changed, 11 insertions(+), 2 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index bb71e70..d9f3829 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -176,5 +176,5 @@ uses: codecov/codecov-action@v3 - name: Check on failure - if: steps.ci_test.outcome == 'failure' + if: steps.ci_test.outcome == 'failure' or steps.ci_test_no_cover.outcome == 'failure' run: exit 1 diff --git a/.github/workflows/write_tests-ci.yml b/.github/workflows/write_tests-ci.yml index 34a2f56..b7a2747 100644 --- a/.github/workflows/write_tests-ci.yml +++ b/.github/workflows/write_tests-ci.yml @@ -96,5 +96,5 @@ uses: codecov/codecov-action@v3 - name: Check on failure - if: steps.ci_test.outcome == 'failure' + if: steps.ci_test.outcome == 'failure' or steps.ci_test_no_cover.outcome == 'failure' run: exit 1 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/961107 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: I2bbdac73d615776135038036441d4621f1e8e378 Gerrit-Change-Number: 961107 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits September 2023