Pywikibot-commits June 2025

pywikibot-commits@lists.wikimedia.org

1 participants
97 discussions

[Gerrit] ...core[master]: IMPR: use pathlib methods in version script
by jenkins-bot (Code Review) 04 Jun '25

04 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1152033?usp=email ) Change subject: IMPR: use pathlib methods in version script ...................................................................... IMPR: use pathlib methods in version script Bug: T395187 Change-Id: I4392b759d898b20a492ca0bf0e85b1f73db74b81 --- M pywikibot/scripts/version.py 1 file changed, 13 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/scripts/version.py b/pywikibot/scripts/version.py index 0905135..454f7f0 100755 --- a/pywikibot/scripts/version.py +++ b/pywikibot/scripts/version.py @@ -12,15 +12,15 @@ the *-nouser* option. """ # -# (C) Pywikibot team, 2007-2024 +# (C) Pywikibot team, 2007-2025 # # Distributed under the terms of the MIT license. # from __future__ import annotations -import codecs import os import sys +from pathlib import Path import pywikibot from pywikibot.version import getversion @@ -75,17 +75,20 @@ or not hasattr(requests.certs, 'where') or not callable(requests.certs.where)): pywikibot.info(' cacerts: not defined') - elif not os.path.isfile(requests.certs.where()): - pywikibot.info(f' cacerts: {requests.certs.where()} (missing)') else: - pywikibot.info(' cacerts: ' + requests.certs.where()) - - with codecs.open(requests.certs.where(), 'r', 'utf-8') as cert_file: - text = cert_file.read() + cert = Path(requests.certs.where()) + # is_symlink() required for Python 3.12 and below. + # Otherwise follow_symlinks=True could be used in is_file(). + if not cert.is_file() or cert.is_symlink(): + pywikibot.info(f' cacerts: {cert.name} (missing)') + else: + pywikibot.info(f' cacerts: {cert}') + text = cert.read_text(encoding='utf-8') if WMF_CACERT in text: has_wikimedia_cert = True - pywikibot.info(' certificate test: {}' - .format('ok' if has_wikimedia_cert else 'not ok')) + pywikibot.info(' certificate test: {}' + .format('ok' if has_wikimedia_cert else 'not ok')) + if not has_wikimedia_cert: pywikibot.info(' Please reinstall requests!') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1152033?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: I4392b759d898b20a492ca0bf0e85b1f73db74b81 Gerrit-Change-Number: 1152033 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]: [tests] remove unused local variable in superset_tests.py
by jenkins-bot (Code Review) 02 Jun '25

02 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1152679?usp=email ) Change subject: [tests] remove unused local variable in superset_tests.py ...................................................................... [tests] remove unused local variable in superset_tests.py Change-Id: I2dbba085dac401ee573b80bef2ef7174c07a8442 --- M tests/superset_tests.py 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/superset_tests.py b/tests/superset_tests.py index 9ba83f8..7977f2f 100755 --- a/tests/superset_tests.py +++ b/tests/superset_tests.py @@ -37,13 +37,11 @@ msg = 'Only one of schema_name and site parameters can be defined' with self.assertRaisesRegex(TypeError, msg): - superset = SupersetQuery(schema_name='enwiki_p', - site=site) + SupersetQuery(schema_name='enwiki_p', site=site) msg = 'database_id should be integer' with self.assertRaisesRegex(TypeError, msg): - superset = SupersetQuery(schema_name='enwiki_p', - database_id='foo') + SupersetQuery(schema_name='enwiki_p', database_id='foo') class TestSupersetWithAuth(TestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1152679?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: I2dbba085dac401ee573b80bef2ef7174c07a8442 Gerrit-Change-Number: 1152679 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]: [bugfix] Fix missing commas in noreferences.py and dry_api_tests.py
by jenkins-bot (Code Review) 02 Jun '25

02 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1152676?usp=email ) Change subject: [bugfix] Fix missing commas in noreferences.py and dry_api_tests.py ...................................................................... [bugfix] Fix missing commas in noreferences.py and dry_api_tests.py Change-Id: I032d00a6959bd97260783d65f01df8159af3bf5b --- M scripts/noreferences.py M tests/dry_api_tests.py M tests/wikiblame_tests.py 3 files changed, 9 insertions(+), 9 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/noreferences.py b/scripts/noreferences.py index 4c373e6..79ca562 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -28,7 +28,7 @@ a list of affected articles """ # -# (C) Pywikibot team, 2007-2024 +# (C) Pywikibot team, 2007-2025 # # Distributed under the terms of the MIT license. # @@ -166,9 +166,9 @@ '바깥 고리', '바깥고리', '바깥 링크', - '바깥링크' + '바깥링크', '외부 고리', - '외부고리' + '외부고리', ], 'lt': [ # no explicit policy on where to put the references 'Nuorodos' @@ -382,10 +382,10 @@ ], 'ko': [ '주석', - '각주' - '주석 및 참고 자료' + '각주', + '주석 및 참고 자료', '주석 및 참고자료', - '주석 및 참고 출처' + '주석 및 참고 출처', ], 'lt': [ # not sure about which ones are preferred. 'Šaltiniai', diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index 2e536ec..9f10c9c 100755 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """API tests which do not interact with a site.""" # -# (C) Pywikibot team, 2012-2024 +# (C) Pywikibot team, 2012-2025 # # Distributed under the terms of the MIT license. # @@ -330,7 +330,7 @@ 'index': 1, 'name': 'prop', 'type': [ - 'displaytitle' + 'displaytitle', 'notificationtimestamp', 'protection', 'subjectid', diff --git a/tests/wikiblame_tests.py b/tests/wikiblame_tests.py index cd27fea..ced4a57 100644 --- a/tests/wikiblame_tests.py +++ b/tests/wikiblame_tests.py @@ -56,7 +56,7 @@ def test_restrictions(self) -> None: """Test main_authors() method with restrictions.""" page = pywikibot.Page(pywikibot.Site('wikipedia:en'), 'Python') - auth = page.authorship(min_chars=100, min_pct=5.0) + auth = page.authorship(4, min_chars=100, min_pct=5.0) self.assertLessEqual(len(auth), 4) for k, (chars, pct) in auth.items(): with self.subTest(user=k): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1152676?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: I032d00a6959bd97260783d65f01df8159af3bf5b Gerrit-Change-Number: 1152676 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 is_symlink method call
by jenkins-bot (Code Review) 01 Jun '25

01 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1152431?usp=email ) Change subject: [bugfix] Fix is_symlink method call ...................................................................... [bugfix] Fix is_symlink method call Change-Id: Ib4aa59aa9b5fd8431b43c356649585d13a9311ca --- M pywikibot/login.py 1 file changed, 8 insertions(+), 7 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/login.py b/pywikibot/login.py index f24b4fc..e4fcf84 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -230,16 +230,17 @@ params = {} if PYTHON_VERSION < (3, 13) else {'follow_symlinks': False} # test for symlink required for Python < 3.13 - if not password_path.is_file(**params) or password_path.is_symlink: + if not password_path.is_file(**params) or password_path.is_symlink(): password_path = Path(config.password_file) # ignore this check when running tests - if os.environ.get('PYWIKIBOT_TEST_RUNNING', '0') == '0': - if not password_path.is_file(**params) or password_path.is_symlink: - raise FileNotFoundError( - f'Password file {password_path.name} does not exist in ' - f'{password_path.parent}' - ) + if os.environ.get('PYWIKIBOT_TEST_RUNNING', '0') == '0' \ + and (not password_path.is_file(**params) + or password_path.is_symlink()): + raise FileNotFoundError( + f'Password file {password_path.name} does not exist in ' + f'{password_path.parent}' + ) # We fix password file permission first. file_mode_checker(password_path, mode=config.private_files_permission) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1152431?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: Ib4aa59aa9b5fd8431b43c356649585d13a9311ca Gerrit-Change-Number: 1152431 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]: IMPR: use pathlib methods in generate_user_file
by jenkins-bot (Code Review) 01 Jun '25

01 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1150058?usp=email ) Change subject: IMPR: use pathlib methods in generate_user_file ...................................................................... IMPR: use pathlib methods in generate_user_file Bug: T395187 Change-Id: I887581593a257ae6b85f467b38df1315e7056ba6 --- M pywikibot/scripts/generate_user_files.py 1 file changed, 29 insertions(+), 28 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/scripts/generate_user_files.py b/pywikibot/scripts/generate_user_files.py index 022471a..bd4d6fb 100755 --- a/pywikibot/scripts/generate_user_files.py +++ b/pywikibot/scripts/generate_user_files.py @@ -8,13 +8,12 @@ Also EXTERNAL EDITOR SETTINGS section can be copied. """ # -# (C) Pywikibot team, 2010-2024 +# (C) Pywikibot team, 2010-2025 # # Distributed under the terms of the MIT license. # from __future__ import annotations -import codecs import os import re import sys @@ -243,8 +242,7 @@ data = [] config_path = Path(__file__).resolve().parents[1].joinpath('config.py') - with codecs.open(config_path, 'r', 'utf-8') as config_f: - config_file = config_f.read() + config_file = config_path.read_text(encoding='utf-8') result = re.findall( '^(?P<section># #{5,} (?P<head>[A-Z][A-Z_ ]+[A-Z]) #{5,}\r?\n' @@ -356,8 +354,8 @@ Create a user-password.py if necessary. """ - _fnc = os.path.join(base_dir, USER_BASENAME) - _fncpass = os.path.join(base_dir, PASS_BASENAME) + f_user = Path(base_dir, USER_BASENAME) + f_pass = Path(base_dir, PASS_BASENAME) userlist = [] if force and not config.verbose_output: @@ -376,7 +374,7 @@ # BotPassword (username, BotPassword name, BotPassword pass) msg: str | None = fill( f'See {__url__}/BotPasswords to know how to get codes. ' - f'Please note that plain text in {_fncpass} and anyone with read' + f'Please note that plain text in {f_pass} and anyone with read' ' access to that directory will be able read the file.' ) botpasswords = [] @@ -421,26 +419,32 @@ try: # Finally save user-config.py - with codecs.open(_fnc, 'w', 'utf-8') as f: - f.write(config_content.format( + f_user.write_text( + config_content.format( main_family=main_family, main_code=main_code, usernames=usernames, config_text=config_text, botpasswords='password_file = ' + (f'"{PASS_BASENAME}"' - if botpasswords - else 'None'))) - pywikibot.info(f"'{_fnc}' written.") + if botpasswords else 'None') + ), + encoding='utf-8' + ) + pywikibot.info(f"'{f_user}' written.") except BaseException: - if os.path.exists(_fnc): - os.remove(_fnc) + f_user.unlink(missing_ok=True) raise - save_botpasswords(botpasswords, _fncpass) + save_botpasswords(botpasswords, f_pass) -def save_botpasswords(botpasswords, _fncpass): - """Write botpasswords to file.""" +def save_botpasswords(botpasswords: str, path: Path): + """Write botpasswords to file. + + :param botpasswords: botpasswords for password file + :param path: file path for password file + :raises OSError: OSError during writing the file + """ if botpasswords: # Save user-password.py if necessary # user-config.py is already created at this point @@ -448,19 +452,16 @@ from pywikibot.tools import file_mode_checker try: # First create an empty file with good permissions, before writing - # in it - with codecs.open(_fncpass, 'w', 'utf-8') as f: - f.write('') - file_mode_checker(_fncpass, + # the content + for content in ('', + PASSFILE_CONFIG.format(botpasswords=botpasswords)): + path.write_text(content, encoding='utf-8') + file_mode_checker(path, mode=config.private_files_permission, - quiet=True) - with codecs.open(_fncpass, 'w', 'utf-8') as f: - f.write(PASSFILE_CONFIG.format(botpasswords=botpasswords)) - file_mode_checker(_fncpass, - mode=config.private_files_permission) - pywikibot.info(f"'{_fncpass}' written.") + quiet=not content) + pywikibot.info(f"'{path}' written.") except OSError: - os.remove(_fncpass) + path.unlink(missing_ok=True) raise -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1150058?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: I887581593a257ae6b85f467b38df1315e7056ba6 Gerrit-Change-Number: 1150058 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]: IMPR: replace codecs.open with Path.write_text in generate_family_file
by jenkins-bot (Code Review) 01 Jun '25

01 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1150036?usp=email ) Change subject: IMPR: replace codecs.open with Path.write_text in generate_family_file ...................................................................... IMPR: replace codecs.open with Path.write_text in generate_family_file Bug: T395187 Change-Id: Ia9fe72392af5c9055646b7a80fcf5e864efe7b61 --- M pywikibot/scripts/generate_family_file.py 1 file changed, 8 insertions(+), 11 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/scripts/generate_family_file.py b/pywikibot/scripts/generate_family_file.py index 8b03eff..3c97c3d 100755 --- a/pywikibot/scripts/generate_family_file.py +++ b/pywikibot/scripts/generate_family_file.py @@ -32,18 +32,17 @@ If the url scheme is missing, ``https`` will be used. """ # -# (C) Pywikibot team, 2010-2024 +# (C) Pywikibot team, 2010-2025 # # Distributed under the terms of the MIT license. # from __future__ import annotations -import codecs -import os import re import string import sys from contextlib import suppress +from pathlib import Path from urllib.parse import urlparse, urlunparse @@ -256,12 +255,11 @@ def writefile(self, verify) -> None: """Write the family file.""" - fn = os.path.join(self.base_dir, 'families', - f'{self.name}_family.py') - print(f'Writing {fn}... ') + fp = Path(self.base_dir, 'families', f'{self.name}_family.py') + print(f'Writing {fp}... ') - if os.path.exists(fn) and input( - f'{fn} already exists. Overwrite? (y/n) ').lower() == 'n': + if fp.exists() and input( + f'{fp} already exists. Overwrite? (y/n) ').lower() == 'n': print('Terminating.') sys.exit(1) @@ -289,9 +287,8 @@ def verify_SSL_certificate(self, code: str) -> bool: return False """ - os.makedirs(os.path.dirname(fn), exist_ok=True) - with codecs.open(fn, 'w', 'utf-8') as fh: - fh.write(content) + fp.parent.mkdir(parents=True, exist_ok=True) + fp.write_text(content, encoding='utf-8') family_template = """\ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1150036?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: Ia9fe72392af5c9055646b7a80fcf5e864efe7b61 Gerrit-Change-Number: 1150036 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]: IMPR: replace codecs.open with stdlib open in pagegenerators/_generat...
by jenkins-bot (Code Review) 01 Jun '25

01 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1150029?usp=email ) Change subject: IMPR: replace codecs.open with stdlib open in pagegenerators/_generators.py ...................................................................... IMPR: replace codecs.open with stdlib open in pagegenerators/_generators.py Bug: T395187 Change-Id: Ia77843a20591bc54853a06c74dc1bdfed56f3917 --- M pywikibot/pagegenerators/_generators.py 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators/_generators.py b/pywikibot/pagegenerators/_generators.py index 2cf3c0e..2958652 100644 --- a/pywikibot/pagegenerators/_generators.py +++ b/pywikibot/pagegenerators/_generators.py @@ -7,7 +7,6 @@ from __future__ import annotations import calendar -import codecs import io import re import typing @@ -401,7 +400,7 @@ return linkingPage.linkedPages(total=total, content=content) -def _yield_titles(f: codecs.StreamReaderWriter | io.StringIO, +def _yield_titles(f: io.TextIOBase, site: pywikibot.site.BaseSite ) -> Generator[pywikibot.page.Page, None, None]: """Yield page titles from a text stream. @@ -451,7 +450,7 @@ site = pywikibot.Site() # If source cannot be parsed as an HTTP URL, treat as local file if not urlparse(source).netloc: - with codecs.open(source, 'r', config.textfile_encoding) as local_file: + with open(source, encoding=config.textfile_encoding) 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 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1150029?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: Ia77843a20591bc54853a06c74dc1bdfed56f3917 Gerrit-Change-Number: 1150029 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits June 2025