tanner/wolframalpha
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use six for urllib compatibility

Browse Source
This commit is contained in:
Jason R. Coombs 2014-06-08 11:02:14 +01:00
parent 9dcc8f1124
commit f72ac2074d
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wolframalpha/__init__.py
View File

@ -1,11 +1,5 @@
try:
import urllib.parse as urllib_parse
import urllib.request as urllib_request
except ImportError:
import urllib as urllib_parse
import urllib2 as urllib_request
from xml.etree import ElementTree as etree from xml.etree import ElementTree as etree
from six.moves import urllib
from . import compat from . import compat
@ -74,12 +68,12 @@ class Client(object):
""" """
Query Wolfram|Alpha with query using the v2.0 API Query Wolfram|Alpha with query using the v2.0 API
""" """
query = urllib_parse.urlencode(dict( query = urllib.parse.urlencode(dict(
input=query, input=query,
appid=self.app_id, appid=self.app_id,
)) ))
url = 'http://api.wolframalpha.com/v2/query?' + query url = 'http://api.wolframalpha.com/v2/query?' + query
resp = urllib_request.urlopen(url) resp = urllib.request.urlopen(url)
assert resp.headers.get_content_type() == 'text/xml' assert resp.headers.get_content_type() == 'text/xml'
assert resp.headers.get_param('charset') == 'utf-8' assert resp.headers.get_param('charset') == 'utf-8'
return Result(resp) return Result(resp)