Pywikibot-commits June 2025

pywikibot-commits@lists.wikimedia.org

1 participants
97 discussions

[Gerrit] ...core[master]: IMPR: Simplify CTEBinaryBytesGenerator
by jenkins-bot (Code Review) 12 Jun '25

12 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1156367?usp=email ) Change subject: IMPR: Simplify CTEBinaryBytesGenerator ...................................................................... IMPR: Simplify CTEBinaryBytesGenerator - cpython issue 63203 is solved/closed - overwrite _handle_text - assign new _handle_text to _writeBody - remove mangle_from option from CTEBinaryBytesGenerator that policy behaviour is used Change-Id: I6b42d9534c527f84a291e1eea00d87b927fd95fc --- M pywikibot/data/api/__init__.py 1 file changed, 4 insertions(+), 8 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api/__init__.py b/pywikibot/data/api/__init__.py index c460530..0af2e3e 100644 --- a/pywikibot/data/api/__init__.py +++ b/pywikibot/data/api/__init__.py @@ -61,7 +61,6 @@ # Bug: T113120, T228841 # Subclassing necessary to fix bug of the email package in Python 3: -# see https://github.com/python/cpython/issues/63203 # see https://github.com/python/cpython/issues/63086 # The following solution might be removed if the bug is fixed for # Python versions which are supported by PWB @@ -70,17 +69,14 @@ """Workaround for bug in python 3 email handling of CTE binary.""" - def __init__(self, *args, **kwargs) -> None: - """Initializer.""" - super().__init__(*args, **kwargs) - self._writeBody = self._write_body - - def _write_body(self, msg) -> None: + def _handle_text(self, msg) -> None: if msg['content-transfer-encoding'] == 'binary': self._fp.write(msg.get_payload(decode=True)) else: super()._handle_text(msg) + _writeBody = _handle_text # noqa: N815 + class CTEBinaryMIMEMultipart(MIMEMultipartOrig): @@ -90,7 +86,7 @@ """Return unmodified binary payload.""" policy = self.policy if policy is None else policy fp = BytesIO() - g = CTEBinaryBytesGenerator(fp, mangle_from_=False, policy=policy) + g = CTEBinaryBytesGenerator(fp, policy=policy) g.flatten(self, unixfrom=unixfrom) return fp.getvalue() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1156367?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: I6b42d9534c527f84a291e1eea00d87b927fd95fc Gerrit-Change-Number: 1156367 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]: Update cpython bug tracker
by Xqt (Code Review) 12 Jun '25

12 Jun '25

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1156357?usp=email ) Change subject: Update cpython bug tracker ...................................................................... Update cpython bug tracker Change-Id: I3e06d284be75cae4da437361def0c16d88706bcd --- M pywikibot/data/api/__init__.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/pywikibot/data/api/__init__.py b/pywikibot/data/api/__init__.py index ca065a3..c460530 100644 --- a/pywikibot/data/api/__init__.py +++ b/pywikibot/data/api/__init__.py @@ -61,10 +61,10 @@ # Bug: T113120, T228841 # Subclassing necessary to fix bug of the email package in Python 3: -# see https://bugs.python.org/issue19003 -# see https://bugs.python.org/issue18886 +# see https://github.com/python/cpython/issues/63203 +# see https://github.com/python/cpython/issues/63086 # The following solution might be removed if the bug is fixed for -# Python versions which are supported by PWB, probably with Python 3.5 +# Python versions which are supported by PWB class CTEBinaryBytesGenerator(BytesGenerator): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1156357?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: I3e06d284be75cae4da437361def0c16d88706bcd Gerrit-Change-Number: 1156357 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de>

1 0

[Gerrit] ...core[master]: tests: fix LinksearchPageGenerator tests
by jenkins-bot (Code Review) 12 Jun '25

12 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1156316?usp=email ) Change subject: tests: fix LinksearchPageGenerator tests ...................................................................... tests: fix LinksearchPageGenerator tests - use dewiki because of misermode when using namespace parameter. Test is 11 times faster now. - use regex for wikipedia.org in test_weblink because the content can be any url ending with wikipedia.org but the protocol does match. - remove unittest.skip, the tests might be fixed with T396280 already. Bug: T396728 Change-Id: Ie9b53c5895c1377b9f24eb65c7299312be758db1 --- M tests/pagegenerators_tests.py 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 2adaba4..9260047 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -1724,15 +1724,16 @@ """Tests for pagegenerators.LinksearchPageGenerator.""" family = 'wikipedia' - code = 'en' + code = 'de' - @unittest.expectedFailure # T396728 def test_weblink(self) -> None: """Test -weblink.""" - cases = (('wikipedia.org', 'http://wikipedia.org'), - ('en.wikipedia.org', 'http://en.wikipedia.org'), - ('https://fr.wikipedia.org', 'https://fr.wikipedia.org'), - ('ftp://*', 'ftp://')) + cases = ( + ('wikipedia.org', 'wikipedia.org'), + ('en.wikipedia.org', 'http://en.wikipedia.org'), + ('https://fr.wikipedia.org', 'https://fr.wikipedia.org'), + ('ftp://*', 'ftp://') + ) for search, expected in cases: with self.subTest(search=search, expected=expected): @@ -1757,7 +1758,6 @@ protocol='https', site=self.site) - @unittest.skip('Needs to be adapted for T14810') def test_double_same_protocols(self) -> None: """Test LinksearchPageGenerator with two same protocols.""" gen = pagegenerators.LinksearchPageGenerator('https://w.wiki', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1156316?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: Ie9b53c5895c1377b9f24eb65c7299312be758db1 Gerrit-Change-Number: 1156316 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: add pbab tasks hints to expectedFailure decorators
by jenkins-bot (Code Review) 12 Jun '25

12 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1156282?usp=email ) Change subject: tests: add pbab tasks hints to expectedFailure decorators ...................................................................... tests: add pbab tasks hints to expectedFailure decorators Also remove skip decorator from pagegenerators_tests.TestLinksearchPageGenerator.test_weblink and replace it with expectedFailure Bug: T396728 Bug: T129368 Change-Id: Ic313f81051c24e0d02b28369df87188ef45d98a6 --- M tests/cosmetic_changes_tests.py M tests/file_tests.py M tests/pagegenerators_tests.py M tests/textlib_tests.py M tests/time_tests.py M tests/wikibase_tests.py 6 files changed, 13 insertions(+), 13 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py index f616540..8bdeba2 100755 --- a/tests/cosmetic_changes_tests.py +++ b/tests/cosmetic_changes_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """Test cosmetic_changes module.""" # -# (C) Pywikibot team, 2015-2024 +# (C) Pywikibot team, 2015-2025 # # Distributed under the terms of the MIT license. # @@ -432,7 +432,7 @@ '[[File:Foo.bar|250px|zentriert|Bar]]', self.cct.translateMagicWords('[[File:Foo.bar|250px|center|Bar]]')) - @unittest.expectedFailure + @unittest.expectedFailure # T396715 def test_translateMagicWords_fail(self) -> None: """Test translateMagicWords method. @@ -470,7 +470,7 @@ self.assertEqual('[[sand]]box', self.cct.cleanUpLinks('[[Sand|sand]]box')) - @unittest.expectedFailure + @unittest.expectedFailure # T396714 def test_cleanup_links(self) -> None: """Test cleanUpLinks method. diff --git a/tests/file_tests.py b/tests/file_tests.py index 27acf1f..6386c8b 100755 --- a/tests/file_tests.py +++ b/tests/file_tests.py @@ -247,7 +247,7 @@ 'https://upload.wikimedia.org/wikipedia/commons/' 'd/d3/Albert_Einstein_Head.jpg') - @unittest.expectedFailure + @unittest.expectedFailure # T391761 def test_get_file_url_thumburl_from_width(self) -> None: """Get File thumburl from width.""" self.assertTrue(self.image.exists()) @@ -259,7 +259,7 @@ self.assertEqual(self.image.latest_file_info.thumbwidth, 100) self.assertEqual(self.image.latest_file_info.thumbheight, 133) - @unittest.expectedFailure + @unittest.expectedFailure # T391761 def test_get_file_url_thumburl_from_height(self) -> None: """Get File thumburl from height.""" self.assertTrue(self.image.exists()) @@ -271,7 +271,7 @@ self.assertEqual(self.image.latest_file_info.thumbwidth, 75) self.assertEqual(self.image.latest_file_info.thumbheight, 100) - @unittest.expectedFailure + @unittest.expectedFailure # T391761 def test_get_file_url_thumburl_from_url_param(self) -> None: """Get File thumburl from height.""" self.assertTrue(self.image.exists()) diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 29aee4e..2adaba4 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -1726,7 +1726,7 @@ family = 'wikipedia' code = 'en' - @unittest.skip('Needs to be adapted for T14810') + @unittest.expectedFailure # T396728 def test_weblink(self) -> None: """Test -weblink.""" cases = (('wikipedia.org', 'http://wikipedia.org'), diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 18324ca..e482ba2 100755 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -71,7 +71,7 @@ self.assertNotContains('Minor_Edits', 'section hashes are case-sensitive') - @unittest.expectedFailure # TODO: T133276 + @unittest.expectedFailure # T133276 def test_encoded_chars_in_section(self) -> None: """Test encoded chars in section.""" self.assertContains('Talk_.28discussion.29_pages', @@ -874,7 +874,7 @@ self.get_site('wt')), '[[Bar]] and [[Bar|bar]]') - @unittest.expectedFailure + @unittest.expectedFailure # T396719 def test_label_diff_namespace(self) -> None: """Test that it uses the old label when the new doesn't match.""" # These tests require to get the actual part which is before the title @@ -1369,7 +1369,7 @@ 'x', 'y', ['file'], site=self.site), '[[File:a|[[foo]] [[bar [invalid ]].x]][[y]]') - @unittest.expectedFailure + @unittest.expectedFailure # T396721 def test_replace_tag_file_failure(self) -> None: """Test showing limits of the file link regex.""" # When the double brackets are unbalanced, the regex diff --git a/tests/time_tests.py b/tests/time_tests.py index b3ec13a..3e682cf 100755 --- a/tests/time_tests.py +++ b/tests/time_tests.py @@ -163,7 +163,7 @@ self.assertEqual(date, str(t1.date())) self.assertEqual(time, str(t1.time())) - @unittest.expectedFailure + @unittest.expectedFailure # T396723 def test_iso_format_with_sep(self) -> None: """Test conversion from and to ISO format with separator.""" sep = '*' diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index cf0c0bb..c590298 100755 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """Tests for the Wikidata parts of the page module.""" # -# (C) Pywikibot team, 2008-2024 +# (C) Pywikibot team, 2008-2025 # # Distributed under the terms of the MIT license. # @@ -716,7 +716,7 @@ self.assertEqual(claim.type, 'wikibase-property') self.assertEqual(claim.target, property_page) - @unittest.expectedFailure + @unittest.expectedFailure # T145971 def test_exists(self) -> None: """Test the exists method of PropertyPage.""" wikidata = self.get_repo() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1156282?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: Ic313f81051c24e0d02b28369df87188ef45d98a6 Gerrit-Change-Number: 1156282 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: Changing sections order for references and some cosmetic changes
by jenkins-bot (Code Review) 12 Jun '25

12 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1156097?usp=email ) Change subject: IMPR: Changing sections order for references and some cosmetic changes ...................................................................... IMPR: Changing sections order for references and some cosmetic changes Section 'Литература' should have higher priority than section 'Ссылки' Change-Id: Ia8c2121583490d9f2a98e56e8b978e65cca43724 --- M scripts/noreferences.py 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Rubin: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/noreferences.py b/scripts/noreferences.py index 2f8a53e..72abc0b 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -202,8 +202,8 @@ 'Notas', ], 'ru': [ - 'Ссылки', 'Литература', + 'Ссылки', ], 'sd': [ 'وڌيڪ ڏسو', @@ -324,11 +324,6 @@ 'Footnotes', 'Notes', ], - 'ru': [ - 'Примечания', - 'Сноски', - 'Источники', - ], 'eo': [ 'Referencoj', ], @@ -408,6 +403,11 @@ 'pt': [ 'Referências', ], + 'ru': [ + 'Примечания', + 'Сноски', + 'Источники', + ], 'sd': [ 'حوالا', ], -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1156097?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: Ia8c2121583490d9f2a98e56e8b978e65cca43724 Gerrit-Change-Number: 1156097 Gerrit-PatchSet: 4 Gerrit-Owner: Rubin <rubin.happy(a)gmail.com> Gerrit-Reviewer: Rubin <rubin.happy(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: Revert "typing: Fix typing annotations"
by jenkins-bot (Code Review) 11 Jun '25

11 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1155704?usp=email ) Change subject: Revert "typing: Fix typing annotations" ...................................................................... Revert "typing: Fix typing annotations" This reverts commit 7da61a2106074fac1b9d2dce44b2564d231d016f. Reason for revert: type hints are also used for documentation Change-Id: I8dc1b6f1cd882f1a34e484c2b1547875b61f586f --- M pywikibot/logentries.py M pywikibot/throttle.py M pywikibot/tools/__init__.py M tests/utils.py 4 files changed, 5 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py index 3656006..92a34cf 100644 --- a/pywikibot/logentries.py +++ b/pywikibot/logentries.py @@ -77,7 +77,7 @@ """Combine site and logid as the hash.""" return self.logid() ^ hash(self.site) - def __eq__(self, other: object) -> bool: + def __eq__(self, other: Any) -> bool: """Compare if self is equal to other.""" if not isinstance(other, LogEntry): pywikibot.debug(f"'{type(self).__name__}' cannot be compared with " diff --git a/pywikibot/throttle.py b/pywikibot/throttle.py index d0ae2da..20680a8 100644 --- a/pywikibot/throttle.py +++ b/pywikibot/throttle.py @@ -67,7 +67,7 @@ def __init__(self, site: pywikibot.site.BaseSite | str, *, mindelay: int | None = None, maxdelay: int | None = None, - writedelay: float | None = None) -> None: + writedelay: int | float | None = None) -> None: """Initializer.""" self.lock = threading.RLock() self.lock_write = threading.RLock() @@ -261,7 +261,7 @@ self._write_file(processes) @staticmethod - def wait(seconds: float) -> None: + def wait(seconds: int | float) -> None: """Wait for seconds seconds. Announce the delay if it exceeds a preset limit. diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 4740030..8fcae2d 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -511,7 +511,7 @@ """ return f"'{self}'" - def __eq__(self, other: object) -> bool: + def __eq__(self, other: Any) -> bool: if isinstance(other, str): other = MediaWikiVersion(other) elif not isinstance(other, MediaWikiVersion): diff --git a/tests/utils.py b/tests/utils.py index 70f7c38..95341b8 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -513,7 +513,7 @@ def execute_pwb(args: list[str], *, data_in: Sequence[str] | None = None, - timeout: float | None = None, + timeout: int | float | None = None, overrides: dict[str, str] | None = None) -> dict[str, Any]: """Execute the pwb.py script and capture outputs. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1155704?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: I8dc1b6f1cd882f1a34e484c2b1547875b61f586f Gerrit-Change-Number: 1155704 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: Try and remove old resource warning catch in utils.py
by jenkins-bot (Code Review) 11 Jun '25

11 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1155635?usp=email ) Change subject: Tests: Try and remove old resource warning catch in utils.py ...................................................................... Tests: Try and remove old resource warning catch in utils.py Bug: T89116 Bug: T183696 Bug: T184996 Change-Id: I8a83f50850567564e2af0dc6bf6b89829031483f --- M tests/utils.py 1 file changed, 1 insertion(+), 7 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/utils.py b/tests/utils.py index 70f7c38..1c95447 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,6 +1,6 @@ """Test utilities.""" # -# (C) Pywikibot team, 2013-2024 +# (C) Pywikibot team, 2013-2025 # # Distributed under the terms of the MIT license. # @@ -153,12 +153,6 @@ skip_frames -= 1 - # Ignore socket IO warnings (T183696, T184996) - if issubclass(warn_msg.category, ResourceWarning) \ - and str(warn_msg.message).startswith( - ('unclosed <ssl.SSLSocket', 'unclosed <socket.socket')): - return - log.append(warn_msg) log = super().__enter__() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1155635?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: I8a83f50850567564e2af0dc6bf6b89829031483f Gerrit-Change-Number: 1155635 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]: typing: Fix typing annotations
by jenkins-bot (Code Review) 11 Jun '25

11 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1155617?usp=email ) Change subject: typing: Fix typing annotations ...................................................................... typing: Fix typing annotations Change-Id: I0d04ecf8d6931863c708d4d4a4947331e3d0b5f7 --- M pywikibot/logentries.py M pywikibot/throttle.py M pywikibot/tools/__init__.py M tests/utils.py 4 files changed, 5 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py index 92a34cf..3656006 100644 --- a/pywikibot/logentries.py +++ b/pywikibot/logentries.py @@ -77,7 +77,7 @@ """Combine site and logid as the hash.""" return self.logid() ^ hash(self.site) - def __eq__(self, other: Any) -> bool: + def __eq__(self, other: object) -> bool: """Compare if self is equal to other.""" if not isinstance(other, LogEntry): pywikibot.debug(f"'{type(self).__name__}' cannot be compared with " diff --git a/pywikibot/throttle.py b/pywikibot/throttle.py index 20680a8..d0ae2da 100644 --- a/pywikibot/throttle.py +++ b/pywikibot/throttle.py @@ -67,7 +67,7 @@ def __init__(self, site: pywikibot.site.BaseSite | str, *, mindelay: int | None = None, maxdelay: int | None = None, - writedelay: int | float | None = None) -> None: + writedelay: float | None = None) -> None: """Initializer.""" self.lock = threading.RLock() self.lock_write = threading.RLock() @@ -261,7 +261,7 @@ self._write_file(processes) @staticmethod - def wait(seconds: int | float) -> None: + def wait(seconds: float) -> None: """Wait for seconds seconds. Announce the delay if it exceeds a preset limit. diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 8fcae2d..4740030 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -511,7 +511,7 @@ """ return f"'{self}'" - def __eq__(self, other: Any) -> bool: + def __eq__(self, other: object) -> bool: if isinstance(other, str): other = MediaWikiVersion(other) elif not isinstance(other, MediaWikiVersion): diff --git a/tests/utils.py b/tests/utils.py index 95341b8..70f7c38 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -513,7 +513,7 @@ def execute_pwb(args: list[str], *, data_in: Sequence[str] | None = None, - timeout: int | float | None = None, + timeout: float | None = None, overrides: dict[str, str] | None = None) -> dict[str, Any]: """Execute the pwb.py script and capture outputs. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1155617?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: I0d04ecf8d6931863c708d4d4a4947331e3d0b5f7 Gerrit-Change-Number: 1155617 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 stacklevel=2 with warnings.warn
by jenkins-bot (Code Review) 11 Jun '25

11 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1155608?usp=email ) Change subject: IMPR: Use stacklevel=2 with warnings.warn ...................................................................... IMPR: Use stacklevel=2 with warnings.warn Change-Id: I4d0f45ca402887f4e058853c059151732c2ee009 --- M pywikibot/bot.py M pywikibot/comms/http.py M pywikibot/config.py M pywikibot/data/api/_requests.py M pywikibot/login.py M pywikibot/page/_basepage.py M pywikibot/page/_toolforge.py M pywikibot/scripts/wrapper.py M pywikibot/site/_apisite.py M pywikibot/site/_basesite.py M pywikibot/tools/__init__.py M pywikibot/version.py 12 files changed, 27 insertions(+), 25 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/bot.py b/pywikibot/bot.py index adb70e1..9a2be57 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -739,7 +739,7 @@ """ if pywikibot._sites: warnings.warn('Site objects have been created before arguments were ' - 'handled', UserWarning) + 'handled', UserWarning, stacklevel=2) # get commandline arguments if necessary if not args: @@ -1161,7 +1161,7 @@ if 'generator' in kwargs: if hasattr(self, 'generator'): warnings.warn(f'{type(self).__name__} has a generator' - ' already. Ignoring argument.') + ' already. Ignoring argument.', stacklevel=2) else: self.generator: Iterable = kwargs.pop('generator') diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index e5d9b37..3d2f26a 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -300,7 +300,7 @@ warn(f'config.authenticate[{path!r}] has invalid value.\n' f'It should contain 2 or 4 items, not {length}.\n' - f'See {pywikibot.__url__}/OAuth for more info.') + f'See {pywikibot.__url__}/OAuth for more info.', stacklevel=2) return None diff --git a/pywikibot/config.py b/pywikibot/config.py index 55e1916..e56469a 100644 --- a/pywikibot/config.py +++ b/pywikibot/config.py @@ -1012,19 +1012,19 @@ value = _assert_default_type(name, value, default_values[name]) except _DifferentTypeError as e: - warn(e) + warn(e, stacklevel=2) else: user_config[name] = value elif not name.startswith('_') and name not in skipped: if name in _deprecated_variables: warn('\n' + fill(DEPRECATED_VARIABLE.format(name)), - _ConfigurationDeprecationWarning) + _ConfigurationDeprecationWarning, stacklevel=2) else: warn('\n' + fill(f'Configuration variable "{name}" is defined ' f'in your {user_config_file} but unknown. It' ' can be a misspelled one or a variable that' ' is no longer supported.'), - UserWarning) + UserWarning, stacklevel=2) _check_user_config_types(_exec_globals, _public_globals, _imports) @@ -1039,7 +1039,7 @@ if _right_user_agent_format != _exec_globals['user_agent_format']: warn('`{httplib2}` in user_agent_format is deprecated, ' 'will replace `{httplib2}` with `{http_backend}`', - _ConfigurationDeprecationWarning) + _ConfigurationDeprecationWarning, stacklevel=2) _exec_globals['user_agent_format'] = _right_user_agent_format del _right_user_agent_format @@ -1048,7 +1048,7 @@ if _key in _deprecated_variables: warn(DEPRECATED_VARIABLE.format(_key), - _ConfigurationDeprecationWarning) + _ConfigurationDeprecationWarning, stacklevel=2) # If we cannot auto-detect the console encoding (e.g. when piping data) # assume utf-8. On Linux, this will typically be correct; on Windows, diff --git a/pywikibot/data/api/_requests.py b/pywikibot/data/api/_requests.py index 33f9fd5..b68f132 100644 --- a/pywikibot/data/api/_requests.py +++ b/pywikibot/data/api/_requests.py @@ -265,7 +265,7 @@ # TODO: Use ParamInfo request to determine valid parameters if isinstance(kwargs.get('parameters'), dict): warn('The request contains already a "parameters" entry which is ' - 'a dict.') + 'a dict.', stacklevel=2) return cls(site=req_site, parameters=kwargs) @classmethod diff --git a/pywikibot/login.py b/pywikibot/login.py index a3679c7..c6fb669 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -139,7 +139,7 @@ warn('When using BotPasswords it is recommended that you store' ' your login credentials in a password_file instead. See ' f'{__url__}/BotPasswords for instructions and more' - ' information.') + ' information.', stacklevel=2) main_username = self.username.partition('@')[0] try: @@ -260,13 +260,13 @@ if not isinstance(entry, tuple): warn(f'Invalid tuple in line {line_len - n}', - _PasswordFileWarning) + _PasswordFileWarning, stacklevel=2) continue if not 2 <= (entry_len := len(entry)) <= 4: warn(f'The length of tuple in line {line_len - n} should be 2 ' f'to 4, {entry_len} given ({entry})', - _PasswordFileWarning) + _PasswordFileWarning, stacklevel=2) continue code, family, username, password = ( @@ -284,7 +284,8 @@ self.login_name = password.login_name(self.username) break - warn('Invalid password format', _PasswordFileWarning) + warn('Invalid password format', _PasswordFileWarning, + stacklevel=2) _api_error = { 'NotExists': 'does not exist', @@ -554,7 +555,7 @@ """ if '@' in suffix: warn('The BotPassword entry should only include the suffix', - _PasswordFileWarning) + _PasswordFileWarning, stacklevel=2) self.suffix = suffix self.password = password @@ -597,7 +598,7 @@ f'Password exists in password file for {self.site}: ' f'{self.username}. Password is unnecessary and should be' ' removed if OAuth enabled.', - _PasswordFileWarning + _PasswordFileWarning, stacklevel=2 ) self._consumer_token = (user, password) self._access_token: tuple[str, str] | None = None diff --git a/pywikibot/page/_basepage.py b/pywikibot/page/_basepage.py index 20301e3..9cbd4eb 100644 --- a/pywikibot/page/_basepage.py +++ b/pywikibot/page/_basepage.py @@ -2186,7 +2186,7 @@ undelete_revs = [] if reason is None: warn('Not passing a reason for undelete() is deprecated.', - DeprecationWarning) + DeprecationWarning, stacklevel=2) pywikibot.info(f'Undeleting {self.title(as_link=True)}.') reason = pywikibot.input( 'Please enter a reason for the undeletion:') diff --git a/pywikibot/page/_toolforge.py b/pywikibot/page/_toolforge.py index a5d6d54..e491b88 100644 --- a/pywikibot/page/_toolforge.py +++ b/pywikibot/page/_toolforge.py @@ -172,7 +172,7 @@ :raise TimeoutError: WikiHistory timeout """ if n and n > 5: - warn('Only the first 5 authors can be given.') + warn('Only the first 5 authors can be given.', stacklevel=2) baseurl = 'https://wikihistory.toolforge.org' pattern = (r'><bdi>(?P<author>.+?)</bdi></a>\s' diff --git a/pywikibot/scripts/wrapper.py b/pywikibot/scripts/wrapper.py index 9396ad2..62cbac8 100755 --- a/pywikibot/scripts/wrapper.py +++ b/pywikibot/scripts/wrapper.py @@ -411,7 +411,7 @@ else: warn("'user_script_paths' must be a list,\n" f'found: {type(config.user_script_paths).__name__}.' - ' Ignoring this setting.') + ' Ignoring this setting.', stacklevel=2) found = test_paths(user_script_paths, Path(config.base_dir)) if found: # pragma: no cover @@ -519,7 +519,7 @@ module = import_module(file_package) except ImportError as e: warn(f'Parent module {file_package} not found: {e}', - ImportWarning) + ImportWarning, stacklevel=2) help_option = any(arg.startswith('-help:') or arg == '-help' for arg in script_args) diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 9480955..eb103c5 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -2102,7 +2102,7 @@ f"{self.user()} is within 'bot' group but 'bot' right" " wasn't activated with OAuth or BotPassword settings" ) - warn(msg) + warn(msg, stacklevel=2) params = dict( action='edit', diff --git a/pywikibot/site/_basesite.py b/pywikibot/site/_basesite.py index 28a33a4..9973973 100644 --- a/pywikibot/site/_basesite.py +++ b/pywikibot/site/_basesite.py @@ -83,7 +83,7 @@ pywikibot.config.mylang = self.__code warn('Global configuration variable "mylang" changed to ' f'"{self.__code}" while instantiating site {self}', - UserWarning) + UserWarning, stacklevel=2) else: error_msg = (f"Language '{self.__code}' does not exist in " f'family {self.__family.name}') diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 8fcae2d..d9aa74e 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -138,7 +138,7 @@ if module_version < required_version: warn(f'Module version {module_version} is lower than requested ' - f'version {required_version}', ImportWarning) + f'version {required_version}', ImportWarning, stacklevel=2) return False return True @@ -687,7 +687,8 @@ os.chmod(filename, mode) # re-read and check changes if os.stat(filename).st_mode != st_mode and not quiet: - warn(warn_str.format(filename, st_mode - stat.S_IFREG, mode)) + warn(warn_str.format(filename, st_mode - stat.S_IFREG, mode), + stacklevel=2) def compute_file_hash(filename: str | os.PathLike, diff --git a/pywikibot/version.py b/pywikibot/version.py index 9af081e..a5e00df 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -105,7 +105,7 @@ tag, rev, date, hsh = ( '', '-1 (unknown)', '0 (unknown)', '(unknown)') warn(f'Unable to detect version; exceptions raised:\n{exceptions!r}', - UserWarning) + UserWarning, stacklevel=2) exceptions = None # Git and SVN can silently fail, as it may be a nightly. @@ -117,7 +117,7 @@ elif isinstance(date, time.struct_time): datestring = time.strftime('%Y/%m/%d, %H:%M:%S', date) else: # pragma: no cover - warn('Unable to detect package date', UserWarning) + warn('Unable to detect package date', UserWarning, stacklevel=2) datestring = '-2 (unknown)' return {'tag': tag, 'rev': rev, 'date': datestring, 'hsh': hsh} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1155608?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: I4d0f45ca402887f4e058853c059151732c2ee009 Gerrit-Change-Number: 1155608 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: implicit string concat
by jenkins-bot (Code Review) 11 Jun '25

11 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1155615?usp=email ) Change subject: tests: implicit string concat ...................................................................... tests: implicit string concat Change-Id: Ib44d088d46c2ea1cdeacd12ab42dcb885fcf07e5 --- M tests/dry_api_tests.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index 9423cd3..fbef7d0 100755 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -233,7 +233,7 @@ parameters={'action': 'query', 'meta': 'siteinfo'}) expect = ('MockSite()User(User:محمد الفلسطيني)' - + "[('action', 'query'), ('meta', 'siteinfo')]") + "[('action', 'query'), ('meta', 'siteinfo')]") self.assertEqual(repr(req._uniquedescriptionstr()), repr(expect)) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1155615?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: Ib44d088d46c2ea1cdeacd12ab42dcb885fcf07e5 Gerrit-Change-Number: 1155615 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> 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 June 2025