diff --git a/heat/engine/manager.py b/heat/engine/manager.py index f02a0544fe..06451d942a 100644 --- a/heat/engine/manager.py +++ b/heat/engine/manager.py @@ -20,7 +20,6 @@ import datetime import functools import os import socket -import sys import tempfile import time import traceback @@ -210,9 +209,9 @@ class EngineManager(manager.Manager): try: s = parser.Stack(context, 'validate', template, 0, params) - except KeyError: - res = 'A Fn::FindInMap operation referenced'\ - 'a non-existent map [%s]' % sys.exc_value + except KeyError as ex: + res = ('A Fn::FindInMap operation referenced ' + 'a non-existent map [%s]' % str(ex)) response = {'ValidateTemplateResult': { 'Description': 'Malformed Query Response [%s]' % (res), diff --git a/heat/engine/parser.py b/heat/engine/parser.py index 46a821b203..fb2754962d 100644 --- a/heat/engine/parser.py +++ b/heat/engine/parser.py @@ -16,7 +16,6 @@ import eventlet import json import logging -import sys from heat.common import exception from heat.engine import checkeddict from heat.engine import cloud_watch @@ -112,9 +111,9 @@ class Stack(object): response = None try: order = self.get_create_order() - except KeyError: + except KeyError as ex: res = 'A Ref operation referenced a non-existent key '\ - '[%s]' % sys.exc_value + '[%s]' % str(ex) response = {'ValidateTemplateResult': { 'Description': 'Malformed Query Response [%s]' % (res),