From a426aea87f9c2357518a1d40a9567d2c4603fdeb Mon Sep 17 00:00:00 2001 From: Zhou Ya Date: Wed, 6 Jul 2016 10:22:44 +0800 Subject: [PATCH] fix oslo.config incompatible error Change-Id: I423f959e3299740dcc510701dad91712efc45d4e --- code/horizon/openstack_dashboard/openstack/common/_i18n.py | 4 ++-- code/horizon/openstack_dashboard/openstack/common/log.py | 4 ++-- code/horizon/openstack_dashboard/openstack/common/policy.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/horizon/openstack_dashboard/openstack/common/_i18n.py b/code/horizon/openstack_dashboard/openstack/common/_i18n.py index 78f1eb9a..65560e6e 100644 --- a/code/horizon/openstack_dashboard/openstack/common/_i18n.py +++ b/code/horizon/openstack_dashboard/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='openstack_dashboard') +_translators = oslo_i18n.TranslatorFactory(domain='openstack_dashboard') # The primary translation function using the well-known name "_" _ = _translators.primary diff --git a/code/horizon/openstack_dashboard/openstack/common/log.py b/code/horizon/openstack_dashboard/openstack/common/log.py index 2c446681..bd016975 100755 --- a/code/horizon/openstack_dashboard/openstack/common/log.py +++ b/code/horizon/openstack_dashboard/openstack/common/log.py @@ -37,8 +37,8 @@ import socket import sys import traceback -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from oslo_utils import importutils import six from six import moves diff --git a/code/horizon/openstack_dashboard/openstack/common/policy.py b/code/horizon/openstack_dashboard/openstack/common/policy.py index 1be6474a..cecac70b 100644 --- a/code/horizon/openstack_dashboard/openstack/common/policy.py +++ b/code/horizon/openstack_dashboard/openstack/common/policy.py @@ -80,8 +80,8 @@ import ast import os import re -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import six import six.moves.urllib.parse as urlparse import six.moves.urllib.request as urlrequest