Pywikibot-commits July 2026

pywikibot-commits@lists.wikimedia.org

1 participants
100 discussions

[Gerrit] ...core[master]: Rename TimeoutError to ApiTimeoutError, keep old name as deprecated a...
by Xqt (Code Review) 05 Jul '26

05 Jul '26

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307599?usp=email ) Change subject: Rename TimeoutError to ApiTimeoutError, keep old name as deprecated alias ...................................................................... Rename TimeoutError to ApiTimeoutError, keep old name as deprecated alias Bug: T431174 Change-Id: Ie36effbc761510c1b1a9efffe0d1dbd2087a652b --- M ROADMAP.rst M pywikibot/data/__init__.py M pywikibot/exceptions.py M pywikibot/page/_toolforge.py M tests/__init__.py A tests/exceptions_tests.py M tests/page_tests.py M tests/site_generators_tests.py M tests/sparql_tests.py 9 files changed, 105 insertions(+), 18 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/ROADMAP.rst b/ROADMAP.rst index 7d1d12e..f7d7322 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,6 +1,7 @@ Release 11.5 ============ +* Rename :exc:`exceptions.TimeoutError` exception to :class:`exceptions.ApiTimeoutError` to avoid collision with Python's built-in exception (:phab:`T431174`) * Drop :mod:`config` ``textfile_encoding`` variable and use 'utf-8' directly instead (:phab:`T430454`) * Use pyclean package with :mod:`make_dist` script. * Fix redirected link for :class:`pagegenerators.PetScanPageGenerator` @@ -107,6 +108,7 @@ Pending removal in Pywikibot 14 ------------------------------- +* 11.5.0: :exc:`exceptions.TimeoutError` is deprecated in favour of :class:`exceptions.ApiTimeoutError` * 11.5.0: :mod:`config` ``textfile_encoding`` variable will be removed; use 'utf-8' directly instead (:phab:`T430454`) * 11.4.0: The signature of :meth:`APISite.allusers() diff --git a/pywikibot/data/__init__.py b/pywikibot/data/__init__.py index aa58b00..19270cc 100644 --- a/pywikibot/data/__init__.py +++ b/pywikibot/data/__init__.py @@ -44,7 +44,7 @@ self.current_retries += 1 if self.current_retries > self.max_retries: - raise pywikibot.exceptions.TimeoutError( + raise pywikibot.exceptions.ApiTimeoutError( 'Maximum retries attempted without success.') # double the next wait, but do not exceed config.retry_max seconds diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index 7c00ac5..7aa1831 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -54,7 +54,7 @@ +-- SiteDefinitionError | +-- UnknownFamilyError | +-- UnknownSiteError - +-- TimeoutError + +-- ApiTimeoutError | +-- MaxlagTimeoutError +-- TranslationError +-- UserRightsError @@ -143,7 +143,7 @@ - CoordinateGlobeUnknownError: globe is not implemented yet. - EntityTypeUnknownError: entity type is not available on the site. -TimeoutError: request failed with a timeout +ApiTimeoutError: request failed with a timeout - MaxlagTimeoutError: request failed with a maxlag timeout @@ -182,7 +182,10 @@ from typing import Any import pywikibot -from pywikibot.tools._deprecate import _NotImplementedWarning +from pywikibot.tools._deprecate import ( + ModuleDeprecationWrapper, + _NotImplementedWarning, +) class NotImplementedWarning(_NotImplementedWarning): @@ -720,12 +723,12 @@ """The requested entity type is not recognised on this site.""" -class TimeoutError(Error): +class ApiTimeoutError(Error): """Request failed with a timeout error.""" -class MaxlagTimeoutError(TimeoutError): +class MaxlagTimeoutError(ApiTimeoutError): """Request failed with a maxlag timeout error.""" @@ -733,3 +736,11 @@ class ApiNotAvailableError(Error): """API is not available, e.g. due to a network error or configuration.""" + + +wrapper = ModuleDeprecationWrapper(__name__) +wrapper.add_deprecated_attr( + 'TimeoutError', + replacement=ApiTimeoutError, + since='11.5.0', +) diff --git a/pywikibot/page/_toolforge.py b/pywikibot/page/_toolforge.py index 84437b0..1e2426e 100644 --- a/pywikibot/page/_toolforge.py +++ b/pywikibot/page/_toolforge.py @@ -72,7 +72,7 @@ :raise NotImplementedError: unsupported site or unsupported namespace. :raise NoPageError: The page does not exist. - :raise TimeoutError: WikiHistory timeout + :raise ApiTimeoutError: WikiHistory timeout """ return collections.Counter( {user: int(cnt) for user, (_, cnt) in self.authorship(5).items()}) @@ -166,7 +166,7 @@ :raise NotImplementedError: unsupported site or unsupported namespace. :raise NoPageError: The page does not exist. - :raise TimeoutError: WikiHistory timeout + :raise ApiTimeoutError: WikiHistory timeout """ if n and n > 5: warn('Only the first 5 authors can be given.', stacklevel=2) @@ -190,7 +190,7 @@ pywikibot.sleep(pywikibot.config.retry_wait) else: - raise pywikibot.exceptions.TimeoutError('WikiHistory Timeout') + raise pywikibot.exceptions.ApiTimeoutError('WikiHistory Timeout') length = len(self.text) result: list[list[str]] = [] diff --git a/tests/__init__.py b/tests/__init__.py index 7c1fb7d..851a402 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -81,6 +81,7 @@ 'echo', 'edit', 'edit_failure', + 'exceptions', 'eventstreams', 'family', 'file', diff --git a/tests/exceptions_tests.py b/tests/exceptions_tests.py new file mode 100755 index 0000000..96d1925 --- /dev/null +++ b/tests/exceptions_tests.py @@ -0,0 +1,73 @@ +#!/usr/bin/env python3 +# +# (C) Pywikibot team, 2026 +# +# Distributed under the terms of the MIT license. +# +"""Tests for the exceptions module.""" +from __future__ import annotations + +import unittest +from contextlib import suppress + +import pywikibot +from pywikibot.exceptions import ApiTimeoutError, Error, MaxlagTimeoutError +from tests.aspects import DeprecationTestCase, TestCase + + +class TestApiTimeoutError(TestCase): + + """Test ApiTimeoutError exceptions.""" + + net = False + + def test_hierarchy(self) -> None: + """Test inheritance hierarchy.""" + self.assertTrue(issubclass(ApiTimeoutError, Error)) + self.assertTrue(issubclass(MaxlagTimeoutError, ApiTimeoutError)) + + def test_raise_catch(self) -> None: + """Test raising and catching ApiTimeoutError.""" + with self.assertRaises(ApiTimeoutError): + raise ApiTimeoutError('Test timeout') + + with self.assertRaises(ApiTimeoutError): + raise MaxlagTimeoutError('Test maxlag timeout') + + +class TestTimeoutErrorDeprecation(DeprecationTestCase): + + """Test deprecation of TimeoutError alias.""" + + net = False + + def test_deprecation(self) -> None: + """Test that accessing TimeoutError triggers a deprecation warning.""" + # Accessing the deprecated attribute + exc_class = pywikibot.exceptions.TimeoutError + self.assertIs(exc_class, ApiTimeoutError) + self.assertOneDeprecationParts( + 'pywikibot.exceptions.TimeoutError', + 'pywikibot.exceptions.ApiTimeoutError' + ) + + def test_raise_catch_deprecated(self) -> None: + """Test raising and catching using the deprecated alias.""" + # Reset any messages from previous tests + self._reset_messages() + + # Catch ApiTimeoutError using the TimeoutError alias + try: + raise ApiTimeoutError('Test raise') + except pywikibot.exceptions.TimeoutError: + pass + + self.assertOneDeprecationParts( + 'pywikibot.exceptions.TimeoutError', + 'pywikibot.exceptions.ApiTimeoutError' + ) + + +if __name__ == '__main__': + with suppress(SystemExit): + unittest.main() diff --git a/tests/page_tests.py b/tests/page_tests.py index 8309042..2aef677 100755 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -19,13 +19,13 @@ from pywikibot import config from pywikibot.exceptions import ( APIError, + ApiTimeoutError, Error, InvalidTitleError, IsNotRedirectPageError, IsRedirectPageError, NoPageError, SectionError, - TimeoutError, UnknownExtensionError, ) from pywikibot.tools import suppress_warnings @@ -523,7 +523,7 @@ for p in mainpage.backlinks(follow_redirects=False, total=10): self.assertIsInstance(p, pywikibot.Page) - with skipping(TimeoutError): + with skipping(ApiTimeoutError): for p in mainpage.embeddedin(total=10): self.assertIsInstance(p, pywikibot.Page) diff --git a/tests/site_generators_tests.py b/tests/site_generators_tests.py index 2e8676e..4f4feb3 100755 --- a/tests/site_generators_tests.py +++ b/tests/site_generators_tests.py @@ -15,11 +15,11 @@ from pywikibot.data import api from pywikibot.exceptions import ( APIError, + ApiTimeoutError, Error, HiddenKeyError, InvalidTitleError, NoPageError, - TimeoutError, ) from pywikibot.tools import suppress_warnings from tests import WARN_SITE_CODE, unittest_print @@ -65,7 +65,7 @@ """Test Site.pagereferences.""" # pagereferences includes both backlinks and embeddedin backlinks = set(self.site.pagebacklinks(self.mainpage, namespaces=[0])) - with skipping(TimeoutError): + with skipping(ApiTimeoutError): embedded = set(self.site.page_embeddedin(self.mainpage, namespaces=[0])) refs = set(self.site.pagereferences(self.mainpage, namespaces=[0])) @@ -105,7 +105,7 @@ def test_embeddedin(self) -> None: """Test Site.page_embeddedin.""" - with skipping(TimeoutError): + with skipping(ApiTimeoutError): embedded_ns_0 = set(self.site.page_embeddedin( self.mainpage, namespaces=[0])) embedded_ns_0_2 = set(self.site.page_embeddedin( diff --git a/tests/sparql_tests.py b/tests/sparql_tests.py index 6ae2d13..ffb985f 100755 --- a/tests/sparql_tests.py +++ b/tests/sparql_tests.py @@ -109,7 +109,7 @@ """Test SELECT query.""" mock_method.return_value = Container( SQL_RESPONSE_CONTAINER % f'{ITEM_Q498787}, {ITEM_Q677525}') - with skipping(pywikibot.exceptions.TimeoutError): + with skipping(pywikibot.exceptions.ApiTimeoutError): q = sparql.SparqlQuery() res = q.select('SELECT * WHERE { ?x ?y ?z }') self.assertIsInstance(res, list, 'Result is not a list') @@ -131,7 +131,7 @@ """Test SELECT query with full data.""" mock_method.return_value = Container( SQL_RESPONSE_CONTAINER % f'{ITEM_Q498787}, {ITEM_Q677525}') - with skipping(pywikibot.exceptions.TimeoutError): + with skipping(pywikibot.exceptions.ApiTimeoutError): q = sparql.SparqlQuery() res = q.select('SELECT * WHERE { ?x ?y ?z }', full_data=True) self.assertIsInstance(res, list, 'Result is not a list') @@ -162,7 +162,7 @@ SQL_RESPONSE_CONTAINER % (f'{ITEM_Q498787}, {ITEM_Q677525}, ' f'{ITEM_Q677525}') ) - with skipping(pywikibot.exceptions.TimeoutError): + with skipping(pywikibot.exceptions.ApiTimeoutError): q = sparql.SparqlQuery() res = q.get_items('SELECT * WHERE { ?x ?y ?z }', 'cat') self.assertEqual(res, {'Q498787', 'Q677525'}) @@ -174,7 +174,7 @@ def testQueryAsk(self, mock_method) -> None: """Test ASK query.""" mock_method.return_value = Container(RESPONSE_TRUE) - with skipping(pywikibot.exceptions.TimeoutError): + with skipping(pywikibot.exceptions.ApiTimeoutError): q = sparql.SparqlQuery() res = q.ask('ASK { ?x ?y ?z }') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307599?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: Ie36effbc761510c1b1a9efffe0d1dbd2087a652b Gerrit-Change-Number: 1307599 Gerrit-PatchSet: 2 Gerrit-Owner: Prakhar0804 <agrahariprakhar31(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: Fix for unnecessary dictionary unpacking in echo.py
by Xqt (Code Review) 04 Jul '26

04 Jul '26

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307553?usp=email ) Change subject: Fix for unnecessary dictionary unpacking in echo.py ...................................................................... Fix for unnecessary dictionary unpacking in echo.py Unpacking a dictionary into another dictionary is redundant. The unpacking operator can be removed, making the code more readable. Change-Id: I303a86be5fd5bbab2e2df056ebdb98f226867e3c --- M pywikibot/echo.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/pywikibot/echo.py b/pywikibot/echo.py index 989d942..387110d 100644 --- a/pywikibot/echo.py +++ b/pywikibot/echo.py @@ -99,4 +99,4 @@ if self.event_id is None: return False - return self.site.notifications_mark_read(**{'list': self.event_id}) + return self.site.notifications_mark_read(list=self.event_id) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307553?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: I303a86be5fd5bbab2e2df056ebdb98f226867e3c Gerrit-Change-Number: 1307553 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: doc: add missing return type annotations to several functions
by jenkins-bot (Code Review) 04 Jul '26

04 Jul '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307552?usp=email ) Change subject: doc: add missing return type annotations to several functions ...................................................................... doc: add missing return type annotations to several functions Change-Id: I1fb07d191873cd0414d86cb7f4688ca9550dcb12 --- M pywikibot/data/api/_generators.py M pywikibot/scripts/generate_family_file.py M tests/citoid_tests.py M tests/interwikibot_tests.py M tests/site_tests.py M tests/tools_deprecate_tests.py 6 files changed, 17 insertions(+), 17 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/data/api/_generators.py b/pywikibot/data/api/_generators.py index bb1b5f7..42cce31 100644 --- a/pywikibot/data/api/_generators.py +++ b/pywikibot/data/api/_generators.py @@ -77,7 +77,7 @@ return getattr(self, '_filter_func', type(self)._filter_func) @filter_func.setter - def filter_func(self, func: Callable[[Any], bool] | None): + def filter_func(self, func: Callable[[Any], bool] | None) -> None: """Set a filter function to apply to items before yielding. .. version-added:: 10.4 diff --git a/pywikibot/scripts/generate_family_file.py b/pywikibot/scripts/generate_family_file.py index 6953dd2..160b053 100755 --- a/pywikibot/scripts/generate_family_file.py +++ b/pywikibot/scripts/generate_family_file.py @@ -98,7 +98,7 @@ self.langs = [] # [Wiki('https://wiki/$1'), ...] @staticmethod - def show(*args, **kwargs): + def show(*args, **kwargs) -> None: """Wrapper around print to be mocked in tests.""" print(*args, **kwargs) # pragma: no cover diff --git a/tests/citoid_tests.py b/tests/citoid_tests.py index d6d9279..74a72eb 100755 --- a/tests/citoid_tests.py +++ b/tests/citoid_tests.py @@ -24,7 +24,7 @@ code = 'test' login = False - def test_citoid_positive(self): + def test_citoid_positive(self) -> None: """Test citoid script.""" client = citoid.CitoidClient(self.site) resp = client.get_citation( @@ -43,7 +43,7 @@ datetime.datetime.now().strftime('%Y-%m-%d') ) - def test_citoid_no_config(self): + def test_citoid_no_config(self) -> None: """Test citoid script with no citoid endpoint configured.""" client = citoid.CitoidClient(pywikibot.Site('wikiquote:pl')) with self.assertRaisesRegex( @@ -55,7 +55,7 @@ 'https://ro.wikipedia.org/wiki/România' ) - def test_citoid_no_valid_format(self): + def test_citoid_no_valid_format(self) -> None: """Test citoid script with invalid format provided.""" client = citoid.CitoidClient(self.site) with self.assertRaisesRegex(ValueError, 'Invalid format mediawiki2'): diff --git a/tests/interwikibot_tests.py b/tests/interwikibot_tests.py index b0a0e8d..6d978f4 100755 --- a/tests/interwikibot_tests.py +++ b/tests/interwikibot_tests.py @@ -33,7 +33,7 @@ site = DrySite(code, fam, None) return site - def test_hint_options(self): + def test_hint_options(self) -> None: """Test -hint and -hintfile options.""" iwc = interwiki.InterwikiBotConfig() self.assertIsInstance(iwc.hints, list) @@ -44,7 +44,7 @@ iwc.readOptions(option) self.assertLength(iwc.hints, 8) - def test_ignore_option(self): + def test_ignore_option(self) -> None: """Test -ignore and -ignorefile options.""" iwc = interwiki.InterwikiBotConfig() self.assertIsInstance(iwc.ignore, list) @@ -54,7 +54,7 @@ iwc.readOptions('-ignore:Foo,Bar,Baz') self.assertLength(iwc.ignore, 8) - def test_skipfile_option(self): + def test_skipfile_option(self) -> None: """Test -skipfile options.""" iwc = interwiki.InterwikiBotConfig() self.assertIsInstance(iwc.skip, set) diff --git a/tests/site_tests.py b/tests/site_tests.py index 473c5d4..6e6fd2b 100755 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -811,17 +811,17 @@ return None @classmethod - def setUpClass(cls): + def setUpClass(cls) -> None: """Use sandbox page for tests.""" super().setUpClass() cls.page = pywikibot.Page(cls.site, 'Sandbox') - def setUp(self): + def setUp(self) -> None: """Patch has_right method.""" super().setUp() self.patch(self.site, 'has_right', lambda right: True) - def test_missing_rights(self): + def test_missing_rights(self) -> None: """Test missing rollback right.""" self.patch(self.site, 'has_right', lambda right: False) with self.assertRaisesRegex( @@ -831,7 +831,7 @@ ): self.site.rollbackpage(self.page, pageid=4711) - def test_exceptions(self): + def test_exceptions(self) -> None: """Test rollback exceptions.""" with self.assertRaisesRegex( ValueError, @@ -849,7 +849,7 @@ NoPageError, r"Page -1 $pageid$ doesn't exist\."): self.site.rollbackpage(pageid=-1) - def test_rollback_simulation(self): + def test_rollback_simulation(self) -> None: """Test rollback in simulate mode.""" result = self.site.rollbackpage(self.page) self.assertIsInstance(result, dict) diff --git a/tests/tools_deprecate_tests.py b/tests/tools_deprecate_tests.py index 55c1202..141d625 100755 --- a/tests/tools_deprecate_tests.py +++ b/tests/tools_deprecate_tests.py @@ -74,7 +74,7 @@ @deprecated() -def deprecated_func_docstring(foo=None): +def deprecated_func_docstring(foo=None) -> None: """DEPRECATED. Deprecated function.""" @@ -85,7 +85,7 @@ @deprecated -def deprecated_func2_docstring(foo=None): +def deprecated_func2_docstring(foo=None) -> None: """DEPRECATED, don't use this. Deprecated function.""" @@ -114,12 +114,12 @@ @deprecated -def deprecated_func_docstring_arg(foo=None): +def deprecated_func_docstring_arg(foo=None) -> None: """:param foo: Foo. DEPRECATED.""" @deprecated -def deprecated_func_docstring_arg2(foo=None): +def deprecated_func_docstring_arg2(foo=None) -> None: """DEPRECATED. :param foo: Foo. DEPRECATED. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307552?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: I1fb07d191873cd0414d86cb7f4688ca9550dcb12 Gerrit-Change-Number: 1307552 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: tests: update wikidata query service hostname
by jenkins-bot (Code Review) 04 Jul '26

04 Jul '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307551?usp=email ) Change subject: tests: update wikidata query service hostname ...................................................................... tests: update wikidata query service hostname Change-Id: I68463b549cbe3cc928040f3bddd0614c919a1964 Signed-off-by: Xqt <info(a)gno.de> --- M tests/README.rst 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/README.rst b/tests/README.rst index 41de0ce..d5bd42a 100644 --- a/tests/README.rst +++ b/tests/README.rst @@ -284,7 +284,7 @@ sites = { 'wdq': - 'hostname': 'wdq.wmflabs.org', + 'hostname': 'query.wikidata.org', } } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307551?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: I68463b549cbe3cc928040f3bddd0614c919a1964 Gerrit-Change-Number: 1307551 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: [bugfix] description variable cannot be None in upload.py script
by Xqt (Code Review) 04 Jul '26

04 Jul '26

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307549?usp=email ) Change subject: [bugfix] description variable cannot be None in upload.py script ...................................................................... [bugfix] description variable cannot be None in upload.py script description variable contains a string from joined description list, or from description file. It cannot be None. Test for not description instead. Change-Id: I55d5ca98ca5248b8029c9e06947389073c541497 --- M scripts/upload.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/upload.py b/scripts/upload.py index a10f06e..7524843 100755 --- a/scripts/upload.py +++ b/scripts/upload.py @@ -213,7 +213,7 @@ if url is None: missing.append('filename') additional = error + ' ' - if description is None: + if not description: missing.append('description') if aborts is not True and ignorewarn is not True: additional += ('Either -ignorewarn or -abortonwarn must be ' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307549?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: I55d5ca98ca5248b8029c9e06947389073c541497 Gerrit-Change-Number: 1307549 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: tests: update pre-commit hooks
by Xqt (Code Review) 04 Jul '26

04 Jul '26

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307550?usp=email ) Change subject: tests: update pre-commit hooks ...................................................................... tests: update pre-commit hooks Change-Id: I9882cab5f39f3e9c415654a449e3eb0a2426a246 --- M .pre-commit-config.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7345ee8..bdc4119 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -96,7 +96,7 @@ name: isort (skip future annotations) files: ^(pwb|pywikibot/families/__init__)\.py$ - repo: https://github.com/jshwi/docsig - rev: v0.87.1 + rev: v0.89.0 hooks: - id: docsig exclude: ^(tests|scripts) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307550?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: I9882cab5f39f3e9c415654a449e3eb0a2426a246 Gerrit-Change-Number: 1307550 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]: [bugfix] Fix missing 'f' prefix or NoTitleError message
by Xqt (Code Review) 04 Jul '26

04 Jul '26

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307544?usp=email ) Change subject: [bugfix] Fix missing 'f' prefix or NoTitleError message ...................................................................... [bugfix] Fix missing 'f' prefix or NoTitleError message Change-Id: I17a50fa9bdb40ff5f41b9b19238e7b043f1a8b9f --- M scripts/pagefromfile.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py index ab99da3..7c0d092 100755 --- a/scripts/pagefromfile.py +++ b/scripts/pagefromfile.py @@ -259,7 +259,7 @@ break except NoTitleError as err: - pywikibot.info('\n{err} - skipping a page.') + pywikibot.info(f'\n{err} - skipping a page.') text = text[err.offset:] else: page = pywikibot.Page(self.site, title) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307544?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: I17a50fa9bdb40ff5f41b9b19238e7b043f1a8b9f Gerrit-Change-Number: 1307544 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: [bugfix] Fix error logging funktion name in upload.py script
by jenkins-bot (Code Review) 04 Jul '26

04 Jul '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307545?usp=email ) Change subject: [bugfix] Fix error logging funktion name in upload.py script ...................................................................... [bugfix] Fix error logging funktion name in upload.py script Change-Id: I1296fa0180fcc767a88fea55d745acd2c56d11e2 --- M scripts/upload.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/upload.py b/scripts/upload.py index 9f8a47c..a10f06e 100755 --- a/scripts/upload.py +++ b/scripts/upload.py @@ -187,7 +187,7 @@ filepath = Path(description_file) if not filepath.is_file() or filepath.is_symlink(): - pywikibot.Error('Invalid filename given with -descfile') + pywikibot.error('Invalid filename given with -descfile') return description = filepath.read_text( -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307545?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: I1296fa0180fcc767a88fea55d745acd2c56d11e2 Gerrit-Change-Number: 1307545 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> 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) 04 Jul '26

04 Jul '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307543?usp=email ) Change subject: doc: update ROADMAP.rst and CHANGELOG.rst ...................................................................... doc: update ROADMAP.rst and CHANGELOG.rst Change-Id: Ic9de8114429188442b12174b7dcb05452d833991 --- M ROADMAP.rst M scripts/CHANGELOG.rst 2 files changed, 23 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/ROADMAP.rst b/ROADMAP.rst index 6674663..7d1d12e 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,7 +1,10 @@ Release 11.5 ============ -* (no changes yet) +* Drop :mod:`config` ``textfile_encoding`` variable and use 'utf-8' directly instead (:phab:`T430454`) +* Use pyclean package with :mod:`make_dist` script. +* Fix redirected link for :class:`pagegenerators.PetScanPageGenerator` +* Update translations (i18n) Deprecations @@ -104,6 +107,8 @@ Pending removal in Pywikibot 14 ------------------------------- +* 11.5.0: :mod:`config` ``textfile_encoding`` variable will be removed; use 'utf-8' directly instead + (:phab:`T430454`) * 11.4.0: The signature of :meth:`APISite.allusers() <pywikibot.site._generators.GeneratorsMixin.allusers>` was changed; all parameters are keyword-only. diff --git a/scripts/CHANGELOG.rst b/scripts/CHANGELOG.rst index 78b4db7..779b629 100644 --- a/scripts/CHANGELOG.rst +++ b/scripts/CHANGELOG.rst @@ -1,6 +1,23 @@ Scripts Changelog ================= +11.5.0 +------ + +interwiki +^^^^^^^^^ + +* Fix pattern for getting dump files (:phab:`T430451`) +* Use :attr:`pywikibot.link_regex` pattern for ``-hintfile`` option +* Re-enable ``-ignorefile`` option (:phab:`T430444`) +* Implement ``-onlylink`` whitelist option and unify link preservation logic (:phab:`T430408`) +* Respect usernames wildcards + +protect +^^^^^^^ + +* Ensure -summary option overrides default summary setting + 11.4.0 ------ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1307543?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: Ic9de8114429188442b12174b7dcb05452d833991 Gerrit-Change-Number: 1307543 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]: config: Drop textfile_encoding variable and use 'utf-8' directly instead
by jenkins-bot (Code Review) 04 Jul '26

04 Jul '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1306111?usp=email ) Change subject: config: Drop textfile_encoding variable and use 'utf-8' directly instead ...................................................................... config: Drop textfile_encoding variable and use 'utf-8' directly instead Bug: T430454 Change-Id: I5c51c9f6750432b7d7bb17998e944a66cf39960a --- M pywikibot/config.py M pywikibot/pagegenerators/_generators.py M scripts/add_text.py M scripts/interwiki.py M scripts/listpages.py M scripts/pagefromfile.py M scripts/upload.py 7 files changed, 10 insertions(+), 15 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/config.py b/pywikibot/config.py index 47679c9..405a183 100644 --- a/pywikibot/config.py +++ b/pywikibot/config.py @@ -106,6 +106,7 @@ 'absolute_import': '10.0.0 ', 'division': '10.0.0', 'unicode_literals': '10.0.0', + 'textfile_encoding': '11.5.0', } # ############# ACCOUNT SETTINGS ############## @@ -497,12 +498,6 @@ transliteration_target: str | None = None -# The encoding in which textfiles are stored, which contain lists of page -# titles. The most used is 'utf-8'; 'utf-8-sig' recognizes BOM. -# For a complete list please see: -# https://docs.python.org/3/library/codecs.html#standard-encodings -textfile_encoding = 'utf-8' - # currently terminal and buffer are the only supported userinterfaces userinterface = 'terminal' diff --git a/pywikibot/pagegenerators/_generators.py b/pywikibot/pagegenerators/_generators.py index c8224d0..a53d39c 100644 --- a/pywikibot/pagegenerators/_generators.py +++ b/pywikibot/pagegenerators/_generators.py @@ -20,7 +20,7 @@ from requests.exceptions import ReadTimeout import pywikibot -from pywikibot import config, date, xmlreader +from pywikibot import date, xmlreader from pywikibot.backports import batched from pywikibot.comms import http from pywikibot.exceptions import APIError, ServerError @@ -477,7 +477,7 @@ site = pywikibot.Site() # If source cannot be parsed as an HTTP URL, treat as local file if not urlparse(source).netloc: - with open(source, encoding=config.textfile_encoding) as local_file: + with open(source, encoding='utf-8') as local_file: yield from _yield_titles(local_file, site) # Else, fetch page (page should return text in same format as that expected # in filename, i.e. pages separated by newlines or pages enclosed in double diff --git a/scripts/add_text.py b/scripts/add_text.py index c37ddbb..0642f27 100755 --- a/scripts/add_text.py +++ b/scripts/add_text.py @@ -74,7 +74,7 @@ from pathlib import Path import pywikibot -from pywikibot import config, pagegenerators, textlib +from pywikibot import pagegenerators, textlib from pywikibot.bot import AutomaticTWSummaryBot, ExistingPageBot @@ -123,7 +123,7 @@ """Read text to be added from file.""" if self.opt.textfile: pth = Path(self.opt.textfile) - self.opt.text = pth.read_text(encoding=config.textfile_encoding) + self.opt.text = pth.read_text(encoding='utf-8') else: # Translating the \\n into binary \n if given from command line self.opt.text = self.opt.text.replace('\\n', '\n') diff --git a/scripts/interwiki.py b/scripts/interwiki.py index bbd5bfe..3258bbb 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -520,7 +520,7 @@ elif arg == 'hintfile': hintfilename = value or pywikibot.input( 'Please enter the hint filename:') - txt = Path(hintfilename).read_text(config.textfile_encoding) + txt = Path(hintfilename).read_text('utf-8') self.hints.extend(m['title'] for m in pywikibot.link_regex.finditer(txt)) elif arg == 'untranslatedonly': diff --git a/scripts/listpages.py b/scripts/listpages.py index f8b4c2b..3706506 100755 --- a/scripts/listpages.py +++ b/scripts/listpages.py @@ -65,7 +65,7 @@ -encode [str] File encoding can be specified with ``-encode:name`` (name must be a valid python encoding: utf-8, etc.). If not - specified, it defaults to :code:`config.textfile_encoding`. + specified, it defaults to ``utf-8``. -put: [str] Save the list to the defined page of the wiki. By default it does not overwrite an existing page. @@ -188,7 +188,7 @@ 'always': True, 'save': None, 'tofile': None, - 'encode': config.textfile_encoding, + 'encode': 'utf-8', 'format': '1', 'notitle': False, 'outputlang': None, diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py index 519b932..ab99da3 100755 --- a/scripts/pagefromfile.py +++ b/scripts/pagefromfile.py @@ -242,7 +242,7 @@ pywikibot.info(f"\n\nReading '{self.filename}'...") filepath = Path(self.filename) try: - text = filepath.read_text(encoding=config.textfile_encoding) + text = filepath.read_text(encoding='utf-8') except OSError as e: pywikibot.error(e) return diff --git a/scripts/upload.py b/scripts/upload.py index 1d6dc3e..9f8a47c 100755 --- a/scripts/upload.py +++ b/scripts/upload.py @@ -191,7 +191,7 @@ return description = filepath.read_text( - encoding=pywikibot.config.textfile_encoding).replace('\r\n', '\n') + encoding='utf-8').replace('\r\n', '\n') while not ('://' in url or os.path.exists(url)): if not url: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1306111?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: I5c51c9f6750432b7d7bb17998e944a66cf39960a Gerrit-Change-Number: 1306111 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits July 2026