diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-08-05 15:40:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-08-05 15:40:28 +0000 |
| commit | 82fa17f89501fe8b2dfd246ce5a8054f1c74c336 (patch) | |
| tree | 29e5767fdb4211b1a7aa2b44f09afe0db692a5d9 /openstack | |
| parent | c8cf9d7e0508d83000100bd6c1685ee5db9322d5 (diff) | |
| parent | ed653bffa899dd6cabab20e4ab0283dc742e7da9 (diff) | |
| download | oslo-82fa17f89501fe8b2dfd246ce5a8054f1c74c336.tar.gz oslo-82fa17f89501fe8b2dfd246ce5a8054f1c74c336.tar.xz oslo-82fa17f89501fe8b2dfd246ce5a8054f1c74c336.zip | |
Merge "Fix Message format-string parsing"
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/gettextutils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack/common/gettextutils.py b/openstack/common/gettextutils.py index a90b241..bbf8fe9 100644 --- a/openstack/common/gettextutils.py +++ b/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): |