From da8176dbdf48d455b1eafc67203374dc390c20c8 Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Wed, 21 Jan 2015 18:00:50 -0500
Subject: [PATCH] Update Oslo imports to remove namespace package

Change-Id: I4ec9b2a310471e4e07867073e9577731ac34027d
Blueprint: drop-namespace-packages
---
 oslo_concurrency/fixture/lockutils.py         | 2 +-
 oslo_concurrency/lockutils.py                 | 2 +-
 oslo_concurrency/processutils.py              | 4 ++--
 oslo_concurrency/tests/unit/test_lockutils.py | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oslo_concurrency/fixture/lockutils.py b/oslo_concurrency/fixture/lockutils.py
index 9639e40..bdf7883 100644
--- a/oslo_concurrency/fixture/lockutils.py
+++ b/oslo_concurrency/fixture/lockutils.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 import fixtures
-from oslo.config import fixture as config
+from oslo_config import fixture as config
 
 from oslo_concurrency import lockutils
 
diff --git a/oslo_concurrency/lockutils.py b/oslo_concurrency/lockutils.py
index 24a54a0..6b514df 100644
--- a/oslo_concurrency/lockutils.py
+++ b/oslo_concurrency/lockutils.py
@@ -27,7 +27,7 @@ import threading
 import time
 import weakref
 
-from oslo.config import cfg
+from oslo_config import cfg
 import retrying
 import six
 
diff --git a/oslo_concurrency/processutils.py b/oslo_concurrency/processutils.py
index 7037094..78d99c4 100644
--- a/oslo_concurrency/processutils.py
+++ b/oslo_concurrency/processutils.py
@@ -25,8 +25,8 @@ import shlex
 import signal
 import time
 
-from oslo.utils import importutils
-from oslo.utils import strutils
+from oslo_utils import importutils
+from oslo_utils import strutils
 import six
 
 from oslo_concurrency._i18n import _
diff --git a/oslo_concurrency/tests/unit/test_lockutils.py b/oslo_concurrency/tests/unit/test_lockutils.py
index f24cce3..258592d 100644
--- a/oslo_concurrency/tests/unit/test_lockutils.py
+++ b/oslo_concurrency/tests/unit/test_lockutils.py
@@ -25,15 +25,15 @@ import tempfile
 import threading
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslotest import base as test_base
 import six
 
 from concurrent import futures
 
-from oslo.config import fixture as config
 from oslo_concurrency.fixture import lockutils as fixtures
 from oslo_concurrency import lockutils
+from oslo_config import fixture as config
 
 
 class LockTestCase(test_base.BaseTestCase):