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

Change-Id: I4ec9b2a310471e4e07867073e9577731ac34027d
Blueprint: drop-namespace-packages
---
 oslo_log/_i18n.py               | 4 ++--
 oslo_log/_options.py            | 2 +-
 oslo_log/formatters.py          | 2 +-
 oslo_log/log.py                 | 4 ++--
 oslo_log/tests/unit/test_log.py | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/oslo_log/_i18n.py b/oslo_log/_i18n.py
index ebd6c454..5813115a 100644
--- a/oslo_log/_i18n.py
+++ b/oslo_log/_i18n.py
@@ -18,10 +18,10 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html .
 
 """
 
-from oslo import i18n
+import oslo_i18n
 
 
-_translators = i18n.TranslatorFactory(domain='oslo.log')
+_translators = oslo_i18n.TranslatorFactory(domain='oslo.log')
 
 # The primary translation function using the well-known name "_"
 _ = _translators.primary
diff --git a/oslo_log/_options.py b/oslo_log/_options.py
index 6ded595a..beada0ca 100644
--- a/oslo_log/_options.py
+++ b/oslo_log/_options.py
@@ -12,7 +12,7 @@
 
 import copy
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 _DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
 
diff --git a/oslo_log/formatters.py b/oslo_log/formatters.py
index 11dea3ba..c76a4c0a 100644
--- a/oslo_log/formatters.py
+++ b/oslo_log/formatters.py
@@ -20,8 +20,8 @@ import traceback
 import six
 from six import moves
 
-from oslo.serialization import jsonutils
 from oslo_context import context as context_utils
+from oslo_serialization import jsonutils
 
 
 def _dictify_context(context):
diff --git a/oslo_log/log.py b/oslo_log/log.py
index 0f588c24..2e880c3d 100644
--- a/oslo_log/log.py
+++ b/oslo_log/log.py
@@ -35,8 +35,8 @@ import socket
 import sys
 import traceback
 
-from oslo.config import cfg
-from oslo.utils import importutils
+from oslo_config import cfg
+from oslo_utils import importutils
 import six
 from six import moves
 
diff --git a/oslo_log/tests/unit/test_log.py b/oslo_log/tests/unit/test_log.py
index 01dc10b9..f1cd1467 100644
--- a/oslo_log/tests/unit/test_log.py
+++ b/oslo_log/tests/unit/test_log.py
@@ -20,12 +20,12 @@ import sys
 import tempfile
 
 import mock
-from oslo.config import cfg
-from oslo.config import fixture as fixture_config  # noqa
-from oslo.i18n import fixture as fixture_trans
-from oslo.serialization import jsonutils
+from oslo_config import cfg
+from oslo_config import fixture as fixture_config  # noqa
 from oslo_context import context
 from oslo_context import fixture as fixture_context
+from oslo_i18n import fixture as fixture_trans
+from oslo_serialization import jsonutils
 from oslotest import base as test_base
 import six