From cc3d46a47b62836fb97f6f49140a28668b8f212b Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Thu, 11 Aug 2016 11:26:25 -0500 Subject: [PATCH] Fix up last-minute imports to use osc-lib Change-Id: I1ed2983cf574ebd565eeac4f8199fbc3a2e29c8e --- openstackclient/identity/v2_0/role_assignment.py | 7 ++++--- .../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 406508ac37..44f55c3b7a 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 ab48c2f418..a356ae0ad5 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