Mercurial > cpython-lru_cache-weakref

diff Objects/stringobject.c @ 63507:38812948c532 2.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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. ........
author Georg Brandl <georg@python.org>
date Sun, 01 Aug 2010 22:02:09 +0000
parents 014e7c00dc28
children 787b969d37f0
line wrap: on
line diff
--- a/Objects/stringobject.c	Sun Aug 01 22:00:39 2010 +0000
+++ b/Objects/stringobject.c	Sun Aug 01 22:02:09 2010 +0000
@@ -3959,7 +3959,7 @@
 #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 @@
 }
 
 PyDoc_STRVAR(p_format__doc__,
-"S.__format__(format_spec) -> unicode\n\
+"S.__format__(format_spec) -> string\n\
 \n\
 ");