From df0f6642e5c5f5c4070ffb1f6d96276230ad2bc9 Mon Sep 17 00:00:00 2001 From: kairat_kushaev Date: Wed, 23 Sep 2015 19:02:13 +0300 Subject: [PATCH] Do not use openstack.common.i18n in glance client i18n library is present in openstack.common but we also have glanceclient module that supports the same functionality. In order to be consistent and exclude dependencies on oslo-incubator code we need to use glanceclient.i18n module only. Change-Id: Iae9722d7903034bfa6fb8afadbb1f1292c29203e --- glanceclient/openstack/common/apiclient/base.py | 2 +- glanceclient/openstack/common/apiclient/client.py | 2 +- glanceclient/openstack/common/apiclient/exceptions.py | 2 +- glanceclient/openstack/common/apiclient/utils.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/glanceclient/openstack/common/apiclient/base.py b/glanceclient/openstack/common/apiclient/base.py index 6f7c64a0..cf3eab92 100644 --- a/glanceclient/openstack/common/apiclient/base.py +++ b/glanceclient/openstack/common/apiclient/base.py @@ -44,7 +44,7 @@ from oslo_utils import strutils import six from six.moves.urllib import parse -from glanceclient.openstack.common._i18n import _ +from glanceclient._i18n import _ from glanceclient.openstack.common.apiclient import exceptions diff --git a/glanceclient/openstack/common/apiclient/client.py b/glanceclient/openstack/common/apiclient/client.py index 241fc4c7..0759a954 100644 --- a/glanceclient/openstack/common/apiclient/client.py +++ b/glanceclient/openstack/common/apiclient/client.py @@ -38,7 +38,7 @@ from oslo_utils import encodeutils from oslo_utils import importutils import requests -from glanceclient.openstack.common._i18n import _ +from glanceclient._i18n import _ from glanceclient.openstack.common.apiclient import exceptions _logger = logging.getLogger(__name__) diff --git a/glanceclient/openstack/common/apiclient/exceptions.py b/glanceclient/openstack/common/apiclient/exceptions.py index 85550085..5bda5f0c 100644 --- a/glanceclient/openstack/common/apiclient/exceptions.py +++ b/glanceclient/openstack/common/apiclient/exceptions.py @@ -38,7 +38,7 @@ import sys import six -from glanceclient.openstack.common._i18n import _ +from glanceclient._i18n import _ class ClientException(Exception): diff --git a/glanceclient/openstack/common/apiclient/utils.py b/glanceclient/openstack/common/apiclient/utils.py index 7110d926..e5d69264 100644 --- a/glanceclient/openstack/common/apiclient/utils.py +++ b/glanceclient/openstack/common/apiclient/utils.py @@ -28,7 +28,7 @@ from oslo_utils import encodeutils from oslo_utils import uuidutils import six -from glanceclient.openstack.common._i18n import _ +from glanceclient._i18n import _ from glanceclient.openstack.common.apiclient import exceptions