commit c5356994edac98da01305f7664182c4a6ed57b9d
author Georg Brandl <georg@python.org> Sun Aug 01 22:02:09 2010 +0000
committer Georg Brandl <georg@python.org> Sun Aug 01 22:02:09 2010 +0000
tree f08fe905e783793b29adc8485cd4cd2f384976ab
parent 0ba1f01adfe9132340324203e10671cf9b419b1c

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.
........

Objects/stringobject.c

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 @@
 #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\
 ");