samtranslator.patch

--- model/eventsources/cloudwatchlogs.py    Thu May 03 19:57:11 2018
+++ model/eventsources/cloudwatchlogs.py    Tue Jun 12 11:31:29 2018
@@ -3,7 +3,7 @@
 from samtranslator.translator.arn_generator import ArnGenerator
 from samtranslator.model.intrinsics import fnSub
 from samtranslator.model.log import SubscriptionFilter
-from push import PushEventSource
+from samtranslator.model.eventsources.push import PushEventSource

 class CloudWatchLogs(PushEventSource):
     """CloudWatch Logs event source for SAM Functions."""
--- model/preferences/deployment_preference_collection.py   Thu May 03 19:57:11 2018
+++ model/preferences/deployment_preference_collection.py   Tue Jun 12 11:38:47 2018
@@ -1,4 +1,4 @@
-from deployment_preference import DeploymentPreference
+from samtranslator.model.preferences.deployment_preference import DeploymentPreference
 from samtranslator.model.codedeploy import CodeDeployApplication
 from samtranslator.model.codedeploy import CodeDeployDeploymentGroup
 from samtranslator.model.iam import IAMRole
--- model/s3_utils/uri_parser.py    Thu May 03 19:57:12 2018
+++ model/s3_utils/uri_parser.py    Tue Jun 12 11:36:03 2018
@@ -1,4 +1,4 @@
-from urlparse import urlparse, parse_qs
+from urllib.parse import urlparse, parse_qs

 from six import string_types

--- model/sam_resources.py  Thu May 03 19:57:12 2018
+++ model/sam_resources.py  Tue Jun 12 11:37:34 2018
@@ -2,7 +2,7 @@
 from copy import deepcopy

 from six import string_types
-from tags.resource_tagging import get_tag_list
+from samtranslator.model.tags.resource_tagging import get_tag_list
 import samtranslator.model.eventsources
 import samtranslator.model.eventsources.pull
 import samtranslator.model.eventsources.push
@@ -19,8 +19,8 @@
 from samtranslator.model.function_policies import FunctionPolicies, PolicyTypes
 from samtranslator.translator import logical_id_generator
 from samtranslator.translator.arn_generator import ArnGenerator
-from api.api_generator import ApiGenerator
-from s3_utils.uri_parser import parse_s3_uri
+from samtranslator.model.api.api_generator import ApiGenerator
+from samtranslator.model.s3_utils.uri_parser import parse_s3_uri


 class SamFunction(SamResourceMacro):
--- plugins/api/implicit_api_plugin.py  Thu May 03 19:57:12 2018
+++ plugins/api/implicit_api_plugin.py  Tue Jun 12 12:32:38 2018
@@ -100,7 +100,7 @@
             return {}

         api_events = {}
-        for event_id, event in function.properties["Events"].iteritems():
+        for event_id, event in function.properties["Events"].items():

             if event and isinstance(event, dict) and event.get("Type") == "Api":
                 api_events[event_id] = event
--- plugins/globals/globals.py  Thu May 03 19:57:12 2018
+++ plugins/globals/globals.py  Tue Jun 12 12:33:26 2018
@@ -47,7 +47,7 @@
         ]
     }

-    supported_resource_section_names = [x.replace(_RESOURCE_PREFIX, "") for x in supported_properties.keys()]
+    supported_resource_section_names = []

     def __init__(self, template):
         """
@@ -59,6 +59,8 @@

         if self._KEYWORD in template:
             self.template_globals = self._parse(template[self._KEYWORD])
+
+        self.supported_resource_section_names = [x.replace(self._RESOURCE_PREFIX, "") for x in self.supported_properties.keys()]

     def merge(self, resource_type, resource_properties):
         """
--- policy_template_processor/processor.py  Thu May 03 19:57:12 2018
+++ policy_template_processor/processor.py  Tue Jun 12 12:31:17 2018
@@ -58,7 +58,7 @@
         PolicyTemplatesProcessor._is_valid_templates_dict(policy_templates_dict, schema)

         self.policy_templates = {}
-        for template_name, template_value_dict in policy_templates_dict["Templates"].iteritems():
+        for template_name, template_value_dict in policy_templates_dict["Templates"].items():
             self.policy_templates[template_name] = Template.from_dict(template_name, template_value_dict)

     def has(self, template_name):
--- sdk/template.py Thu May 03 19:57:12 2018
+++ sdk/template.py Tue Jun 12 12:31:58 2018
@@ -26,7 +26,7 @@
         :yields (string, SamResource): Tuple containing LogicalId and the resource
         """

-        for logicalId, resource_dict in self.resources.iteritems():
+        for logicalId, resource_dict in self.resources.items():

             resource = SamResource(resource_dict)
             needs_filter = resource.valid()
--- validator/validator.py  Thu May 03 19:57:12 2018
+++ validator/validator.py  Tue Jun 12 11:29:43 2018
@@ -1,7 +1,7 @@
 import json
 import jsonschema
 from jsonschema.exceptions import ValidationError
-import sam_schema
+import samtranslator.validator.sam_schema as sam_schema

 class SamTemplateValidator(object):

--- region_configuration.py Thu May 03 19:57:12 2018
+++ region_configuration.py Tue Jun 12 11:36:55 2018
@@ -1,4 +1,4 @@
-from translator.arn_generator import ArnGenerator
+from samtranslator.translator.arn_generator import ArnGenerator

 class RegionConfiguration(object):
     """