Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
15358 discussions

[Gerrit] ...core[master]: Allow -user to override OAuth authentication
by jenkins-bot (Code Review) 05 Oct '26

05 Oct '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1323814?usp=email ) Change subject: Allow -user to override OAuth authentication ...................................................................... Allow -user to override OAuth authentication Remember usernames selected by the global -user option. When a site's OAuth token authenticates as another user, disable OAuth for that site and retry with the selected user's cookie or password credentials. Keep OAuth enabled when identities match and preserve configuration mismatch errors without an explicit override. Bug: T420084 Change-Id: I9caf1ea43a1a91dccbd500e54f156089ed4bcde1 --- M pywikibot/bot.py M pywikibot/comms/http.py M pywikibot/site/_apisite.py M tests/bot_tests.py M tests/http_tests.py M tests/site_tests.py 6 files changed, 179 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 8981cae..4afbfa3 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -282,6 +282,8 @@ #: global args used by tests via pwb wrapper global_args: list[str] | None = None +#: site and username selected with the global ``-user`` option +_user_override: tuple[str, str, str] | None = None def set_interface(module_name: str) -> None: @@ -780,7 +782,7 @@ # not the one in pywikibot.bot. args = pywikibot.argvu[1:] - global global_args + global global_args, _user_override global_args = args # get the name of the module calling this function. This is @@ -883,6 +885,7 @@ non_global_args.append(arg) if username: + _user_override = (config.family, config.mylang, username) config.usernames[config.family][config.mylang] = username init_handlers() diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index c9e6cf7..bf09359 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -327,6 +327,8 @@ headers['user-agent'] = user_agent(site, format_string) baseuri = site.base_url(uri, protocol=kwargs.pop('protocol', None)) + if getattr(site, '_oauth_disabled', False): + kwargs.setdefault('auth', None) r = fetch(baseuri, headers=headers, **kwargs) retry_after = r.headers.get('retry-after', '0') # literal of retry_after may int or float (T414197) @@ -455,6 +457,9 @@ :type verify: bool or path to certificates :keyword callbacks: Methods to call once data is fetched :type callbacks: list of callable + :keyword auth: Authentication handler. If omitted, authentication is read + from :attr:`config.authenticate`; use ``None`` to disable configured + authentication. """ # Change user agent depending on fake UA settings. # Set header to new UA if needed. @@ -496,8 +501,11 @@ charset = kwargs.pop('charset', None) - auth = get_authentication(uri) - if auth is not None and len(auth) == 4: + if 'auth' in kwargs: + auth = kwargs.pop('auth') + else: + auth = get_authentication(uri) + if isinstance(auth, tuple) and len(auth) == 4: if isinstance(requests_oauthlib, ImportError): raise ModuleNotFoundError(f"""{requests_oauthlib}. Install it with diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 6185563..c4027b2 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -18,7 +18,7 @@ from warnings import warn import pywikibot -from pywikibot import login +from pywikibot import bot, login from pywikibot.comms import http from pywikibot.data import api from pywikibot.exceptions import ( @@ -135,6 +135,7 @@ ) -> None: """Initializer.""" super().__init__(code, fam, user) + self._oauth_disabled = False self._globaluserinfo: dict[int | str, Any] = {} self._interwikimap = _InterwikiMap(self) self._msgcache: dict[str, str] = {} @@ -339,9 +340,21 @@ def is_oauth_token_available(self) -> bool: """Check whether OAuth token is set for this site.""" + if getattr(self, '_oauth_disabled', False): + return False auth_token = http.get_authentication(self.base_url('')) return auth_token is not None and len(auth_token) == 4 + def _is_global_user_override(self) -> bool: + """Return whether this site uses the global ``-user`` option.""" + override = bot._user_override + return ( + override is not None + and self.family.name == override[0] + and self.code == override[1] + and normalize_username(override[2]) == self.username() + ) + def login( self, autocreate: bool = False, @@ -411,6 +424,19 @@ raise if self.is_oauth_token_available(): + if (self.userinfo['name'] != self.username() + and self._is_global_user_override()): + oauth_user = self.userinfo['name'] + self._oauth_disabled = True + pywikibot.info( + f'OAuth authentication on {self} uses {oauth_user}; ' + f'ignoring it because -user:{self.username()} was given.') + del self.userinfo + self._loginstatus = login.LoginStatus.NOT_ATTEMPTED + self.login(autocreate=autocreate, user=user, + cookie_only=cookie_only) + return + if self.userinfo['name'] == self.username(): error_msg = f'Logging in on {self} via OAuth failed' elif self.username() is None: diff --git a/tests/bot_tests.py b/tests/bot_tests.py index bc829d5..7de4e39 100755 --- a/tests/bot_tests.py +++ b/tests/bot_tests.py @@ -12,10 +12,11 @@ from contextlib import suppress from tempfile import TemporaryDirectory from textwrap import dedent +from unittest.mock import patch import pywikibot import pywikibot.bot -from pywikibot import i18n +from pywikibot import config, i18n from tests.aspects import DefaultSiteTestCase, SiteAttributeTestCase, TestCase from tests.utils import execute @@ -78,6 +79,31 @@ super().setUpClass() +class TestHandleArgs(TestCase): + + """Test global argument handling.""" + + net = False + + @patch('pywikibot.bot.init_handlers') + @patch('pywikibot.bot.writeToCommandLogFile') + @patch('pywikibot.bot.calledModuleName', + return_value='generate_user_files') + def test_user_override(self, *unused) -> None: + """Test that an explicit username override is retained.""" + with patch.object(config, 'family', 'wikipedia'), \ + patch.object(config, 'mylang', 'test'), \ + patch.object(pywikibot.bot, '_user_override', None), \ + patch.object(pywikibot, '_sites', {}), \ + patch.dict(config.usernames['wikipedia'], {}, clear=True): + result = pywikibot.handle_args(['-user:Xqt'], do_help=False) + + self.assertIsEmpty(result) + self.assertEqual(pywikibot.bot._user_override, + ('wikipedia', 'test', 'Xqt')) + self.assertEqual(config.usernames['wikipedia']['test'], 'Xqt') + + class TestBotTreatExit: """Mixin to provide handling for treat and exit.""" diff --git a/tests/http_tests.py b/tests/http_tests.py index e6db15d..7f8284b 100755 --- a/tests/http_tests.py +++ b/tests/http_tests.py @@ -86,6 +86,19 @@ for url, auth in pairs.items(): self.assertEqual(http.get_authentication(url), auth) + @patch.object(http.session, 'request') + def test_disable_url_authentication(self, request) -> None: + """Test configured authentication can be explicitly disabled.""" + response = requests.Response() + response.request = requests.Request(headers={}) + response.url = 'https://en.wikipedia.beta.wmcloud.org' + response._content = b'' + request.return_value = response + http.fetch('https://en.wikipedia.beta.wmcloud.org', auth=None, + default_error_handling=False) + + self.assertIsNone(request.call_args.kwargs['auth']) + class HttpsCertificateTestCase(TestCase): diff --git a/tests/site_tests.py b/tests/site_tests.py index 9cb2d17..ed8ef56 100755 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -15,19 +15,22 @@ from collections.abc import Iterable, Mapping from contextlib import suppress from unittest import mock -from unittest.mock import patch +from unittest.mock import Mock, patch import pywikibot from pywikibot import config +from pywikibot.comms import http from pywikibot.exceptions import ( APIError, Error, IsNotRedirectPageError, NoPageError, + NoUsernameError, PageInUseError, UnknownExtensionError, UnknownSiteError, ) +from pywikibot.login import LoginStatus from tests.aspects import ( DefaultSiteTestCase, DeprecationTestCase, @@ -39,6 +42,100 @@ from tests.basepage import BasePageLoadRevisionsCachingTestBase +class _OAuthLoginSite(pywikibot.site.APISite): + + """APISite stub providing OAuth and cookie identities.""" + + def __init__(self, oauth_user: str, cookie_user: str | None) -> None: + pywikibot.site.BaseSite.__init__( + self, 'test', 'wikipedia', user='Xqt') + self._oauth_user = oauth_user + self._cookie_user = cookie_user + self._oauth_disabled = False + self._userinfo = {} + self._loginstatus = LoginStatus.NOT_ATTEMPTED + + @property + def userinfo(self) -> dict: + """Return the identity for the effective authentication method.""" + username = (self._cookie_user if self._oauth_disabled + else self._oauth_user) + if username is None: + return {'name': '', 'id': 0, 'anon': ''} + return {'name': username, 'id': 1} + + @userinfo.deleter + def userinfo(self) -> None: + """Ignore attempts to clear the generated userinfo.""" + + +class TestOAuthUserOverride(PatchingTestCase): + + """Test OAuth interaction with the global ``-user`` option.""" + + net = False + oauth_tokens = ('consumer', 'secret', 'access', 'secret') + + def setUp(self) -> None: + """Set OAuth and site configuration.""" + super().setUp() + self.patch(config, 'authenticate', + {'*.wikipedia.org': self.oauth_tokens}) + self.patch(config, 'family', 'wikipedia') + self.patch(config, 'mylang', 'test') + self.patch(http.cookie_jar, 'load', Mock()) + + def test_matching_oauth_user(self) -> None: + """Keep OAuth when its identity matches the explicit username.""" + site = _OAuthLoginSite('Xqt', None) + override = ('wikipedia', 'test', 'Xqt') + with patch.object(pywikibot.bot, '_user_override', override), \ + patch.object(pywikibot, 'info') as info: + site.login(cookie_only=True) + + self.assertFalse(site._oauth_disabled) + self.assertTrue(site.logged_in()) + info.assert_not_called() + + def test_mismatching_oauth_user_override(self) -> None: + """Bypass OAuth when ``-user`` requests another identity.""" + site = _OAuthLoginSite('Pywikibot-oauth', 'Xqt') + override = ('wikipedia', 'test', 'Xqt') + with patch.object(pywikibot.bot, '_user_override', override), \ + patch.object(pywikibot, 'info') as info: + site.login(cookie_only=True) + + self.assertTrue(site._oauth_disabled) + self.assertTrue(site.logged_in()) + info.assert_called_once_with( + 'OAuth authentication on wikipedia:test uses Pywikibot-oauth; ' + 'ignoring it because -user:Xqt was given.') + + def test_mismatching_configured_oauth_user(self) -> None: + """Reject an OAuth mismatch without an explicit user override.""" + site = _OAuthLoginSite('Pywikibot-oauth', 'Xqt') + with patch.object(pywikibot.bot, '_user_override', None), \ + self.assertRaisesRegex(NoUsernameError, + 'via OAuth as Pywikibot-oauth'): + site.login(cookie_only=True) + + self.assertFalse(site._oauth_disabled) + + def test_disabled_oauth_not_added_to_request(self) -> None: + """Do not add configured OAuth to requests for an override site.""" + site = _OAuthLoginSite('Pywikibot-oauth', 'Xqt') + site._oauth_disabled = True + response = Mock(headers={}) + + with patch.object(http, 'fetch', return_value=response) as fetch: + http.request(site, site.apipath()) + + self.assertIsNone(fetch.call_args.kwargs['auth']) + self.assertEqual( + http.get_authentication('https://en.wikipedia.org'), + self.oauth_tokens) + + class TestSiteObject(DefaultSiteTestCase): """Test cases for Site methods.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1323814?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I9caf1ea43a1a91dccbd500e54f156089ed4bcde1 Gerrit-Change-Number: 1323814 Gerrit-PatchSet: 6 Gerrit-Owner: Mahveotm <mahveotm(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: Simplify username and PetScan query merges
by jenkins-bot (Code Review) 05 Oct '26

05 Oct '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1346441?usp=email ) Change subject: Simplify username and PetScan query merges ...................................................................... Simplify username and PetScan query merges Combine wildcard and family-specific usernames with a dictionary union, retaining family-specific precedence without inserting a missing wildcard into the configuration defaultdict. Merge extra PetScan options into the newly constructed query instead of copying it first. Keep caller-provided mappings unchanged. Change-Id: I089c4e42f06b1d45e14ba3f6bfea3ba876fc4836 --- M pywikibot/__init__.py M pywikibot/pagegenerators/_generators.py 2 files changed, 5 insertions(+), 7 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 64ef994..a738738 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -254,10 +254,9 @@ issue_deprecation_warning( 'wikisource:beta', 'betawikisource:en', since='11.8.0') - code_to_user = {} - if '*' in _config.usernames: # T253127: usernames is a defaultdict - code_to_user = _config.usernames['*'].copy() - code_to_user.update(_config.usernames[family_name]) + # T253127: Do not insert a missing wildcard into the defaultdict. + code_to_user = (_config.usernames.get('*', {}) + | _config.usernames[family_name]) user = user or code_to_user.get(code) or code_to_user.get('*') if not isinstance(interface, type): diff --git a/pywikibot/pagegenerators/_generators.py b/pywikibot/pagegenerators/_generators.py index 4dcf807..d698be7 100644 --- a/pywikibot/pagegenerators/_generators.py +++ b/pywikibot/pagegenerators/_generators.py @@ -1452,10 +1452,9 @@ for namespace in namespaces: query[f'ns[{int(namespace)}]'] = 1 - query_final = query.copy() - query_final.update(extra_options) + query |= extra_options - return query_final + return query def query(self) -> Generator[dict[str, Any]]: """Query PetScan. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1346441?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I089c4e42f06b1d45e14ba3f6bfea3ba876fc4836 Gerrit-Change-Number: 1346441 Gerrit-PatchSet: 2 Gerrit-Owner: Mahveotm <mahveotm(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: time: Simplify ISO 8601 timezone parsing with strptime
by jenkins-bot (Code Review) 05 Oct '26

05 Oct '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1336850?usp=email ) Change subject: time: Simplify ISO 8601 timezone parsing with strptime ...................................................................... time: Simplify ISO 8601 timezone parsing with strptime Python 3.7 added support for Z and colon-separated offsets to strptime's %z directive, so all supported Python versions can parse them directly. Use %z for both forms and retain padding for abbreviated offsets and conversion to naive UTC. Change-Id: Ib3b1c2826187c21342a594be562256bef4885b18 --- M pywikibot/time.py 1 file changed, 6 insertions(+), 8 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/time.py b/pywikibot/time.py index 0603390..3f970f8 100644 --- a/pywikibot/time.py +++ b/pywikibot/time.py @@ -160,14 +160,12 @@ strpfmt += '.%f' strpstr += m['u'].replace(',', '.') # .ljust(7, '0') - if m['tz']: - if m['tz'] == 'Z': - strpfmt += 'Z' - strpstr += 'Z' - else: - strpfmt += '%z' - # strptime wants HHMM, without ':' - strpstr += (m['tz'].replace(':', '')).ljust(5, '0') + if tz := m['tz']: + strpfmt += '%z' + if tz != 'Z': + # Complete abbreviated offsets, preserving any colon. + tz = tz.ljust(6 if ':' in tz else 5, '0') + strpstr += tz ts = cls.strptime(strpstr, strpfmt) if ts.tzinfo is not None: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1336850?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ib3b1c2826187c21342a594be562256bef4885b18 Gerrit-Change-Number: 1336850 Gerrit-PatchSet: 3 Gerrit-Owner: Mahveotm <mahveotm(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: Use built-in methods for exact prefix and suffix removal
by jenkins-bot (Code Review) 05 Oct '26

05 Oct '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1346433?usp=email ) Change subject: Use built-in methods for exact prefix and suffix removal ...................................................................... Use built-in methods for exact prefix and suffix removal Replace guarded leading-dash slices in script option parsers with removeprefix(). Use removesuffix() for extracted textlib footers and the trailing dot in abbreviated month names. Retain validation branches and slicing that depends on case-insensitive matching, parsed positions or overlapping delimiters. Change-Id: I3f77967b332e165ce1db0839341ac5cf95a36765 --- M pywikibot/textlib.py M scripts/archivebot.py M scripts/clean_sandbox.py M scripts/download_dump.py M scripts/interwikidata.py M scripts/misspelling.py M scripts/movepages.py M scripts/newitem.py M scripts/nowcommons.py M scripts/parser_function_count.py M scripts/protect.py M scripts/revertbot.py 12 files changed, 16 insertions(+), 18 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 7da87fc..71c05b2 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -1381,9 +1381,9 @@ if footer: if sections: sections[-1] = Section( - sections[-1].title, last_section_content[:-len(footer)]) + sections[-1].title, last_section_content.removesuffix(footer)) else: - header = header[:-len(footer)] + header = header.removesuffix(footer) return Content(header, sections, footer) @@ -2295,7 +2295,7 @@ # in some cases month in ~~~~ might end without dot even if # site.months_names do not. if short.endswith('.'): - self.origNames2monthNum[func(short[:-1])] = n + self.origNames2monthNum[func(short.removesuffix('.'))] = n timeR = (r'(?P<time>(?P<hour>([0-1]\d|2[0-3]))[:\.h]' r'(?P<minute>[0-5]\d))') diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 979ea68..c584d9c 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -1060,7 +1060,7 @@ if not option.startswith('-'): templates.append(arg) continue - option = option[1:] + option = option.removeprefix('-') if option in ('file', 'filename'): filename = value elif option == 'locale': diff --git a/scripts/clean_sandbox.py b/scripts/clean_sandbox.py index 5581314..d49b035 100755 --- a/scripts/clean_sandbox.py +++ b/scripts/clean_sandbox.py @@ -319,7 +319,7 @@ if not opt.startswith('-'): continue - opt = opt[1:] + opt = opt.removeprefix('-') if opt == 'hours': opts[opt] = float(value) elif opt == 'delay': diff --git a/scripts/download_dump.py b/scripts/download_dump.py index bce2ac0..b49a3d8 100755 --- a/scripts/download_dump.py +++ b/scripts/download_dump.py @@ -202,7 +202,7 @@ for arg in local_args: option, _, value = arg.partition(':') if option.startswith('-'): - option = option[1:] + option = option.removeprefix('-') if option == 'filename': opts[option] = value or pywikibot.input('Enter the filename: ') diff --git a/scripts/interwikidata.py b/scripts/interwikidata.py index 1e8c66c..6b1aa53 100755 --- a/scripts/interwikidata.py +++ b/scripts/interwikidata.py @@ -246,7 +246,7 @@ for arg in local_args: option, _, value = arg.partition(':') if option.startswith('-'): - option = option[1:] + option = option.removeprefix('-') else: continue diff --git a/scripts/misspelling.py b/scripts/misspelling.py index 0756619..999c141 100755 --- a/scripts/misspelling.py +++ b/scripts/misspelling.py @@ -171,7 +171,7 @@ opt, _, value = arg.partition(':') if not opt.startswith('-'): continue - opt = opt[1:] + opt = opt.removeprefix('-') if opt == 'always': # the option that's always selected when the bot wonders # what to do with a link. If it's None, the user is prompted diff --git a/scripts/movepages.py b/scripts/movepages.py index 2676324..f86c914 100755 --- a/scripts/movepages.py +++ b/scripts/movepages.py @@ -231,7 +231,7 @@ opt, _, value = arg.partition(':') if not opt.startswith('-'): continue - opt = opt[1:] + opt = opt.removeprefix('-') if opt == 'pairsfile': filename = value or pywikibot.input( 'Enter the name of the file containing pairs:') diff --git a/scripts/newitem.py b/scripts/newitem.py index 0d32c4d..e2578da 100755 --- a/scripts/newitem.py +++ b/scripts/newitem.py @@ -193,7 +193,7 @@ for arg in local_args: if arg.startswith(('-pageage:', '-lastedit:')): key, val = arg.split(':', 1) - options[key[1:]] = int(val) + options[key.removeprefix('-')] = int(val) elif gen.handle_arg(arg): pass else: diff --git a/scripts/nowcommons.py b/scripts/nowcommons.py index d62938a..940d2c7 100755 --- a/scripts/nowcommons.py +++ b/scripts/nowcommons.py @@ -406,11 +406,9 @@ if arg == '-replacealways': options['replace'] = True options['replacealways'] = True - elif arg.startswith('-') and arg[1:] in ('always', - 'replace', - 'replaceloose', - 'replaceonly'): - options[arg[1:]] = True + elif arg.startswith('-') and (option := arg.removeprefix('-')) in ( + 'always', 'replace', 'replaceloose', 'replaceonly'): + options[option] = True bot = NowCommonsDeleteBot(**options) bot.run() diff --git a/scripts/parser_function_count.py b/scripts/parser_function_count.py index f7cc5ac..01a2b7a 100755 --- a/scripts/parser_function_count.py +++ b/scripts/parser_function_count.py @@ -175,7 +175,7 @@ opt, _, value = arg.partition(':') if not opt.startswith('-'): continue - opt = opt[1:] + opt = opt.removeprefix('-') if opt == 'start': options[opt] = value or pywikibot.input( 'From which title do you want to continue?') diff --git a/scripts/protect.py b/scripts/protect.py index c1c6414..f6d744f 100755 --- a/scripts/protect.py +++ b/scripts/protect.py @@ -184,7 +184,7 @@ if not option.startswith('-'): continue - option = option[1:] + option = option.removeprefix('-') if option == 'always': options[option] = True elif option == 'summary': diff --git a/scripts/revertbot.py b/scripts/revertbot.py index debe6d9..d919f7a 100755 --- a/scripts/revertbot.py +++ b/scripts/revertbot.py @@ -256,7 +256,7 @@ opt, _, value = arg.partition(':') if not opt.startswith('-'): continue - opt = opt[1:] + opt = opt.removeprefix('-') if opt == 'username': options['user'] = value or pywikibot.input( 'Please enter username of the person you want to revert:') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1346433?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I3f77967b332e165ce1db0839341ac5cf95a36765 Gerrit-Change-Number: 1346433 Gerrit-PatchSet: 3 Gerrit-Owner: Mahveotm <mahveotm(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: tests: Keep new property label and description distinct
by jenkins-bot (Code Review) 05 Oct '26

05 Oct '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1348690?usp=email ) Change subject: tests: Keep new property label and description distinct ...................................................................... tests: Keep new property label and description distinct The timestamped label introduced for T367323 matches the description. Wikibase rejects equal labels and descriptions with modification-failed. Use distinct description wording while retaining the unique label. Bug: T367323 Change-Id: I3ef4735a3e02429694eb1baa354c8f3af5f117c4 --- M tests/wikibase_edit_tests.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py index cb5df66..b35c16b 100755 --- a/tests/wikibase_edit_tests.py +++ b/tests/wikibase_edit_tests.py @@ -173,7 +173,7 @@ 'descriptions': { 'en': { 'language': 'en', - 'value': 'Pywikibot test new property - ' + ts, + 'value': 'Property created by Pywikibot test - ' + ts, } } } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1348690?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I3ef4735a3e02429694eb1baa354c8f3af5f117c4 Gerrit-Change-Number: 1348690 Gerrit-PatchSet: 2 Gerrit-Owner: Mahveotm <mahveotm(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: tests: Test framework with Python 3.16-dev
by Xqt (Code Review) 05 Oct '26

05 Oct '26

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1351192?usp=email ) Change subject: tests: Test framework with Python 3.16-dev ...................................................................... tests: Test framework with Python 3.16-dev Change-Id: Ia0a57af4a5983693a9216682285de9a50a824b68 --- M .github/workflows/doctest.yml M .github/workflows/login_tests-ci.yml M .github/workflows/oauth_tests-ci.yml M .github/workflows/pywikibot-ci.yml 4 files changed, 39 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index e15a12d..5009d3e 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -28,6 +28,8 @@ os: [windows-latest, macOS-latest, ubuntu-latest] include: - python-version: 3.15-dev + - python-version: 3.16-dev + experimental: true exclude: # Test already made on Jenkins - python-version: '3.10' os: ubuntu-latest @@ -41,9 +43,15 @@ persist-credentials: false - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v7 + if: matrix.python-version != '3.16-dev' with: python-version: ${{ matrix.python-version }} allow-prereleases: ${{ endsWith(matrix.python-version, '-dev') }} + - name: Set up Python ${{ matrix.python-version }} + uses: deadsnakes/action(a)v3.2.0 + if: matrix.python-version == '3.16-dev' + with: + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml index 1f14029..c239c8f 100644 --- a/.github/workflows/login_tests-ci.yml +++ b/.github/workflows/login_tests-ci.yml @@ -77,6 +77,9 @@ - python-version: '3' site: wikipedia:de os: macOS-latest + - python-version: 3.16-dev + site: wikipedia:test + experimental: true steps: - name: Checkout Repository uses: actions/checkout@v7 @@ -85,9 +88,15 @@ persist-credentials: false - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v7 + if: matrix.python-version != '3.16-dev' with: python-version: ${{ matrix.python-version }} allow-prereleases: ${{ endsWith(matrix.python-version, '-dev') }} + - name: Set up Python ${{ matrix.python-version }} + uses: deadsnakes/action(a)v3.2.0 + if: matrix.python-version == '3.16-dev' + with: + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index aa14b95..68055b8 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -39,6 +39,11 @@ code: [test] domain: [test.wikipedia.org] include: + - python-version: 3.16-dev + family: wikipedia + code: test + domain: test.wikipedia.org + experimental: true - python-version: '3.9' family: betawikipedia code: en @@ -55,9 +60,15 @@ persist-credentials: false - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v7 + if: matrix.python-version != '3.16-dev' with: python-version: ${{ matrix.python-version }} allow-prereleases: ${{ endsWith(matrix.python-version, '-dev') }} + - name: Set up Python ${{ matrix.python-version }} + uses: deadsnakes/action(a)v3.2.0 + if: matrix.python-version == '3.16-dev' + with: + python-version: ${{ matrix.python-version }} - name: Get token name env: _oauth_token: OAUTH_TOKEN_${{ matrix.family }}_${{ matrix.code }} diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index ce4b263..e5f01ec 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -64,6 +64,9 @@ site: wikipedia:test - python-version: 3.14t site: wikipedia:test + - python-version: 3.16-dev + site: wikipedia:test + experimental: true # ubuntu-22.04 required 3.15-dev due to T382214 - python-version: 3.15-dev site: wikipedia:en @@ -79,15 +82,22 @@ persist-credentials: false - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v7 + if: matrix.python-version != '3.16-dev' with: python-version: ${{ matrix.python-version }} allow-prereleases: ${{ endsWith(matrix.python-version, '-dev') }} + - name: Set up Python ${{ matrix.python-version }} + uses: deadsnakes/action(a)v3.2.0 + if: matrix.python-version == '3.16-dev' + with: + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip pip --version pip install -r dev-requirements.txt - if [ "${{ matrix.python-version }}" = "3.13t" ]; then + if [ "${{ matrix.python-version }}" = "3.13t" ] || + [ "${{ matrix.python-version }}" = "3.16-dev" ]; then pip install '.[all-no-gui]' else pip install -r requirements.txt -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1351192?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ia0a57af4a5983693a9216682285de9a50a824b68 Gerrit-Change-Number: 1351192 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: user: Rename force parameter to refresh
by Xqt (Code Review) 04 Oct '26

04 Oct '26

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1350308?usp=email ) Change subject: user: Rename force parameter to refresh ...................................................................... user: Rename force parameter to refresh In User methods force only drops the cached user properties and reloads them; it does not override any restriction. Rename it to refresh and keep force working through @deprecated_args for the deprecation period. save(force=...) and botMayEdit(force=...) keep the old name, where the parameter really does override something. Bug: T433225 Change-Id: I757e0fc188f4700714623d112102f3926fdf1999 --- M ROADMAP.rst M pywikibot/page/_user.py M tests/user_tests.py 3 files changed, 132 insertions(+), 46 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/ROADMAP.rst b/ROADMAP.rst index 020fef9..5706226 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,6 +1,8 @@ Release 11.9 ============ +* The *force* parameter of :class:`pywikibot.User` methods was renamed to + *refresh* (:phab:`T433225`) * Suggest installing all requirements for missing dependencies with :mod:`pwb<pywikibot.scripts.wrapper>` wrapper. * Various performance, stability, and code quality improvements. @@ -107,6 +109,8 @@ Pending removal in Pywikibot 14 ------------------------------- +* 11.9.0: The *force* parameter of :class:`pywikibot.User` methods was renamed to + *refresh*. The old parameter name will be removed. (:phab:`T433225`) * 11.8.0: Public *reason* and *comment* parameters used for page-action and upload summaries were renamed to *summary*. The old parameter names will be removed. (:phab:`T62442`) diff --git a/pywikibot/page/_user.py b/pywikibot/page/_user.py index 5956b8a..d37c930 100644 --- a/pywikibot/page/_user.py +++ b/pywikibot/page/_user.py @@ -22,7 +22,7 @@ from pywikibot.page._page import Page from pywikibot.page._revision import Revision from pywikibot.time import Timestamp -from pywikibot.tools import is_ip_address, is_ip_network +from pywikibot.tools import deprecated_args, is_ip_address, is_ip_network from pywikibot.tools.collections import DataRecord @@ -101,7 +101,8 @@ return '#' + self.title(with_ns=False) return self.title(with_ns=False) - def isRegistered(self, force: bool = False) -> bool: # noqa: N802 + @deprecated_args(force='refresh') # since 11.9.0 + def isRegistered(self, refresh: bool = False) -> bool: # noqa: N802 """Determine if the user is registered on the site. It is possible to have a page named ``User:xyz`` and not have a @@ -117,13 +118,16 @@ - :meth:`is_temporary` - :meth:`is_named` - :param force: If True, forces reloading the data from API + .. version-changed:: 11.9 + The *force* parameter was renamed to *refresh*. + + :param refresh: If True, forces reloading the data from API :return: True if the user is either a named (regular) user or a temporary account. """ # T135828: the registration timestamp may be None but the key exists return (not self.isAnonymous() - and 'registration' in self.getprops(force)) + and 'registration' in self.getprops(refresh)) def isAnonymous(self) -> bool: # noqa: N802 """Determine if the user is editing as an IP address. @@ -148,7 +152,8 @@ """ return is_ip_network(self.username) - def is_named(self, *, force: bool = False) -> bool: + @deprecated_args(force='refresh') # since 11.9.0 + def is_named(self, *, refresh: bool = False) -> bool: """Determine if the user is a regular named account. A named account is neither an IP nor a temporary account. @@ -159,9 +164,12 @@ - :meth:`isAnonymous` - :meth:`is_temporary` - :param force: If True, forces reloading the data from API + .. version-changed:: 11.9 + The *force* parameter was renamed to *refresh*. + + :param refresh: If True, forces reloading the data from API """ - return self.isRegistered(force) and not self.is_temporary() + return self.isRegistered(refresh) and not self.is_temporary() def is_temporary(self) -> bool: """Determine if the user is a temporary account. @@ -175,7 +183,8 @@ """ return 'temp' in self.groups() - def temp_expired(self, force: bool = False) -> bool | None: + @deprecated_args(force='refresh') # since 11.9.0 + def temp_expired(self, refresh: bool = False) -> bool | None: """Indicates whether the temporary account has expired or not. If account isn't temporary, None is returned. @@ -183,16 +192,20 @@ .. version-added:: 11.4 .. seealso:: :meth:`is_temporary` - :param force: If True, forces reloading the data from API + .. version-changed:: 11.9 + The *force* parameter was renamed to *refresh*. + + :param refresh: If True, forces reloading the data from API """ if not self.is_temporary(): return None - return 'tempexpired' in self.getprops(force, ['tempexpired']) + return 'tempexpired' in self.getprops(refresh, ['tempexpired']) + @deprecated_args(force='refresh') # since 11.9.0 def getprops( self, - force: bool = False, + refresh: bool = False, extra_props: Iterable[str] = () ) -> dict[str, Any]: """Return user properties. @@ -201,8 +214,10 @@ detect range blocks .. version-changed:: 11.4 Added the *extra_props* parameter. + .. version-changed:: 11.9 + The *force* parameter was renamed to *refresh*. - :param force: If True, forces reloading the data from API + :param refresh: If True, forces reloading the data from API :param extra_props: Additional user properties to request. """ if not hasattr(self, '_additional_props'): @@ -214,7 +229,7 @@ new_props = bool(missing) self._additional_props.update(missing) - if (force or new_props) and hasattr(self, '_userprops'): + if (refresh or new_props) and hasattr(self, '_userprops'): self._userprops: dict[str, Any] del self._userprops @@ -230,28 +245,37 @@ return self._userprops + @deprecated_args(force='refresh') # since 11.9.0 def registration(self, - force: bool = False) -> pywikibot.Timestamp | None: + refresh: bool = False) -> pywikibot.Timestamp | None: """Fetch registration date for this user. - :param force: If True, forces reloading the data from API + .. version-changed:: 11.9 + The *force* parameter was renamed to *refresh*. + + :param refresh: If True, forces reloading the data from API """ if not self.isAnonymous(): - reg = self.getprops(force).get('registration') + reg = self.getprops(refresh).get('registration') if reg: return pywikibot.Timestamp.fromISOformat(reg) return None - def editCount(self, force: bool = False) -> int: # noqa: N802 + @deprecated_args(force='refresh') # since 11.9.0 + def editCount(self, refresh: bool = False) -> int: # noqa: N802 """Return edit count for a registered user. Always returns 0 for 'anonymous' users. - :param force: If True, forces reloading the data from API - """ - return self.getprops(force).get('editcount', 0) + .. version-changed:: 11.9 + The *force* parameter was renamed to *refresh*. - def is_blocked(self, force: bool = False) -> bool: + :param refresh: If True, forces reloading the data from API + """ + return self.getprops(refresh).get('editcount', 0) + + @deprecated_args(force='refresh') # since 11.9.0 + def is_blocked(self, refresh: bool = False) -> bool: """Determine whether the user is currently blocked. .. seealso:: @@ -262,12 +286,15 @@ renamed from :meth:`isBlocked` method .. version-changed:: 9.0 can also detect range blocks. + .. version-changed:: 11.9 + The *force* parameter was renamed to *refresh*. - :param force: If True, forces reloading the data from API + :param refresh: If True, forces reloading the data from API """ - return 'blockedby' in self.getprops(force) + return 'blockedby' in self.getprops(refresh) - def is_partial_blocked(self, *, force: bool = False) -> bool: + @deprecated_args(force='refresh') # since 11.9.0 + def is_partial_blocked(self, *, refresh: bool = False) -> bool: """Return True if this user is partially blocked, False otherwise. .. seealso:: @@ -276,12 +303,17 @@ <pywikibot.site._apisite.APISite.is_partial_blocked>` .. version-added:: 11.0 + .. version-changed:: 11.9 + The *force* parameter was renamed to *refresh*. - :param force: If True, forces reloading the data from API + :param refresh: If True, forces reloading the data from API """ - return 'blockpartial' in self.getprops(force) + return 'blockpartial' in self.getprops(refresh) - def get_block_info(self, *, force: bool = False) -> dict[str, Any] | None: + @deprecated_args(force='refresh') # since 11.9.0 + def get_block_info( + self, *, refresh: bool = False + ) -> dict[str, Any] | None: """Return a dictionary of block information if the user is blocked. Returns None if the user is not blocked. @@ -298,23 +330,28 @@ - :meth:`is_partial_blocked` .. version-added:: 11.0 + .. version-changed:: 11.9 + The *force* parameter was renamed to *refresh*. - :param force: If True, forces reloading the data from API + :param refresh: If True, forces reloading the data from API """ - props = self.getprops(force) + props = self.getprops(refresh) if 'blockid' not in props: return None return {k: v for k, v in props.items() if k.startswith('block')} - def is_locked(self, force: bool = False) -> bool: + @deprecated_args(force='refresh') # since 11.9.0 + def is_locked(self, refresh: bool = False) -> bool: """Determine whether the user is currently locked globally. .. version-added:: 7.0 + .. version-changed:: 11.9 + The *force* parameter was renamed to *refresh*. - :param force: If True, forces reloading the data from API + :param refresh: If True, forces reloading the data from API """ - return self.site.is_locked(self.username, force) + return self.site.is_locked(self.username, refresh) def is_globally_blocked(self) -> bool: """Return whether an active global block matches this user. @@ -339,40 +376,56 @@ """ return self.site.is_globally_blocked(self.username) - def isEmailable(self, force: bool = False) -> bool: # noqa: N802 + @deprecated_args(force='refresh') # since 11.9.0 + def isEmailable(self, refresh: bool = False) -> bool: # noqa: N802 """Determine whether emails may be sent to this user through MediaWiki. - :param force: If True, forces reloading the data from API - """ - return not self.isAnonymous() and 'emailable' in self.getprops(force) + .. version-changed:: 11.9 + The *force* parameter was renamed to *refresh*. - def groups(self, force: bool = False) -> list: + :param refresh: If True, forces reloading the data from API + """ + return not self.isAnonymous() and 'emailable' in self.getprops(refresh) + + @deprecated_args(force='refresh') # since 11.9.0 + def groups(self, refresh: bool = False) -> list: """Return a list of groups to which this user belongs. The list of groups may be empty. - :param force: If True, forces reloading the data from API + .. version-changed:: 11.9 + The *force* parameter was renamed to *refresh*. + + :param refresh: If True, forces reloading the data from API :return: Groups property """ - return self.getprops(force).get('groups', []) + return self.getprops(refresh).get('groups', []) - def gender(self, force: bool = False) -> str: + @deprecated_args(force='refresh') # since 11.9.0 + def gender(self, refresh: bool = False) -> str: """Return the gender of the user. - :param force: If True, forces reloading the data from API + .. version-changed:: 11.9 + The *force* parameter was renamed to *refresh*. + + :param refresh: If True, forces reloading the data from API :return: Return 'male', 'female', or 'unknown' """ if self.isAnonymous(): return 'unknown' - return self.getprops(force).get('gender', 'unknown') + return self.getprops(refresh).get('gender', 'unknown') - def rights(self, force: bool = False) -> list: + @deprecated_args(force='refresh') # since 11.9.0 + def rights(self, refresh: bool = False) -> list: """Return user rights. - :param force: If True, forces reloading the data from API + .. version-changed:: 11.9 + The *force* parameter was renamed to *refresh*. + + :param refresh: If True, forces reloading the data from API :return: Return user rights """ - return self.getprops(force).get('rights', []) + return self.getprops(refresh).get('rights', []) def getUserPage(self, subpage: str = '') -> Page: # noqa: N802 """Return a Page object relative to this user's main page. diff --git a/tests/user_tests.py b/tests/user_tests.py index 16d7366..11f52a7 100755 --- a/tests/user_tests.py +++ b/tests/user_tests.py @@ -18,7 +18,7 @@ AutoblockUserError, UnknownExtensionError, ) -from tests.aspects import DefaultSiteTestCase, TestCase +from tests.aspects import DefaultSiteTestCase, DeprecationTestCase, TestCase class TestUserClass(TestCase): @@ -355,6 +355,35 @@ self.assertEqual(event.user(), user.username) +class TestUserRefreshParameter(DeprecationTestCase): + + """Test the rename of the *force* parameter to *refresh*.""" + + family = 'wikipedia' + code = 'de' + dry = True + + def test_refresh(self) -> None: + """Test that refresh is forwarded without a deprecation.""" + user = User(self.site, 'Example') + with patch.object( + User, 'getprops', return_value={'editcount': 7} + ) as getprops: + self.assertEqual(user.editCount(refresh=True), 7) + getprops.assert_called_once_with(True) + self.assertNoDeprecation() + + def test_force_is_deprecated(self) -> None: + """Test that force still works but warns.""" + user = User(self.site, 'Example') + with patch.object( + User, 'getprops', return_value={'editcount': 7} + ) as getprops: + self.assertEqual(user.editCount(force=True), 7) + getprops.assert_called_once_with(True) + self.assertOneDeprecation() + + if __name__ == '__main__': with suppress(SystemExit): unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1350308?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I757e0fc188f4700714623d112102f3926fdf1999 Gerrit-Change-Number: 1350308 Gerrit-PatchSet: 2 Gerrit-Owner: Varshitha <varshithakolupuri100(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: docs: update changelog link to the rendered docs instead of HISTORY.rst
by jenkins-bot (Code Review) 04 Oct '26

04 Oct '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1348495?usp=email ) Change subject: docs: update changelog link to the rendered docs instead of HISTORY.rst ...................................................................... docs: update changelog link to the rendered docs instead of HISTORY.rst The stable documentation is more up to date than the stable branch and includes rendered links to Phabricator tasks and methods. Change-Id: If833e9e3b893ae22bd4caf25d23dc9b53bdbcca2 --- M README.rst 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Mahveotm: Looks good to me, approved diff --git a/README.rst b/README.rst index 81ae5fc..c885b8a 100644 --- a/README.rst +++ b/README.rst @@ -143,7 +143,7 @@ Release history =============== -See https://github.com/wikimedia/pywikibot/blob/stable/HISTORY.rst +See https://doc.wikimedia.org/pywikibot/stable/changelog.html Contributing ============ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1348495?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: If833e9e3b893ae22bd4caf25d23dc9b53bdbcca2 Gerrit-Change-Number: 1348495 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Mahveotm <mahveotm(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: [bugfix] Support custom Timestamp ISO separators
by Xqt (Code Review) 02 Oct '26

02 Oct '26

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1319954?usp=email ) Change subject: [bugfix] Support custom Timestamp ISO separators ...................................................................... [bugfix] Support custom Timestamp ISO separators Pass the requested separator to the ISO 8601 parser and escape it when building the regular expression. This restores round-trip compatibility between Timestamp.isoformat() and Timestamp.fromISOformat() for arbitrary one-character separators. Bug: T396723 Change-Id: Id0e01793dec13beb644393dbcbce750cf04b086a --- M pywikibot/time.py M tests/time_tests.py 2 files changed, 6 insertions(+), 4 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/pywikibot/time.py b/pywikibot/time.py index e345f95..0603390 100644 --- a/pywikibot/time.py +++ b/pywikibot/time.py @@ -133,7 +133,8 @@ return cls.strptime(timestr, cls.mediawikiTSFormat) @classmethod - def _from_iso8601(cls, timestr: str) -> Timestamp: + def _from_iso8601(cls, timestr: str, + separators: str = 'T ') -> Timestamp: """Convert a string in ISO8601 format to a Timestamp object. ISO8601 format: @@ -141,7 +142,8 @@ .. version-added:: 7.5 """ - RE_ISO8601 = (r'(?:\d{4}-\d{2}-\d{2})(?P<sep>[T ])' # noqa: N806 + RE_ISO8601 = (rf'(?:\d{{4}}-\d{{2}}-\d{{2}})' # noqa: N806 + rf'(?P<sep>[{re.escape(separators)}])' r'(?:\d{2}:\d{2}:\d{2})(?P<u>[.,]\d{1,6})?' r'(?P<tz>Z|[+\-]\d{2}:?\d{,2})?' ) @@ -253,7 +255,8 @@ f'ts argument must be a string or a Timestamp object,' f' not {type(ts).__name__}') - return cls._from_iso8601(f'{ts[:10]}{sep}{ts[11:]}') + assert len(sep) == 1 + return cls._from_iso8601(ts, sep) @classmethod def fromtimestampformat(cls, diff --git a/tests/time_tests.py b/tests/time_tests.py index e0e1967..0a90bef 100755 --- a/tests/time_tests.py +++ b/tests/time_tests.py @@ -163,7 +163,6 @@ self.assertEqual(date, str(t1.date())) self.assertEqual(time, str(t1.time())) - @unittest.expectedFailure # T396723 def test_iso_format_with_sep(self) -> None: """Test conversion from and to ISO format with separator.""" sep = '*' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1319954?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Id0e01793dec13beb644393dbcbce750cf04b086a Gerrit-Change-Number: 1319954 Gerrit-PatchSet: 2 Gerrit-Owner: Mahveotm <mahveotm(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: doc: Update ROADMAP.rst and CHANGELOG.rst
by jenkins-bot (Code Review) 02 Oct '26

02 Oct '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1347605?usp=email ) Change subject: doc: Update ROADMAP.rst and CHANGELOG.rst ...................................................................... doc: Update ROADMAP.rst and CHANGELOG.rst Change-Id: I284909a8db815980dc69e1040811aa7def33175e --- M ROADMAP.rst M scripts/CHANGELOG.rst 2 files changed, 17 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 0a674f2..020fef9 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,7 +1,10 @@ Release 11.9 ============ -* (no changes yet) +* Suggest installing all requirements for missing dependencies with + :mod:`pwb<pywikibot.scripts.wrapper>` wrapper. +* Various performance, stability, and code quality improvements. +* Support legacy encoded section titles. (:phab:`T133276`) Deprecations diff --git a/scripts/CHANGELOG.rst b/scripts/CHANGELOG.rst index 3c3a3be..6e4ffa1 100644 --- a/scripts/CHANGELOG.rst +++ b/scripts/CHANGELOG.rst @@ -1,6 +1,19 @@ Scripts Changelog ================= +11.9.0 +------ + +category +^^^^^^^^ + +* Extract bot construction. (:phab:`T434526`) + +clean_sandbox +^^^^^^^^^^^^^ + +* Fix L10N for arzwiki. + 11.8.0 ------ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1347605?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I284909a8db815980dc69e1040811aa7def33175e Gerrit-Change-Number: 1347605 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits