Skip to content

tld: Use Wiki API #1970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgw merged 1 commit into from
Dec 23, 2020
Merged

tld: Use Wiki API #1970

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions sopel/modules/tld.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

DATE_FORMAT = '%Y-%m-%d %H:%M:%S'
IANA_LIST_URI = 'https://data.iana.org/TLD/tlds-alpha-by-domain.txt'
WIKI_PAGE_URI = 'https://en.wikipedia.org/wiki/List_of_Internet_top-level_domains'
WIKI_PAGE_NAME = 'List_of_Internet_top-level_domains'
r_tld = re.compile(r'^\.(\S+)')
r_idn = re.compile(r'^(xn--[A-Za-z0-9]+)')

Expand Down Expand Up @@ -234,8 +234,21 @@ def _update_tld_data(bot, which):
bot.memory['tld_list_cache_updated'] = now
elif which == 'data':
try:
tld_data = requests.get(WIKI_PAGE_URI).text
except requests.exceptions.RequestException:
# https://www.mediawiki.org/wiki/Special:MyLanguage/API:Get_the_contents_of_a_page
tld_response = requests.get(
"https://en.wikipedia.org/w/api.php",
params={
"action": "parse",
"format": "json",
"prop": "text",
"utf8": 1,
"formatversion": 2,
"page": WIKI_PAGE_NAME,
},
).json()
tld_data = tld_response["parse"]["text"]
# py <3.5 needs ValueError instead of more specific json.decoder.JSONDecodeError
except (requests.exceptions.RequestException, ValueError, KeyError):
# Log error and continue life; it'll be fine
LOGGER.warning(
"Error fetching TLD data from Wikipedia; will try again later.",
Expand Down