From 7d9350d8867a955d7db761b651bb4254563e462d Mon Sep 17 00:00:00 2001
From: Adam Coldrick <adam@sotk.co.uk>
Date: Mon, 21 Sep 2015 22:33:25 +0100
Subject: [PATCH] Fix oslo imports

Oslo modules are now named with `_` instead of `.`. This patch updates
the import statements in python-storyboardclient to reflect this.

Change-Id: Id866d316bd79d00737896340a458a9281b74fa07
---
 storyboardclient/openstack/common/_i18n.py            | 4 ++--
 storyboardclient/openstack/common/apiclient/base.py   | 2 +-
 storyboardclient/openstack/common/apiclient/client.py | 4 ++--
 storyboardclient/openstack/common/apiclient/utils.py  | 2 +-
 storyboardclient/openstack/common/log.py              | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/storyboardclient/openstack/common/_i18n.py b/storyboardclient/openstack/common/_i18n.py
index e3dfd1a..a058a87 100644
--- a/storyboardclient/openstack/common/_i18n.py
+++ b/storyboardclient/openstack/common/_i18n.py
@@ -17,14 +17,14 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html
 """
 
 try:
-    import oslo.i18n
+    import oslo_i18n
 
     # NOTE(dhellmann): This reference to o-s-l-o will be replaced by the
     # application name when this module is synced into the separate
     # repository. It is OK to have more than one translation function
     # using the same domain, since there will still only be one message
     # catalog.
-    _translators = oslo.i18n.TranslatorFactory(domain='storyboardclient')
+    _translators = oslo_i18n.TranslatorFactory(domain='storyboardclient')
 
     # The primary translation function using the well-known name "_"
     _ = _translators.primary
diff --git a/storyboardclient/openstack/common/apiclient/base.py b/storyboardclient/openstack/common/apiclient/base.py
index de08fbf..ade5ea1 100644
--- a/storyboardclient/openstack/common/apiclient/base.py
+++ b/storyboardclient/openstack/common/apiclient/base.py
@@ -40,7 +40,7 @@ Base utilities to build API operation managers and objects on top of.
 import abc
 import copy
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 import six
 from six.moves.urllib import parse
 
diff --git a/storyboardclient/openstack/common/apiclient/client.py b/storyboardclient/openstack/common/apiclient/client.py
index 5c06810..2afbc5a 100644
--- a/storyboardclient/openstack/common/apiclient/client.py
+++ b/storyboardclient/openstack/common/apiclient/client.py
@@ -34,8 +34,8 @@ try:
 except ImportError:
     import json
 
-from oslo.utils import encodeutils
-from oslo.utils import importutils
+from oslo_utils import encodeutils
+from oslo_utils import importutils
 import requests
 
 from storyboardclient.openstack.common._i18n import _
diff --git a/storyboardclient/openstack/common/apiclient/utils.py b/storyboardclient/openstack/common/apiclient/utils.py
index 5491ab0..88375c3 100644
--- a/storyboardclient/openstack/common/apiclient/utils.py
+++ b/storyboardclient/openstack/common/apiclient/utils.py
@@ -24,7 +24,7 @@
 #
 ########################################################################
 
-from oslo.utils import encodeutils
+from oslo_utils import encodeutils
 import six
 
 from storyboardclient.openstack.common._i18n import _
diff --git a/storyboardclient/openstack/common/log.py b/storyboardclient/openstack/common/log.py
index e0efafe..5ff8a41 100644
--- a/storyboardclient/openstack/common/log.py
+++ b/storyboardclient/openstack/common/log.py
@@ -38,9 +38,9 @@ import socket
 import sys
 import traceback
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils
-from oslo.utils import importutils
+from oslo_config import cfg
+from oslo_serialization import jsonutils
+from oslo_utils import importutils
 import six
 from six import moves