From 1477d25d55bc0a343b457b544d4ea654659e65b5 Mon Sep 17 00:00:00 2001 From: Sun Austin Date: Mon, 15 Oct 2018 17:00:21 +0800 Subject: [PATCH] Fix: "raise" issues for Python 2/3 compatible code. use from six import reraise as raise_ to re-implement raise Story:2003430 Task:27478 Change-Id: I34373ce7f233f7f908da3d92bcc000a9e924375d Signed-off-by: Sun Austin --- service-mgmt-api/sm-api/sm_api/openstack/common/excutils.py | 4 ++-- .../sm-api/sm_api/openstack/common/rpc/impl_fake.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/service-mgmt-api/sm-api/sm_api/openstack/common/excutils.py b/service-mgmt-api/sm-api/sm_api/openstack/common/excutils.py index 4af93f35..ebdf1ce2 100644 --- a/service-mgmt-api/sm-api/sm_api/openstack/common/excutils.py +++ b/service-mgmt-api/sm-api/sm_api/openstack/common/excutils.py @@ -27,7 +27,7 @@ import contextlib import logging import sys import traceback - +from six import reraise as raise_ from sm_api.openstack.common.gettextutils import _ @@ -52,4 +52,4 @@ def save_and_reraise_exception(): logging.error(_('Original exception being dropped: %s'), traceback.format_exception(type_, value, tb)) raise - raise type_, value, tb + raise_(type_,value,tb) diff --git a/service-mgmt-api/sm-api/sm_api/openstack/common/rpc/impl_fake.py b/service-mgmt-api/sm-api/sm_api/openstack/common/rpc/impl_fake.py index 331bd28b..edca5eb5 100644 --- a/service-mgmt-api/sm-api/sm_api/openstack/common/rpc/impl_fake.py +++ b/service-mgmt-api/sm-api/sm_api/openstack/common/rpc/impl_fake.py @@ -31,6 +31,7 @@ import time import eventlet +from six import reraise as raise_ from sm_api.openstack.common.rpc import common as rpc_common CONSUMERS = {} @@ -73,7 +74,7 @@ class Consumer(object): # Caller might have called ctxt.reply() manually for (reply, failure) in ctxt._response: if failure: - raise failure[0], failure[1], failure[2] + raise_(failure[0],failure[1],failure[2]) res.append(reply) # if ending not 'sent'...we might have more data to # return from the function itself