From 8e4c79625c4008ee5382d506ad80248ee647f4df Mon Sep 17 00:00:00 2001
From: Jessie Nadler <jessie@yipitdata.com>
Date: Thu, 8 Jun 2017 15:33:14 -0400
Subject: [PATCH] Clean Export name and value before appending to exports

---
 moto/cloudformation/parsing.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/moto/cloudformation/parsing.py b/moto/cloudformation/parsing.py
index 744b1d08e..8877b90c7 100644
--- a/moto/cloudformation/parsing.py
+++ b/moto/cloudformation/parsing.py
@@ -522,7 +522,9 @@ class OutputMap(collections.Mapping):
         if self.outputs:
             for key, value in self._output_json_map.items():
                 if value.get('Export'):
-                    exports.append(Export(self._stack_id, value['Export'].get('Name'), value.get('Value')))
+                    cleaned_name = clean_json(value['Export'].get('Name'), self._resource_map)
+                    cleaned_value = clean_json(value.get('Value'), self._resource_map)
+                    exports.append(Export(self._stack_id, cleaned_name, cleaned_value))
         return exports
 
     def create(self):