Merge "Migrate away from oslo_i18n.enable_lazy()"
This commit is contained in:
commit
bf6fdb9f96
|
@ -19,7 +19,6 @@ patches.patch_all()
|
|||
import os
|
||||
import sys
|
||||
|
||||
import oslo_i18n
|
||||
from oslo_log import log
|
||||
|
||||
LOG = log.getLogger(__name__)
|
||||
|
@ -35,12 +34,6 @@ if os.path.exists(os.path.join(possible_topdir,
|
|||
sys.path.insert(0, possible_topdir)
|
||||
|
||||
|
||||
# NOTE(slukjanov): i18n.enable_lazy() must be called before
|
||||
# sahara.utils.i18n._() is called to ensure it has the desired
|
||||
# lazy lookup behavior.
|
||||
oslo_i18n.enable_lazy()
|
||||
|
||||
|
||||
import sahara.main as server
|
||||
|
||||
|
||||
|
|
|
@ -19,8 +19,6 @@ patches.patch_minidom_writexml()
|
|||
import os
|
||||
import sys
|
||||
|
||||
import oslo_i18n
|
||||
|
||||
# If ../sahara/__init__.py exists, add ../ to Python search path, so that
|
||||
# it will override what happens to be installed in /usr/(local/)lib/python...
|
||||
possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
|
||||
|
@ -32,12 +30,6 @@ if os.path.exists(os.path.join(possible_topdir,
|
|||
sys.path.insert(0, possible_topdir)
|
||||
|
||||
|
||||
# NOTE(slukjanov): i18n.enable_lazy() must be called before
|
||||
# sahara.utils.i18n._() is called to ensure it has the desired
|
||||
# lazy lookup behavior.
|
||||
oslo_i18n.enable_lazy()
|
||||
|
||||
|
||||
import sahara.main as server
|
||||
|
||||
|
||||
|
|
|
@ -19,9 +19,6 @@ patches.patch_all()
|
|||
import os
|
||||
import sys
|
||||
|
||||
import oslo_i18n
|
||||
|
||||
|
||||
# If ../sahara/__init__.py exists, add ../ to Python search path, so that
|
||||
# it will override what happens to be installed in /usr/(local/)lib/python...
|
||||
possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
|
||||
|
@ -33,12 +30,6 @@ if os.path.exists(os.path.join(possible_topdir,
|
|||
sys.path.insert(0, possible_topdir)
|
||||
|
||||
|
||||
# NOTE(slukjanov): i18n.enable_lazy() must be called before
|
||||
# sahara.utils.i18n._() is called to ensure it has the desired
|
||||
# lazy lookup behavior.
|
||||
oslo_i18n.enable_lazy()
|
||||
|
||||
|
||||
import sahara.main as server
|
||||
from sahara.service import ops
|
||||
|
||||
|
|
|
@ -15,10 +15,3 @@
|
|||
|
||||
from sahara.utils import patches
|
||||
patches.patch_all()
|
||||
|
||||
import oslo_i18n
|
||||
|
||||
# NOTE(slukjanov): i18n.enable_lazy() must be called before
|
||||
# sahara.utils.i18n._() is called to ensure it has the desired
|
||||
# lazy lookup behavior.
|
||||
oslo_i18n.enable_lazy()
|
||||
|
|
Loading…
Reference in New Issue