Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13480 discussions

[Gerrit] ...core[master]: [cleanup] remove keys() and items() methods of api.Request
by jenkins-bot (Code Review) 17 Dec '23

17 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/981476 ) Change subject: [cleanup] remove keys() and items() methods of api.Request ...................................................................... [cleanup] remove keys() and items() methods of api.Request - remove keys() and items() methods of api.Request because they are already inherited from MutableMapping (but as view instead a list). - deprecate iteritems() method; items should be used instead. Bug: T310953 Change-Id: I800d6b3686d7d5fff579b0d49ff9b1a64ebc88ef --- M ROADMAP.rst M pywikibot/data/api/_requests.py 2 files changed, 26 insertions(+), 11 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 5286bd6..7535ee9 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -32,6 +32,7 @@ Deprecations ------------ +* 9.0.0: ``iteritems`` method of :class:`data.api.Request` will be removed in favour of ``items`` * 9.0.0: ``SequenceOutputter.output()`` is deprecated in favour of :attr:`tools.formatter.SequenceOutputter.out` property * 9.0.0: *nullcontext* context manager and *SimpleQueue* queue of :mod:`backports` are derecated * 8.4.0: *modules_only_mode* parameter of :class:`data.api.ParamInfo`, its *paraminfo_keys* class attribute diff --git a/pywikibot/data/api/_requests.py b/pywikibot/data/api/_requests.py index 61dad40..9cb8a99 100644 --- a/pywikibot/data/api/_requests.py +++ b/pywikibot/data/api/_requests.py @@ -38,7 +38,7 @@ ) from pywikibot.login import LoginStatus from pywikibot.textlib import removeDisabledParts, removeHTMLParts -from pywikibot.tools import PYTHON_VERSION +from pywikibot.tools import PYTHON_VERSION, deprecated __all__ = ('CachedRequest', 'Request', 'encode_url') @@ -130,7 +130,10 @@ ['namespaces', 'userinfo'] .. versionchanged:: 8.4 - inherited from WaitingMixin. + inherited from :class:`WaitingMixin`. + + .. versionchanged:: 9.0 + *keys* and *items* methods return a view object instead a list """ # To make sure the default value of 'parameters' can be identified. @@ -382,10 +385,6 @@ """Implement dict interface.""" del self._params[key] - def keys(self): - """Implement dict interface.""" - return list(self._params) - def __iter__(self): """Implement dict interface.""" return iter(self._params) @@ -394,13 +393,14 @@ """Implement dict interface.""" return len(self._params) + @deprecated('items()', since='9.0.0') def iteritems(self): - """Implement dict interface.""" - return iter(self._params.items()) + """Implement dict interface. - def items(self): - """Return a list of tuples containing the parameters in any order.""" - return list(self._params.items()) + .. deprecated:: 9.0 + Use ``items()`` instead. + """ + return iter(self.items()) def _add_defaults(self): """ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/981476 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: I800d6b3686d7d5fff579b0d49ff9b1a64ebc88ef Gerrit-Change-Number: 981476 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] Add APISite.ratelimit() method
by jenkins-bot (Code Review) 17 Dec '23

17 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/836251 ) Change subject: [IMPR] Add APISite.ratelimit() method ...................................................................... [IMPR] Add APISite.ratelimit() method - add a RateLimit namedtuple to tools/collections.py - add APISite.ratelimit() method - use it in api.Request instead of private _ratelimited() method to handle ratelimited warning - add some tests Bug: T304808 Change-Id: I5db248dc4ef4bea03ad3ac4589830c209b961a04 --- M pywikibot/site/_apisite.py M pywikibot/data/api/_requests.py M pywikibot/tools/collections.py M tests/site_tests.py 4 files changed, 204 insertions(+), 16 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api/_requests.py b/pywikibot/data/api/_requests.py index 3b63cb2..916fc41 100644 --- a/pywikibot/data/api/_requests.py +++ b/pywikibot/data/api/_requests.py @@ -918,21 +918,11 @@ return True def _ratelimited(self) -> None: - """Handle ratelimited warning.""" - ratelimits = self.site.userinfo['ratelimits'] - delay = None + """Handle ratelimited warning. - ratelimit = ratelimits.get(self.action, {}) - # find the lowest wait time for the given action - for limit in ratelimit.values(): - seconds = limit['seconds'] - hits = limit['hits'] - delay = min(delay or seconds, seconds / hits) - - if not delay: - pywikibot.warning( - f'No rate limit found for action {self.action}') - self.wait(delay) + This is also called from :meth:`_default_warning_handler`. + """ + self.wait(self.site.ratelimit(self.action).delay) def _bad_token(self, code) -> bool: """Check for bad token. diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 1b4b1e6..2135184 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -78,6 +78,7 @@ merge_unique_dicts, normalize_username, ) +from pywikibot.tools.collections import RateLimit if TYPE_CHECKING: @@ -85,8 +86,8 @@ __all__ = ('APISite', ) -_mw_msg_cache: DefaultDict[str, dict[str, str]] = defaultdict(dict) +_mw_msg_cache: DefaultDict[str, dict[str, str]] = defaultdict(dict) _CompType = Union[int, str, 'pywikibot.page.Page', 'pywikibot.page.Revision'] _RequestWrapperT = TypeVar('_RequestWrapperT', bound='api._RequestWrapper') @@ -498,6 +499,108 @@ return int(parameter['limit']) # T78333, T161783 + def ratelimit(self, action: str) -> RateLimit: + """Get the rate limit for a given action. + + This method get the ratelimit for a given action and returns a + :class:`tools.collections.RateLimit` namedtuple which has the + following fields and properties: + + - ``group`` --- The current user group returned by the API. If + the user is not logged in, the group will be 'ip'. + - ``hits`` --- rate limit hits; API requests should not exceed + this limit value for the given action. + - ``seconds`` --- time base in seconds for the maximum hits + - ``delay`` --- *(property)* calculated as seconds per hits + which may be used for wait cycles. + - ``ratio`` --- *(property)* inverse of delay, calculated as + hits per seconds. The result may be Infinite. + + If the user has 'noratelimit' rights, :meth:`maxlimit` is used + for ``hits`` and ``seconds`` will be 0. 'noratelimit' is + returned as group parameter in that case. + + If no rate limit is found for the given action, :meth:`maxlimit` + is used for ``hits`` and ``seconds`` will be + :ref:`config.put_throttle<Settings to Avoid Server Overload>`. + As group parameter 'unknown' is returned in that case. + + **Examples:** + + This is an example for a bot user which is not logged in. The + rate limit user group is 'ip' + + >>> site = pywikibot.Site() + >>> limit = site.ratelimit('edit') # get rate limit for 'edit' action + >>> limit + RateLimit(group='ip', hits=8, seconds=60) + >>> limit.delay # delay and ratio must be get as attributes + 7.5 + >>> site.ratelimit('purge').hits # get purge hits + 30 + >>> group, *limit = site.ratelimit('urlshortcode') + >>> group # the user is not logged in, we get 'ip' as group + 'ip' + >>> limit # starred assignment is allowed for the fields + [10, 120] + + After login to the site and the rate limit will change. The + limit user group might be 'user': + + >>> limit = site.ratelimit('edit') # doctest: +SKIP + >>> limit # doctest: +SKIP + RateLimit(group='user', hits=90, seconds=60) + >>> limit.ratio # doctest: +SKIP + 1.5 + >>> limit = site.ratelimit('urlshortcode') # no action limit found + >>> group, *limits = limit + >>> group # doctest: +SKIP + 'unknown' # the group is 'unknown' because action was not found + >>> limits # doctest: +SKIP + (50, 10) # hits is maxlimit and seconds is config.put_throttle + >>> site.maxlimit, pywikibot.config.put_throttle + (50, 10) + + If a user is logged in and has no rate limit, e.g bot accounts, + we always get a default RateLimit namedtuple like this: + + >>> site.has_right['noratelimit'] # doctest: +SKIP + True + >>> limit = site.ratelimit('any_action') # maxlimit is used + >>> limit # doctest: +SKIP + RateLimit(group='noratelimit', hits=500, seconds=0) + >>> limit.delay, limit.ratio # doctest: +SKIP + (0.0, inf) + + .. seealso:: :class:`tools.collections.RateLimit` for RateLimit + examples. + .. note:: It is not verified whether ``action`` parameter has a + valid value. + .. seealso:: :api:`Ratelimit` + .. versionadded:: 9.0 + + :param action: action which might be limited + :return: RateLimit tuple with ``group``, ``hits`` and ``seconds`` + fields and properties for ``delay`` and ``ratio``. + """ + ratio = 0 + for key, value in self.userinfo['ratelimits'].get(action, {}).items(): + h, s = value['hits'], value['seconds'] + # find the highest ratio hits per seconds + if h / s > ratio: + limit = value + limit['group'] = key + ratio = h / s + + if not ratio: # no limits found + limit = {'hits': self.maxlimit} + if self.has_right('noratelimit'): + limit['group'] = 'noratelimit' + else: + limit['seconds'] = pywikibot.config.put_throttle + + return RateLimit(**limit) + @property def userinfo(self) -> dict[str, Any]: """Retrieve userinfo from site and store in _userinfo attribute. diff --git a/pywikibot/tools/collections.py b/pywikibot/tools/collections.py index 63fbe43..38e330a 100644 --- a/pywikibot/tools/collections.py +++ b/pywikibot/tools/collections.py @@ -11,7 +11,7 @@ from collections.abc import Collection, Generator, Iterator, Mapping from contextlib import suppress from itertools import chain -from typing import Any +from typing import Any, NamedTuple from pywikibot.backports import Generator as GeneratorType @@ -21,6 +21,7 @@ 'DequeGenerator', 'EmptyDefault', 'GeneratorWrapper', + 'RateLimit', 'SizedKeyCollection', 'EMPTY_DEFAULT', ) @@ -294,3 +295,55 @@ """Restart the generator.""" with suppress(AttributeError): del self._started_gen + + +class RateLimit(NamedTuple): + + """A namedtuple which can hold rate limit content. + + This class is used by :meth:`APISite.ratelimit() + <pywikibot.site._apisite.APISite.ratelimit>`. + + .. note:: :meth:`delay` and :meth:`ratio` properties cannot be + sliced or used with tuple indices. The must be used as attributes. + + >>> limit = RateLimit('user', 500, 10) + >>> limit + RateLimit(group='user', hits=500, seconds=10) + >>> limit.delay + 0.02 + >>> limit.ratio + 50.0 + >>> limit._fields + ('group', 'hits', 'seconds') + >>> limit._asdict() # doctest: +SKIP + {'group': 'user', 'hits': 500, 'seconds': 10} + >>> limit[0] + 'user' + >>> limit[-1] + 10 + >>> user, hits, seconds = limit + >>> hits, seconds + (500, 10) + >>> newlimit = limit._replace(seconds=0) + >>> newlimit.delay + 0.0 + >>> newlimit.ratio + inf + + .. versionadded:: 9.0 + """ + + group: str = 'unknown' + hits: int = 50 + seconds: int = 0 + + @property + def delay(self) -> float: + """Calculate a delay value which is the inverse of :meth:`ratio`.""" + return self.seconds / self.hits + + @property + def ratio(self) -> float: + """Calculate a ratio how many hits can be done within one second.""" + return self.hits / self.seconds if self.seconds != 0 else float('inf') diff --git a/tests/site_tests.py b/tests/site_tests.py index d2a51cf..840b5b2 100755 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -277,6 +277,32 @@ if a: self.assertEqual(a[0], mainpage) + def test_maxlimit(self): + """Test maxlimit property.""" + limit = self.site.maxlimit + self.assertIsInstance(limit, int) + self.assertIn(limit, [10, 50, 500, 5000]) + + def test_ratelimit(self): + """Test ratelimit method.""" + actions = ('edit', 'move', 'purge', 'invalid') + if self.site.logged_in(): + groups = ['user', 'unknown', 'noratelimit'] + else: + groups = ['ip', 'unknown'] + self.assertFalse(self.site.has_right('noratelimit')) + for action in actions: + with self.subTest(action=action): + limit = self.site.ratelimit(action) + self.assertIn(limit.group, groups) + self.assertEqual(limit.seconds / limit.hits, limit.delay) + self.assertEqual( + 1 / limit.delay if limit.seconds else float('inf'), + limit.ratio) + if limit.group == 'unknown': + self.assertEqual(limit.hits, self.site.maxlimit) + self.assertEqual(limit.seconds, config.put_throttle) + class TestLockingPage(DefaultSiteTestCase): """Test cases for lock/unlock a page within threads.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/836251 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: I5db248dc4ef4bea03ad3ac4589830c209b961a04 Gerrit-Change-Number: 836251 Gerrit-PatchSet: 19 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] Allow to run tests with oauth
by jenkins-bot (Code Review) 17 Dec '23

17 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/983522 ) Change subject: [bugfix] Allow to run tests with oauth ...................................................................... [bugfix] Allow to run tests with oauth Use api.php instead of index.php to check if site in alive. Bug: T352606 Change-Id: I2a436d0f1cd2c06201688d4ebe211bf97c787640 --- M tests/aspects.py 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/aspects.py b/tests/aspects.py index ff191ee..f6dc453 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -940,7 +940,7 @@ # obsolete without a mapping to a hostname. with suppress(KeyError): data['hostname'] = ( - data['site'].base_url(data['site'].path())) + data['site'].base_url(data['site'].apipath())) cm.__exit__(None, None, None) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/983522 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: I2a436d0f1cd2c06201688d4ebe211bf97c787640 Gerrit-Change-Number: 983522 Gerrit-PatchSet: 2 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Align import of NamespacesDict
by jenkins-bot (Code Review) 15 Dec '23

15 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/983266 ) Change subject: [IMPR] Align import of NamespacesDict ...................................................................... [IMPR] Align import of NamespacesDict Change-Id: I56d16a5a18b3cbf5f442d45f4667fa2342ece5b5 --- M tests/cosmetic_changes_tests.py 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py index ed86b5c..215ba06 100755 --- a/tests/cosmetic_changes_tests.py +++ b/tests/cosmetic_changes_tests.py @@ -12,7 +12,7 @@ from pywikibot import Page from pywikibot.cosmetic_changes import CANCEL, CosmeticChangesToolkit -from pywikibot.site._namespace import NamespacesDict +from pywikibot.site import NamespacesDict from pywikibot.tools import has_module from tests.aspects import TestCase -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/983266 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: I56d16a5a18b3cbf5f442d45f4667fa2342ece5b5 Gerrit-Change-Number: 983266 Gerrit-PatchSet: 1 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Use BuiltinNamespace enum instead of int
by jenkins-bot (Code Review) 15 Dec '23

15 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/981672 ) Change subject: [IMPR] Use BuiltinNamespace enum instead of int ...................................................................... [IMPR] Use BuiltinNamespace enum instead of int Change-Id: I80a9c638562edbbccd5cc5308361e7d15a49c664 --- M pywikibot/site/__init__.py M pywikibot/page/_basepage.py M pywikibot/cosmetic_changes.py M pywikibot/site/_apisite.py M pywikibot/data/api/_generators.py M scripts/patrol.py 6 files changed, 46 insertions(+), 27 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index 845d6ce..27650ef 100644 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -66,6 +66,7 @@ import pywikibot from pywikibot import exceptions, textlib from pywikibot.backports import Callable, Match, Pattern +from pywikibot.site import Namespace from pywikibot.textlib import ( FILE_LINK_REGEX, MultiTemplateMatchBuilder, @@ -247,7 +248,7 @@ self.namespace = page.namespace() self.show_diff = show_diff - self.template = (self.namespace == 10) + self.template = (self.namespace == Namespace.TEMPLATE) self.talkpage = self.namespace >= 0 and self.namespace % 2 == 1 self.ignore = ignore @@ -402,12 +403,13 @@ exceptions = ['nowiki', 'comment', 'math', 'pre'] for namespace in self.site.namespaces.values(): - if namespace == 0: + if namespace == Namespace.MAIN: # skip main (article) namespace continue # a clone is needed. Won't change the namespace dict namespaces = list(namespace) - if namespace == 6 and self.site.family.name == 'wikipedia': + if (namespace == Namespace.FILE + and self.site.family.name == 'wikipedia'): if self.site.code in ('en', 'fr'): # do not change "Image" on en-wiki and fr-wiki with suppress(ValueError): @@ -423,9 +425,11 @@ 0, namespaces.pop(namespaces.index('Imagem'))) # final namespace variant final_ns = namespaces.pop(0) - if namespace in (2, 3): + if namespace in (Namespace.USER, Namespace.USER_TALK): # skip localized user namespace, maybe gender is used - namespaces = ['User' if namespace == 2 else 'User talk'] + namespaces = ['User' + if namespace == Namespace.USER + else 'User talk'] # lowerspaced and underscored namespaces for i, item in enumerate(namespaces): item = item.replace(' ', '[ _]') @@ -433,7 +437,8 @@ namespaces[i] = item namespaces.append(first_lower(final_ns)) if final_ns and namespaces: - if self.site.sitename == 'wikipedia:pt' and namespace == 6: + if (self.site.sitename == 'wikipedia:pt' + and namespace == Namespace.FILE): # only change on these file extensions (per T57242) extensions = ('png', 'gif', 'jpg', 'jpeg', 'svg', 'tiff', 'tif') @@ -544,7 +549,7 @@ page = pywikibot.Page(pywikibot.Link(titleWithSection, self.site)) in_main_namespace = None with suppress(exceptions.InvalidTitleError): - in_main_namespace = page.namespace() == 0 + in_main_namespace = page.namespace() == Namespace.MAIN if not in_main_namespace: return oldlink @@ -682,7 +687,7 @@ def removeEmptySections(self, text: str) -> str: """Cleanup empty sections.""" # userspace contains article stubs without nobots/in use templates - if self.namespace == 2: + if self.namespace == Namespace.USER: return text skippings = ['comment', 'category'] @@ -818,10 +823,11 @@ def replace_link(match: Match[str]) -> str: """Create a string to replace a single link.""" replacement = '[[' - if re.match(r'(?:{}):' - .format('|'.join((*self.site.namespaces[6], - *self.site.namespaces[14]))), - match['link']): + if re.match( + r'(?:{}):'.format('|'.join( + (*self.site.namespaces[Namespace.FILE], + *self.site.namespaces[Namespace.CATEGORY]))), + match['link']): replacement += ':' replacement += match['link'] @@ -1045,7 +1051,8 @@ [1]: https://commons.wikimedia.org/wiki/Commons:Tools/pywiki_file_description_cl… """ - if self.site.sitename != 'commons:commons' or self.namespace == 6: + if (self.site.sitename != 'commons:commons' + or self.namespace == Namespace.FILE): return text # section headers to {{int:}} versions diff --git a/pywikibot/data/api/_generators.py b/pywikibot/data/api/_generators.py index af10237..4b0d1f0 100644 --- a/pywikibot/data/api/_generators.py +++ b/pywikibot/data/api/_generators.py @@ -19,6 +19,7 @@ import pywikibot from pywikibot import config from pywikibot.exceptions import Error, InvalidTitleError, UnsupportedPageError +from pywikibot.site import Namespace from pywikibot.tools import deprecated from pywikibot.tools.collections import GeneratorWrapper @@ -718,12 +719,12 @@ p = pywikibot.Page(self.site, pagedata['title'], pagedata['ns']) ns = pagedata['ns'] # Upcast to proper Page subclass. - if ns == 2: + if ns == Namespace.USER: p = pywikibot.User(p) - elif ns == 6: + elif ns == Namespace.FILE: with suppress(ValueError): p = pywikibot.FilePage(p) - elif ns == 14: + elif ns == Namespace.CATEGORY: p = pywikibot.Category(p) update_page(p, pagedata, self.props) return p diff --git a/pywikibot/page/_basepage.py b/pywikibot/page/_basepage.py index b6b7255..9ff008c 100644 --- a/pywikibot/page/_basepage.py +++ b/pywikibot/page/_basepage.py @@ -267,12 +267,12 @@ 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: + elif self.namespace() == Namespace.MAIN 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: + if not with_ns and self.namespace() != Namespace.MAIN: title = label + section else: title += section @@ -845,11 +845,11 @@ def is_categorypage(self): """Return True if the page is a Category, False otherwise.""" - return self.namespace() == 14 + return self.namespace() == Namespace.CATEGORY def is_filepage(self): """Return True if this is a file description page, False otherwise.""" - return self.namespace() == 6 + return self.namespace() == Namespace.FILE def isDisambig(self) -> bool: """ diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index 146ee74..8a7c5d4 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -6,11 +6,13 @@ # from __future__ import annotations +# to prevent ImportError exception due to circular imports +from pywikibot.site._namespace import Namespace, NamespacesDict + from pywikibot.site._apisite import APISite from pywikibot.site._basesite import BaseSite from pywikibot.site._datasite import DataSite from pywikibot.site._namespace import NamespaceArgType # noqa: F401 -from pywikibot.site._namespace import Namespace, NamespacesDict from pywikibot.site._obsoletesites import ClosedSite, RemovedSite from pywikibot.site._siteinfo import Siteinfo from pywikibot.site._tokenwallet import TokenWallet diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 1b4b1e6..defdd83 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -1565,14 +1565,13 @@ # Upcast to proper Page subclass. ns = target.namespace() - if ns == 2: + if ns == Namespace.USER: target = pywikibot.User(target) - elif ns == 6: + elif ns == Namespace.FILE: target = pywikibot.FilePage(target) - elif ns == 14: + elif ns == Namespace.CATEGORY: target = pywikibot.Category(target) page._redirtarget = target - return page._redirtarget @deprecated(since='8.0.0') diff --git a/scripts/patrol.py b/scripts/patrol.py index cf3df12..c0d422f 100755 --- a/scripts/patrol.py +++ b/scripts/patrol.py @@ -58,6 +58,7 @@ from pywikibot import pagegenerators from pywikibot.backports import Container, removeprefix from pywikibot.bot import BaseBot, suggest_help +from pywikibot.site import Namespace def verbose_output(string) -> None: @@ -216,7 +217,7 @@ continue obj = pywikibot.Link(node.title, self.site) - if obj.namespace == -1: + if obj.namespace == Namespace.SPECIAL: # the parser accepts 'special:prefixindex/' as a wildcard # this allows a prefix that doesn't match an existing page # to be a blue link, and can be clicked to see what pages @@ -231,7 +232,7 @@ verbose_output('Whitelist prefixindex hack for: ' + page) - elif obj.namespace == 2 and not current_user: + elif obj.namespace == Namespace.USER and not current_user: # if a target user hasn't been found yet, and the link is # 'user:' # the user will be the target of subsequent rules -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/981672 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: I80a9c638562edbbccd5cc5308361e7d15a49c664 Gerrit-Change-Number: 981672 Gerrit-PatchSet: 7 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [requirements] Update requirements for stdnum
by jenkins-bot (Code Review) 15 Dec '23

15 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/983212 ) Change subject: [requirements] Update requirements for stdnum ...................................................................... [requirements] Update requirements for stdnum Change-Id: Ic25b0d9e731563553e72d00cc520e24ee4d7007d --- M setup.py M requirements.txt 2 files changed, 11 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/requirements.txt b/requirements.txt index f4095df..9d0fd0e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -37,7 +37,7 @@ pydot >= 1.4.1 # cosmetic_changes -python-stdnum >= 1.18 +python-stdnum >= 1.19 # GUI Pillow >= 8.1.2, < 10.0.0; platform_machine == 'AMD32' diff --git a/setup.py b/setup.py index eb49071..609e4e2 100755 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ extra_deps = { # Core library dependencies 'eventstreams': ['sseclient<0.0.23,>=0.0.18'], # T222885 - 'isbn': ['python-stdnum>=1.18'], + 'isbn': ['python-stdnum>=1.19'], 'Graphviz': ['pydot>=1.4.1'], 'Google': ['google>=1.7'], 'memento': ['memento_client==0.6.1'], -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/983212 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: Ic25b0d9e731563553e72d00cc520e24ee4d7007d Gerrit-Change-Number: 983212 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] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 14 Dec '23

14 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/983170 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I068006b67926df3c00978b44beaa9cf7427308ae --- A welcome/mzn.json 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/welcome/mzn.json b/welcome/mzn.json new file mode 100644 index 0000000..d045833 --- /dev/null +++ b/welcome/mzn.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "محک" + ] + }, + "welcome-welcome": "خش بمونی!" +} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/983170 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: I068006b67926df3c00978b44beaa9cf7427308ae Gerrit-Change-Number: 983170 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [cleanup] deprecate SequenceOutputter.output() method
by Xqt (Code Review) 14 Dec '23

14 Dec '23

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/981376 ) Change subject: [cleanup] deprecate SequenceOutputter.output() method ...................................................................... [cleanup] deprecate SequenceOutputter.output() method SequenceOutputter acts like a bot_choice Option and output() methods were derecated in Pywikibot 6.2 in favour of out property due to cache_output implementation Change-Id: I0dd4fdc006d7adde16f1aa22ff3fa0eee4c66831 --- M scripts/solve_disambiguation.py M ROADMAP.rst M pywikibot/tools/formatter.py 3 files changed, 21 insertions(+), 2 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/ROADMAP.rst b/ROADMAP.rst index c95ddc6..a0e7f09 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -29,6 +29,7 @@ Deprecations ------------ +* 9.0.0: ``SequenceOutputter.output()`` is deprecated in favour of :attr:`tools.formatter.SequenceOutputter.out` property * 9.0.0: *nullcontext* context manager and *SimpleQueue* queue of :mod:`backports` are derecated * 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 diff --git a/pywikibot/tools/formatter.py b/pywikibot/tools/formatter.py index 7008347..6ad82f5 100644 --- a/pywikibot/tools/formatter.py +++ b/pywikibot/tools/formatter.py @@ -55,8 +55,13 @@ content = '' return self.prefix + content + self.suffix + @deprecated('pywikibot.info(SequenceOutputter.out)', since='9.0.0') def output(self) -> None: - """Output the text of the current sequence.""" + """Output the text of the current sequence. + + .. deprecated:: 9.0 + Use :func:`pywikibot.info` with *out* property + """ info(self.out) diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index 45e5956..ac7f4ad 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -1275,7 +1275,7 @@ self.opt.pos.sort(key=lambda x: x.lower()) else: self.opt.pos.sort() - SequenceOutputter(self.opt.pos).output() + pywikibot.info(SequenceOutputter(self.opt.pos).out) gen = ReferringPageGeneratorWithIgnore( page, -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/981376 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: I0dd4fdc006d7adde16f1aa22ff3fa0eee4c66831 Gerrit-Change-Number: 981376 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <dalangi-ctr(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] Suppress error in CosmeticChangesToolkit.cleanUpLinks()
by jenkins-bot (Code Review) 13 Dec '23

13 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/921582 ) Change subject: [bugfix] Suppress error in CosmeticChangesToolkit.cleanUpLinks() ...................................................................... [bugfix] Suppress error in CosmeticChangesToolkit.cleanUpLinks() - no longer retry api request on ServerError which includes FatalServerError. ServerError is raised when a requests.ReadTimeout or requests.ConnectTimeout occurs. - suppress ServerError in CosmeticChangesToolkit.cleanUpLinks() when calling site.isInterwikiLink() because the corresponding site may be down. Bug: T337045 Change-Id: I499bc1d7cc2bbd98cac20548a5e40c9dbf314ec2 --- M pywikibot/cosmetic_changes.py M pywikibot/data/api/_requests.py 2 files changed, 26 insertions(+), 9 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index 1e13373..845d6ce 100644 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -64,9 +64,8 @@ from urllib.parse import urlparse, urlunparse import pywikibot -from pywikibot import textlib +from pywikibot import exceptions, textlib from pywikibot.backports import Callable, Match, Pattern -from pywikibot.exceptions import InvalidTitleError from pywikibot.textlib import ( FILE_LINK_REGEX, MultiTemplateMatchBuilder, @@ -532,8 +531,10 @@ oldlink = url2string(match.group(), encodings=self.site.encodings()) - is_interwiki = self.site.isInterwikiLink(titleWithSection) - if is_interwiki: + is_interwiki = None + with suppress(exceptions.ServerError): + is_interwiki = self.site.isInterwikiLink(titleWithSection) + if is_interwiki is not False: return oldlink # The link looks like this: @@ -541,10 +542,9 @@ # We only work on namespace 0 because pipes and linktrails work # differently for images and categories. page = pywikibot.Page(pywikibot.Link(titleWithSection, self.site)) - try: + in_main_namespace = None + with suppress(exceptions.InvalidTitleError): in_main_namespace = page.namespace() == 0 - except InvalidTitleError: - in_main_namespace = False if not in_main_namespace: return oldlink diff --git a/pywikibot/data/api/_requests.py b/pywikibot/data/api/_requests.py index 3b63cb2..61dad40 100644 --- a/pywikibot/data/api/_requests.py +++ b/pywikibot/data/api/_requests.py @@ -30,10 +30,10 @@ from pywikibot.exceptions import ( Client414Error, Error, - FatalServerError, MaxlagTimeoutError, NoUsernameError, Server504Error, + ServerError, SiteDefinitionError, ) from pywikibot.login import LoginStatus @@ -694,7 +694,7 @@ pywikibot.warning( 'Caught HTTP 414 error, although not using GET.') raise - except (ConnectionError, FatalServerError): + except (ConnectionError, ServerError): # This error is not going to be fixed by just waiting pywikibot.error(traceback.format_exc()) raise -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/921582 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: I499bc1d7cc2bbd98cac20548a5e40c9dbf314ec2 Gerrit-Change-Number: 921582 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: 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] Use sphinx-notfound-page extension with sphinx
by jenkins-bot (Code Review) 12 Dec '23

12 Dec '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/982406 ) Change subject: [doc] Use sphinx-notfound-page extension with sphinx ...................................................................... [doc] Use sphinx-notfound-page extension with sphinx Change-Id: If611a85ddc1c9f10a83468e9de2a022f98454e04 --- M docs/conf.py M docs/requirements.txt 2 files changed, 11 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/conf.py b/docs/conf.py index 07ca0d6..a662a5f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -49,6 +49,7 @@ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = [ + 'notfound.extension', 'sphinx.ext.autodoc', 'sphinx.ext.autosectionlabel', 'sphinx.ext.autosummary', diff --git a/docs/requirements.txt b/docs/requirements.txt index 22026e7..0052ead 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -4,4 +4,5 @@ sphinx >= 7.2.6 rstcheck >=6.2.0 sphinxext-opengraph >= 0.9.0 +sphinx-notfound-page >= 1.0.0 furo >= 2023.9.10 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/982406 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: If611a85ddc1c9f10a83468e9de2a022f98454e04 Gerrit-Change-Number: 982406 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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits