summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-12-19 17:30:28 (GMT)
committerGeorg Brandl <georg@python.org>2009-12-19 17:30:28 (GMT)
commit8b10f13aaf552000d44c16341193495f61b186a8 (patch)
treee465edce798b86ffb01d0ff195306fccc630bdce /Doc/library
parent5ff37ae14b3b766e5194b02c661c0c16027dff9d (diff)
downloadcpython-8b10f13aaf552000d44c16341193495f61b186a8.zip
cpython-8b10f13aaf552000d44c16341193495f61b186a8.tar.gz
cpython-8b10f13aaf552000d44c16341193495f61b186a8.tar.bz2
#7527: use standard versionadded tags.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/string.rst8
1 files changed, 5 insertions, 3 deletions
diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index b636ca0..8f8e165 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -105,7 +105,9 @@ The constants defined in this module are:
String Formatting
-----------------
-Starting in Python 2.6, the built-in str and unicode classes provide the ability
+.. versionadded:: 2.6
+
+The built-in str and unicode classes provide the ability
to do complex variable substitutions and value formatting via the
:meth:`str.format` method described in :pep:`3101`. The :class:`Formatter`
class in the :mod:`string` module allows you to create and customize your own
@@ -488,6 +490,8 @@ The available presentation types for floating point and decimal values are:
Template strings
----------------
+.. versionadded:: 2.4
+
Templates provide simpler string substitutions as described in :pep:`292`.
Instead of the normal ``%``\ -based substitutions, Templates support ``$``\
-based substitutions, using the following rules:
@@ -506,8 +510,6 @@ Instead of the normal ``%``\ -based substitutions, Templates support ``$``\
Any other appearance of ``$`` in the string will result in a :exc:`ValueError`
being raised.
-.. versionadded:: 2.4
-
The :mod:`string` module provides a :class:`Template` class that implements
these rules. The methods of :class:`Template` are: