diff options
| author | Thomas Wouters <thomas@python.org> | 2006-07-05 11:03:49 (GMT) | 
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2006-07-05 11:03:49 (GMT) | 
| commit | add191118fd583107e900c264f6e7aa1e786a387 (patch) | |
| tree | aff4b6d042a6b729021fcd11b7ed81b29ba81d2a /Lib/string.py | |
| parent | 9ba7ca82298fabe84b633514317d795b42eef770 (diff) | |
| download | cpython-add191118fd583107e900c264f6e7aa1e786a387.zip cpython-add191118fd583107e900c264f6e7aa1e786a387.tar.gz cpython-add191118fd583107e900c264f6e7aa1e786a387.tar.bz2  | |
Fix bug in passing tuples to string.Template. All other values (with working
str() or repr()) would work, just not multi-value tuples. Probably not a
backport candidate, since it changes the behaviour of passing a
single-element tuple:
>>> string.Template("$foo").substitute(dict(foo=(1,)))
'(1,)'
versus
'1'
Diffstat (limited to 'Lib/string.py')
| -rw-r--r-- | Lib/string.py | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/string.py b/Lib/string.py index ba85a49..a5837e9 100644 --- a/Lib/string.py +++ b/Lib/string.py @@ -161,7 +161,7 @@ class Template:                  val = mapping[named]                  # We use this idiom instead of str() because the latter will                  # fail if val is a Unicode containing non-ASCII characters. -                return '%s' % val +                return '%s' % (val,)              if mo.group('escaped') is not None:                  return self.delimiter              if mo.group('invalid') is not None: @@ -186,13 +186,13 @@ class Template:                  try:                      # We use this idiom instead of str() because the latter                      # will fail if val is a Unicode containing non-ASCII -                    return '%s' % mapping[named] +                    return '%s' % (mapping[named],)                  except KeyError:                      return self.delimiter + named              braced = mo.group('braced')              if braced is not None:                  try: -                    return '%s' % mapping[braced] +                    return '%s' % (mapping[braced],)                  except KeyError:                      return self.delimiter + '{' + braced + '}'              if mo.group('escaped') is not None:  | 
