[Python-checkins] r78447 - in python/branches/release31-maint: Doc/library/string.rst

[eric.smith]

Author: eric.smith
Date: Thu Feb 25 15:59:39 2010
New Revision: 78447

Log:
Merged revisions 78446 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78446 | eric.smith | 2010-02-25 09:58:13 -0500 (Thu, 25 Feb 2010) | 9 lines
  
  Merged revisions 78444 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r78444 | eric.smith | 2010-02-25 09:26:33 -0500 (Thu, 25 Feb 2010) | 1 line
    
    Issue #7928: Document str.format element_index better.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/string.rst

Modified: python/branches/release31-maint/Doc/library/string.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/string.rst	(original)
+++ python/branches/release31-maint/Doc/library/string.rst	Thu Feb 25 15:59:39 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>