mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 80521 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80521 | r.david.murray | 2010-04-26 22:45:53 -0400 (Mon, 26 Apr 2010) | 13 lines

  Merged revisions 80512 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80512 | r.david.murray | 2010-04-26 17:17:14 -0400 (Mon, 26 Apr 2010) | 7 lines

    Issue #6656: fix locale.format_string to handle escaped percents and mappings.

    Refactors format_string.  Includes tests for the two problems noted in
    the issue, but as far as I can see there are no other tests that confirm
    that format_string conforms to normal % formatting rules.
  ........
................
This commit is contained in:
R. David Murray 2010-09-05 22:40:41 +00:00
parent 0bb502dcac
commit 7e00ef0974
3 changed files with 45 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Lib/locale.py
View file

@ -224,22 +224,30 @@ def format_string(f, val, grouping=False):
percents = list(_percent_re.finditer(f))
new_f = _percent_re.sub('%s', f)
if isinstance(val, tuple):
new_val = list(val)
if isinstance(val, collections.Mapping):
new_val = []
for perc in percents:
if perc.group()[-1]=='%':
new_val.append('%')
else:
new_val.append(format(perc.group(), val, grouping))
else:
if not isinstance(val, tuple):
val = (val,)
new_val = []
i = 0
for perc in percents:
starcount = perc.group('modifiers').count('*')
new_val[i] = format(perc.group(), new_val[i], grouping, False, *new_val[i+1:i+1+starcount])
del new_val[i+1:i+1+starcount]
i += (1 + starcount)
val = tuple(new_val)
elif isinstance(val, collections.Mapping):
for perc in percents:
key = perc.group("key")
val[key] = format(perc.group(), val[key], grouping)
else:
# val is a single value
val = format(percents[0].group(), val, grouping)
if perc.group()[-1]=='%':
new_val.append('%')
else:
starcount = perc.group('modifiers').count('*')
new_val.append(_format(perc.group(),
val[i],
grouping,
False,
*val[i+1:i+1+starcount]))
i += (1 + starcount)
val = tuple(new_val)
return new_f % val