From 1212640c86015b777a2d4f4fb2b5f4007ee750f9 Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Wed, 6 May 2015 19:02:32 +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: I1f539cf9f5d6f48e10cac381c13eeb5fa314abd4
---
 ceilometerclient/common/utils.py                      | 2 +-
 ceilometerclient/openstack/common/_i18n.py            | 4 ++--
 ceilometerclient/openstack/common/apiclient/base.py   | 2 +-
 ceilometerclient/openstack/common/apiclient/client.py | 4 ++--
 ceilometerclient/openstack/common/apiclient/utils.py  | 2 +-
 ceilometerclient/openstack/common/cliutils.py         | 4 ++--
 ceilometerclient/v2/shell.py                          | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ceilometerclient/common/utils.py b/ceilometerclient/common/utils.py
index 998ada8d..d1ac7203 100644
--- a/ceilometerclient/common/utils.py
+++ b/ceilometerclient/common/utils.py
@@ -19,7 +19,7 @@ import sys
 import textwrap
 import uuid
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
 from oslo_utils import importutils
 import prettytable
diff --git a/ceilometerclient/openstack/common/_i18n.py b/ceilometerclient/openstack/common/_i18n.py
index 4b0745f2..907ab4f7 100644
--- a/ceilometerclient/openstack/common/_i18n.py
+++ b/ceilometerclient/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='ceilometerclient')
+    _translators = oslo_i18n.TranslatorFactory(domain='ceilometerclient')
 
     # The primary translation function using the well-known name "_"
     _ = _translators.primary
diff --git a/ceilometerclient/openstack/common/apiclient/base.py b/ceilometerclient/openstack/common/apiclient/base.py
index 4462e433..53aad2a1 100644
--- a/ceilometerclient/openstack/common/apiclient/base.py
+++ b/ceilometerclient/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/ceilometerclient/openstack/common/apiclient/client.py b/ceilometerclient/openstack/common/apiclient/client.py
index c5d6528b..5a13753c 100644
--- a/ceilometerclient/openstack/common/apiclient/client.py
+++ b/ceilometerclient/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 ceilometerclient.openstack.common._i18n import _
diff --git a/ceilometerclient/openstack/common/apiclient/utils.py b/ceilometerclient/openstack/common/apiclient/utils.py
index 6d947591..7b9d56bc 100644
--- a/ceilometerclient/openstack/common/apiclient/utils.py
+++ b/ceilometerclient/openstack/common/apiclient/utils.py
@@ -24,7 +24,7 @@
 #
 ########################################################################
 
-from oslo.utils import encodeutils
+from oslo_utils import encodeutils
 import six
 
 from ceilometerclient.openstack.common._i18n import _
diff --git a/ceilometerclient/openstack/common/cliutils.py b/ceilometerclient/openstack/common/cliutils.py
index 341cd01b..326aab59 100644
--- a/ceilometerclient/openstack/common/cliutils.py
+++ b/ceilometerclient/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
diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py
index bb09e183..a02ae1d4 100644
--- a/ceilometerclient/v2/shell.py
+++ b/ceilometerclient/v2/shell.py
@@ -22,7 +22,7 @@ import argparse
 import functools
 import json
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import strutils
 import six