x/daisycloud-core
Code Issues Proposed changes

fix oslo.config incompatible error

Browse Source 
Change-Id: I423f959e3299740dcc510701dad91712efc45d4e
This commit is contained in:
Zhou Ya 2016-07-06 10:22:44 +08:00
parent 1b7676c52d
commit a426aea87f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/horizon/openstack_dashboard/openstack/common/_i18n.py
View File

@ -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

4
code/horizon/openstack_dashboard/openstack/common/log.py
View File

@ -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

4
code/horizon/openstack_dashboard/openstack/common/policy.py
View File

@ -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