From 29d6c613f674bec9f36a6207ba1b9f50886863e8 Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Wed, 26 Oct 2016 19:30:18 -0400 Subject: Graduate to oslo.i18n and cleanup incubator usage Graduate from Oslo Incubator to oslo.i18n library. Cleanup of unused Oslo Incubator utils. Added optional enable_lazy() usage. Change-Id: I5ec02477f3f52f4d7097669120581e82cced3748 Signed-off-by: Chuck Short --- heatclient/osc/v1/event.py | 2 +- heatclient/osc/v1/software_config.py | 2 +- heatclient/osc/v1/software_deployment.py | 2 +- heatclient/osc/v1/stack.py | 4 ++-- heatclient/osc/v1/stack_failures.py | 2 +- heatclient/osc/v1/template.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'heatclient/osc') diff --git a/heatclient/osc/v1/event.py b/heatclient/osc/v1/event.py index 44bcc37..9cdf28a 100644 --- a/heatclient/osc/v1/event.py +++ b/heatclient/osc/v1/event.py @@ -19,10 +19,10 @@ from cliff.formatters import base from osc_lib.command import command from osc_lib import utils +from heatclient._i18n import _ from heatclient.common import event_utils from heatclient.common import utils as heat_utils from heatclient import exc -from heatclient.openstack.common._i18n import _ class ShowEvent(command.ShowOne): diff --git a/heatclient/osc/v1/software_config.py b/heatclient/osc/v1/software_config.py index 7adccc8..af27be7 100644 --- a/heatclient/osc/v1/software_config.py +++ b/heatclient/osc/v1/software_config.py @@ -22,11 +22,11 @@ import six from six.moves.urllib import request import yaml +from heatclient._i18n import _ from heatclient.common import format_utils from heatclient.common import template_format from heatclient.common import utils as heat_utils from heatclient import exc as heat_exc -from heatclient.openstack.common._i18n import _ class DeleteConfig(command.Command): diff --git a/heatclient/osc/v1/software_deployment.py b/heatclient/osc/v1/software_deployment.py index 90c0ceb..37abcb4 100644 --- a/heatclient/osc/v1/software_deployment.py +++ b/heatclient/osc/v1/software_deployment.py @@ -20,11 +20,11 @@ from osc_lib import exceptions as exc from osc_lib import utils from oslo_serialization import jsonutils +from heatclient._i18n import _ from heatclient.common import deployment_utils from heatclient.common import format_utils from heatclient.common import utils as heat_utils from heatclient import exc as heat_exc -from heatclient.openstack.common._i18n import _ class CreateDeployment(format_utils.YamlFormat): diff --git a/heatclient/osc/v1/stack.py b/heatclient/osc/v1/stack.py index 5ecf843..2dcb579 100644 --- a/heatclient/osc/v1/stack.py +++ b/heatclient/osc/v1/stack.py @@ -24,6 +24,8 @@ from oslo_serialization import jsonutils import six from six.moves.urllib import request +from heatclient._i18n import _ +from heatclient._i18n import _LI from heatclient.common import event_utils from heatclient.common import format_utils from heatclient.common import hook_utils @@ -31,8 +33,6 @@ from heatclient.common import http from heatclient.common import template_utils from heatclient.common import utils as heat_utils from heatclient import exc as heat_exc -from heatclient.openstack.common._i18n import _ -from heatclient.openstack.common._i18n import _LI class CreateStack(command.ShowOne): diff --git a/heatclient/osc/v1/stack_failures.py b/heatclient/osc/v1/stack_failures.py index 257f151..687f903 100644 --- a/heatclient/osc/v1/stack_failures.py +++ b/heatclient/osc/v1/stack_failures.py @@ -16,9 +16,9 @@ import collections from osc_lib.command import command +from heatclient._i18n import _ from heatclient.common import format_utils from heatclient import exc -from heatclient.openstack.common._i18n import _ class ListStackFailures(command.Command): diff --git a/heatclient/osc/v1/template.py b/heatclient/osc/v1/template.py index 1b089dd..154fc2e 100644 --- a/heatclient/osc/v1/template.py +++ b/heatclient/osc/v1/template.py @@ -18,12 +18,12 @@ from osc_lib.command import command from osc_lib import utils import six +from heatclient._i18n import _ from heatclient.common import format_utils from heatclient.common import http from heatclient.common import template_utils from heatclient.common import utils as heat_utils from heatclient import exc -from heatclient.openstack.common._i18n import _ class VersionList(command.Lister): -- cgit v1.2.1