From: Eric Smith <eric@trueblade.com>
Date: Thu, 25 Feb 2010 14:59:39 +0000 (+0000)
Subject: Merged revisions 78446 via svnmerge from
X-Git-Tag: v3.1.2rc1~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de75569016969ee6cd0652fabf7d5faf6b542419;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 933927021e79..c7aba9991657 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -199,7 +199,8 @@ The grammar for a replacement field is as follows:
       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>