From 0d4bd24ed334949a11dd55a3b2f910833b194ff3 Mon Sep 17 00:00:00 2001 From: Grzegorz Grasza Date: Thu, 5 Feb 2015 12:50:54 +0100 Subject: [PATCH] Rename utils -> _utils Hide the utils module, which should not be part of the public API. utils.py contains functions required internally (moved from Nova). Change-Id: I3666d35d28592bd49768424049142e5d353a916d Closes-Bug: 1417284 --- oslo_versionedobjects/{utils.py => _utils.py} | 0 oslo_versionedobjects/base.py | 2 +- oslo_versionedobjects/test.py | 2 +- oslo_versionedobjects/tests/test_objects.py | 2 +- oslo_versionedobjects/tests/test_utils.py | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename oslo_versionedobjects/{utils.py => _utils.py} (100%) diff --git a/oslo_versionedobjects/utils.py b/oslo_versionedobjects/_utils.py similarity index 100% rename from oslo_versionedobjects/utils.py rename to oslo_versionedobjects/_utils.py diff --git a/oslo_versionedobjects/base.py b/oslo_versionedobjects/base.py index f495c9db..a4251254 100644 --- a/oslo_versionedobjects/base.py +++ b/oslo_versionedobjects/base.py @@ -28,10 +28,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') diff --git a/oslo_versionedobjects/test.py b/oslo_versionedobjects/test.py index b03a3e13..4998ead3 100644 --- a/oslo_versionedobjects/test.py +++ b/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 diff --git a/oslo_versionedobjects/tests/test_objects.py b/oslo_versionedobjects/tests/test_objects.py index f24d6501..35997b3a 100755 --- a/oslo_versionedobjects/tests/test_objects.py +++ b/oslo_versionedobjects/tests/test_objects.py @@ -28,11 +28,11 @@ from oslo_serialization import jsonutils from oslo_utils import timeutils 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__) diff --git a/oslo_versionedobjects/tests/test_utils.py b/oslo_versionedobjects/tests/test_utils.py index b6abb53b..07c9c75f 100755 --- a/oslo_versionedobjects/tests/test_utils.py +++ b/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