From: Georg Brandl <georg@python.org>
Date: Sat, 31 Jul 2010 19:07:37 +0000 (+0000)
Subject: #9328: string format methods return strings.
X-Git-Tag: v2.7.1rc1~531
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05f819b6e9b026ab454cf187269b145bd7ac1ed6;p=thirdparty%2FPython%2Fcpython.git

#9328: string format methods return strings.
---

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 8d3403a0c3e6..347f3183381a 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -3580,7 +3580,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\
 ");
 
@@ -3614,7 +3614,7 @@ done:
 }
 
 PyDoc_STRVAR(p_format__doc__,
-"S.__format__(format_spec) -> unicode\n\
+"S.__format__(format_spec) -> string\n\
 \n\
 ");