From: Eric Smith <eric@trueblade.com>
Date: Thu, 25 Feb 2010 14:55:41 +0000 (+0000)
Subject: Merged revisions 78444 via svnmerge from
X-Git-Tag: v2.6.5rc1~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a896788b62608104a04a73820216768de11188e;p=python

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.
........
---

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 68f78ff9bd..d63ad02e80 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -223,7 +223,8 @@ The grammar for a replacement field is as follows:
       replacement_field: "{" `field_name` ["!" `conversion`] [":" `format_spec`] "}"
       field_name: (`identifier` | `integer`) ("." `attribute_name` | "[" `element_index` "]")*
       attribute_name: `identifier`
-      element_index: `integer`
+      element_index: `integer` | `index_string`
+      index_string: <any source character except "]"> +
       conversion: "r" | "s"
       format_spec: <described in the next section>