From 0e95eb0441cec3714296984e12f4e5dba2495fb3 Mon Sep 17 00:00:00 2001 From: lin-hua-cheng Date: Sun, 18 Jan 2015 14:23:32 -0800 Subject: [PATCH] Switch from oslo.utils to oslo_utils oslo_utils moved out of the oslo namespace. Partially Implements: blueprint drop-namespace-packages Change-Id: I3c38426142de535b5474676b1214ea72b231ce76 --- openstack_dashboard/api/swift.py | 2 +- openstack_dashboard/dashboards/project/stacks/forms.py | 2 +- openstack_dashboard/openstack/common/fileutils.py | 2 +- openstack_dashboard/openstack/common/log.py | 2 +- openstack_dashboard/test/test_data/swift_data.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openstack_dashboard/api/swift.py b/openstack_dashboard/api/swift.py index 24d62eac7f..165de721e9 100644 --- a/openstack_dashboard/api/swift.py +++ b/openstack_dashboard/api/swift.py @@ -18,7 +18,7 @@ import logging -from oslo.utils import timeutils +from oslo_utils import timeutils import six.moves.urllib.parse as urlparse import swiftclient diff --git a/openstack_dashboard/dashboards/project/stacks/forms.py b/openstack_dashboard/dashboards/project/stacks/forms.py index 5aed5851a5..581c403e9d 100644 --- a/openstack_dashboard/dashboards/project/stacks/forms.py +++ b/openstack_dashboard/dashboards/project/stacks/forms.py @@ -16,7 +16,7 @@ import logging from django.utils.translation import ugettext_lazy as _ from django.views.decorators.debug import sensitive_variables # noqa -from oslo.utils import strutils +from oslo_utils import strutils import six from horizon import exceptions diff --git a/openstack_dashboard/openstack/common/fileutils.py b/openstack_dashboard/openstack/common/fileutils.py index 0d5c84392f..fb34a29bd6 100644 --- a/openstack_dashboard/openstack/common/fileutils.py +++ b/openstack_dashboard/openstack/common/fileutils.py @@ -18,7 +18,7 @@ import errno import os import tempfile -from oslo.utils import excutils +from oslo_utils import excutils from openstack_dashboard.openstack.common import log as logging diff --git a/openstack_dashboard/openstack/common/log.py b/openstack_dashboard/openstack/common/log.py index b7b40f9042..bf7877931f 100644 --- a/openstack_dashboard/openstack/common/log.py +++ b/openstack_dashboard/openstack/common/log.py @@ -39,7 +39,7 @@ import traceback from oslo.config import cfg from oslo.serialization import jsonutils -from oslo.utils import importutils +from oslo_utils import importutils import six from six import moves diff --git a/openstack_dashboard/test/test_data/swift_data.py b/openstack_dashboard/test/test_data/swift_data.py index e0cac11f26..daa8167f01 100644 --- a/openstack_dashboard/test/test_data/swift_data.py +++ b/openstack_dashboard/test/test_data/swift_data.py @@ -11,7 +11,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import timeutils +from oslo_utils import timeutils from django.utils import http as utils_http