Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13500 discussions

[Gerrit] ...core[master]: [IMPR] Guess the last needed token key if the token is not found
by Xqt (Code Review) 07 Apr '23

07 Apr '23

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/906740 ) Change subject: [IMPR] Guess the last needed token key if the token is not found ...................................................................... [IMPR] Guess the last needed token key if the token is not found Bug: T334288 Change-Id: I0514f460384a736d583849078f813c14c72bc129 --- M pywikibot/site/_tokenwallet.py 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/pywikibot/site/_tokenwallet.py b/pywikibot/site/_tokenwallet.py index 5ffd72f..0d7ec5a 100644 --- a/pywikibot/site/_tokenwallet.py +++ b/pywikibot/site/_tokenwallet.py @@ -29,6 +29,8 @@ self.site: APISite = site self._tokens: Dict[str, str] = {} self._currentuser: Optional[str] = site.user() + # guess the needed token in update_tokens + self._last_token_key: Optional[str] = None def __getitem__(self, key: str) -> str: """Get token value for the given key.""" @@ -58,6 +60,7 @@ f'Invalid token {key!r} for user {self._currentuser!r} on ' f'{self.site} wiki.') from None + self._last_token_key = key return token def __contains__(self, key) -> bool: @@ -119,7 +122,7 @@ # find the token types types = [key for key, value in self._tokens.items() for token in tokens - if value == token] + if value == token] or [self._last_token_key] self.clear() # clear the cache return [self[token_type] for token_type in types] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/906740 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: I0514f460384a736d583849078f813c14c72bc129 Gerrit-Change-Number: 906740 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] Add parameters to APIError to show them
by jenkins-bot (Code Review) 07 Apr '23

07 Apr '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/906730 ) Change subject: [IMPR] Add parameters to APIError to show them ...................................................................... [IMPR] Add parameters to APIError to show them Bug: T333957 Change-Id: I8b9cd3d18df4894e0e8af0e16ed9f5dd88b70b3f --- M pywikibot/data/api/_requests.py 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api/_requests.py b/pywikibot/data/api/_requests.py index 3c7bbc6..0377577 100644 --- a/pywikibot/data/api/_requests.py +++ b/pywikibot/data/api/_requests.py @@ -1083,7 +1083,9 @@ f'API Error: query=\n{pprint.pformat(param_repr)}') pywikibot.log(f' response=\n{result}') - raise pywikibot.exceptions.APIError(**error) + args = {'param': body} if body else {} + args.update(error) + raise pywikibot.exceptions.APIError(**args) except TypeError: raise RuntimeError(result) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/906730 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: I8b9cd3d18df4894e0e8af0e16ed9f5dd88b70b3f Gerrit-Change-Number: 906730 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]: [doc] Add links to new mw.org content to landing page and recipes page
by jenkins-bot (Code Review) 07 Apr '23

07 Apr '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/906032 ) Change subject: [doc] Add links to new mw.org content to landing page and recipes page ...................................................................... [doc] Add links to new mw.org content to landing page and recipes page Bug: T333540 Change-Id: I7166f84dcf4b628773e058ddfd0f94a85f405341 --- M docs/recipes.rst M docs/index.rst 2 files changed, 19 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/index.rst b/docs/index.rst index a7b1802..959a7f6 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -28,7 +28,11 @@ :ref:`MIT license`; manual pages on mediawiki.org are licensed under the `CC-BY-SA 3.0`_ license. -.. seealso:: `Pywikibot Manual`_ at https://www.mediawiki.org +.. seealso:: `Pywikibot Manual`_ on https://www.mediawiki.org, which includes additional resources, such as: + + * `Pywikibot Cookbook`_ + * `Pywikibot Workshop Materials`_ + ************************** Framework modules overview @@ -83,3 +87,5 @@ .. _CC-BY-SA 3.0: https://creativecommons.org/licenses/by-sa/3.0/ .. _Pywikibot Manual: https://www.mediawiki.org/wiki/Manual:Pywikibot +.. _Pywikibot Cookbook: https://www.mediawiki.org/wiki/Manual:Pywikibot/Cookbook +.. _Pywikibot Workshop Materials: https://www.mediawiki.org/wiki/Manual:Pywikibot/Workshop_Materials diff --git a/docs/recipes.rst b/docs/recipes.rst index bba2fdd..cfa3487 100644 --- a/docs/recipes.rst +++ b/docs/recipes.rst @@ -2,6 +2,8 @@ Recipes ******* +For more recipes, see the `Pywikibot Cookbook <https://www.mediawiki.org/wiki/Manual:Pywikibot/Cookbook>`_. + How to modify a page ==================== -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/906032 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: I7166f84dcf4b628773e058ddfd0f94a85f405341 Gerrit-Change-Number: 906032 Gerrit-PatchSet: 1 Gerrit-Owner: KBach <kbach(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] No longer lazy load cookies
by Xqt (Code Review) 07 Apr '23

07 Apr '23

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/906547 ) Change subject: [bugfix] No longer lazy load cookies ...................................................................... [bugfix] No longer lazy load cookies Lazy load of cookies was introduced with ba56084 when cookie files for each user was introduced because the username was needed first load the cookie. But this change needs an explicit login() call and was a regression against Pywikibot 7.6. - always make a cookie-only login when a Site was initialzed - try to login if API response is 'notloggedin'; this is the same behaviour as for 'readapidenied' Bug: T331315 Bug: T330488 Bug: T329132 Bug: T326779 Bug: T271858 Change-Id: I34caa567b883a5d0ae81eea5250fae01fcb29554 --- M tests/utils.py M pywikibot/site/_apisite.py M pywikibot/data/api/_requests.py 3 files changed, 67 insertions(+), 23 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/pywikibot/data/api/_requests.py b/pywikibot/data/api/_requests.py index bbd5744..3c7bbc6 100644 --- a/pywikibot/data/api/_requests.py +++ b/pywikibot/data/api/_requests.py @@ -938,8 +938,11 @@ return True def submit(self) -> dict: - """ - Submit a query and parse the response. + """Submit a query and parse the response. + + .. versionchanged:: 8.1 + in addition to *readapidenied* also try to login when API + response is *notloggedin*. :return: a dict containing data retrieved from api.php """ @@ -1033,8 +1036,8 @@ self._ratelimited() continue - # If readapidenied is returned try to login - if code == 'readapidenied' \ + # If notloggedin or readapidenied is returned try to login + if code in ('notloggedin', 'readapidenied') \ and self.site._loginstatus in (LoginStatus.NOT_ATTEMPTED, LoginStatus.NOT_LOGGED_IN): self.site.login() diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index ae8bb42..673d619 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -118,11 +118,13 @@ super().__init__(code, fam, user) self._globaluserinfo: Dict[Union[int, str], Any] = {} self._interwikimap = _InterwikiMap(self) - self._loginstatus = login.LoginStatus.NOT_ATTEMPTED self._msgcache: Dict[str, str] = {} self._paraminfo = api.ParamInfo(self) self._siteinfo = Siteinfo(self) self._tokens = TokenWallet(self) + self._loginstatus = login.LoginStatus.NOT_ATTEMPTED + with suppress(SiteDefinitionError): + self.login(cookie_only=True) def __getstate__(self) -> Dict[str, Any]: """Remove TokenWallet before pickling, for security reasons.""" @@ -324,12 +326,17 @@ def login( self, autocreate: bool = False, - user: Optional[str] = None + user: Optional[str] = None, + *, + cookie_only: bool = False ) -> None: """Log the user in if not already logged in. .. versionchanged:: 8.0 - lazy load cookies when logging in. + lazy load cookies when logging in. This was dropped in 8.1 + .. versionchanged:: 8.1 + the *cookie_only* parameter was added and cookies are loaded + whenever the site is initialized. .. seealso:: :api:`Login` @@ -337,6 +344,8 @@ using unified login :param user: bot user name. Overrides the username set by BaseSite initializer parameter or user config setting + :param cookie_only: Only try to login from cookie but do not + force to login with username/password settings. :raises pywikibot.exceptions.NoUsernameError: Username is not recognised by the site. @@ -404,23 +413,22 @@ raise NoUsernameError(error_msg) - login_manager = login.ClientLoginManager(site=self, - user=self.username()) - if login_manager.login(retry=True, autocreate=autocreate): - self._username = login_manager.username - del self.userinfo # force reloading + if not cookie_only: + login_manager = login.ClientLoginManager(site=self, + user=self.username()) + if login_manager.login(retry=True, autocreate=autocreate): + self._username = login_manager.username + del self.userinfo # force reloading - # load userinfo - if self.userinfo['name'] == self.username(): - self._loginstatus = login.LoginStatus.AS_USER - return + # load userinfo + if self.userinfo['name'] == self.username(): + self._loginstatus = login.LoginStatus.AS_USER + return - pywikibot.error('{} != {} after {}.login() and successful ' - '{}.login()' - .format(self.userinfo['name'], - self.username(), - type(self).__name__, - type(login_manager).__name__)) + pywikibot.error( + f"{self.userinfo['name']} != {self.username()} after " + f'{type(self).__name__}.login() and successful ' + f'{type(login_manager).__name__}.login()') self._loginstatus = login.LoginStatus.NOT_LOGGED_IN # failure @@ -538,7 +546,8 @@ assert 'userinfo' in uidata['query'], \ "API userinfo response lacks 'userinfo' key" self._userinfo = uidata['query']['userinfo'] - if 'anon' in self._userinfo or not self._userinfo.get('id'): + if self._loginstatus != login.LoginStatus.IN_PROGRESS \ + and ('anon' in self._userinfo or not self._userinfo.get('id')): pywikibot.warning('No user is logged in on site {}' .format(self)) return self._userinfo diff --git a/tests/utils.py b/tests/utils.py index c71658d..38c4105 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -400,6 +400,15 @@ interface=DryDataSite) return None + def login(self, *args, cookie_only=False, **kwargs): + """Overwrite login which is called when a site is initialized. + + .. versionadded: 8.1 + """ + if cookie_only: + return + raise Exception(f'Attempting to login with {type(self).__name__}') + class DryDataSite(DrySite, pywikibot.site.DataSite): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/906547 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: I34caa567b883a5d0ae81eea5250fae01fcb29554 Gerrit-Change-Number: 906547 Gerrit-PatchSet: 7 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Amire80 <amir.aharoni(a)mail.huji.ac.il> Gerrit-Reviewer: Bináris <wikiposta(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> 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) 06 Apr '23

06 Apr '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/906549 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I145f9c1302c2e45f07647ff9ec2098ea2b5d5e62 --- M pywikibot/bn.json M delinker/bn.json M unprotect/de.json M archivebot/gsw.json M delinker/ca.json M welcome/de.json M protect/ca.json M delinker/fr.json M pywikibot/pdc.json M checkimages/de.json M unprotect/he.json 11 files changed, 31 insertions(+), 14 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/archivebot/gsw.json b/archivebot/gsw.json index 12d999e..ed2a601 100644 --- a/archivebot/gsw.json +++ b/archivebot/gsw.json @@ -7,6 +7,6 @@ }, "archivebot-archive-full": "(ARCHIVE FULL)", "archivebot-archive-summary": "Bötli: Due %(count)d {{PLURAL:count|Abschnitt|Abschnitte}} vo [[%(from)s]] archiviere", - "archivebot-older-than": "elter wie", + "archivebot-older-than": "{{PLURAL:%(count)d|elter}} wie %(duration)s", "archivebot-page-summary": "Bötli: Due %(count)d {{PLURAL:count|Abschnitt|Abschnitte}} (%(why)s) uff %(archives)s archiviere" } diff --git a/checkimages/de.json b/checkimages/de.json index d12c4c2..07f0541 100644 --- a/checkimages/de.json +++ b/checkimages/de.json @@ -7,10 +7,10 @@ ] }, "checkimages-deletion-comment": "Bot: Füge %(adding)s hinzu", - "checkimages-doubles-file-comment": "Bot: Datei liegt auf Commons", + "checkimages-doubles-file-comment": "Bot: Datei liegt bereits auf Commons, kann gelöscht werden", "checkimages-doubles-head": "Datei-Duplikat", "checkimages-doubles-talk-comment": "Bot: Benachrichtigung, dass die Datei bereits auf Commons vorhanden ist", - "checkimages-log-comment": "Bot: schreibe Log", + "checkimages-log-comment": "Bot: Aktualisiere das Log", "checkimages-no-license-head": "Bild ohne Lizenz", "checkimages-source-tag-comment": "Bot: Markiere zur Dateiüberprüfung, da keine Lizenzvorlage gefunden.", "checkimages-source-notice-comment": "Bot: Benachrichtigung über Lizenzprobleme.", diff --git a/delinker/bn.json b/delinker/bn.json index c71d56a..931e88a 100644 --- a/delinker/bn.json +++ b/delinker/bn.json @@ -4,5 +4,5 @@ "আফতাবুজ্জামান" ] }, - "delinker-delink": "বট: [[%(title)s]] ফাইলটি সরানো হল, কারণ এটি [[:User:%(user)s]] কর্তৃক অপসারিত হয়েছে: ''%(comment)s''।" + "delinker-delink": "বট: [[%(title)s]] ফাইলটি সরানো হল, কারণ এটি [[:User:%(user)s]] কর্তৃক অপসারিত হয়েছে: ''%(comment)s''" } diff --git a/delinker/ca.json b/delinker/ca.json index cdfde97..018670f 100644 --- a/delinker/ca.json +++ b/delinker/ca.json @@ -1,8 +1,9 @@ { "@metadata": { "authors": [ + "Mguix", "Robertgarrigos" ] }, - "delinker-delink": "Bot: el fitxer [[%(title)s]] s'ha eliminat, ja que l'ha suprimit [[:User:%(user)s]]: ''%(comment)s''." + "delinker-delink": "Bot: el fitxer [[%(title)s]] s'ha eliminat, ja que l'ha suprimit [[:User:%(user)s]]: ''%(comment)s''" } diff --git a/delinker/fr.json b/delinker/fr.json index 5d3da4f..1ab82e1 100644 --- a/delinker/fr.json +++ b/delinker/fr.json @@ -4,5 +4,5 @@ "Verdy p" ] }, - "delinker-delink": "Robot : le fichier [[%(title)s]] a été supprimé, comme demandé par [[:User:%(user)s]] : ''%(comment)s''." + "delinker-delink": "Robot : le fichier [[%(title)s]] a été retiré car il a été supprimé par [[:User:%(user)s]] : ''%(comment)s''." } diff --git a/protect/ca.json b/protect/ca.json index cecb1b0..9e14e03 100644 --- a/protect/ca.json +++ b/protect/ca.json @@ -8,6 +8,6 @@ "protect-category": "Bot: Protegint totes les pàgines de la categoria %(cat)s", "protect-images": "Bot: Protegint totes les imatges de la pàgina %(page)s", "protect-links": "Bot: Protegint totes les pàgines que s'enllacen des de %(page)s", - "protect-ref": "Bot: Protegint totes les pàgines amb referència des de %(page)s", + "protect-ref": "Bot: Protegint totes les pàgines amb referència cap a %(page)s", "protect-simple": "Bot: Protegint una llista de fitxers." } diff --git a/pywikibot/bn.json b/pywikibot/bn.json index 09ba89e..4c4033e 100644 --- a/pywikibot/bn.json +++ b/pywikibot/bn.json @@ -10,6 +10,7 @@ "আফতাবুজ্জামান" ] }, + "pywikibot-bot-prefix": "বট:", "pywikibot-cosmetic-changes": "; সজ্জা পরিবর্তন", "pywikibot-enter-category-name": "বিষয়শ্রেণীর নাম প্রবেশ করান:", "pywikibot-enter-new-text": "দয়া করে নতুন বাক্য লিখুন:", diff --git a/pywikibot/pdc.json b/pywikibot/pdc.json index 359faa8..41af2b5 100644 --- a/pywikibot/pdc.json +++ b/pywikibot/pdc.json @@ -1,6 +1,9 @@ { "@metadata": { - "authors": [] + "authors": [ + "Xqt" + ] }, + "pywikibot-bot-prefix": "Waddefresser:", "pywikibot-cosmetic-changes": "; gleenere Enneringe" } diff --git a/unprotect/de.json b/unprotect/de.json index 261bc2f..c7cf4e1 100644 --- a/unprotect/de.json +++ b/unprotect/de.json @@ -1,11 +1,12 @@ { "@metadata": { "authors": [ - "Metalhead64" + "Metalhead64", + "Xqt" ] }, - "unprotect-category": "Bot: Gebe alle Seiten aus der Kategorie %(cat)s frei", - "unprotect-images": "Bot: Gebe alle Bilder auf der Seite %(page)s frei", + "unprotect-category": "Bot: Hebe den Schutz aller Seiten aus der Kategorie %(cat)s auf", + "unprotect-images": "Bot: Hebe den Schutz aller Dateien auf der Seite %(page)s auf", "unprotect-links": "Bot: Gebe alle Seiten frei, die von %(page)s verlinkt sind", "unprotect-ref": "Bot: Gebe alle Seiten frei, die von %(page)s verweisen", "unprotect-simple": "Bot: Gebe eine Liste mit Dateien frei" diff --git a/unprotect/he.json b/unprotect/he.json index 303c908..afd4b91 100644 --- a/unprotect/he.json +++ b/unprotect/he.json @@ -7,6 +7,6 @@ "unprotect-category": "בוט: מסיר הגנה מהקטגוריה %(cat)s", "unprotect-images": "בוט: מסיר הגנה מכל התמונות בדף %(page)s", "unprotect-links": "בוט: מסיר הכנה מכל הדפים שמקושרים מהדף %(page)s", - "unprotect-ref": "בוט: מסיר הגנה מכל הדפים שמקשרים על %(page)s", + "unprotect-ref": "בוט: מסיר הגנה מכל הדפים שמקשרים לדף %(page)s", "unprotect-simple": "בוט: מסיר הגנה מרשימת קבצים" } diff --git a/welcome/de.json b/welcome/de.json index 0a2fb99..7d169c1 100644 --- a/welcome/de.json +++ b/welcome/de.json @@ -1,8 +1,10 @@ { "@metadata": { - "authors": [] + "authors": [ + "Xqt" + ] }, - "welcome-bad_username": "Bot: Ergänze zu überprüfenden Benutzernamen", + "welcome-bad_username": "Bot: Ergänze einen zu überprüfenden Benutzernamen", "welcome-updating": "Bot: Aktualisiere Logdatei", "welcome-welcome": "Herzlich willkommen!" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/906549 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: I145f9c1302c2e45f07647ff9ec2098ea2b5d5e62 Gerrit-Change-Number: 906549 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]: [IMPR] use dataclasses with make_dist.py; Python 3.7+ required
by jenkins-bot (Code Review) 05 Apr '23

05 Apr '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/904176 ) Change subject: [IMPR] use dataclasses with make_dist.py; Python 3.7+ required ...................................................................... [IMPR] use dataclasses with make_dist.py; Python 3.7+ required Change-Id: I1450bc103ac7899436bc3cdbfa53b382dd393004 --- M make_dist.py M tests/make_dist_tests.py 2 files changed, 27 insertions(+), 9 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/make_dist.py b/make_dist.py index 45d64b7..1fca5b1 100755 --- a/make_dist.py +++ b/make_dist.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -"""Script to create a new distribution. +"""Script to create a new distribution. Requires Python 3.7+. The following options are supported: @@ -37,6 +37,7 @@ - *nodist* option was added .. versionchanged:: 8.1 + Python 3.7+ required because *dataclasses* module is used. *nodist* option was removed, *clear* option does not create a distribution. *local* and *remote* option clears old distributions first. @@ -49,6 +50,7 @@ import abc import shutil import sys +from dataclasses import dataclass, field from pathlib import Path from subprocess import check_call, run @@ -57,19 +59,24 @@ from pywikibot.backports import Tuple +@dataclass class SetupBase(abc.ABC): """Setup distribution base class. .. versionadded:: 8.0 + .. versionchanged:: 8.1 + *dataclass* is used. """ - def __init__(self, local, remote, clear, upgrade) -> None: - """Initializer.""" - self.local = local - self.remote = remote - self.clear = clear - self.upgrade = upgrade + local: bool + remote: bool + clear: bool + upgrade: bool + folder: Path = field(init=False) + + def __post_init__(self) -> None: + """Post-init initializer.""" self.folder = Path().resolve() def clear_old_dist(self) -> None: # pragma: no cover diff --git a/tests/make_dist_tests.py b/tests/make_dist_tests.py index 264e634..1a79759 100755 --- a/tests/make_dist_tests.py +++ b/tests/make_dist_tests.py @@ -9,11 +9,11 @@ import sys import unittest -from make_dist import handle_args from pywikibot import __version__ -from tests.aspects import TestCase +from tests.aspects import TestCase, require_modules +@require_modules('dataclasses') # Python 3.7+ class TestMakeDist(TestCase): """Test the make_dist script.""" @@ -29,12 +29,14 @@ def test_handle_args_empty(self): """Test make_dist handle_args function.""" + from make_dist import handle_args args = handle_args() self.assertEqual(args, (False, ) * 4) self._test_argv() def test_handle_args(self): """Test make_dist handle_args function.""" + from make_dist import handle_args sys.argv += ['-clear', '-local', '-remote', '-upgrade'] local, remote, clear, upgrade = handle_args() self.assertTrue(local) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/904176 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: I1450bc103ac7899436bc3cdbfa53b382dd393004 Gerrit-Change-Number: 904176 Gerrit-PatchSet: 6 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] use f-format in api._requests.py
by jenkins-bot (Code Review) 05 Apr '23

05 Apr '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/906006 ) Change subject: [IMPR] use f-format in api._requests.py ...................................................................... [IMPR] use f-format in api._requests.py Change-Id: I3a0e9cefbc70f0aa1606758beeced1b2997d754b --- M pywikibot/data/api/_requests.py 1 file changed, 46 insertions(+), 49 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api/_requests.py b/pywikibot/data/api/_requests.py index ebdbe9e..bbd5744 100644 --- a/pywikibot/data/api/_requests.py +++ b/pywikibot/data/api/_requests.py @@ -183,8 +183,8 @@ """ if site is None: self.site = pywikibot.Site() - warn('Request() invoked without a site; setting to {}' - .format(self.site), RuntimeWarning, 2) + warn(f'Request() invoked without a site; setting to {self.site}', + RuntimeWarning, 2) else: self.site = site @@ -239,13 +239,12 @@ raise Error('API write action attempted without user name') if 'anon' in self.site.userinfo: - raise Error("API write action attempted as IP '{}'" - .format(username)) + raise Error(f'API write action attempted as IP {username!r}') if not self.site.user() or self.site.username() != username: pywikibot.warning( - 'API write action by unexpected username {} commenced.\n' - 'userinfo: {!r}'.format(username, self.site.userinfo)) + f'API write action by unexpected username {username} ' + f'commenced.\nuserinfo: {self.site.userinfo!r}') # Make sure user is logged in if self.write: @@ -301,8 +300,8 @@ break args |= set(inspect.getfullargspec(super_cls.__init__).args) else: - raise ValueError('Request was not a super class of ' - '{!r}'.format(cls)) + raise ValueError(f'Request was not a super class of {cls!r}') + args -= {'self'} old_kwargs = set(kwargs) # all kwargs defined above but not in args indicate 'kwargs' mode @@ -343,9 +342,8 @@ return value.strftime(pywikibot.Timestamp.ISO8601Format) if isinstance(value, pywikibot.page.BasePage): if value.site != self.site: - raise RuntimeError( - 'value.site {!r} is different from Request.site {!r}' - .format(value.site, self.site)) + raise RuntimeError(f'value.site {value.site!r} is different ' + f'from Request.site {self.site!r}') return value.title(with_section=False) return str(value) @@ -452,7 +450,7 @@ self._params.setdefault('format', ['json']) if self['format'] != ['json']: raise TypeError( - "Query format '{}' cannot be parsed.".format(self['format'])) + f'Query format {self["format"]!r} cannot be parsed.') self.__defaulted = True # skipcq: PTC-W0037 @@ -496,8 +494,8 @@ value = value.encode(self.site.encoding()) except Exception: pywikibot.error( - "_encoded_items: '{}' could not be encoded as '{}':" - ' {!r}'.format(key, self.site.encoding(), value)) + f'_encoded_items: {key!r} could not be encoded as ' + f'{self.site.encoding()!r}: {value!r}') assert key.encode('ascii') assert isinstance(key, str) params[key] = value @@ -523,9 +521,8 @@ def __repr__(self) -> str: """Return internal representation.""" - return '{}.{}<{}->{!r}>'.format(self.__class__.__module__, - self.__class__.__name__, - self.site, str(self)) + cls = type(self) + return f"{cls.__module__}.{cls.__name__}<{self.site}->'{self}'>" def _simulate(self, action): """Simulate action.""" @@ -669,9 +666,8 @@ else: body = paramstring - pywikibot.debug('API request to {} (uses get: {}):\n' - 'Headers: {!r}\nURI: {!r}\nBody: {!r}' - .format(self.site, use_get, headers, uri, body)) + pywikibot.debug(f'API request to {self.site} (uses get: {use_get}):\n' + f'Headers: {headers!r}\nURI: {uri!r}\nBody: {body!r}') return use_get, uri, body, headers def _http_request(self, use_get: bool, uri: str, data, headers, @@ -741,8 +737,8 @@ # Note: family.AutoFamily is a function to create that class if self.site.family.__class__.__name__ == 'AutoFamily': pywikibot.debug(msg) - raise SiteDefinitionError('Invalid AutoFamily({!r})' - .format(self.site.family.domain)) + raise SiteDefinitionError( + f'Invalid AutoFamily({self.site.family.domain!r})') if not self.json_warning: # warn only once pywikibot.warning(msg) @@ -763,8 +759,8 @@ def _relogin(self, message: str = '') -> None: """Force re-login and inform user.""" - pywikibot.error('{}{}Forcing re-login.'.format(message, - ' ' if message else '')) + message += ' Forcing re-login.' + pywikibot.error(f'{message.strip()}') self.site._relogin() def _userinfo_query(self, result) -> bool: @@ -776,9 +772,8 @@ username = result['query']['userinfo']['name'] if (self.site.user() is not None and self.site.user() != username and self.site._loginstatus != LoginStatus.IN_PROGRESS): - message = ("Logged in as '{actual}' instead of '{expected}'." - .format(actual=username, expected=self.site.user())) - self._relogin(message) + self._relogin(f'Logged in as {username!r} instead of ' + f'{self.site.user()!r}.') return True return False @@ -801,8 +796,8 @@ # bug T51978 text = warning['html']['*'] else: - pywikibot.warning('API warning ({}) of unknown format: {}' - .format(mod, warning)) + pywikibot.warning( + f'API warning ({mod}) of unknown format: {warning}') continue # multiple warnings are in text separated by a newline @@ -812,8 +807,8 @@ handled = self._default_warning_handler(mod, single_warning) if handled is None: - pywikibot.warning('API warning ({}): {}' - .format(mod, single_warning)) + pywikibot.warning( + f'API warning ({mod}): {single_warning}') else: retry = retry or handled return retry @@ -895,12 +890,9 @@ pywikibot.error('Detected MediaWiki API exception {}{}' .format(e, '; retrying' if retry else '; raising')) param_repr = str(self._params) - pywikibot.log('MediaWiki exception {} details:\n' - ' query=\n{}\n' - ' response=\n{}' - .format(class_name, - pprint.pformat(param_repr), - result)) + pywikibot.log(f'MediaWiki exception {class_name} details:\n' + f' query=\n{pprint.pformat(param_repr)}\n' + f' response=\n{result}') if not retry: raise e @@ -935,8 +927,7 @@ return False if self.site._loginstatus == LoginStatus.IN_PROGRESS: - pywikibot.log('Login status: {}' - .format(self.site._loginstatus.name)) + pywikibot.log(f'Login status: {self.site._loginstatus.name}') return False # invalidate superior wiki cookies (T224712) @@ -1053,13 +1044,11 @@ continue if 'mwoauth-invalid-authorization' in code: + msg = f'OAuth authentication for {self.site}: {info}' if 'Nonce already used' in info: - pywikibot.error( - 'Retrying failed OAuth authentication for {}: {}' - .format(self.site, info)) + pywikibot.error(f'Retrying failed {msg}') continue - raise NoUsernameError('Failed OAuth authentication for {}: {}' - .format(self.site, info)) + raise NoUsernameError(f'Failed {msg}') if code == 'cirrussearch-too-busy-error': # T170647 self.wait() continue @@ -1087,8 +1076,8 @@ # raise error try: param_repr = str(self._params) - pywikibot.log('API Error: query=\n{}' - .format(pprint.pformat(param_repr))) + pywikibot.log( + f'API Error: query=\n{pprint.pformat(param_repr)}') pywikibot.log(f' response=\n{result}') raise pywikibot.exceptions.APIError(**error) @@ -1113,8 +1102,7 @@ delay *= 2 ** (self.current_retries - 1) delay = min(delay, config.retry_max) - pywikibot.warning('Waiting {:.1f} seconds before retrying.' - .format(delay)) + pywikibot.warning(f'Waiting {delay:.1f} seconds before retrying.') pywikibot.sleep(delay) @@ -1191,7 +1179,7 @@ # The returned value can't be encoded to anything other than # ascii otherwise it creates an exception when _create_file_name() # tries to encode it as utf-8. - user_key = 'User(User:{})'.format(self.site.userinfo['name']) + user_key = f'User(User:{self.site.userinfo["name"]})' else: user_key = repr(LoginStatus(LoginStatus.NOT_LOGGED_IN)) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/906006 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: I3a0e9cefbc70f0aa1606758beeced1b2997d754b Gerrit-Change-Number: 906006 Gerrit-PatchSet: 4 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]: [bugfix] Fix -namespace usage if RedirectGenerator is used
by jenkins-bot (Code Review) 05 Apr '23

05 Apr '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/904875 ) Change subject: [bugfix] Fix -namespace usage if RedirectGenerator is used ...................................................................... [bugfix] Fix -namespace usage if RedirectGenerator is used Only use pagegenerators' namespace filter if RedirectGenerator is used with -xml or -fullscan option or 'both' action. The later is like -fullscan but with broken and double action. Also show a warning if -fullscan is used together with 'both' action Bug: T331243 Change-Id: Ieffe10248a75877ee79d637bd35ad1585a17684c --- M scripts/redirect.py 1 file changed, 31 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/redirect.py b/scripts/redirect.py index 45d138e..a4dadd7 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -30,7 +30,7 @@ "-xml:filename.xml". Cannot be used with -fullscan or -moves. -fullscan Retrieve redirect pages from live wiki, not from a special page - Cannot be used with -xml. + Cannot be used with -xml or 'both' action. -moves Use the page move log to find double-redirect candidates. Only works with action "double", does not work with -xml. @@ -66,12 +66,13 @@ &params; """ # -# (C) Pywikibot team, 2004-2022 +# (C) Pywikibot team, 2004-2023 # # Distributed under the terms of the MIT license. # import datetime from contextlib import suppress +from textwrap import fill from typing import Any, Generator, Optional, Union import pywikibot @@ -723,7 +724,12 @@ problem = 'You can only use one of {} options.'.format( ' or '.join(source)) if len(source) > 1 else '' - if suggest_help(additional_text=problem, + + if action == 'both' and '-fullscan' in source: + problem += (' You can only use either -fullscan together with ' + "broken/double action or 'both' action") + + if suggest_help(additional_text=fill(problem), unknown_parameters=unknown, missing_action=not action): return @@ -733,8 +739,12 @@ if gen_factory.namespaces: gen_options['namespaces'] = gen_factory.namespaces gen = RedirectGenerator(action, **gen_options) - options['generator'] = gen_factory.getCombinedGenerator(gen=gen) - bot = RedirectRobot(action, **options) + + if gen_factory.gens \ + or action != 'both' and source not in ('-fullscan', '-xml'): + gen = gen_factory.getCombinedGenerator(gen=gen) + + bot = RedirectRobot(action, generator=gen, **options) bot.run() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/904875 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: Ieffe10248a75877ee79d637bd35ad1585a17684c Gerrit-Change-Number: 904875 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[master]: [fix] Decrease needed mwpfh version to 0.5.2
by Xqt (Code Review) 04 Apr '23

04 Apr '23

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/905545 ) Change subject: [fix] Decrease needed mwpfh version to 0.5.2 ...................................................................... [fix] Decrease needed mwpfh version to 0.5.2 mwpfh version 0.5.2 is available on toolforge. Pywikibot uses an external installation which is not detected via pkg_resources in wrapper.py script. Bug: T326498 Bug: T327600 Change-Id: I729e8736ca17788442669f75d1cc190e8ed3c34c --- M setup.py M requirements.txt 2 files changed, 17 insertions(+), 2 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/requirements.txt b/requirements.txt index 67bdf87..1c7e5ed 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ # $ awk -F '[#>=]' '{print $1}' requirements.txt | xargs apt-cache search # mandatory dependencies, others are optional -mwparserfromhell>=0.6.3 +mwparserfromhell>=0.5.2 requests>=2.21.0, < 2.28.0; python_version < '3.7' requests>=2.21.0; python_version >= '3.7' setuptools>=48.0.0 ; python_version >= '3.10' diff --git a/setup.py b/setup.py index e2d203f..8ac1364 100755 --- a/setup.py +++ b/setup.py @@ -86,7 +86,7 @@ # ------- setup install_requires ------- # # packages which are mandatory dependencies = [ - 'mwparserfromhell>=0.6.3', + 'mwparserfromhell>=0.5.2', 'requests>=2.21.0, <2.28.0; python_version < "3.7"', 'requests>=2.21.0; python_version>="3.7"', # PEP 440 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/905545 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: I729e8736ca17788442669f75d1cc190e8ed3c34c Gerrit-Change-Number: 905545 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]: [doc] Update ROADMAP.rst and other documentation
by jenkins-bot (Code Review) 03 Apr '23

03 Apr '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/905253 ) Change subject: [doc] Update ROADMAP.rst and other documentation ...................................................................... [doc] Update ROADMAP.rst and other documentation Change-Id: Ie985aae2fcdecd2d8b713aaf2213f211e5ca7a34 --- M pywikibot/exceptions.py M ROADMAP.rst M scripts/CHANGELOG.rst M pywikibot/page/_wikibase.py 4 files changed, 32 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index a072b85..28f8138 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,9 +1,12 @@ Current release --------------- +* Raise :exc:`exceptions.NoSiteLinkError` instead of :exc:`exceptions.NoPageError` when sitelink + is missing in :meth:`ItemPage.getSitelink()<pywikibot.ItemPage.getSitelink>` (:phab:`T332341`) * :exc:`exceptions.ClientError` was added * Raise :exc:`exceptions.NoPageError` when deleting a missing Page (:phab:`T332924`) * ``text`` parameter of :class:`proofreadpage.PagesTagParser` has a default value +* L10N updates * Ignore talk pages with :meth:`APISite.watched_pages()<pywikibot.site._generators.GeneratorsMixin.watched_pages>` (:phab:`T330806`) * Load page info when creating a page if not updated previously (:phab:`T330980`) * Improve flush exception logging @@ -12,6 +15,7 @@ Deprecations ------------ +* 8.1.0: Dependency of :exc:`exceptions.NoSiteLinkError` from :exc:`exceptions.NoPageError` will be removed * 8.1.0: ``exceptions.Server414Error`` is deprecated in favour of :exc:`exceptions.Client414Error` * 8.0.0: :meth:`Timestamp.clone()<pywikibot.time.Timestamp.clone>` method is deprecated in favour of ``Timestamp.replace()`` method. diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index 9cd518a..cfe4601 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -400,7 +400,12 @@ class NoSiteLinkError(PageLoadRelatedError, NoPageError): - """ItemPage has no sitelink to the given language.""" + """ItemPage has no sitelink to the given language. + + .. versionadded:: 8.1 + .. deprecated:: 8.1 + :exc:`NoPageError` dependency. + """ def __init__(self, page: 'pywikibot.page.ItemPage', lang: str) -> None: """Initializer. diff --git a/pywikibot/page/_wikibase.py b/pywikibot/page/_wikibase.py index d904039..0e278c8 100644 --- a/pywikibot/page/_wikibase.py +++ b/pywikibot/page/_wikibase.py @@ -1076,11 +1076,13 @@ yield pg def getSitelink(self, site, force: bool = False) -> str: - """ - Return the title for the specific site. + """Return the title for the specific site. If the item doesn't have that language, raise NoSiteLinkError. + .. versionchanged:: 8.1 + raises NoSiteLinkError instead of NoPageError. + :param site: Site to find the linked page of. :type site: pywikibot.Site or database name :param force: override caching diff --git a/scripts/CHANGELOG.rst b/scripts/CHANGELOG.rst index 01c5615..30f2c59 100644 --- a/scripts/CHANGELOG.rst +++ b/scripts/CHANGELOG.rst @@ -1,6 +1,15 @@ Scripts Changelog ================= +8.1.0 +----- + +archivebot +~~~~~~~~~~ + +* Processing speed was improved and is up to 20 times faster, 2-3 times on average + + 8.0.2 ----- -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/905253 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: Ie985aae2fcdecd2d8b713aaf2213f211e5ca7a34 Gerrit-Change-Number: 905253 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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits