Add additional explicit imports of _ where needed

It appears that I missed some of the needed explicit
imports of _.  I have now run through all the /bin/cinder-*
functions and ensured that they can be properly started.

This patch adds additional imports of _ and also changes
cinder-rtstool to use the 'cinder' domain as was suggested by
Duncan Thomas in the first review cycle.

Change-Id: I6477093cb817b5b9506dd3787f027e073c51f37d
Closes-Bug:  1345789
This commit is contained in:
Jay S. Bryant 2014-07-20 20:14:27 -05:00
parent 238522098e
commit 42cc9906cc
4 changed files with 8 additions and 3 deletions

View File

@ -49,6 +49,7 @@ gettextutils.enable_lazy()
# Need to register global_opts
from cinder.common import config # noqa
from cinder.openstack.common.gettextutils import _
from cinder.openstack.common import log as logging
from cinder import service
from cinder import utils

View File

@ -80,6 +80,7 @@ from cinder.common import config # noqa
from cinder import context
from cinder import db
from cinder.db import migration
from cinder.openstack.common.gettextutils import _
from cinder.openstack.common import log as logging
from cinder.openstack.common import uuidutils
from cinder import rpc

View File

@ -16,13 +16,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import gettext
import sys
import rtslib
gettext.install('cinder-rtstool', unicode=1)
gettext.enable_lazy()
from cinder.openstack.common import gettextutils
from cinder.openstack.common.gettextutils import _
gettextutils.install('cinder')
gettextutils.enable_lazy()
class RtstoolError(Exception):

View File

@ -57,6 +57,7 @@ gettextutils.enable_lazy()
from cinder import context
from cinder import db
from cinder.openstack.common.gettextutils import _
from cinder.openstack.common import log as logging
from cinder import rpc
from cinder import utils