Skip to content

Commit 25a7c1f

Browse files
author
Jamie Lennox
committed
Don't import form keystoneclient.openstack.common
The keystoneclient.openstack.common directory is where we sync files from oslo incubator. It is not a public directory and should not be being consumed by openstackclient. Change-Id: I011bb95c2c824e2dbc4b822ca922ae77b8d9b955
1 parent 52d2235 commit 25a7c1f

13 files changed

Lines changed: 13 additions & 14 deletions

File tree

‎openstackclient/api/api.py‎

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

1616
import simplejson as json
1717

18-
from keystoneclient.openstack.common.apiclient \
19-
import exceptions as ksc_exceptions
18+
from keystoneclient import exceptions as ksc_exceptions
2019
from keystoneclient import session as ksc_session
2120
from openstackclient.common import exceptions
2221

‎openstackclient/compute/v2/security_group.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from cliff import lister
2424
from cliff import show
2525

26-
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
26+
from keystoneclient import exceptions as ksc_exc
2727
from novaclient.v1_1 import security_group_rules
2828
from openstackclient.common import parseractions
2929
from openstackclient.common import utils

‎openstackclient/identity/v2_0/project.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from cliff import command
2222
from cliff import lister
2323
from cliff import show
24-
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
24+
from keystoneclient import exceptions as ksc_exc
2525

2626
from openstackclient.common import parseractions
2727
from openstackclient.common import utils

‎openstackclient/identity/v2_0/role.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from cliff import command
2222
from cliff import lister
2323
from cliff import show
24-
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
24+
from keystoneclient import exceptions as ksc_exc
2525

2626
from openstackclient.common import exceptions
2727
from openstackclient.common import utils

‎openstackclient/identity/v2_0/user.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from cliff import command
2222
from cliff import lister
2323
from cliff import show
24-
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
24+
from keystoneclient import exceptions as ksc_exc
2525

2626
from openstackclient.common import utils
2727
from openstackclient.i18n import _ # noqa

‎openstackclient/identity/v3/domain.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from cliff import command
2323
from cliff import lister
2424
from cliff import show
25-
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
25+
from keystoneclient import exceptions as ksc_exc
2626

2727
from openstackclient.common import utils
2828
from openstackclient.i18n import _ # noqa

‎openstackclient/identity/v3/group.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from cliff import command
2323
from cliff import lister
2424
from cliff import show
25-
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
25+
from keystoneclient import exceptions as ksc_exc
2626

2727
from openstackclient.common import utils
2828
from openstackclient.i18n import _ # noqa

‎openstackclient/identity/v3/project.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from cliff import command
2222
from cliff import lister
2323
from cliff import show
24-
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
24+
from keystoneclient import exceptions as ksc_exc
2525

2626
from openstackclient.common import parseractions
2727
from openstackclient.common import utils

‎openstackclient/identity/v3/role.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from cliff import command
2323
from cliff import lister
2424
from cliff import show
25-
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
25+
from keystoneclient import exceptions as ksc_exc
2626

2727
from openstackclient.common import utils
2828
from openstackclient.i18n import _ # noqa

‎openstackclient/identity/v3/user.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from cliff import command
2222
from cliff import lister
2323
from cliff import show
24-
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
24+
from keystoneclient import exceptions as ksc_exc
2525

2626
from openstackclient.common import utils
2727
from openstackclient.i18n import _ # noqa

0 commit comments

Comments
 (0)