jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1237679?usp=email )
Change subject: weblinkchecker: Fix i18n message key
......................................................................
weblinkchecker: Fix i18n message key
Also do not raise an exception but return in LinkCheckThread.run()
Bug: T416785
Change-Id: I49d695300d2fcfb1bc248c82e1b6fcb2c3c1e0b0
---
M scripts/weblinkchecker.py
1 file changed, 16 insertions(+), 14 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py
index 1b8d2c8..5c35aed 100755
--- a/scripts/weblinkchecker.py
+++ b/scripts/weblinkchecker.py
@@ -103,7 +103,7 @@
python pwb.py weblinkchecker -repeat
"""
#
-# (C) Pywikibot team, 2005-2025
+# (C) Pywikibot team, 2005-2026
#
# Distributed under the terms of the MIT license.
#
@@ -124,6 +124,7 @@
from pywikibot import comms, config, i18n, pagegenerators, textlib
from pywikibot.bot import ExistingPageBot, SingleSiteBot, suggest_help
from pywikibot.exceptions import (
+ FatalServerError,
IsRedirectPageError,
NoPageError,
SpamblacklistError,
@@ -283,25 +284,26 @@
def run(self) -> None:
"""Run the bot."""
time.sleep(self.get_delay(self.name))
+
try:
header = self.header
r = comms.http.fetch(
self.url, headers=header,
use_fake_user_agent=self._use_fake_user_agent)
- except requests.exceptions.InvalidURL:
- message = i18n.twtranslate(self.page.site,
- 'weblinkchecker-badurl_msg',
- {'URL': self.url})
- except Exception:
- pywikibot.info(f'Exception while processing URL {self.url} in '
- f'page {self.page}')
- raise
-
- if (
- r.status_code != HTTPStatus.OK
- or r.status_code in self.http_ignores
- ):
+ bad = (r.status_code != HTTPStatus.OK
+ or r.status_code in self.http_ignores)
message = HTTPStatus(r.status_code).phrase
+ except (requests.exceptions.InvalidURL, FatalServerError):
+ bad = True
+ message = i18n.twtranslate(self.page.site,
+ 'weblinkchecker-badurl',
+ {'URL': self.url})
+ except Exception as e:
+ pywikibot.info(f'Exception while processing URL {self.url} in '
+ f'page {self.page}:\n{e}')
+ return
+
+ if bad:
pywikibot.info(f'*{self.page} links to {self.url} - {message}.')
self.history.set_dead_link(self.url, message, self.page,
config.weblink_dead_days)
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1237679?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: I49d695300d2fcfb1bc248c82e1b6fcb2c3c1e0b0
Gerrit-Change-Number: 1237679
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
