diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-09-13 07:46:37 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-09-13 07:46:37 (GMT) |
| commit | 9b90cd1f7b7fa658a48389ca599cd6ffde922e34 (patch) | |
| tree | 860050591ce74169f13d8fb1ebaf3cb735de6b7e /Lib/string.py | |
| parent | f994f047455f9a558f9da4a9a9df9a679fcdd628 (diff) | |
| download | cpython-9b90cd1f7b7fa658a48389ca599cd6ffde922e34.zip cpython-9b90cd1f7b7fa658a48389ca599cd6ffde922e34.tar.gz cpython-9b90cd1f7b7fa658a48389ca599cd6ffde922e34.tar.bz2 | |
Merged revisions 84470-84471,84566-84567,84759 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84470 | florent.xicluna | 2010-09-03 22:00:37 +0200 (ven., 03 sept. 2010) | 1 line
Strengthen BytesWarning tests.
........
r84471 | florent.xicluna | 2010-09-03 22:23:40 +0200 (ven., 03 sept. 2010) | 1 line
Typo
........
r84566 | florent.xicluna | 2010-09-06 22:27:15 +0200 (lun., 06 sept. 2010) | 1 line
typo
........
r84567 | florent.xicluna | 2010-09-06 22:27:55 +0200 (lun., 06 sept. 2010) | 1 line
typo
........
r84759 | florent.xicluna | 2010-09-13 04:28:18 +0200 (lun., 13 sept. 2010) | 1 line
Reenable test_ucs4 and remove some duplicated lines.
........
Diffstat (limited to 'Lib/string.py')
| -rw-r--r-- | Lib/string.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/string.py b/Lib/string.py index 5e13d15..9c0ebe1 100644 --- a/Lib/string.py +++ b/Lib/string.py @@ -607,7 +607,7 @@ class Formatter(object): return str(value) elif conversion is None: return value - raise ValueError("Unknown converion specifier {0!s}".format(conversion)) + raise ValueError("Unknown conversion specifier {0!s}".format(conversion)) # returns an iterable that contains tuples of the form: |