From 8911c279384687e1c740d12a855c4342fb3cdbc2 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Wed, 6 May 2015 19:43:54 +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: I37ce99d8c9a2ba5b97a12a0c2666f6340dbc7f42 --- saharaclient/openstack/common/_i18n.py | 4 ++-- saharaclient/openstack/common/cliutils.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/saharaclient/openstack/common/_i18n.py b/saharaclient/openstack/common/_i18n.py index ff3f7ff5..5cc57a14 100644 --- a/saharaclient/openstack/common/_i18n.py +++ b/saharaclient/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='saharaclient') + _translators = oslo_i18n.TranslatorFactory(domain='saharaclient') # The primary translation function using the well-known name "_" _ = _translators.primary diff --git a/saharaclient/openstack/common/cliutils.py b/saharaclient/openstack/common/cliutils.py index f90adcda..b17266d0 100644 --- a/saharaclient/openstack/common/cliutils.py +++ b/saharaclient/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