Update Oslo imports to remove namespace package
Change-Id: I4ec9b2a310471e4e07867073e9577731ac34027d Blueprint: drop-namespace-packages
This commit is contained in:
parent
2a30128b72
commit
402abdbcd0
|
@ -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,
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue