#1966: Remove future library from project.

requirements.in

@@ -8,7 +8,6 @@ pip>=9.0.1
 python-dateutil<2.7.0
 python-slugify
 PyYAML
-future
 # previous version don't work with urllib3 1.24
 requests>=2.20.0
 six

requirements.txt

@@ -13,7 +13,6 @@ chardet==3.0.4            # via requests
 click==7.0                # via cfn-flip, kappa, pip-tools
 docutils==0.15.2          # via botocore
 durationpy==0.5
-future==0.18.2
 hjson==3.0.1
 idna==2.9                 # via requests
 importlib-metadata==1.5.0  # via argcomplete

test_requirements.txt

@@ -21,7 +21,6 @@ durationpy==0.5
 entrypoints==0.3          # via flake8
 flake8==3.7.9
 flask==1.1.1
-future==0.18.2
 hjson==3.0.1
 idna==2.9                 # via requests
 importlib-metadata==1.5.0  # via argcomplete

tests/test_event_script_app.py

@@ -1,6 +1,3 @@
-from __future__ import print_function
-
-
 def handler_for_events(event, context):
     print('Event:', event)
     return True

zappa/cli.py

@@ -7,7 +7,6 @@
 Deploy arbitrary Python programs as serverless Zappa applications.
 
 """
-from past.builtins import basestring
 from builtins import input, bytes
 
 import argcomplete
@@ -1549,7 +1548,7 @@ def check_environment(self, environment):
 
         non_strings = []
         for (k,v) in environment.items():
-            if not isinstance(v, basestring):
+            if not isinstance(v, str):
                 non_strings.append(k)
         if non_strings:
             raise ValueError("The following environment variables are not strings: {}".format(", ".join(non_strings)))

zappa/utilities.py

@@ -12,8 +12,6 @@
 import stat
 import sys
 
-from past.builtins import basestring
-
 from urllib.parse import urlparse
 
 LOG = logging.getLogger(__name__)
@@ -481,7 +479,7 @@ def validate_name(name, maxlen=80):
     Return: the name
     Raise: InvalidAwsLambdaName, if the name is invalid.
     """
-    if not isinstance(name, basestring):
+    if not isinstance(name, str):
         msg = "Name must be of type string"
         raise InvalidAwsLambdaName(msg)
     if len(name) > maxlen: