From 7feae8288129d1c5b1187a1b479eab67f6e9d371 Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Thu, 13 Aug 2015 10:59:49 +0000 Subject: [PATCH] Do not import using oslo namespace This doesn't work with oslo.utils 2.0.0 Change-Id: I7f938ab0e6829fb80056cc2834cd27b3f322f417 --- storyboard/openstack/common/fileutils.py | 2 +- storyboard/openstack/common/jsonutils.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/storyboard/openstack/common/fileutils.py b/storyboard/openstack/common/fileutils.py index b97a93e7..144a4a98 100644 --- a/storyboard/openstack/common/fileutils.py +++ b/storyboard/openstack/common/fileutils.py @@ -19,7 +19,7 @@ import os import tempfile from oslo_log import log as logging -from oslo.utils import excutils +from oslo_utils import excutils LOG = logging.getLogger(__name__) diff --git a/storyboard/openstack/common/jsonutils.py b/storyboard/openstack/common/jsonutils.py index 5d940531..30c3d508 100644 --- a/storyboard/openstack/common/jsonutils.py +++ b/storyboard/openstack/common/jsonutils.py @@ -37,8 +37,8 @@ import inspect import itertools import json -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