Merge "Update Oslo imports to remove namespace package"

3 files changed, 7 insertions, 8 deletions

diff --git a/oslo_serialization/jsonutils.py b/oslo_serialization/jsonutils.py
index 7637d5a..4dec8b7 100644
--- a/oslo_serialization/jsonutils.py
+++ b/oslo_serialization/jsonutils.py
@@ -56,13 +56,12 @@ if sys.version_info < (2, 7):
 else:
     import json
 
+from oslo_utils import encodeutils
+from oslo_utils import importutils
+from oslo_utils import timeutils
 import six
 import six.moves.xmlrpc_client as xmlrpclib
 
-from oslo.utils import encodeutils
-from oslo.utils import importutils
-from oslo.utils import timeutils
-
 netaddr = importutils.try_import("netaddr")
 
 _nasty_type_tests = [inspect.ismodule, inspect.isclass, inspect.ismethod,
diff --git a/oslo_serialization/msgpackutils.py b/oslo_serialization/msgpackutils.py
index 69fb0de..570e3a5 100644
--- a/oslo_serialization/msgpackutils.py
+++ b/oslo_serialization/msgpackutils.py
@@ -18,8 +18,8 @@ import sys
 import uuid
 
 import msgpack
-from oslo.utils import importutils
-from oslo.utils import timeutils
+from oslo_utils import importutils
+from oslo_utils import timeutils
 import six
 import six.moves.xmlrpc_client as xmlrpclib
 
@@ -116,7 +116,7 @@ def load(fp):
 
 
 def dump(obj, fp):
-    """Serialize ``obj`` as a messagepack formatted stream to ``fp``"""
+    """Serialize ``obj`` as a messagepack formatted stream to ``fp``."""
     return msgpack.pack(obj, fp, default=_serializer, use_bin_type=True)
 
 
diff --git a/oslo_serialization/tests/test_jsonutils.py b/oslo_serialization/tests/test_jsonutils.py
index c7d6e5e..9709cb6 100644
--- a/oslo_serialization/tests/test_jsonutils.py
+++ b/oslo_serialization/tests/test_jsonutils.py
@@ -19,12 +19,12 @@ import json
 
 import mock
 import netaddr
+from oslo_i18n import fixture
 from oslotest import base as test_base
 import simplejson
 import six
 import six.moves.xmlrpc_client as xmlrpclib
 
-from oslo.i18n import fixture
 from oslo_serialization import jsonutils