jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1018197?usp=email )
Change subject: [IMPR] Improvement for CheckImagesBot.takesettings()
......................................................................
[IMPR] Improvement for CheckImagesBot.takesettings()
remove outer exception handling. It is unclear what error may
occur there. Errors should never pass silently.
Patch detached from e1eabc9
Change-Id: If65b36cbb3d13b12924c90750f3aec3eaa70e779
---
M scripts/checkimages.py
1 file changed, 44 insertions(+), 35 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/checkimages.py b/scripts/checkimages.py
index 7950b79..3eb9d17 100755
--- a/scripts/checkimages.py
+++ b/scripts/checkimages.py
@@ -71,7 +71,7 @@
Welcome messages are imported from :mod:`scripts.welcome` script.
"""
#
-# (C) Pywikibot team, 2006-2023
+# (C) Pywikibot team, 2006-2024
#
# Distributed under the terms of the MIT license.
#
@@ -1058,42 +1058,37 @@
def takesettings(self) -> None:
"""Function to take the settings from the wiki."""
settings_page = i18n.translate(self.site, PAGE_WITH_SETTINGS)
- try:
- if not settings_page:
- self.settings_data = None
- else:
- page = pywikibot.Page(self.site, settings_page)
- self.settings_data = []
- try:
- testo = page.get()
- for number, m in enumerate(SETTINGS_REGEX.finditer(testo),
- start=1):
- name = str(m[1])
- find_tipe = str(m[2])
- find = str(m[3])
- imagechanges = str(m[4])
- summary = str(m[5])
- head = str(m[6])
- text = str(m[7])
- mexcatched = str(m[8])
- tupla = [number, name, find_tipe, find, imagechanges,
- summary, head, text, mexcatched]
- self.settings_data += [tupla]
-
- if not self.settings_data:
- pywikibot.info(
- "You've set wrongly your settings, please take a
"
- 'look to the relative page. (run without them)')
- self.settings_data = None
- except NoPageError:
- pywikibot.info("The settings' page doesn't
exist!")
- self.settings_data = None
- except Error:
- pywikibot.info(
- 'Problems with loading the settigs, run without them.')
+ if not settings_page:
self.settings_data = None
- self.some_problem = False
+ else:
+ page = pywikibot.Page(self.site, settings_page)
+ self.settings_data = []
+ try:
+ testo = page.get()
+
+ for number, m in enumerate(SETTINGS_REGEX.finditer(testo),
+ start=1):
+ name = str(m[1])
+ find_tipe = str(m[2])
+ find = str(m[3])
+ imagechanges = str(m[4])
+ summary = str(m[5])
+ head = str(m[6])
+ text = str(m[7])
+ mexcatched = str(m[8])
+ tupla = [number, name, find_tipe, find, imagechanges,
+ summary, head, text, mexcatched]
+ self.settings_data += [tupla]
+
+ if not self.settings_data:
+ pywikibot.info(
+ "You've set wrongly your settings, please take a "
+ 'look to the relative page. (run without them)')
+ self.settings_data = None
+ except NoPageError:
+ pywikibot.info("The settings' page doesn't exist!")
+ self.settings_data = None
# Real-Time page loaded
if self.settings_data:
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1018197?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: If65b36cbb3d13b12924c90750f3aec3eaa70e779
Gerrit-Change-Number: 1018197
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: D3r1ck01 <dalangi-ctr(a)wikimedia.org>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged