diff --git a/app.py b/app.py index 784d9e571b..38ccc563ec 100755 --- a/app.py +++ b/app.py @@ -1,6 +1,13 @@ #!/usr/bin/env python -import urllib +from __future__ import print_function +from future.standard_library import install_aliases +install_aliases() + +from urllib.parse import urlparse, urlencode +from urllib.request import urlopen, Request +from urllib.error import HTTPError + import json import os @@ -35,8 +42,8 @@ def processRequest(req): yql_query = makeYqlQuery(req) if yql_query is None: return {} - yql_url = baseurl + urllib.urlencode({'q': yql_query}) + "&format=json" - result = urllib.urlopen(yql_url).read() + yql_url = baseurl + urlencode({'q': yql_query}) + "&format=json" + result = urlopen(yql_url).read() data = json.loads(result) res = makeWebhookResult(data) return res @@ -95,6 +102,6 @@ def makeWebhookResult(data): if __name__ == '__main__': port = int(os.getenv('PORT', 5000)) - print "Starting app on port %d" % port + print("Starting app on port %d" % port) app.run(debug=False, port=port, host='0.0.0.0') diff --git a/requirements.txt b/requirements.txt index 56eeb0c801..a679b0f117 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ -Flask==0.10.1 \ No newline at end of file +Flask==0.10.1 +future==0.16.0