summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-12-15 02:38:25 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-12-15 02:38:25 (GMT)
commit0bf590627b14b9ffab4a24c49a8e21b7ff49886d (patch)
tree3c27a6cf02039b9eb058641d31b533f93ec22d09 /Doc/library
parent471bc3c8148a421317bf02c9d556c718556b0124 (diff)
parent7b440dfec48da8e5d27c4bf55ea75a6ff5880d26 (diff)
downloadcpython-0bf590627b14b9ffab4a24c49a8e21b7ff49886d.zip
cpython-0bf590627b14b9ffab4a24c49a8e21b7ff49886d.tar.gz
cpython-0bf590627b14b9ffab4a24c49a8e21b7ff49886d.tar.bz2
Issue #28944: Merge from 3.5
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/stdtypes.rst5
1 files changed, 2 insertions, 3 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index a32e238..1e665af 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2160,7 +2160,7 @@ The conversion types are:
+------------+-----------------------------------------------------+-------+
| ``'o'`` | Signed octal value. | \(1) |
+------------+-----------------------------------------------------+-------+
-| ``'u'`` | Obsolete type -- it is identical to ``'d'``. | \(7) |
+| ``'u'`` | Obsolete type -- it is identical to ``'d'``. | \(6) |
+------------+-----------------------------------------------------+-------+
| ``'x'`` | Signed hexadecimal (lowercase). | \(2) |
+------------+-----------------------------------------------------+-------+
@@ -2225,8 +2225,7 @@ Notes:
(5)
If precision is ``N``, the output is truncated to ``N`` characters.
-
-(7)
+(6)
See :pep:`237`.
Since Python strings have an explicit length, ``%s`` conversions do not assume