summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-12-15 02:38:46 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-12-15 02:38:46 (GMT)
commit5234d54c66db1838236a30de50325c2493d41c37 (patch)
tree35d13fe3dbffc92827e35d49cef48c229f12accc
parent161a4dd495dbf5cb12364e8f6e2d113cfd0633fc (diff)
parent0bf590627b14b9ffab4a24c49a8e21b7ff49886d (diff)
downloadcpython-5234d54c66db1838236a30de50325c2493d41c37.zip
cpython-5234d54c66db1838236a30de50325c2493d41c37.tar.gz
cpython-5234d54c66db1838236a30de50325c2493d41c37.tar.bz2
Issue #28944: Merge from 3.6
-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