From: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date: Tue, 6 Aug 2013 19:30:38 +0000 (+0000)
Subject: Sync oslo gettextutils
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e0de5bf99ea11df126c826223a36a8be273e5375;p=openstack-build%2Fneutron-build.git

Sync oslo gettextutils

Change-Id: Id347e157ca2ccefe510b3328ea0047c87f25b3e4
---

diff --git a/neutron/openstack/common/gettextutils.py b/neutron/openstack/common/gettextutils.py
index 3a6d4bf4b..9aa2a30cb 100644
--- a/neutron/openstack/common/gettextutils.py
+++ b/neutron/openstack/common/gettextutils.py
@@ -137,7 +137,7 @@ class Message(UserString.UserString, object):
         # look for %(blah) fields in string;
         # ignore %% and deal with the
         # case where % is first character on the line
-        keys = re.findall('(?:[^%]|^)%\((\w*)\)[a-z]', full_msg)
+        keys = re.findall('(?:[^%]|^)?%\((\w*)\)[a-z]', full_msg)
 
         # if we don't find any %(blah) blocks but have a %s
         if not keys and re.findall('(?:[^%]|^)%[a-z]', full_msg):