Merge "Rename utils -> _utils"

oslo_versionedobjects/base.py

@@ -25,10 +25,10 @@ from oslo_utils import timeutils
 import six
 
 from oslo_versionedobjects._i18n import _, _LE
+from oslo_versionedobjects import _utils as utils
 from oslo_versionedobjects import exception
 from oslo_versionedobjects import fields
 from oslo_versionedobjects.openstack.common import versionutils
-from oslo_versionedobjects import utils
 
 
 LOG = logging.getLogger('object')

oslo_versionedobjects/test.py

@@ -39,11 +39,11 @@ from oslotest import moxstubout
 import six
 import testtools
 
+from oslo_versionedobjects import _utils as utils
 #from nova import db
 #from nova.network import manager as network_manager
 #from nova import objects
 from oslo_versionedobjects.tests import obj_fixtures
-from oslo_versionedobjects import utils
 
 
 CONF = cfg.CONF

oslo_versionedobjects/tests/test_objects.py

@@ -27,11 +27,11 @@ from oslo_context import context
 from oslo_serialization import jsonutils
 from testtools import matchers
 
+from oslo_versionedobjects import _utils as utils
 from oslo_versionedobjects import base
 from oslo_versionedobjects import exception
 from oslo_versionedobjects import fields
 from oslo_versionedobjects import test
-from oslo_versionedobjects import utils
 
 
 LOG = logging.getLogger(__name__)

oslo_versionedobjects/tests/test_utils.py

@@ -14,9 +14,9 @@
 
 from oslo_config import cfg
 
+from oslo_versionedobjects import _utils as utils
 from oslo_versionedobjects import exception
 from oslo_versionedobjects import test
-from oslo_versionedobjects import utils
 
 CONF = cfg.CONF