summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorEric Smith <eric@trueblade.com>2010-02-25 14:59:39 (GMT)
committerEric Smith <eric@trueblade.com>2010-02-25 14:59:39 (GMT)
commitde75569016969ee6cd0652fabf7d5faf6b542419 (patch)
tree65b1cdf9084755e875548faa1e31ffe00825dfcc /Doc/library
parentea2e7898a1d1b43187b6f5d18905c49c55532746 (diff)
downloadcpython-de75569016969ee6cd0652fabf7d5faf6b542419.zip
cpython-de75569016969ee6cd0652fabf7d5faf6b542419.tar.gz
cpython-de75569016969ee6cd0652fabf7d5faf6b542419.tar.bz2
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. ........ ................
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/string.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 9339270..c7aba99 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>