[Python-checkins] r86278 - in python/branches/release31-maint: Objects/unicodeobject.c

[eric.smith]

Author: eric.smith
Date: Sat Nov  6 20:29:45 2010
New Revision: 86278

Log:
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__.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Objects/unicodeobject.c

Modified: python/branches/release31-maint/Objects/unicodeobject.c
==============================================================================
--- python/branches/release31-maint/Objects/unicodeobject.c	(original)
+++ python/branches/release31-maint/Objects/unicodeobject.c	Sat Nov  6 20:29:45 2010
@@ -8803,7 +8803,8 @@
 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 @@
 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)