From e36e8ee5d0201b1f47158028e14225537c353d18 Mon Sep 17 00:00:00 2001 From: Kennan Date: Wed, 31 Dec 2014 17:06:30 +0800 Subject: [PATCH] change old oslo.concurrency to oslo_concurrency as oslo.concurrency deprecated, need to sync to latest usage Change-Id: I151f2ef3d786745ef11f9b9c2be2aff167218fff --- magnum/common/utils.py | 2 +- magnum/openstack/common/utils.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/magnum/common/utils.py b/magnum/common/utils.py index 33403e01d4..134568e2cc 100644 --- a/magnum/common/utils.py +++ b/magnum/common/utils.py @@ -29,9 +29,9 @@ import tempfile import uuid import netaddr -from oslo.concurrency import processutils from oslo.config import cfg from oslo.utils import excutils +from oslo_concurrency import processutils import paramiko import six diff --git a/magnum/openstack/common/utils.py b/magnum/openstack/common/utils.py index d29f663bf9..4442e6f339 100644 --- a/magnum/openstack/common/utils.py +++ b/magnum/openstack/common/utils.py @@ -9,7 +9,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from oslo.concurrency import processutils +from oslo_concurrency import processutils def execute(*cmd, **kwargs): @@ -19,4 +19,4 @@ def execute(*cmd, **kwargs): def trycmd(*args, **kwargs): """Convenience wrapper around oslo's trycmd() method.""" - return processutils.trycmd(*args, **kwargs) \ No newline at end of file + return processutils.trycmd(*args, **kwargs)