From 787dd546952a4e8f8f9c9f1f18ad466f37180334 Mon Sep 17 00:00:00 2001 From: tengqm Date: Mon, 26 Jan 2015 19:39:01 +0800 Subject: [PATCH] Simplified exception translation This is enabled by server side modification that the fault middleware is encoding error code into the error body. --- senlinclient/common/exc.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/senlinclient/common/exc.py b/senlinclient/common/exc.py index dd62bb92..91e90d30 100644 --- a/senlinclient/common/exc.py +++ b/senlinclient/common/exc.py @@ -232,15 +232,9 @@ def parse_exception(exc): try: code = record['error']['code'] except KeyError as err: - # Some exception are not caught by SDK, we need to try again - # The 'code' field may be misplaced - try: - code = record['code'] - record['error']['code'] = code - except KeyError as err: - print(_('Malformed exception record, missing field "%s"') % err) - print(_('Original error record: %s') % record) - return + print(_('Malformed exception record, missing field "%s"') % err) + print(_('Original error record: %s') % record) + return if code in _EXCEPTION_MAP: inst = _EXCEPTION_MAP.get(code)