From: kong wei Date: Thu, 27 Apr 2017 10:43:24 +0000 (+0000) Subject: Merge "The keystoneclient.openstack.common is error path of exception. escalator... X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=escalator.git;a=commitdiff_plain;h=6a4f961b61dfdb41d77dcec262bcda64f44689dd;hp=872bef90d91089812110e31927354a5e9e27af4c Merge "The keystoneclient.openstack.common is error path of exception. escalator should use keystoneclient.exception" --- diff --git a/client/escalatorclient/shell.py b/client/escalatorclient/shell.py index 782106c..ec8ffb3 100644 --- a/client/escalatorclient/shell.py +++ b/client/escalatorclient/shell.py @@ -41,7 +41,7 @@ from escalatorclient import exc from keystoneclient.auth.identity import v2 as v2_auth from keystoneclient.auth.identity import v3 as v3_auth from keystoneclient import discover -from keystoneclient.openstack.common.apiclient import exceptions as ks_exc +from keystoneclient import exceptions as ks_exc from keystoneclient import session osprofiler_profiler = importutils.try_import("osprofiler.profiler")