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
This commit is contained in:
parent
4243d8731b
commit
25d9af18bc
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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 _
|
||||
|
@ -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 _
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user