summaryrefslogtreecommitdiffstats
path: root/Doc/library/string.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-09-01 07:42:40 (GMT)
committerGeorg Brandl <georg@python.org>2009-09-01 07:42:40 (GMT)
commit2f3ed6808ee2952a064619a5cea8a902ac44a98c (patch)
tree11462aa21eeec4aade1139b31f43182615c735cd /Doc/library/string.rst
parentc9a5a0e1650b264bdf75e63ecdb577a46adbfd4c (diff)
downloadcpython-2f3ed6808ee2952a064619a5cea8a902ac44a98c.zip
cpython-2f3ed6808ee2952a064619a5cea8a902ac44a98c.tar.gz
cpython-2f3ed6808ee2952a064619a5cea8a902ac44a98c.tar.bz2
Recorded merge of revisions 74614 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r74614 | georg.brandl | 2009-09-01 09:40:54 +0200 (Di, 01 Sep 2009) | 1 line #6813: better documentation for numberless string formats. ........
Diffstat (limited to 'Doc/library/string.rst')
-rw-r--r--Doc/library/string.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 2a46a35..8098651 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -194,7 +194,7 @@ literal text, it can be escaped by doubling: ``{{`` and ``}}``.
The grammar for a replacement field is as follows:
.. productionlist:: sf
- replacement_field: "{" `field_name` ["!" `conversion`] [":" `format_spec`] "}"
+ replacement_field: "{" [`field_name`] ["!" `conversion`] [":" `format_spec`] "}"
field_name: arg_name ("." `attribute_name` | "[" `element_index` "]")*
arg_name: (`identifier` | `integer`)?
attribute_name: `identifier`
@@ -202,7 +202,7 @@ The grammar for a replacement field is as follows:
conversion: "r" | "s" | "a"
format_spec: <described in the next section>
-In less formal terms, the replacement field starts with a *field_name* that specifies
+In less formal terms, the replacement field can start with a *field_name* that specifies
the object whose value is to be formatted and inserted
into the output instead of the replacement field.
The *field_name* is optionally followed by a *conversion* field, which is
@@ -223,7 +223,7 @@ Some simple format string examples::
"First, thou shalt count to {0}" # References first positional argument
"Bring me a {}" # Implicitly references the first positional argument
- "From {} to {}" # Same as "From {0] to {1}"
+ "From {} to {}" # Same as "From {0} to {1}"
"My quest is {name}" # References keyword argument 'name'
"Weight in tons {0.weight}" # 'weight' attribute of first positional arg
"Units destroyed: {players[0]}" # First element of keyword argument 'players'.
@@ -243,6 +243,7 @@ Some examples::
"Harold's a clever {0!s}" # Calls str() on the argument first
"Bring out the holy {name!r}" # Calls repr() on the argument first
+ "More {!a}" # Calls ascii() on the argument first
The *format_spec* field contains a specification of how the value should be
presented, including such details as field width, alignment, padding, decimal