From f69bb43453795dbbc0b2851ee0ba42b19cdbfb7d Mon Sep 17 00:00:00 2001 From: Takashi NATSUME Date: Fri, 19 May 2017 15:43:21 +0900 Subject: [PATCH] Fix string interpolation in ValueError Fix string interpolation and misuse of log marker function in ValueError. Change-Id: Ief34fbf75a28c46b95c08a4d7ae2cb831607a05b Closes-Bug: #1684771 --- oslo_versionedobjects/fields.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/oslo_versionedobjects/fields.py b/oslo_versionedobjects/fields.py index 747728a..45dad72 100644 --- a/oslo_versionedobjects/fields.py +++ b/oslo_versionedobjects/fields.py @@ -26,7 +26,7 @@ from oslo_utils import strutils from oslo_utils import timeutils import six -from oslo_versionedobjects._i18n import _, _LE +from oslo_versionedobjects._i18n import _ from oslo_versionedobjects import _utils from oslo_versionedobjects import exception @@ -376,7 +376,7 @@ class MACAddress(StringPattern): lowered = value.lower().replace('-', ':') if MACAddress._REGEX.match(lowered): return lowered - raise ValueError(_LE("Malformed MAC %s"), value) + raise ValueError(_("Malformed MAC %s") % (value,)) class PCIAddress(StringPattern): @@ -390,7 +390,7 @@ class PCIAddress(StringPattern): newvalue = value.lower() if PCIAddress._REGEX.match(newvalue): return newvalue - raise ValueError(_LE("Malformed PCI address %s"), value) + raise ValueError(_("Malformed PCI address %s") % (value,)) class Integer(FieldType):