From b608cb4e24f474a146fd1920299d54b5ddb2f61a Mon Sep 17 00:00:00 2001 From: Csaba Henk Date: Fri, 16 Oct 2015 06:58:15 +0200 Subject: [PATCH] glusterfs: add missing i18n import Also remove unnecessary fake _ function from the test suite so that other possible occurrences of this genre of bug would be detected by unit tests. Change-Id: I8292fceda02442f83210e98cee4619c81bc181e5 Closes-Bug: #1506297 --- manila/share/drivers/glusterfs/__init__.py | 1 + manila/tests/__init__.py | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/manila/share/drivers/glusterfs/__init__.py b/manila/share/drivers/glusterfs/__init__.py index bb67ac8074..2da3b96c7a 100644 --- a/manila/share/drivers/glusterfs/__init__.py +++ b/manila/share/drivers/glusterfs/__init__.py @@ -32,6 +32,7 @@ from oslo_config import cfg from oslo_log import log from manila import exception +from manila.i18n import _ from manila.i18n import _LE from manila.share import driver from manila.share.drivers import ganesha diff --git a/manila/tests/__init__.py b/manila/tests/__init__.py index edb653e682..6132d017f4 100644 --- a/manila/tests/__init__.py +++ b/manila/tests/__init__.py @@ -29,10 +29,5 @@ """ import eventlet -from six.moves import builtins eventlet.monkey_patch() - -# See http://code.google.com/p/python-nose/issues/detail?id=373 -# The code below enables nosetests to work with i18n _() blocks -setattr(builtins, '_', lambda x: x)