Merge "glusterfs: add missing i18n import"
This commit is contained in:
commit
6e371442f0
@ -32,6 +32,7 @@ from oslo_config import cfg
|
|||||||
from oslo_log import log
|
from oslo_log import log
|
||||||
|
|
||||||
from manila import exception
|
from manila import exception
|
||||||
|
from manila.i18n import _
|
||||||
from manila.i18n import _LE
|
from manila.i18n import _LE
|
||||||
from manila.share import driver
|
from manila.share import driver
|
||||||
from manila.share.drivers import ganesha
|
from manila.share.drivers import ganesha
|
||||||
|
@ -29,10 +29,5 @@
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
import eventlet
|
import eventlet
|
||||||
from six.moves import builtins
|
|
||||||
|
|
||||||
eventlet.monkey_patch()
|
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)
|
|
||||||
|
Loading…
Reference in New Issue
Block a user