openstack/python-glanceclient
Code Issues Proposed changes

Merge "Import i18n functions directly"

Browse Source
This commit is contained in:
Jenkins
2015-10-22 12:13:47 +00:00
committed by Gerrit Code Review
parent 297474a734 6b9133c9b6
commit b82df59208
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
glanceclient/common/utils.py
View File

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

3
glanceclient/shell.py
View File

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

2
tox.ini
View File

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