nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Modules: global dusting: call getJSON instead of making raw calls to urllib

Browse source
This commit is contained in:
nemunaire 2014-12-17 07:32:34 +01:00
parent 66ec7cb7ca
commit d14fec4cec
14 changed files with 118 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/mediawiki.py
View file

@ -5,7 +5,6 @@
import json
import re
import urllib.parse
import urllib.request
from hooks import hook
from tools import web
@ -22,8 +21,7 @@ def get_namespaces(site, ssl=False):
print_debug(url)
# Make the request
raw = urllib.request.urlopen(url)
data = json.loads(raw.read().decode())
data = web.getJSON(url)
namespaces = dict()
for ns in data["query"]["namespaces"]:
@ -38,8 +36,7 @@ def get_raw_page(site, term, ssl=False):
print_debug(url)
# Make the request
raw = urllib.request.urlopen(url)
data = json.loads(raw.read().decode())
data = web.getJSON(url)
for k in data["query"]["pages"]:
try:
@ -55,8 +52,7 @@ def get_unwikitextified(site, wikitext, ssl=False):
print_debug(url)
# Make the request
raw = urllib.request.urlopen(url)
data = json.loads(raw.read().decode())
data = web.getJSON(url)
return data["expandtemplates"]["*"]
@ -129,8 +125,7 @@ def search(site, term, ssl=False):
print_debug(url)
# Make the request
raw = urllib.request.urlopen(url)
data = json.loads(raw.read().decode())
data = web.getJSON(url)
if data is not None and "query" in data and "search" in data["query"]:
for itm in data["query"]["search"]: