From 3c77bac0a282f3939f24c6bf2c800a938bf5cb9c Mon Sep 17 00:00:00 2001
From: Sridhar Ramaswamy <srics.r@gmail.com>
Date: Mon, 10 Aug 2015 18:09:09 -0700
Subject: [PATCH] Support Tacker client in master branch

Change oslo.xyz references to oslo_xyz

Depends-On: I281ada8dd859a221994ba99c3bbd1bfe3d186451
Change-Id: I15506b6d0f872e04b765ea55398b8f35b750a061
Closes-Bug: 1480570
---
 tackerclient/common/serializer.py    | 2 +-
 tackerclient/common/utils.py         | 4 ++--
 tackerclient/i18n.py                 | 2 +-
 tackerclient/shell.py                | 2 +-
 tackerclient/tacker/v1_0/__init__.py | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tackerclient/common/serializer.py b/tackerclient/common/serializer.py
index e10020c1..b66e9c1a 100644
--- a/tackerclient/common/serializer.py
+++ b/tackerclient/common/serializer.py
@@ -17,7 +17,7 @@ import logging
 from xml.etree import ElementTree as etree
 from xml.parsers import expat
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import six
 
 from tackerclient.common import constants
diff --git a/tackerclient/common/utils.py b/tackerclient/common/utils.py
index 3a0105b5..41f79d6d 100644
--- a/tackerclient/common/utils.py
+++ b/tackerclient/common/utils.py
@@ -21,8 +21,8 @@ import argparse
 import logging
 import os
 
-from oslo.utils import encodeutils
-from oslo.utils import importutils
+from oslo_utils import encodeutils
+from oslo_utils import importutils
 import six
 
 from tackerclient.common import exceptions
diff --git a/tackerclient/i18n.py b/tackerclient/i18n.py
index eb699a7d..ee4265f1 100644
--- a/tackerclient/i18n.py
+++ b/tackerclient/i18n.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo import i18n
+import oslo_i18n as i18n
 
 _translators = i18n.TranslatorFactory(domain='tackerclient')
 
diff --git a/tackerclient/shell.py b/tackerclient/shell.py
index d8ebb162..f8e52a18 100644
--- a/tackerclient/shell.py
+++ b/tackerclient/shell.py
@@ -33,7 +33,7 @@ from keystoneclient.auth.identity import v3 as v3_auth
 from keystoneclient import discover
 from keystoneclient.openstack.common.apiclient import exceptions as ks_exc
 from keystoneclient import session
-from oslo.utils import encodeutils
+from oslo_utils import encodeutils
 import six.moves.urllib.parse as urlparse
 
 from cliff import app
diff --git a/tackerclient/tacker/v1_0/__init__.py b/tackerclient/tacker/v1_0/__init__.py
index da151d7d..0edc94f5 100644
--- a/tackerclient/tacker/v1_0/__init__.py
+++ b/tackerclient/tacker/v1_0/__init__.py
@@ -24,7 +24,7 @@ import re
 from cliff.formatters import table
 from cliff import lister
 from cliff import show
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import six
 
 from tackerclient.common import command