Merge pull request #57 from iron-io/python-fixes

Python fixes

Author: nikhilm

images/python/Dockerfile

@@ -13,8 +13,8 @@ RUN \
  && apk --no-cache add py-curl \
  && easy_install-2.7 "urlgrabber==3.9.1" \
 \
- && easy_install-2.7 "botocore==1.4.1" \
- && easy_install-2.7 "boto3==1.2.6" \
+ && easy_install-2.7 "botocore==1.4.17" \
+ && easy_install-2.7 "boto3==1.3.1" \
 \
  && rm  -rf /tmp/*
 

images/python/bootstrap.py

@@ -33,7 +33,7 @@ def __init__(self):
         self.memory_limit_in_mb = int(getTASK_MAXRAM() / 1024 / 1024)
 
     def get_remaining_time_in_millis(self):
-        remaining = plannedEnd - time.time()
+        remaining = plannedEnd - int(time.time())
         if remaining < 0:
             remaining = 0
         return remaining * 1000
@@ -112,8 +112,10 @@ def getPAYLOAD_FILE():
 
 
 def getTASK_TIMEOUT():
-    return os.environ.get('TASK_TIMEOUT') or 3600
-
+    try:
+        return int(os.environ.get('TASK_TIMEOUT'))
+    except ValueError:
+        return 3600
 
 def getTASK_MAXRAM():
     # IronWorker uses MAXMEM, Hybrid uses MAXRAM.
@@ -190,7 +192,7 @@ def filter(self, record):
     }
     logging.config.dictConfig(loggingConfig)
 
-plannedEnd = time.time() + getTASK_TIMEOUT()
+plannedEnd = int(time.time()) + getTASK_TIMEOUT()
 
 debugging and print ('os.environ      = ', os.environ)
 debugging and print ('/mnt content    = ', os.listdir("/mnt"))

test-suite/tests/python/test-context-values/test.py

@@ -5,7 +5,7 @@
 def run(event, context):
     print("Function name is set:", not (context.function_name is None))
     print("Function version is set:", not (context.function_version is None))
-    print("Memory limit in MB (grater or equal than 100):", context.memory_limit_in_mb > 100)
+    print("Memory limit in MB is positive:", context.memory_limit_in_mb > 0)
     print("AWS request ID is set:", not (context.aws_request_id is None))
 
     remaining1 = context.get_remaining_time_in_millis()