From 9247aa4f423cb4a3829d0d441402336d2aebfcfa Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Tue, 28 Apr 2015 22:25:57 +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: I9891564317aa3cf84874debdc966e48fb270455e --- os_brick/i18n.py | 2 +- os_brick/tests/base.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/os_brick/i18n.py b/os_brick/i18n.py index 80e5df055..0ec6c2e7b 100644 --- a/os_brick/i18n.py +++ b/os_brick/i18n.py @@ -18,7 +18,7 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html . """ -from oslo import i18n +import oslo_i18n as i18n DOMAIN = 'os-brick' diff --git a/os_brick/tests/base.py b/os_brick/tests/base.py index 53a539c8c..11e706dce 100644 --- a/os_brick/tests/base.py +++ b/os_brick/tests/base.py @@ -20,8 +20,8 @@ import os import fixtures import mock -from oslo.utils import strutils from oslo_log import log as oslo_logging +from oslo_utils import strutils from oslotest import base