summaryrefslogtreecommitdiff
path: root/openstackclient/identity/v2_0
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2016-06-08 14:17:14 -0500
committerDean Troyer <dtroyer@gmail.com>2016-06-13 10:50:01 -0500
commitd20c863ebc11cecaaefe043e615b2fb4f5f26063 (patch)
tree7f4b63a9e21982d6244e5a24fd93dab697470ce0 /openstackclient/identity/v2_0
parent17627c55956bca21ddb601fb2604579d0fbb9c9b (diff)
downloadpython-openstackclient-d20c863ebc11cecaaefe043e615b2fb4f5f26063.tar.gz
osc-lib: exceptions
Use osc-lib directly for exceptions. Leave openstackclient.common.exceptions for deprecation period. Change-Id: Iea3e862302372e1b31ccd27f69db59b4953ca828
Diffstat (limited to 'openstackclient/identity/v2_0')
-rw-r--r--openstackclient/identity/v2_0/catalog.py2
-rw-r--r--openstackclient/identity/v2_0/role.py5
-rw-r--r--openstackclient/identity/v2_0/service.py3
3 files changed, 5 insertions, 5 deletions
diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py
index 33692a0d..3210df76 100644
--- a/openstackclient/identity/v2_0/catalog.py
+++ b/openstackclient/identity/v2_0/catalog.py
@@ -13,10 +13,10 @@
"""Identity v2 Service Catalog action implementations"""
+from osc_lib import exceptions
import six
from openstackclient.common import command
-from openstackclient.common import exceptions
from openstackclient.common import utils
from openstackclient.i18n import _
diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py
index 0f8da992..8914abfd 100644
--- a/openstackclient/identity/v2_0/role.py
+++ b/openstackclient/identity/v2_0/role.py
@@ -15,12 +15,11 @@
"""Identity v2 Role action implementations"""
-import six
-
from keystoneauth1 import exceptions as ks_exc
+from osc_lib import exceptions
+import six
from openstackclient.common import command
-from openstackclient.common import exceptions
from openstackclient.common import utils
from openstackclient.i18n import _
diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py
index 7fe66d91..1293afc7 100644
--- a/openstackclient/identity/v2_0/service.py
+++ b/openstackclient/identity/v2_0/service.py
@@ -16,10 +16,11 @@
"""Service action implementations"""
import argparse
+
+from osc_lib import exceptions
import six
from openstackclient.common import command
-from openstackclient.common import exceptions
from openstackclient.common import utils
from openstackclient.i18n import _
from openstackclient.identity import common