summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEric V. Smith <eric@trueblade.com>2013-04-15 13:53:49 (GMT)
committerEric V. Smith <eric@trueblade.com>2013-04-15 13:53:49 (GMT)
commit7d55a40b9a2c386d1389fab5b3fe48960ced919a (patch)
treee52bf63d8ca961dd80816c58f40a450fc1c80547 /Doc
parentd25e7de4a18675170345e7fccaed5810889589f2 (diff)
parent45fe62dc9c406f1c2520867d99e557ac227f9bfb (diff)
downloadcpython-7d55a40b9a2c386d1389fab5b3fe48960ced919a.zip
cpython-7d55a40b9a2c386d1389fab5b3fe48960ced919a.tar.gz
cpython-7d55a40b9a2c386d1389fab5b3fe48960ced919a.tar.bz2
Issue #17728: Merge with 3.3.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/string.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 0d50760..c92a005 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -432,12 +432,13 @@ The available presentation types for floating point and decimal values are:
+=========+==========================================================+
| ``'e'`` | Exponent notation. Prints the number in scientific |
| | notation using the letter 'e' to indicate the exponent. |
+ | | The default precision is ``6``. |
+---------+----------------------------------------------------------+
| ``'E'`` | Exponent notation. Same as ``'e'`` except it uses an |
| | upper case 'E' as the separator character. |
+---------+----------------------------------------------------------+
| ``'f'`` | Fixed point. Displays the number as a fixed-point |
- | | number. |
+ | | number. The default precision is ``6``. |
+---------+----------------------------------------------------------+
| ``'F'`` | Fixed point. Same as ``'f'``, but converts ``nan`` to |
| | ``NAN`` and ``inf`` to ``INF``. |
@@ -464,7 +465,7 @@ The available presentation types for floating point and decimal values are:
| | the precision. |
| | |
| | A precision of ``0`` is treated as equivalent to a |
- | | precision of ``1``. |
+ | | precision of ``1``. The default precision is ``6``. |
+---------+----------------------------------------------------------+
| ``'G'`` | General format. Same as ``'g'`` except switches to |
| | ``'E'`` if the number gets too large. The |