diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-10-14 14:10:27 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-10-14 14:10:27 +0000 |
commit | 3c8f1276a2f874f3fcaf7db08761d79bd013cf28 (patch) | |
tree | 2f62081bef16cf57fa965434725198e703670b62 /keystoneclient/v3 | |
parent | 090e2c8e2839cea0528a494d0017643c64d53f03 (diff) | |
parent | 5b91fedd650613f7ba480039fca7df83c1ff6bed (diff) | |
download | python-keystoneclient-3c8f1276a2f874f3fcaf7db08761d79bd013cf28.tar.gz |
Merge "Use exceptions from Keystoneauth"
Diffstat (limited to 'keystoneclient/v3')
-rw-r--r-- | keystoneclient/v3/auth.py | 2 | ||||
-rw-r--r-- | keystoneclient/v3/contrib/federation/base.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/keystoneclient/v3/auth.py b/keystoneclient/v3/auth.py index 6272dbc..0009a3a 100644 --- a/keystoneclient/v3/auth.py +++ b/keystoneclient/v3/auth.py @@ -10,10 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. +from keystoneauth1 import exceptions from keystoneauth1 import plugin from keystoneclient import base -from keystoneclient import exceptions from keystoneclient.v3 import domains from keystoneclient.v3 import projects diff --git a/keystoneclient/v3/contrib/federation/base.py b/keystoneclient/v3/contrib/federation/base.py index 5e2e9e7..98567a2 100644 --- a/keystoneclient/v3/contrib/federation/base.py +++ b/keystoneclient/v3/contrib/federation/base.py @@ -12,11 +12,11 @@ import abc +from keystoneauth1 import exceptions from keystoneauth1 import plugin import six from keystoneclient import base -from keystoneclient import exceptions @six.add_metaclass(abc.ABCMeta) @@ -33,7 +33,7 @@ class EntityManager(base.Manager): url = '/auth/%s' % self.object_type try: tenant_list = self._list(url, self.object_type) - except exceptions.EndpointException: + except exceptions.CatalogException: endpoint_filter = {'interface': plugin.AUTH_INTERFACE} tenant_list = self._list(url, self.object_type, endpoint_filter=endpoint_filter) |