replaced future library with six for py3 support fixes #6

johnwheeler · Jun 2, 2016 · 810e16a · 810e16a
1 parent 37c5194
commit 810e16a
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 20 deletions.
diff --git a/flask_ask/verifier.py b/flask_ask/verifier.py
@@ -1,12 +1,9 @@
-from future.standard_library import install_aliases
-install_aliases()
-
 import os
-import urllib.request, urllib.error, urllib.parse
 import base64
 import posixpath
-from urllib.parse import urlparse
 from datetime import datetime
+from six.moves.urllib.parse import urlparse
+from six.moves.urllib.request import urlopen
 
 from OpenSSL import crypto
 
@@ -19,7 +16,7 @@ class VerificationError(Exception): pass
 def load_certificate(cert_url):
     if not _valid_certificate_url(cert_url):
         raise VerificationError("Certificate URL verification failed")
-    cert_data = urllib.request.urlopen(cert_url).read()
+    cert_data = urlopen(cert_url).read()
     cert = crypto.load_certificate(crypto.FILETYPE_PEM, cert_data)
     if not _valid_certificate(cert):
         raise VerificationError("Certificate verification failed")

diff --git a/...helloworld/speechAssets/IntentSchema.json → ...elloworld/speech_assets/IntentSchema.json b/...helloworld/speechAssets/IntentSchema.json → ...elloworld/speech_assets/IntentSchema.json
diff --git a/...loworld/speechAssets/SampleUtterances.txt → ...oworld/speech_assets/SampleUtterances.txt b/...loworld/speechAssets/SampleUtterances.txt → ...oworld/speech_assets/SampleUtterances.txt
diff --git a/samples/historybuff/historybuff.py b/samples/historybuff/historybuff.py
@@ -1,9 +1,6 @@
-from future.standard_library import install_aliases
-install_aliases()
-
 import logging
-import urllib.request, urllib.error, urllib.parse
 import re
+from six.moves.urllib.request import urlopen
 
 
 from flask import Flask
@@ -107,14 +104,16 @@ def session_ended():
 
 def _get_json_events_from_wikipedia(month, date):
     url = "{}{}_{}".format(URL_PREFIX, month, date)
-    data = urllib.request.urlopen(url).read()
+    data = urlopen(url).read().decode('utf-8')
     return _parse_json(data)
 
 
 def _parse_json(text):
     events = []
     try:
-        text = text[text.index("\\nEvents\\n") + SIZE_OF_EVENTS: text.index("\\n\\n\\nBirths")];
+        slice_start = text.index("\\nEvents\\n") + SIZE_OF_EVENTS
+        slice_end = text.index("\\n\\n\\nBirths")
+        text = text[slice_start:slice_end];
     except ValueError:
         return events
     start_index = end_index = 0

diff --git a/...istorybuff/speechAssets/IntentSchema.json → ...storybuff/speech_assets/IntentSchema.json b/...istorybuff/speechAssets/IntentSchema.json → ...storybuff/speech_assets/IntentSchema.json
diff --git a/...orybuff/speechAssets/SampleUtterances.txt → ...rybuff/speech_assets/SampleUtterances.txt b/...orybuff/speechAssets/SampleUtterances.txt → ...rybuff/speech_assets/SampleUtterances.txt
diff --git a/...es/session/speechAssets/IntentSchema.json → ...s/session/speech_assets/IntentSchema.json b/...es/session/speechAssets/IntentSchema.json → ...s/session/speech_assets/IntentSchema.json
diff --git a/...session/speechAssets/SampleUtterances.txt → ...ession/speech_assets/SampleUtterances.txt b/...session/speechAssets/SampleUtterances.txt → ...ession/speech_assets/SampleUtterances.txt
diff --git a/...eechAssets/customSlotTypes/LIST_OF_COLORS → ...ech_assets/customSlotTypes/LIST_OF_COLORS b/...eechAssets/customSlotTypes/LIST_OF_COLORS → ...ech_assets/customSlotTypes/LIST_OF_COLORS
diff --git a/.../spacegeek/speechAssets/IntentSchema.json → ...spacegeek/speech_assets/IntentSchema.json b/.../spacegeek/speechAssets/IntentSchema.json → ...spacegeek/speech_assets/IntentSchema.json
diff --git a/...acegeek/speechAssets/SampleUtterances.txt → ...cegeek/speech_assets/SampleUtterances.txt b/...acegeek/speechAssets/SampleUtterances.txt → ...cegeek/speech_assets/SampleUtterances.txt
diff --git a/...tidepooler/speechAssets/IntentSchema.json → ...idepooler/speech_assets/IntentSchema.json b/...tidepooler/speechAssets/IntentSchema.json → ...idepooler/speech_assets/IntentSchema.json
diff --git a/...epooler/speechAssets/SampleUtterances.txt → ...pooler/speech_assets/SampleUtterances.txt b/...epooler/speechAssets/SampleUtterances.txt → ...pooler/speech_assets/SampleUtterances.txt
diff --git a/...eechAssets/customSlotTypes/LIST_OF_CITIES → ...ech_assets/customSlotTypes/LIST_OF_CITIES b/...eechAssets/customSlotTypes/LIST_OF_CITIES → ...ech_assets/customSlotTypes/LIST_OF_CITIES
diff --git a/...eechAssets/customSlotTypes/LIST_OF_STATES → ...ech_assets/customSlotTypes/LIST_OF_STATES b/...eechAssets/customSlotTypes/LIST_OF_STATES → ...ech_assets/customSlotTypes/LIST_OF_STATES
diff --git a/samples/tidepooler/tidepooler.py b/samples/tidepooler/tidepooler.py
@@ -1,13 +1,10 @@
-from future.standard_library import install_aliases
-install_aliases()
-
 import os
 import logging
 import datetime
-import urllib.request, urllib.error, urllib.parse
 import math
 import re
-from urllib.parse import urlencode
+from six.moves.urllib.request import urlopen
+from six.moves.urllib.parse import urlencode
 
 import aniso8601
 from flask import Flask, json, render_template
@@ -241,7 +238,7 @@ def _make_tide_request(city, date):
         noaa_api_params['begin_date'] = date.strftime('%Y%m%d')
         noaa_api_params['range'] = 24
     url = ENDPOINT + "?" + urlencode(noaa_api_params)
-    resp_body = urllib.request.urlopen(url).read()
+    resp_body = urlopen(url).read()
     if len(resp_body) == 0:
         statement_text = render_template('noaa_problem')
     else:

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
     name='Flask-Ask',
-    version='0.7.3',
+    version='0.7.4',
     url='https://github.com/johnwheeler/flask-ask',
     license='Apache 2.0',
     author='John Wheeler',
@@ -25,7 +25,7 @@
         'pyOpenSSL',
         'PyYAML',
         'aniso8601',
-        'future',
+        'six',
     ],
     classifiers=[
         'License :: OSI Approved :: Apache Software License',