Merge "Fix up last-minute imports to use osc-lib"

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
 
 

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