From b7118bf954a0529806fb3b32fee0a3b760f02530 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Fri, 13 Jul 2012 12:13:57 -0400 Subject: Sync gettextutils fixes from openstack-common. commit c80bfb563626200f7587c7ca52433c59a303b469 Author: Eric Windisch Date: Thu Jun 28 00:32:52 2012 -0400 Fix missing gettextutils in several modules. Fixes bug 1021453. Change-Id: I98758a088911cc422b61abd02b3be6cc6d6a472b --- nova/openstack/common/log.py | 1 + nova/openstack/common/notifier/api.py | 1 + nova/openstack/common/notifier/list_notifier.py | 1 + nova/openstack/common/notifier/rabbit_notifier.py | 1 + nova/openstack/common/policy.py | 1 + nova/openstack/common/rpc/amqp.py | 1 + nova/openstack/common/rpc/matchmaker.py | 1 + 7 files changed, 7 insertions(+) (limited to 'nova/openstack') diff --git a/nova/openstack/common/log.py b/nova/openstack/common/log.py index b25a4eefc..228f39dd1 100644 --- a/nova/openstack/common/log.py +++ b/nova/openstack/common/log.py @@ -41,6 +41,7 @@ import sys import traceback from nova.openstack.common import cfg +from nova.openstack.common.gettextutils import _ from nova.openstack.common import jsonutils from nova.openstack.common import local from nova.openstack.common import notifier diff --git a/nova/openstack/common/notifier/api.py b/nova/openstack/common/notifier/api.py index 4a09d0ac2..ba6c2dd9f 100644 --- a/nova/openstack/common/notifier/api.py +++ b/nova/openstack/common/notifier/api.py @@ -18,6 +18,7 @@ import uuid from nova.openstack.common import cfg from nova.openstack.common import context +from nova.openstack.common.gettextutils import _ from nova.openstack.common import importutils from nova.openstack.common import jsonutils from nova.openstack.common import log as logging diff --git a/nova/openstack/common/notifier/list_notifier.py b/nova/openstack/common/notifier/list_notifier.py index 7c2ec6e6d..f59106d9a 100644 --- a/nova/openstack/common/notifier/list_notifier.py +++ b/nova/openstack/common/notifier/list_notifier.py @@ -14,6 +14,7 @@ # under the License. from nova.openstack.common import cfg +from nova.openstack.common.gettextutils import _ from nova.openstack.common import importutils from nova.openstack.common import log as logging diff --git a/nova/openstack/common/notifier/rabbit_notifier.py b/nova/openstack/common/notifier/rabbit_notifier.py index a74e29480..d37b5ea65 100644 --- a/nova/openstack/common/notifier/rabbit_notifier.py +++ b/nova/openstack/common/notifier/rabbit_notifier.py @@ -16,6 +16,7 @@ from nova.openstack.common import cfg from nova.openstack.common import context as req_context +from nova.openstack.common.gettextutils import _ from nova.openstack.common import log as logging from nova.openstack.common import rpc diff --git a/nova/openstack/common/policy.py b/nova/openstack/common/policy.py index 9337ec950..1086b2f8b 100644 --- a/nova/openstack/common/policy.py +++ b/nova/openstack/common/policy.py @@ -21,6 +21,7 @@ import logging import urllib import urllib2 +from nova.openstack.common.gettextutils import _ from nova.openstack.common import jsonutils diff --git a/nova/openstack/common/rpc/amqp.py b/nova/openstack/common/rpc/amqp.py index 510a03819..13ff5665e 100644 --- a/nova/openstack/common/rpc/amqp.py +++ b/nova/openstack/common/rpc/amqp.py @@ -36,6 +36,7 @@ from eventlet import semaphore from nova.openstack.common import excutils from nova.openstack.common import local +from nova.openstack.common.gettextutils import _ from nova.openstack.common.rpc import common as rpc_common diff --git a/nova/openstack/common/rpc/matchmaker.py b/nova/openstack/common/rpc/matchmaker.py index fe9896a04..783e3713c 100644 --- a/nova/openstack/common/rpc/matchmaker.py +++ b/nova/openstack/common/rpc/matchmaker.py @@ -24,6 +24,7 @@ import json import logging from nova.openstack.common import cfg +from nova.openstack.common.gettextutils import _ matchmaker_opts = [ -- cgit