Sync oslo-incubator common code
Sync common code to address changes made in dependencies and make branch "stable/kilo" workable. Cherry-pick commits 0cc741a, 2aacb111, ac17de97 from oslo-incubator Change-Id: If746912c99a83806137ca96e0863c4ff2ea8d96c Closes-Bug: #1480314
This commit is contained in:
parent
8d66e529cf
commit
e9c0f09a13
@ -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='keystoneclient')
|
||||
_translators = oslo_i18n.TranslatorFactory(domain='keystoneclient')
|
||||
|
||||
# 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
|
||||
|
||||
|
@ -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 keystoneclient.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 keystoneclient.openstack.common._i18n import _
|
||||
|
@ -16,8 +16,8 @@
|
||||
|
||||
"""Super simple fake memcache client."""
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo.utils import timeutils
|
||||
from oslo_config import cfg
|
||||
from oslo_utils import timeutils
|
||||
|
||||
memcache_opts = [
|
||||
cfg.ListOpt('memcached_servers',
|
||||
|
Loading…
Reference in New Issue
Block a user