summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorEric Smith <eric@trueblade.com>2010-11-06 19:29:45 (GMT)
committerEric Smith <eric@trueblade.com>2010-11-06 19:29:45 (GMT)
commit16562f41b09a4440182ff6877e75b8e5065ee9db (patch)
tree11cbf729d852e5ee349ab085d07f281bd66448a4 /Objects
parent651e6b5d4980aa3706b133a6de5114b312718eae (diff)
downloadcpython-16562f41b09a4440182ff6877e75b8e5065ee9db.zip
cpython-16562f41b09a4440182ff6877e75b8e5065ee9db.tar.gz
cpython-16562f41b09a4440182ff6877e75b8e5065ee9db.tar.bz2
Merged revisions 86277 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86277 | eric.smith | 2010-11-06 15:27:37 -0400 (Sat, 06 Nov 2010) | 1 line Added more to docstrings for str.format, format_map, and __format__. ........
Diffstat (limited to 'Objects')
-rw-r--r--Objects/unicodeobject.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index f875e10..6bffaea 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -8803,7 +8803,8 @@ unicode_endswith(PyUnicodeObject *self,
PyDoc_STRVAR(format__doc__,
"S.format(*args, **kwargs) -> str\n\
\n\
-");
+Return a formatted version of S, using substitutions from args and kwargs.\n\
+The substitutions are identified by braces ('{' and '}').");
static PyObject *
unicode__format__(PyObject* self, PyObject* args)
@@ -8821,7 +8822,7 @@ unicode__format__(PyObject* self, PyObject* args)
PyDoc_STRVAR(p_format__doc__,
"S.__format__(format_spec) -> str\n\
\n\
-");
+Return a formatted version of S as described by format_spec.");
static PyObject *
unicode__sizeof__(PyUnicodeObject *v)