Adding Python3.6 support for local and runtime environments

asaolabs · asaolabs · commit 75a0539266aa · 2017-07-12T09:06:04.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -57,3 +57,6 @@ docs/_build/
 
 # PyBuilder
 target/
+
+# Jetbrains/PyCharm project files
+.idea/
diff --git a/README.rst b/README.rst
@@ -12,6 +12,12 @@ python-λ
 
 Python-lambda is a toolset for developing and deploying *serverless* Python code in AWS Lambda.
 
+NOTE: CHANGES FROM BASE REPOSITORY
+============================
+
+* Adding Python 3.6 support for the local environment & the lambda runtime
+
+
 A call for contributors
 =======================
 With python-lambda and `pytube <https://github.com/nficano/pytube/>`_ both continuing to gain momentum, I'm calling for contributors to help build out new features, review pull requests, fix bugs, and maintain overall code quality. If you're interested, please email me at nficano[at]gmail.com.
@@ -28,7 +34,7 @@ The *Python-Lambda* library takes away the guess work of developing your Python-
 Requirements
 ============
 
-* Python 2.7 (At the time of writing this, AWS Lambda only supports Python 2.7).
+* Python 2.7 & 3.6 (At the time of writing this, AWS Lambda only supports Python 2.7/3.6).
 * Pip (~8.1.1)
 * Virtualenv (~15.0.0)
 * Virtualenvwrapper (~4.7.1)
diff --git a/aws_lambda/aws_lambda.py b/aws_lambda/aws_lambda.py
@@ -344,7 +344,7 @@ def create_function(cfg, path_to_zip_file):
     """Register and upload a function to AWS Lambda."""
 
     print('Creating your new Lambda function')
-    byte_stream = read(path_to_zip_file)
+    byte_stream = read(path_to_zip_file, binary_file=True)
     aws_access_key_id = cfg.get('aws_access_key_id')
     aws_secret_access_key = cfg.get('aws_secret_access_key')
 
@@ -389,7 +389,7 @@ def update_function(cfg, path_to_zip_file):
     """Updates the code of an existing Lambda function"""
 
     print('Updating your Lambda function')
-    byte_stream = read(path_to_zip_file)
+    byte_stream = read(path_to_zip_file, binary_file=True)
     aws_access_key_id = cfg.get('aws_access_key_id')
     aws_secret_access_key = cfg.get('aws_secret_access_key')
 
diff --git a/aws_lambda/helpers.py b/aws_lambda/helpers.py
@@ -1,16 +1,17 @@
 # -*- coding: utf-8 -*-
-import datetime as dt
 import os
 import zipfile
+import datetime as dt
 
 
 def mkdir(path):
     if not os.path.exists(path):
         os.makedirs(path)
 
 
-def read(path, loader=None):
-    with open(path) as fh:
+def read(path, loader=None, binary_file=False):
+    open_mode = 'rb' if binary_file else 'r'
+    with open(path, mode=open_mode) as fh:
         if not loader:
             return fh.read()
         return loader(fh.read())
diff --git a/aws_lambda/project_templates/config.yaml b/aws_lambda/project_templates/config.yaml
@@ -4,6 +4,7 @@ function_name: my_lambda_function
 handler: service.handler
 # role: lambda_basic_execution
 description: My first lambda function
+runtime: python2.7
 
 # if access key and secret are left blank, boto will use the credentials
 # defined in the [default] section of ~/.aws/credentials.
@@ -14,6 +15,7 @@ aws_secret_access_key:
 # timeout: 15
 # memory_size: 512
 #
+
 # Experimental Environment variables
 environment_variables:
     env_1: foo
