Skip to content

Commit f46f8a7

Browse files
committed
t5: Guard against CIDR too broad errors
Change-Id: I8e4a850121d73f92df4bf0b1ffee383c6835ab82
1 parent cc8ec9b commit f46f8a7

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

majavahbot/tasks/task_5_steward_request_bot.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from typing import Dict, List
66

77
import mwparserfromhell
8+
import pywikibot
89
from mwparserfromhell.wikicode import Wikicode
910
from pywikibot.data.api import QueryGenerator
1011

@@ -77,11 +78,17 @@ def __init__(self, number, name, site, family):
7778
self.supports_manual_run = True
7879

7980
def get_steward_who_gblocked_ip(self, api: MediawikiApi, ip_or_range):
80-
data = QueryGenerator(
81-
site=api.get_site(),
82-
list="globalblocks",
83-
bgip=ip_or_range,
84-
).request.submit()["query"]["globalblocks"]
81+
try:
82+
data = QueryGenerator(
83+
site=api.get_site(),
84+
list="globalblocks",
85+
bgip=ip_or_range,
86+
).request.submit()["query"]["globalblocks"]
87+
except pywikibot.exceptions.APIError as e:
88+
if e.code == "cidrtoobroad":
89+
return None
90+
raise
91+
8592
if len(data) == 0:
8693
return None
8794

0 commit comments

Comments
 (0)