From de99fce9fbc4aa1e15406c05ea94aa03ad53bb00 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 7 Oct 2012 20:35:28 -0400 Subject: [PATCH] Add Python 3 compatibility imports --- wolframalpha/__init__.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/wolframalpha/__init__.py b/wolframalpha/__init__.py index 7e976fe..0c1b6fc 100644 --- a/wolframalpha/__init__.py +++ b/wolframalpha/__init__.py @@ -1,5 +1,10 @@ -import urllib -import urllib2 +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 class Result(object): @@ -54,12 +59,12 @@ class Client(object): """ Query Wolfram|Alpha with query using the v2.0 API """ - query = urllib.urlencode(dict( + query = urllib_parse.urlencode(dict( input=query, appid=self.app_id, )) url = 'http://api.wolframalpha.com/v2/query?' + query - resp = urllib2.urlopen(url) + resp = urllib_request.urlopen(url) assert resp.headers.gettype() == 'text/xml' assert resp.headers.getparam('charset') == 'utf-8' return Result(resp)