Pywikibot-commits August 2026

pywikibot-commits@lists.wikimedia.org

1 participants
186 discussions

[Gerrit] ...core[master]: tests: Fix tabular-data claim target
by jenkins-bot (Code Review) 30 Aug '26

30 Aug '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332478?usp=email ) Change subject: tests: Fix tabular-data claim target ...................................................................... tests: Fix tabular-data claim target Construct the tabular-data claim target with WbTabularData instead of WbGeoShape so the .tab page is validated against the correct datatype. Remove expectedFailure now that the test uses its intended target. Bug: T367327 Change-Id: I67f7720e462f499ab6abee042e763489ec45dec5 --- M tests/wikibase_edit_tests.py 1 file changed, 1 insertion(+), 2 deletions(-) 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 ae4518d..2ea0f73 100755 --- a/tests/wikibase_edit_tests.py +++ b/tests/wikibase_edit_tests.py @@ -377,7 +377,6 @@ claim = item.claims['P27199'][0] self.assertEqual(claim.getTarget(), target) - @unittest.expectedFailure # T367327 def test_WbTabularData_edit(self) -> None: """Attempt adding a tabular-data with valid input.""" # Clean the slate in preparation for test. @@ -389,7 +388,7 @@ testsite, 'P30175', datatype='tabular-data') commons_site = pywikibot.Site('commons') page = pywikibot.Page(commons_site, 'Data:Bea.gov/GDP by state.tab') - target = pywikibot.WbGeoShape(page) + target = pywikibot.WbTabularData(page) claim.setTarget(target) item.addClaim(claim) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332478?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: I67f7720e462f499ab6abee042e763489ec45dec5 Gerrit-Change-Number: 1332478 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: Fix chunked upload warning test
by jenkins-bot (Code Review) 30 Aug '26

30 Aug '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332477?usp=email ) Change subject: tests: Fix chunked upload warning test ...................................................................... tests: Fix chunked upload warning test A first chunk with an unignored warning is stored as a standalone stashed file, not an active chunked upload session. Verify that behavior instead of trying to resume the invalid session. Bug: T133288 Change-Id: I5ea10e03f0457cb5621907332204116f5010c507 --- M tests/upload_tests.py 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/upload_tests.py b/tests/upload_tests.py index c196248..87e66ad 100755 --- a/tests/upload_tests.py +++ b/tests/upload_tests.py @@ -317,9 +317,10 @@ # First upload the warning with warnings enabled page = pywikibot.FilePage(self.site, 'MP_sounds-pwb.png') self.assertNotHasAttr(self, '_file_key') - self.site.upload(page, source_filename=self.sounds_png, - comment='pywikibot test', chunk_size=chunk_size, - ignore_warnings=warn_callback) + self.assertFalse( + self.site.upload(page, source_filename=self.sounds_png, + comment='pywikibot test', chunk_size=chunk_size, + ignore_warnings=warn_callback)) # Check that the warning happened and it's cached self.assertHasAttr(self, '_file_key') @@ -359,10 +360,9 @@ """Test continuing to upload a file without using chunked mode.""" self._test_continue_filekey(0) - @unittest.expectedFailure # T133288 - def test_continue_filekey_chunked(self) -> None: - """Test continuing to upload a file with using chunked mode.""" - self._test_continue_filekey(1024) + def test_first_chunk_warning_stash(self) -> None: + """Test a first chunk is stashed after an upload warning.""" + self._init_upload(1024) @unittest.expectedFailure # T367321 def test_sha1_mismatch(self) -> None: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332477?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: I5ea10e03f0457cb5621907332204116f5010c507 Gerrit-Change-Number: 1332477 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: Keep ParamInfo format test dry
by jenkins-bot (Code Review) 30 Aug '26

30 Aug '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332479?usp=email ) Change subject: tests: Keep ParamInfo format test dry ...................................................................... tests: Keep ParamInfo format test dry Restore the edit action to the dummy ParamInfo response and register all cached query submodules. Guard the membership checks against site requests so fixture drift cannot escape to the network. Bug: T381202 Change-Id: Iba9eb8e275f1fc28239736f775a260828855fb60 --- M tests/dry_api_tests.py 1 file changed, 14 insertions(+), 7 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index c78b022..21eb37e 100755 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -291,7 +291,7 @@ dry = True - # https://en.wikipedia.org/w/api.php?action=paraminfo&modules=query+info|quer… + # ParamInfo data for the query+info, query+tokens, and edit modules. paraminfodata = { 'paraminfo': { 'modules': [ @@ -355,6 +355,10 @@ 'highlimit': 500 } ] + }, + { + 'name': 'edit', + 'path': 'edit', } ] } @@ -369,18 +373,21 @@ for mod in site._paraminfo.init_modules: site._paraminfo._paraminfo[mod] = {} site._paraminfo._action_modules = frozenset(['edit']) - site._paraminfo._modules = {'query': frozenset(['info'])} + site._paraminfo._modules = {'query': frozenset(['info', 'tokens'])} data = site._paraminfo.normalize_paraminfo(self.paraminfodata) site._paraminfo._paraminfo.update(data) def test_format(self) -> None: """Test using a dummy formatted in the new modules-only mode.""" pi = self.get_site()._paraminfo - self.assertIn('query+info', pi._paraminfo) - self.assertIn('query+tokens', pi._paraminfo) - self.assertIn('edit', pi) - self.assertIn('info', pi) - self.assertIn('tokens', pi) + with patch.object(pi.site, '_request') as request: + self.assertIn('query+info', pi._paraminfo) + self.assertIn('query+tokens', pi._paraminfo) + self.assertIn('edit', pi._paraminfo) + self.assertIn('edit', pi) + self.assertIn('info', pi) + self.assertIn('tokens', pi) + request.assert_not_called() def test_attribute(self) -> None: """Test using __getitem__.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332479?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: Iba9eb8e275f1fc28239736f775a260828855fb60 Gerrit-Change-Number: 1332479 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: Add precision to coordinate claim
by jenkins-bot (Code Review) 30 Aug '26

30 Aug '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332480?usp=email ) Change subject: tests: Add precision to coordinate claim ...................................................................... tests: Add precision to coordinate claim Wikibase requires globe-coordinate values to include a numeric precision. Supply an explicit positive precision in the valid-input edit test and remove its expected-failure marker. Bug: T367326 Change-Id: Ied5159fe06df3dfc4d956b77a1d90461874f7a67 --- M tests/wikibase_edit_tests.py 1 file changed, 1 insertion(+), 2 deletions(-) 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 c82a15b..ae4518d 100755 --- a/tests/wikibase_edit_tests.py +++ b/tests/wikibase_edit_tests.py @@ -290,7 +290,6 @@ claim = item.claims['P271'][0] self.assertEqual(claim.getTarget(), target) - @unittest.expectedFailure # T367326 def test_Coordinate_edit(self) -> None: """Attempt adding a Coordinate with globe set via item.""" testsite = self.get_repo() @@ -300,7 +299,7 @@ claim = pywikibot.page.Claim(testsite, 'P20480', datatype='globe-coordinate') target = pywikibot.Coordinate(site=testsite, lat=12.0, lon=13.0, - globe_item=item) + precision=0.1, globe_item=item) claim.setTarget(target) item.addClaim(claim) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332480?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: Ied5159fe06df3dfc4d956b77a1d90461874f7a67 Gerrit-Change-Number: 1332480 Gerrit-PatchSet: 1 Gerrit-Owner: Mahveotm <mahveotm(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: pagegenerators: Add depth to PetScanPageGenerator
by jenkins-bot (Code Review) 30 Aug '26

30 Aug '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1328323?usp=email ) Change subject: pagegenerators: Add depth to PetScanPageGenerator ...................................................................... pagegenerators: Add depth to PetScanPageGenerator Expose PetScan's category depth option through PetScanPageGenerator and buildQuery(). Keep zero as the default so existing direct-category behavior is unchanged. Preserve extra_options as the final override layer. Bug: T334299 Change-Id: I59e9146282a02776f2f294061b5c1709b855f58a --- M pywikibot/pagegenerators/_generators.py M tests/pagegenerators_tests.py 2 files changed, 34 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/pagegenerators/_generators.py b/pywikibot/pagegenerators/_generators.py index ca95234..5eb3f45 100644 --- a/pywikibot/pagegenerators/_generators.py +++ b/pywikibot/pagegenerators/_generators.py @@ -1383,6 +1383,8 @@ .. version-added:: 3.0 .. version-changed:: 7.6 subclassed from :class:`tools.collections.GeneratorWrapper` + .. version-changed:: 11.8 + The *depth* parameter was added. """ def __init__( @@ -1391,7 +1393,9 @@ subset_combination: bool = True, namespaces: Iterable[int | pywikibot.site.Namespace] | None = None, site: BaseSite | None = None, - extra_options: dict[Any, Any] | None = None + extra_options: dict[Any, Any] | None = None, + *, + depth: int = 0 ) -> None: """Initializer. @@ -1403,19 +1407,22 @@ None, meaning all namespaces) :param site: Site to operate on (default is the default site from the user config) - :param extra_options: Dictionary of extra options to use - (optional) + :param extra_options: Additional PetScan query parameters. These + options override values supplied by named parameters. + :param depth: Number of subcategory levels to include (default + is 0, meaning only direct category members) """ if site is None: site = pywikibot.Site() self.site = site self.opts = self.buildQuery(categories, subset_combination, - namespaces, extra_options) + namespaces, extra_options, depth=depth) def buildQuery(self, categories: Sequence[str], subset_combination: bool, namespaces: Iterable[int | pywikibot.site.Namespace] | None, - extra_options: dict[Any, Any] | None) -> dict[str, Any]: + extra_options: dict[Any, Any] | None, *, + depth: int = 0) -> dict[str, Any]: """Get the querystring options to query PetScan. :param categories: List of categories (as strings) @@ -1423,7 +1430,9 @@ the intersection of the results of the categories, else returns the union of the results of the categories :param namespaces: List of namespaces to search in - :param extra_options: Dictionary of extra options to use + :param extra_options: Additional PetScan query parameters. These + options override values supplied by named parameters. + :param depth: Number of subcategory levels to include :return: Dictionary of querystring parameters to use in the query """ @@ -1432,6 +1441,7 @@ query = { 'language': self.site.code, 'project': self.site.hostname().split('.')[-2], + 'depth': depth, 'combination': 'subset' if subset_combination else 'union', 'categories': '\r\n'.join(categories), 'format': 'json', diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 99c424f..d63a043 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -85,6 +85,24 @@ """Test module import.""" self.assertIn('pywikibot.pagegenerators', sys.modules) + def test_petscan_depth(self) -> None: + """Test the PetScan category depth option.""" + gen = pagegenerators.PetScanPageGenerator( + ['Pywikibot'], site=self.site) + self.assertEqual(gen.opts['depth'], 0) + + gen = pagegenerators.PetScanPageGenerator( + ['Pywikibot'], site=self.site, depth=1) + self.assertEqual(gen.opts['depth'], 1) + query = gen.buildQuery( + ['Pywikibot'], True, None, None, depth=2) + self.assertEqual(query['depth'], 2) + + gen = pagegenerators.PetScanPageGenerator( + ['Pywikibot'], site=self.site, extra_options={'depth': 2}, + depth=1) + self.assertEqual(gen.opts['depth'], 2) + def test_PagesFromTitlesGenerator(self) -> None: """Test PagesFromTitlesGenerator.""" self.assertFunction('PagesFromTitlesGenerator') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1328323?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: I59e9146282a02776f2f294061b5c1709b855f58a Gerrit-Change-Number: 1328323 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]: category_redirect: Fix delay option parsing
by jenkins-bot (Code Review) 30 Aug '26

30 Aug '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332463?usp=email ) Change subject: category_redirect: Fix delay option parsing ...................................................................... category_redirect: Fix delay option parsing The option name returned by partition() excludes the colon. Match delay instead of delay: so -delay:N is converted to an integer rather than a boolean option. Add focused coverage for the parsed bot option. Change-Id: Ib13655905ce0c35f62b16c695de74030406068d3 --- M scripts/category_redirect.py A tests/category_redirect_tests.py 2 files changed, 37 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 680e147..5ae0f31 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -578,7 +578,7 @@ continue opt = opt[1:] - if opt == 'delay:': + if opt == 'delay': options[opt] = int(value) elif opt == 'category': options[opt] = value diff --git a/tests/category_redirect_tests.py b/tests/category_redirect_tests.py new file mode 100755 index 0000000..02f2235 --- /dev/null +++ b/tests/category_redirect_tests.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python3 +# +# (C) Pywikibot team, 2026 +# +# Distributed under the terms of the MIT license. +# +"""Tests for the category_redirect script.""" +from __future__ import annotations + +import unittest +from unittest.mock import patch + +from scripts import category_redirect +from tests.aspects import TestCase + + +class CategoryRedirectMainTestCase(TestCase): + + """Test :func:`category_redirect.main`.""" + + net = False + + @patch.object(category_redirect, 'CategoryRedirectBot') + @patch.object(category_redirect.pywikibot.bot, 'suggest_help', + return_value=False) + @patch.object(category_redirect.pywikibot, 'handle_args', + side_effect=lambda args: args) + def test_delay_option(self, _, __, bot_mock) -> None: + """Test that the delay option is passed as an integer.""" + category_redirect.main('-delay:14') + + bot_mock.assert_called_once_with(delay=14) + + +if __name__ == '__main__': + unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332463?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: Ib13655905ce0c35f62b16c695de74030406068d3 Gerrit-Change-Number: 1332463 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]: upload: Clean up temporary downloads
by jenkins-bot (Code Review) 30 Aug '26

30 Aug '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332197?usp=email ) Change subject: upload: Clean up temporary downloads ...................................................................... upload: Clean up temporary downloads Remove partial files when URL downloads fail and close streamed responses after each attempt. Delete owned download files after upload completion or failure. Preserve caller-provided local files. Change-Id: Ia52d9fbb0209f23e7b52c96e2376e7339e043baa --- M pywikibot/specialbots/_upload.py M tests/uploadbot_tests.py 2 files changed, 263 insertions(+), 88 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/specialbots/_upload.py b/pywikibot/specialbots/_upload.py index 06715f9..2415662 100644 --- a/pywikibot/specialbots/_upload.py +++ b/pywikibot/specialbots/_upload.py @@ -138,7 +138,16 @@ else: self.target_site = pywikibot.Site() - def read_file_content(self, file_url: str): + @staticmethod + def _remove_temp_file(path: Path) -> None: + """Remove a temporary file without masking an earlier error.""" + try: + path.unlink(missing_ok=True) + except OSError as e: + pywikibot.warning( + f'Unable to remove temporary file {path}: {e}') + + def read_file_content(self, file_url: str) -> str: """Return name of temp file in which remote file is saved.""" pywikibot.info('Reading file ' + file_url) @@ -146,61 +155,78 @@ os.close(temp_fd) path = Path(tempname) size = 0 + complete = False - dt_gen = (el for el in (15, 30, 45, 60, 120, 180, 240, 300)) - while True: - file_len = path.stat().st_size - if file_len: - pywikibot.info('Download resumed.') - headers = {'Range': f'bytes={file_len}-'} - else: - headers = {} + try: + dt_gen = (el for el in (15, 30, 45, 60, 120, 180, 240, 300)) + while True: + file_len = path.stat().st_size + if file_len: + pywikibot.info('Download resumed.') + headers = {'Range': f'bytes={file_len}-'} + else: + headers = {} - with path.open('ab') as fd: + with path.open('ab') as fd: + try: + with http.fetch(file_url, stream=True, + headers=headers) as response: + try: + response.raise_for_status() + except requests.HTTPError as e: + # exit criteria if size is not available + # error on last iteration is OK, we're + # requesting {'Range': 'bytes=file_len-'} + err = ( + HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE + ) + if response.status_code == err \ + and path.stat().st_size: + break + raise FatalServerError(str(e)) from e + + # get download info, if available + # Note: this is not enough to exclude pages + # e.g. 'application/json' is also not a media + content_type = response.headers.get( + 'Content-Type', '') + if 'text/' in content_type: + raise FatalServerError( + 'The requested URL was not found on ' + 'server.') + size = max( + size, + int(response.headers.get('Content-Length', 0)) + ) + + # stream content to temp file (in chunks of 1Mb) + for chunk in response.iter_content( + chunk_size=1024 * 1024): + fd.write(chunk) + + # raised from connection lost during iter_content() + except requests.ConnectionError: + fd.flush() + pywikibot.info( + 'Connection closed at byte ' + f'{path.stat().st_size}') + + if size and size == path.stat().st_size: + break try: - response = http.fetch(file_url, stream=True, - headers=headers) - response.raise_for_status() + dt = next(dt_gen) + pywikibot.info(f'Sleeping for {dt} seconds ...') + pywikibot.sleep(dt) + except StopIteration: + raise FatalServerError( + 'Download failed, too many retries!') - # get download info, if available - # Note: this is not enough to exclude pages - # e.g. 'application/json' is also not a media - if 'text/' in response.headers['Content-Type']: - raise FatalServerError('The requested URL was not ' - 'found on server.') - size = max(size, - int(response.headers.get('Content-Length', 0))) - - # stream content to temp file (in chunks of 1Mb) - for chunk in response.iter_content(chunk_size=1024 * 1024): - fd.write(chunk) - - # raised from connection lost during response.iter_content() - except requests.ConnectionError: - fd.flush() - pywikibot.info( - f'Connection closed at byte {path.stat().st_size}') - # raised from response.raise_for_status() - except requests.HTTPError as e: - # exit criteria if size is not available - # error on last iteration is OK, we're requesting - # {'Range': 'bytes=file_len-'} - err = HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE - if response.status_code == err and path.stat().st_size: - break - raise FatalServerError(str(e)) from e - - if size and size == path.stat().st_size: - break - try: - dt = next(dt_gen) - pywikibot.info(f'Sleeping for {dt} seconds ...') - pywikibot.sleep(dt) - except StopIteration: - raise FatalServerError('Download failed, too many retries!') - - pywikibot.info(f'Downloaded {path.stat().st_size} bytes') - return tempname + pywikibot.info(f'Downloaded {path.stat().st_size} bytes') + complete = True + return tempname + finally: + if not complete: + self._remove_temp_file(path) def _handle_warning(self, warning: str) -> bool | None: """Return whether the warning cause an abort or be ignored. @@ -414,45 +440,53 @@ ignore_warnings = self.ignore_warning is True or self._handle_warnings download = False - while True: - if '://' in file_url \ - and (not site.has_right('upload_by_url') or download): + temp_filename: str | None = None + try: + while True: + if '://' in file_url \ + and (not site.has_right('upload_by_url') or download): + try: + temp_filename = self.read_file_content(file_url) + file_url = temp_filename + except FatalServerError as e: + pywikibot.error(e) + return None + try: - file_url = self.read_file_content(file_url) - except FatalServerError as e: - pywikibot.error(e) - return None - - try: - success = imagepage.upload(file_url, - ignore_warnings=ignore_warnings, - chunk_size=self.chunk_size, - asynchronous=self.asynchronous, - comment=self.summary) - except APIError as error: - if error.code == 'uploaddisabled': - pywikibot.error(f'Upload error: Local file uploads are ' - f'disabled on {site}.') - elif error.code == 'copyuploadbaddomain' and not download \ - and '://' in file_url: - pywikibot.error(error) - pywikibot.info('Downloading the file and retry...') - download = True - continue - else: + success = imagepage.upload( + file_url, + ignore_warnings=ignore_warnings, + chunk_size=self.chunk_size, + asynchronous=self.asynchronous, + comment=self.summary) + except APIError as error: + if error.code == 'uploaddisabled': + pywikibot.error( + f'Upload error: Local file uploads are disabled ' + f'on {site}.') + elif error.code == 'copyuploadbaddomain' and not download \ + and '://' in file_url: + pywikibot.error(error) + pywikibot.info('Downloading the file and retry...') + download = True + continue + else: + pywikibot.exception('Upload error: ') + except Exception: pywikibot.exception('Upload error: ') - except Exception: - pywikibot.exception('Upload error: ') - else: - if success: - # No warning, upload complete. - pywikibot.info(f'Upload of {filename} successful.') - self.counter['upload'] += 1 - return filename # data['filename'] - pywikibot.info('Upload aborted.') - break + else: + if success: + # No warning, upload complete. + pywikibot.info(f'Upload of {filename} successful.') + self.counter['upload'] += 1 + return filename # data['filename'] + pywikibot.info('Upload aborted.') + break - return None + return None + finally: + if temp_filename is not None: + self._remove_temp_file(Path(temp_filename)) def skip_run(self) -> bool: """Check whether processing is to be skipped.""" diff --git a/tests/uploadbot_tests.py b/tests/uploadbot_tests.py index 1c84614..1945210 100755 --- a/tests/uploadbot_tests.py +++ b/tests/uploadbot_tests.py @@ -11,10 +11,15 @@ from __future__ import annotations import os +import tempfile import unittest from contextlib import suppress +from pathlib import Path from unittest import mock +import requests + +from pywikibot.exceptions import APIError from pywikibot.specialbots import UploadRobot from tests import join_images_path from tests.aspects import DefaultSiteTestCase, TestCase @@ -85,6 +90,142 @@ self.assertIsNone(bot.post_processor) +class TestUploadbotTempFiles(TestCase): + + """Dry tests for UploadRobot temporary files.""" + + net = False + + def test_download_failure_removes_partial_file(self) -> None: + """Test that a failed download removes its partial file.""" + response = mock.MagicMock() + response.__enter__.return_value = response + response.headers = { + 'Content-Type': 'image/png', + 'Content-Length': '10', + } + + def chunks(): + yield b'partial' + raise requests.Timeout('Download timed out') + + response.iter_content.return_value = chunks() + bot = UploadRobot( + url=['mahveo.png'], target_site=mock.Mock(), always=False) + + with tempfile.TemporaryDirectory() as directory: + temp_fd, tempname = tempfile.mkstemp(dir=directory) + with ( + mock.patch('pywikibot.specialbots._upload.tempfile.mkstemp', + return_value=(temp_fd, tempname)), + mock.patch('pywikibot.specialbots._upload.http.fetch', + return_value=response), + self.assertRaises(requests.Timeout), + ): + bot.read_file_content('https://yo.wikipedia.org/mahveo.png') + + self.assertFalse(Path(tempname).exists()) + + response.__exit__.assert_called_once() + + def test_downloaded_file_cleanup(self) -> None: + """Test that downloaded files are removed after an upload attempt.""" + file_url = 'https://yo.wikipedia.org/mahveo.png' + cases = ( + (True, 'mahveo.png'), + (False, None), + (APIError('mahveo', 'Upload failed'), None), + ) + + for outcome, expected in cases: + with self.subTest(outcome=outcome), \ + tempfile.TemporaryDirectory() as directory: + temp_path = Path(directory) / 'download' + temp_path.write_bytes(b'content') + site = mock.Mock() + site.has_right.return_value = False + imagepage = mock.Mock() + + def upload(source, *, expected_path=temp_path, + upload_outcome=outcome, **kwargs): + self.assertEqual(source, str(expected_path)) + self.assertTrue(expected_path.exists()) + if isinstance(upload_outcome, Exception): + raise upload_outcome + return upload_outcome + + imagepage.upload.side_effect = upload + bot = UploadRobot( + url=[file_url], target_site=site, always=False) + with ( + mock.patch.object(bot, 'process_filename', + return_value='mahveo.png'), + mock.patch.object(bot, 'read_file_content', + return_value=str(temp_path)), + mock.patch('pywikibot.FilePage', return_value=imagepage), + mock.patch('pywikibot.exception'), + ): + result = bot.upload_file(file_url) + + self.assertEqual(result, expected) + self.assertFalse(temp_path.exists()) + + def test_local_file_is_preserved(self) -> None: + """Test that a caller-owned local file is not removed.""" + site = mock.Mock() + imagepage = mock.Mock() + imagepage.upload.return_value = True + + with tempfile.TemporaryDirectory() as directory: + path = Path(directory) / 'mahveo.png' + path.write_bytes(b'content') + bot = UploadRobot( + url=[str(path)], target_site=site, always=False) + with ( + mock.patch.object(bot, 'process_filename', + return_value='mahveo.png'), + mock.patch('pywikibot.FilePage', return_value=imagepage), + ): + result = bot.upload_file(str(path)) + + self.assertEqual(result, 'mahveo.png') + self.assertTrue(path.exists()) + + def test_downloaded_file_cleanup_after_retry(self) -> None: + """Test cleanup after falling back from URL to file upload.""" + file_url = 'https://yo.wikipedia.org/mahveo.png' + site = mock.Mock() + site.has_right.return_value = True + imagepage = mock.Mock() + + with tempfile.TemporaryDirectory() as directory: + temp_path = Path(directory) / 'download' + temp_path.write_bytes(b'content') + + def upload(source, **kwargs): + if source == file_url: + raise APIError('copyuploadbaddomain', 'Bad domain') + self.assertEqual(source, str(temp_path)) + self.assertTrue(temp_path.exists()) + return True + + imagepage.upload.side_effect = upload + bot = UploadRobot( + url=[file_url], target_site=site, always=False) + with ( + mock.patch.object(bot, 'process_filename', + return_value='mahveo.png'), + mock.patch.object(bot, 'read_file_content', + return_value=str(temp_path)) as download, + mock.patch('pywikibot.FilePage', return_value=imagepage), + ): + result = bot.upload_file(file_url) + + self.assertEqual(result, 'mahveo.png') + download.assert_called_once_with(file_url) + self.assertFalse(temp_path.exists()) + + class TestUploadbotCounter(TestCase): """Dry tests for UploadRobot counters.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332197?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: Ia52d9fbb0209f23e7b52c96e2376e7339e043baa Gerrit-Change-Number: 1332197 Gerrit-PatchSet: 5 Gerrit-Owner: Mahveotm <mahveotm(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: site: Fix loadrevisions step handling
by jenkins-bot (Code Review) 30 Aug '26

30 Aug '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332215?usp=email ) Change subject: site: Fix loadrevisions step handling ...................................................................... site: Fix loadrevisions step handling Call set_query_increment instead of replacing the method so that step controls the API batch size. Change-Id: I717b136b63a87ae76f58ab44125d37f8da07d5e6 --- M pywikibot/site/_generators.py M tests/site_generators_tests.py 2 files changed, 13 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/_generators.py b/pywikibot/site/_generators.py index 54fe872..4667fe9 100644 --- a/pywikibot/site/_generators.py +++ b/pywikibot/site/_generators.py @@ -878,7 +878,7 @@ total=kwargs.get('total'), **rvargs) if step: - rvgen.set_query_increment = step + rvgen.set_query_increment(step) if latest or 'revids' in rvgen.request: rvgen.set_maximum_items(-1) # suppress use of rvlimit parameter diff --git a/tests/site_generators_tests.py b/tests/site_generators_tests.py index ed3611b..fb753a9 100755 --- a/tests/site_generators_tests.py +++ b/tests/site_generators_tests.py @@ -126,6 +126,18 @@ self.assertTrue(result) namespace.assert_called_once_with() + def test_loadrevisions_step(self) -> None: + """Test that loadrevisions sets its API query increment.""" + page = pywikibot.Page(self.site, 'Main Page') + with patch.object(self.site, '_generator') as generator: + rvgen = generator.return_value + set_query_increment = rvgen.set_query_increment + rvgen.request = {} + rvgen.__iter__.return_value = () + self.site.loadrevisions(page, step=5) + + set_query_increment.assert_called_once_with(5) + class TestSiteGenerators(DefaultSiteTestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332215?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: I717b136b63a87ae76f58ab44125d37f8da07d5e6 Gerrit-Change-Number: 1332215 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]: delete: Clear cached reference table
by jenkins-bot (Code Review) 30 Aug '26

30 Aug '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332224?usp=email ) Change subject: delete: Clear cached reference table ...................................................................... delete: Clear cached reference table Register _ref_table for cache invalidation so clear_cache discards stale references. Change-Id: I7ccbb5c42e04e229145b29d31d0885d03171a561 --- M scripts/delete.py M tests/deletionbot_tests.py 2 files changed, 15 insertions(+), 5 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/delete.py b/scripts/delete.py index 0a82deb..4056eb3 100755 --- a/scripts/delete.py +++ b/scripts/delete.py @@ -82,11 +82,7 @@ Supports the same interface as Page, with some added methods. """ - def __init__(self, source, title: str = '', ns=0) -> None: - """Initializer.""" - super().__init__(source, title, ns) - _cache_attrs = list(super()._cache_attrs) - _cache_attrs = tuple(_cache_attrs + ['_ref_table']) + _cache_attrs = (*Page._cache_attrs, '_ref_table') def get_ref_table(self, *args, **kwargs) -> RefTable: """Build mapping table with pages which links the current page.""" diff --git a/tests/deletionbot_tests.py b/tests/deletionbot_tests.py index 30dbfa3..4aa8f2d 100755 --- a/tests/deletionbot_tests.py +++ b/tests/deletionbot_tests.py @@ -17,6 +17,20 @@ from tests.utils import empty_sites +class TestPageWithRefs(DefaultSiteTestCase): + + """Test PageWithRefs.""" + + dry = True + + def test_clear_ref_table_cache(self) -> None: + """Test that the reference table is cleared.""" + page = delete.PageWithRefs(self.site, 'Main Page') + page._ref_table = {} + page.clear_cache() + self.assertNotHasAttr(page, '_ref_table') + + class TestDeletionBotWrite(ScriptMainTestCase): """Test deletionbot script.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332224?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: I7ccbb5c42e04e229145b29d31d0885d03171a561 Gerrit-Change-Number: 1332224 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]: tests: Remove unreliable bad recipient test
by jenkins-bot (Code Review) 30 Aug '26

30 Aug '26

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332231?usp=email ) Change subject: tests: Remove unreliable bad recipient test ...................................................................... tests: Remove unreliable bad recipient test The test treats User.is_thankable as the server's recipient policy. Wikimedia wikis allow thanking bots under T341388, so a bot selected from recent changes can be thanked successfully instead of raising invalidrecipient. The self-thank test already covers invalidrecipient deterministically. Change-Id: I9b835a809e83bbc7aed540987140030977ccff2b --- M tests/thanks_tests.py 1 file changed, 0 insertions(+), 15 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/thanks_tests.py b/tests/thanks_tests.py index 1298407..bba6606 100755 --- a/tests/thanks_tests.py +++ b/tests/thanks_tests.py @@ -77,21 +77,6 @@ code = 'test' write = True - def test_bad_recipient(self) -> None: - """Test that thanking a bad recipient causes an error.""" - site = self.get_site() - data = site.recentchanges(total=20) - for rev in data: - revid = rev['revid'] - username = rev['user'] - user = User(site, username) - if not user.is_thankable: - break - else: - self.skipTest(NO_THANKABLE_REVS) - self.assertAPIError('invalidrecipient', None, site.thank_revision, - revid, source='pywikibot test') - def test_invalid_revision(self) -> None: """Test that passing an invalid revision ID causes an error.""" site = self.get_site() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1332231?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: I9b835a809e83bbc7aed540987140030977ccff2b Gerrit-Change-Number: 1332231 Gerrit-PatchSet: 2 Gerrit-Owner: Mahveotm <mahveotm(a)gmail.com> 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 August 2026