Finish osc-lib transition for command.py

Dean Troyer · Dean Troyer · commit e7ed403712f4 · 2016-06-15T22:50:43.000Z
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
diff --git 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
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@`
`17`	`17`
`18`	`18`	`import sys`
`19`	`19`
`20`		`-from osc_lib.command import * # noqa`
	`20`	`+from osc_lib.command.command import * # noqa`
`21`	`21`
`22`	`22`
`23`	`23`	`sys.stderr.write(`
`24`	`24`	`"WARNING: %s is deprecated and will be removed after Jun 2017. "`
`25`		`- "Please use osc_lib.command\n" % __name__`
	`25`	`+ "Please use osc_lib.command.command\n" % __name__`
`26`	`26`	`)`