Issue #28944: Merge from 3.6

This commit is contained in:
Berker Peksag 2016-12-15 05:38:46 +03:00
commit 5234d54c66
1 changed files with 2 additions and 3 deletions

View File

@ -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