Merge "Update Oslo imports to remove namespace package"

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

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"
 

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):

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
 

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