From ccfa3d3b34732fe9ed068bb4064c2ce6bf09f940 Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Wed, 6 May 2015 19:47:22 +0000
Subject: [PATCH] Drop use of 'oslo' namespace package

The Oslo libraries have moved all of their code out of the 'oslo'
namespace package into per-library packages. The namespace package was
retained during kilo for backwards compatibility, but will be removed by
the liberty-2 milestone. This change removes the use of the namespace
package, replacing it with the new package names.

The patches in the libraries will be put on hold until application
patches have landed, or L2, whichever comes first. At that point, new
versions of the libraries without namespace packages will be released as
a major version update.

Please merge this patch, or an equivalent, before L2 to avoid problems
with those library releases.

Blueprint: remove-namespace-packages
https://blueprints.launchpad.net/oslo-incubator/+spec/remove-namespace-packages

Change-Id: I324a3bd0c468a3e84f633497ad5c0d59c5ccc455
---
 tuskarclient/common/utils.py                      | 2 +-
 tuskarclient/openstack/common/_i18n.py            | 4 ++--
 tuskarclient/openstack/common/apiclient/base.py   | 2 +-
 tuskarclient/openstack/common/apiclient/client.py | 4 ++--
 tuskarclient/openstack/common/apiclient/utils.py  | 2 +-
 tuskarclient/openstack/common/cliutils.py         | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tuskarclient/common/utils.py b/tuskarclient/common/utils.py
index a44214b..6894994 100644
--- a/tuskarclient/common/utils.py
+++ b/tuskarclient/common/utils.py
@@ -17,7 +17,7 @@ from __future__ import print_function
 
 import uuid
 
-from oslo.utils import importutils
+from oslo_utils import importutils
 
 from tuskarclient.openstack.common.apiclient import exceptions as exc
 from tuskarclient.openstack.common import cliutils
diff --git a/tuskarclient/openstack/common/_i18n.py b/tuskarclient/openstack/common/_i18n.py
index 3d37afb..c570579 100644
--- a/tuskarclient/openstack/common/_i18n.py
+++ b/tuskarclient/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='tuskarclient')
+    _translators = oslo_i18n.TranslatorFactory(domain='tuskarclient')
 
     # The primary translation function using the well-known name "_"
     _ = _translators.primary
diff --git a/tuskarclient/openstack/common/apiclient/base.py b/tuskarclient/openstack/common/apiclient/base.py
index 7a02aeb..48f050e 100644
--- a/tuskarclient/openstack/common/apiclient/base.py
+++ b/tuskarclient/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/tuskarclient/openstack/common/apiclient/client.py b/tuskarclient/openstack/common/apiclient/client.py
index a80747c..9f05cea 100644
--- a/tuskarclient/openstack/common/apiclient/client.py
+++ b/tuskarclient/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 tuskarclient.openstack.common._i18n import _
diff --git a/tuskarclient/openstack/common/apiclient/utils.py b/tuskarclient/openstack/common/apiclient/utils.py
index e67912b..062e004 100644
--- a/tuskarclient/openstack/common/apiclient/utils.py
+++ b/tuskarclient/openstack/common/apiclient/utils.py
@@ -24,7 +24,7 @@
 #
 ########################################################################
 
-from oslo.utils import encodeutils
+from oslo_utils import encodeutils
 import six
 
 from tuskarclient.openstack.common._i18n import _
diff --git a/tuskarclient/openstack/common/cliutils.py b/tuskarclient/openstack/common/cliutils.py
index a1cc1d0..ae4e75b 100644
--- a/tuskarclient/openstack/common/cliutils.py
+++ b/tuskarclient/openstack/common/cliutils.py
@@ -24,8 +24,8 @@ import os
 import sys
 import textwrap
 
-from oslo.utils import encodeutils
-from oslo.utils import strutils
+from oslo_utils import encodeutils
+from oslo_utils import strutils
 import prettytable
 import six
 from six import moves