[Python-checkins] cpython (merge 3.3 -> default): Merge: remove redundant sentence from c-api docs (issue #16323)

[andrew.svetlov]

http://hg.python.org/cpython/rev/efedd0f62a7e
changeset:   80653:efedd0f62a7e
parent:      80650:2d887691a99b
parent:      80652:af45e9ec35f0
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 29 15:23:46 2012 +0200
summary:
  Merge: remove redundant sentence from c-api docs (issue #16323)

files:
  Doc/c-api/unicode.rst |  5 +----
  1 files changed, 1 insertions(+), 4 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
@@ -742,10 +742,7 @@
    Decode a string from the current locale encoding. The supported
    error handlers are ``"strict"`` and ``"surrogateescape"``
    (:pep:`383`). The decoder uses ``"strict"`` error handler if
-   *errors* is ``NULL``. If a byte sequence can be decoded as a
-   surrogate character and *errors* is not ``"strict"``, then the byte
-   sequence is escaped using the ``"surrogateescape"`` error handler
-   instead of being decoded. *str* must end with a null character but
+   *errors* is ``NULL``.  *str* must end with a null character but
    cannot contain embedded null characters.
 
    .. seealso::

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