diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 22:02:09 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 22:02:09 (GMT) |
| commit | c5356994edac98da01305f7664182c4a6ed57b9d (patch) | |
| tree | f08fe905e783793b29adc8485cd4cd2f384976ab /Objects | |
| parent | 0ba1f01adfe9132340324203e10671cf9b419b1c (diff) | |
| download | cpython-c5356994edac98da01305f7664182c4a6ed57b9d.zip cpython-c5356994edac98da01305f7664182c4a6ed57b9d.tar.gz cpython-c5356994edac98da01305f7664182c4a6ed57b9d.tar.bz2 | |
Merged revisions 83354,83365 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint
........
r83354 | georg.brandl | 2010-07-31 21:07:37 +0200 (Sa, 31 Jul 2010) | 1 line
#9328: string format methods return strings.
........
r83365 | georg.brandl | 2010-07-31 23:22:36 +0200 (Sa, 31 Jul 2010) | 1 line
#1019882: if start() and stop() were not in the same stack frame, stats.load() would crash with IndexError.
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/stringobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index f8f6cef..e37b579 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -3959,7 +3959,7 @@ string_getnewargs(PyStringObject *v) #include "stringlib/string_format.h" PyDoc_STRVAR(format__doc__, -"S.format(*args, **kwargs) -> unicode\n\ +"S.format(*args, **kwargs) -> string\n\ \n\ "); @@ -3993,7 +3993,7 @@ done: } PyDoc_STRVAR(p_format__doc__, -"S.__format__(format_spec) -> unicode\n\ +"S.__format__(format_spec) -> string\n\ \n\ "); |