From 25d9af18bcfe63134f16863679bdcaf5708ce10a Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Wed, 6 May 2015 19:35: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: Ib86c36f81f6fdbee64d88dd0b1d126bcc16649ac --- manilaclient/client.py | 2 +- manilaclient/config.py | 2 +- manilaclient/httpclient.py | 2 +- manilaclient/openstack/common/_i18n.py | 4 ++-- manilaclient/openstack/common/apiclient/base.py | 2 +- manilaclient/openstack/common/apiclient/client.py | 2 +- manilaclient/openstack/common/apiclient/utils.py | 2 +- manilaclient/openstack/common/cliutils.py | 4 ++-- manilaclient/shell.py | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/manilaclient/client.py b/manilaclient/client.py index fff2dd024..2bc7ad6ce 100644 --- a/manilaclient/client.py +++ b/manilaclient/client.py @@ -20,7 +20,7 @@ OpenStack Client interface. Handles the REST calls and responses. """ -from oslo.utils import importutils +from oslo_utils import importutils from manilaclient import exceptions diff --git a/manilaclient/config.py b/manilaclient/config.py index 41c4a402b..6c2410270 100644 --- a/manilaclient/config.py +++ b/manilaclient/config.py @@ -16,7 +16,7 @@ import copy import os -from oslo.config import cfg +from oslo_config import cfg import oslo_log._options as log_options # 1. Define opts diff --git a/manilaclient/httpclient.py b/manilaclient/httpclient.py index 1944d5cbf..edf80b132 100644 --- a/manilaclient/httpclient.py +++ b/manilaclient/httpclient.py @@ -19,7 +19,7 @@ import copy import logging -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import strutils import requests import six diff --git a/manilaclient/openstack/common/_i18n.py b/manilaclient/openstack/common/_i18n.py index 7019b3a53..98b22e6eb 100644 --- a/manilaclient/openstack/common/_i18n.py +++ b/manilaclient/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='manilaclient') +_translators = oslo_i18n.TranslatorFactory(domain='manilaclient') # The primary translation function using the well-known name "_" _ = _translators.primary diff --git a/manilaclient/openstack/common/apiclient/base.py b/manilaclient/openstack/common/apiclient/base.py index 5808bc6dd..a4c151515 100644 --- a/manilaclient/openstack/common/apiclient/base.py +++ b/manilaclient/openstack/common/apiclient/base.py @@ -26,7 +26,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/manilaclient/openstack/common/apiclient/client.py b/manilaclient/openstack/common/apiclient/client.py index d2e026d07..1234c97d3 100644 --- a/manilaclient/openstack/common/apiclient/client.py +++ b/manilaclient/openstack/common/apiclient/client.py @@ -33,7 +33,7 @@ try: except ImportError: import json -from oslo.utils import importutils +from oslo_utils import importutils import requests from manilaclient.openstack.common._i18n import _ diff --git a/manilaclient/openstack/common/apiclient/utils.py b/manilaclient/openstack/common/apiclient/utils.py index bac80cdeb..bd36152a3 100644 --- a/manilaclient/openstack/common/apiclient/utils.py +++ b/manilaclient/openstack/common/apiclient/utils.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import encodeutils +from oslo_utils import encodeutils import six from manilaclient.openstack.common._i18n import _ diff --git a/manilaclient/openstack/common/cliutils.py b/manilaclient/openstack/common/cliutils.py index aaeaed22e..4803d18e3 100644 --- a/manilaclient/openstack/common/cliutils.py +++ b/manilaclient/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/manilaclient/shell.py b/manilaclient/shell.py index 5b82b5b91..02ac62f25 100644 --- a/manilaclient/shell.py +++ b/manilaclient/shell.py @@ -29,7 +29,7 @@ import os import pkgutil import sys -from oslo.utils import encodeutils +from oslo_utils import encodeutils import six from manilaclient import client