Merge "Remove log translations"
This commit is contained in:
commit
1254cb9460
|
@ -27,7 +27,6 @@ import six
|
||||||
from six.moves import urllib
|
from six.moves import urllib
|
||||||
|
|
||||||
from muranoclient.common import exceptions as exc
|
from muranoclient.common import exceptions as exc
|
||||||
from muranoclient.i18n import _LW
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
USER_AGENT = 'python-muranoclient'
|
USER_AGENT = 'python-muranoclient'
|
||||||
|
@ -49,7 +48,7 @@ def get_system_ca_file():
|
||||||
if os.path.exists(ca):
|
if os.path.exists(ca):
|
||||||
LOG.debug("Using ca file %s", ca)
|
LOG.debug("Using ca file %s", ca)
|
||||||
return ca
|
return ca
|
||||||
LOG.warning(_LW("System ca file could not be found."))
|
LOG.warning("System ca file could not be found.")
|
||||||
|
|
||||||
|
|
||||||
class HTTPClient(object):
|
class HTTPClient(object):
|
||||||
|
@ -371,5 +370,5 @@ def _set_data(kwargs):
|
||||||
if 'data' in kwargs:
|
if 'data' in kwargs:
|
||||||
raise ValueError("Can't provide both 'data' and "
|
raise ValueError("Can't provide both 'data' and "
|
||||||
"'body' to a request")
|
"'body' to a request")
|
||||||
LOG.warning(_LW("Use of 'body' is deprecated; use 'data' instead"))
|
LOG.warning("Use of 'body' is deprecated; use 'data' instead")
|
||||||
kwargs['data'] = kwargs.pop('body')
|
kwargs['data'] = kwargs.pop('body')
|
||||||
|
|
|
@ -43,7 +43,6 @@ import yaql
|
||||||
|
|
||||||
from muranoclient.common import exceptions
|
from muranoclient.common import exceptions
|
||||||
from muranoclient.i18n import _
|
from muranoclient.i18n import _
|
||||||
from muranoclient.i18n import _LW
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import yaql.language # noqa
|
import yaql.language # noqa
|
||||||
|
@ -586,8 +585,8 @@ def ensure_images(glance_client, image_specs, base_url,
|
||||||
def _image_valid(image, keys):
|
def _image_valid(image, keys):
|
||||||
for key in keys:
|
for key in keys:
|
||||||
if key not in image:
|
if key not in image:
|
||||||
LOG.warning(_LW("Image specification invalid: "
|
LOG.warning("Image specification invalid: "
|
||||||
"No {0} key in image ").format(key))
|
"No {0} key in image ").format(key)
|
||||||
return False
|
return False
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
|
@ -22,13 +22,3 @@ _translators = oslo_i18n.TranslatorFactory(domain='muranoclient')
|
||||||
|
|
||||||
# The primary translation function using the well-known name "_"
|
# The primary translation function using the well-known name "_"
|
||||||
_ = _translators.primary
|
_ = _translators.primary
|
||||||
|
|
||||||
# Translators for log levels.
|
|
||||||
#
|
|
||||||
# The abbreviated names are meant to reflect the usual use of a short
|
|
||||||
# name like '_'. The "L" is for "log" and the other letter comes from
|
|
||||||
# the level.
|
|
||||||
_LI = _translators.log_info
|
|
||||||
_LW = _translators.log_warning
|
|
||||||
_LE = _translators.log_error
|
|
||||||
_LC = _translators.log_critical
|
|
||||||
|
|
Loading…
Reference in New Issue