Skip to content

Commit d20c863

Browse files
author
Dean Troyer
committed
osc-lib: exceptions
Use osc-lib directly for exceptions. Leave openstackclient.common.exceptions for deprecation period. Change-Id: Iea3e862302372e1b31ccd27f69db59b4953ca828
1 parent 17627c5 commit d20c863

52 files changed

Lines changed: 96 additions & 62 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎doc/source/plugins.rst‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,11 @@ the plugin commands:
151151

152152
.. code-block:: python
153153
154+
# osc-lib interfaces available to plugins:
155+
from osc_lib import exceptions
156+
154157
# OSC common interfaces available to plugins:
155158
from openstackclient.common import command
156-
from openstackclient.common import exceptions
157159
from openstackclient.common import parseractions
158160
from openstackclient.common import logs
159161
from openstackclient.common import utils

‎openstackclient/api/api.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717

1818
from keystoneauth1 import exceptions as ks_exceptions
1919
from keystoneauth1 import session as ks_session
20-
21-
from openstackclient.common import exceptions
20+
from osc_lib import exceptions
2221

2322

2423
class KeystoneSession(object):

‎openstackclient/api/auth.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import logging
1818

1919
from keystoneauth1.loading import base
20+
from osc_lib import exceptions as exc
2021

21-
from openstackclient.common import exceptions as exc
2222
from openstackclient.common import utils
2323
from openstackclient.i18n import _
2424

‎openstackclient/common/clientmanager.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import pkg_resources
2121
import sys
2222

23+
from osc_lib import exceptions
2324
from oslo_utils import strutils
2425
import requests
2526
import six
2627

2728
from openstackclient.api import auth
28-
from openstackclient.common import exceptions
2929
from openstackclient.common import session as osc_session
3030
from openstackclient.identity import client as identity_client
3131

‎openstackclient/common/command.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
from cliff import command
1919
from cliff import lister
2020
from cliff import show
21+
from osc_lib import exceptions
2122
import six
2223

23-
from openstackclient.common import exceptions
2424
from openstackclient.i18n import _
2525

2626

‎openstackclient/compute/client.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515

1616
import logging
1717

18-
from openstackclient.common import exceptions
18+
from osc_lib import exceptions
19+
1920
from openstackclient.common import utils
2021
from openstackclient.i18n import _
2122

‎openstackclient/compute/v2/agent.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515

1616
"""Agent action implementations"""
1717

18+
from osc_lib import exceptions
1819
import six
1920

2021
from openstackclient.common import command
21-
from openstackclient.common import exceptions
2222
from openstackclient.common import utils
2323
from openstackclient.i18n import _
2424

‎openstackclient/compute/v2/flavor.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515

1616
"""Flavor action implementations"""
1717

18+
from osc_lib import exceptions
1819
import six
1920

2021
from openstackclient.common import command
21-
from openstackclient.common import exceptions
2222
from openstackclient.common import parseractions
2323
from openstackclient.common import utils
2424
from openstackclient.i18n import _

‎openstackclient/compute/v2/keypair.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717

1818
import io
1919
import os
20-
import six
2120
import sys
2221

22+
from osc_lib import exceptions
23+
import six
24+
2325
from openstackclient.common import command
24-
from openstackclient.common import exceptions
2526
from openstackclient.common import utils
2627
from openstackclient.i18n import _
2728

‎openstackclient/compute/v2/server.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
import getpass
2020
import io
2121
import os
22-
import six
2322
import sys
2423

25-
from openstackclient.common import command
24+
from osc_lib import exceptions
25+
import six
2626

2727
try:
2828
from novaclient.v2 import servers
2929
except ImportError:
3030
from novaclient.v1_1 import servers
3131

32-
from openstackclient.common import exceptions
32+
from openstackclient.common import command
3333
from openstackclient.common import parseractions
3434
from openstackclient.common import utils
3535
from openstackclient.i18n import _

0 commit comments

Comments
 (0)