diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-18 22:12:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-18 22:12:35 +0000 |
| commit | dbfc203c7bd38c44cca76b081b286b06c4f789b1 (patch) | |
| tree | ee5bce8d2328df7e4c132fd772f32dc3c13f49b4 /openstackclient | |
| parent | a28e281a912b42c2809a7338e215a6536b1facc2 (diff) | |
| parent | cc3d46a47b62836fb97f6f49140a28668b8f212b (diff) | |
| download | python-openstackclient-dbfc203c7bd38c44cca76b081b286b06c4f789b1.tar.gz | |
Merge "Fix up last-minute imports to use osc-lib"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/identity/v2_0/role_assignment.py | 7 | ||||
| -rw-r--r-- | openstackclient/tests/identity/v2_0/test_role_assignment.py | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/openstackclient/identity/v2_0/role_assignment.py b/openstackclient/identity/v2_0/role_assignment.py index 406508ac..44f55c3b 100644 --- a/openstackclient/identity/v2_0/role_assignment.py +++ b/openstackclient/identity/v2_0/role_assignment.py @@ -13,9 +13,10 @@ """Identity v2 Assignment action implementations """ -from openstackclient.common import command -from openstackclient.common import exceptions -from openstackclient.common import utils +from osc_lib.command import command +from osc_lib import exceptions +from osc_lib import utils + from openstackclient.i18n import _ # noqa diff --git a/openstackclient/tests/identity/v2_0/test_role_assignment.py b/openstackclient/tests/identity/v2_0/test_role_assignment.py index ab48c2f4..a356ae0a 100644 --- a/openstackclient/tests/identity/v2_0/test_role_assignment.py +++ b/openstackclient/tests/identity/v2_0/test_role_assignment.py @@ -14,7 +14,8 @@ import copy import mock -from openstackclient.common import exceptions +from osc_lib import exceptions + from openstackclient.identity.v2_0 import role_assignment from openstackclient.tests import fakes from openstackclient.tests.identity.v2_0 import fakes as identity_fakes |