[Python-checkins] r78446 - in python/branches/py3k: Doc/library/string.rst

Thu Feb 25 15:58:13 CET 2010

Author: eric.smith
Date: Thu Feb 25 15:58:13 2010
New Revision: 78446
Log:
Merged revisions 78444 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r78444 | eric.smith | 2010年02月25日 09:26:33 -0500 (2010年2月25日) | 1 line
 
 Issue #7928: Document str.format element_index better.
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Doc/library/string.rst
Modified: python/branches/py3k/Doc/library/string.rst
==============================================================================

--- python/branches/py3k/Doc/library/string.rst	(original)
+++ python/branches/py3k/Doc/library/string.rst	Thu Feb 25 15:58:13 2010
@@ -199,7 +199,8 @@
 field_name: arg_name ("." `attribute_name` | "[" `element_index` "]")*
 arg_name: (`identifier` | `integer`)?
 attribute_name: `identifier`
- element_index: `integer`
+ element_index: `integer` | `index_string`
+ index_string: <any source character except "]"> +
 conversion: "r" | "s" | "a"
 format_spec: <described in the next section>
 
