[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #28432: Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/1fc08c283f8f
changeset:   104512:1fc08c283f8f
branch:      3.6
parent:      104507:7d38d0404718
parent:      104511:a4889719e3c2
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Mon Oct 17 00:46:37 2016 +0300
summary:
  Issue #28432: Merge from 3.5

files:
  Doc/c-api/unicode.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -787,7 +787,7 @@
    Encode a Unicode object to the current locale encoding. The
    supported error handlers are ``"strict"`` and ``"surrogateescape"``
    (:pep:`383`). The encoder uses ``"strict"`` error handler if
-   *errors* is ``NULL``. Return a :class:`bytes` object. *str* cannot
+   *errors* is ``NULL``. Return a :class:`bytes` object. *unicode* cannot
    contain embedded null characters.
 
    Use :c:func:`PyUnicode_EncodeFSDefault` to encode a string to

-- 
Repository URL: https://hg.python.org/cpython