Merge "Import i18n functions directly"

glanceclient/common/utils.py

@@ -37,10 +37,9 @@ from oslo_utils import encodeutils
 from oslo_utils import strutils
 import prettytable
 
-from glanceclient import _i18n
+from glanceclient._i18n import _
 from glanceclient import exc
 
-_ = _i18n._
 
 _memoized_property_lock = threading.Lock()
 

glanceclient/shell.py

@@ -34,7 +34,7 @@ from oslo_utils import importutils
 import six.moves.urllib.parse as urlparse
 
 import glanceclient
-from glanceclient import _i18n
+from glanceclient._i18n import _
 from glanceclient.common import utils
 from glanceclient import exc
 
@@ -45,7 +45,6 @@ from keystoneclient.openstack.common.apiclient import exceptions as ks_exc
 from keystoneclient import session
 
 osprofiler_profiler = importutils.try_import("osprofiler.profiler")
-_ = _i18n._
 
 SUPPORTED_VERSIONS = [1, 2]
 

tox.ini

@@ -45,4 +45,4 @@ show-source = True
 exclude = .venv*,.tox,dist,*egg,build,.git,doc,*openstack/common*,*lib/python*,.update-venv
 
 [hacking]
-import_exceptions = six.moves
+import_exceptions = six.moves,glanceclient._i18n