From 44c628adda7611c6eeaef08a404ed07c49c4d822 Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Tue, 28 Apr 2015 18:35:27 +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: I5bd1cdc35d2ecaf98a0802fff589d8c37aaa8028
---
 openstack_auth/openstack/common/_i18n.py     | 4 ++--
 openstack_auth/openstack/common/fileutils.py | 2 +-
 openstack_auth/openstack/common/log.py       | 6 +++---
 openstack_auth/openstack/common/policy.py    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/openstack_auth/openstack/common/_i18n.py b/openstack_auth/openstack/common/_i18n.py
index 8ba1bd9..2f037a4 100644
--- a/openstack_auth/openstack/common/_i18n.py
+++ b/openstack_auth/openstack/common/_i18n.py
@@ -16,7 +16,7 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html
 
 """
 
-import oslo.i18n
+import oslo_i18n
 
 
 # NOTE(dhellmann): This reference to o-s-l-o will be replaced by the
@@ -24,7 +24,7 @@ import oslo.i18n
 # 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='openstack_auth')
+_translators = oslo_i18n.TranslatorFactory(domain='openstack_auth')
 
 # The primary translation function using the well-known name "_"
 _ = _translators.primary
diff --git a/openstack_auth/openstack/common/fileutils.py b/openstack_auth/openstack/common/fileutils.py
index ec26eaf..64cee1c 100644
--- a/openstack_auth/openstack/common/fileutils.py
+++ b/openstack_auth/openstack/common/fileutils.py
@@ -19,7 +19,7 @@ import logging
 import os
 import tempfile
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/openstack_auth/openstack/common/log.py b/openstack_auth/openstack/common/log.py
index 9fe3dc7..c3b23f3 100644
--- a/openstack_auth/openstack/common/log.py
+++ b/openstack_auth/openstack/common/log.py
@@ -37,9 +37,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
 
diff --git a/openstack_auth/openstack/common/policy.py b/openstack_auth/openstack/common/policy.py
index 413e158..f72221b 100644
--- a/openstack_auth/openstack/common/policy.py
+++ b/openstack_auth/openstack/common/policy.py
@@ -80,8 +80,8 @@ import ast
 import os
 import re
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils
+from oslo_config import cfg
+from oslo_serialization import jsonutils
 import six
 import six.moves.urllib.parse as urlparse
 import six.moves.urllib.request as urlrequest