From e7ed403712f4d12182d0c2d040ae6eed0177a05c Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Wed, 15 Jun 2016 15:26:35 -0500
Subject: [PATCH] Finish osc-lib transition for command.py
https://review.openstack.org/#/c/328318/ was the transition of
openstackclient/common/command.py to osc-lib but it was incomplete;
https://review.openstack.org/#/c/329885/ started to fix it but
was also incomplete. Third time is charm?
Change-Id: Ib6c0266155c2155ae59067ce7b15bebca1e375e8
---
openstackclient/common/command.py | 4 ++--
openstackclient/tests/common/test_command.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/openstackclient/common/command.py b/openstackclient/common/command.py
index 9abaae0b87..29c1534d63 100644
--- a/openstackclient/common/command.py
+++ b/openstackclient/common/command.py
@@ -17,10 +17,10 @@
import sys
-from osc_lib.command import * # noqa
+from osc_lib.command.command import * # noqa
sys.stderr.write(
"WARNING: %s is deprecated and will be removed after Jun 2017. "
- "Please use osc_lib.command\n" % __name__
+ "Please use osc_lib.command.command\n" % __name__
)
diff --git a/openstackclient/tests/common/test_command.py b/openstackclient/tests/common/test_command.py
index a8bcf6a81a..658bc895c0 100644
--- a/openstackclient/tests/common/test_command.py
+++ b/openstackclient/tests/common/test_command.py
@@ -14,9 +14,9 @@
import mock
-from osc_lib.command import command
from osc_lib import exceptions
+from openstackclient.common import command
from openstackclient.tests import fakes as test_fakes
from openstackclient.tests import utils as test_utils