Merge branch 'master' of github.com:johnwheeler/flask-ask

flask_ask/core.py

@@ -3,7 +3,7 @@
 import yaml
 import inspect
 from datetime import datetime
-from io import StringIO
+from io import BytesIO
 from functools import wraps, partial
 
 import aniso8601
@@ -612,7 +612,7 @@ def unicode_to_wsgi(u):
         body = json.dumps(event)
         environ['CONTENT_TYPE'] = 'application/json'
         environ['CONTENT_LENGTH'] = len(body)
-        environ['wsgi.input'] = StringIO(body)
+        environ['wsgi.input'] = BytesIO(body)
 
         # Start response is a required callback that must be passed when
         # the application is invoked. It is used to set HTTP status and

requirements.txt

@@ -1,5 +1,6 @@
 aniso8601==1.2.0
 Flask==0.12.1
+cryptography==2.1.4
 pyOpenSSL==17.0.0
 PyYAML==3.12
 six==1.11.0

setup.py

@@ -5,7 +5,11 @@
 Easy Alexa Skills Kit integration for Flask
 """
 from setuptools import setup
-from pip.req import parse_requirements
+
+def parse_requirements(filename):
+    """ load requirements from a pip requirements file """
+    lineiter = (line.strip() for line in open(filename))
+    return [line for line in lineiter if line and not line.startswith("#")]
 
 setup(
     name='Flask-Ask',
@@ -20,10 +24,7 @@
     zip_safe=False,
     include_package_data=True,
     platforms='any',
-    install_requires=[
-        str(item.req) for item in
-        parse_requirements('requirements.txt', session=False)
-    ],
+    install_requires=parse_requirements('requirements.txt'),
     test_requires=[
         'mock',
         'requests'