summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2013-05-08 11:38:22 +0100
committerMark McLoughlin <markmc@redhat.com>2013-05-08 11:41:11 +0100
commita41958137e01d3ca57959bc6789753c2eb41c722 (patch)
tree763362b13af6edb1d83dc658021ae730717bae7d
parentd016c5558791fc047866d7a6746644eea8fae42a (diff)
downloadnova-a41958137e01d3ca57959bc6789753c2eb41c722.tar.gz
nova-a41958137e01d3ca57959bc6789753c2eb41c722.tar.xz
nova-a41958137e01d3ca57959bc6789753c2eb41c722.zip
Remove duplicate gettext.install() calls
When commit 799a925 moved us to console scripts entry points, we moved the gettext.install() call into nova/cmd/__init__.py but forgot to remove it from some of the commands. Since that move, we've switched to using gettextutils.install() which supports a $NOVA_LOCALEDIR environment variable ... so calling install() from these commands will actually break that support. Change-Id: I1f959704551b35e95c5470a7aef900312db2e223
-rw-r--r--nova/cmd/baremetal_manage.py3
-rw-r--r--nova/cmd/clear_rabbit_queues.py4
-rw-r--r--nova/cmd/dhcpbridge.py3
-rw-r--r--nova/cmd/manage.py3
-rw-r--r--nova/cmd/scheduler.py3
5 files changed, 0 insertions, 16 deletions
diff --git a/nova/cmd/baremetal_manage.py b/nova/cmd/baremetal_manage.py
index eaf4a8416..4b659db31 100644
--- a/nova/cmd/baremetal_manage.py
+++ b/nova/cmd/baremetal_manage.py
@@ -54,14 +54,11 @@
CLI interface for nova bare-metal management.
"""
-import gettext
import os
import sys
from oslo.config import cfg
-gettext.install('nova', unicode=1)
-
from nova import config
from nova.openstack.common import cliutils
from nova.openstack.common import log as logging
diff --git a/nova/cmd/clear_rabbit_queues.py b/nova/cmd/clear_rabbit_queues.py
index b1ec0b92e..6748949ae 100644
--- a/nova/cmd/clear_rabbit_queues.py
+++ b/nova/cmd/clear_rabbit_queues.py
@@ -23,14 +23,10 @@
"""
-import gettext
import sys
from oslo.config import cfg
-gettext.install('nova', unicode=1)
-
-
from nova import config
from nova.openstack.common import log as logging
from nova.openstack.common import rpc
diff --git a/nova/cmd/dhcpbridge.py b/nova/cmd/dhcpbridge.py
index 108aafcf9..10ccfbd1d 100644
--- a/nova/cmd/dhcpbridge.py
+++ b/nova/cmd/dhcpbridge.py
@@ -21,14 +21,11 @@
Handle lease database updates from DHCP servers.
"""
-import gettext
import os
import sys
from oslo.config import cfg
-gettext.install('nova', unicode=1)
-
from nova import config
from nova import context
from nova import db
diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py
index 41b97f26d..9a427bc43 100644
--- a/nova/cmd/manage.py
+++ b/nova/cmd/manage.py
@@ -54,15 +54,12 @@
CLI interface for nova management.
"""
-import gettext
import netaddr
import os
import sys
from oslo.config import cfg
-gettext.install('nova', unicode=1)
-
from nova.api.ec2 import ec2utils
from nova import availability_zones
from nova.compute import instance_types
diff --git a/nova/cmd/scheduler.py b/nova/cmd/scheduler.py
index 5bf459b97..40486f5db 100644
--- a/nova/cmd/scheduler.py
+++ b/nova/cmd/scheduler.py
@@ -19,13 +19,10 @@
"""Starter script for Nova Scheduler."""
-import gettext
import sys
from oslo.config import cfg
-gettext.install('nova', unicode=1)
-
from nova import config
from nova.openstack.common import log as logging
from nova import service