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: Id26264ad0b002ab21e60431a2fd39fcecf76c490
This commit is contained in:
Doug Hellmann 2015-05-06 19:32:54 +00:00
parent a5693c0cd6
commit a6b486d3e0
6 changed files with 10 additions and 10 deletions
magnumclient

@ -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='magnumclient')
_translators = oslo_i18n.TranslatorFactory(domain='magnumclient')
# The primary translation function using the well-known name "_"
_ = _translators.primary

@ -40,7 +40,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

@ -34,8 +34,8 @@ try:
except ImportError:
import json
from oslo.utils import encodeutils
from oslo.utils import importutils
from oslo_utils import encodeutils
from oslo_utils import importutils
import requests
from magnumclient.openstack.common._i18n import _

@ -24,7 +24,7 @@
#
########################################################################
from oslo.utils import encodeutils
from oslo_utils import encodeutils
import six
from magnumclient.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,8 +29,8 @@ import logging
import os
import sys
from oslo.utils import encodeutils
from oslo.utils import strutils
from oslo_utils import encodeutils
from oslo_utils import strutils
import six
HAS_KEYRING = False