[Python-checkins] cpython (merge 3.6 -> default): Issue #29009: Merge 3.6.

[xiang.zhang]

https://hg.python.org/cpython/rev/9568343fde42
changeset:   105744:9568343fde42
parent:      105740:ac2715d04119
parent:      105743:da958d01755a
user:        Xiang Zhang <angwerzx at 126.com>
date:        Mon Dec 19 18:39:28 2016 +0800
summary:
  Issue #29009: Merge 3.6.

files:
  Doc/c-api/unicode.rst   |  4 ----
  Include/unicodeobject.h |  4 ----
  2 files changed, 0 insertions(+), 8 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
@@ -1668,10 +1668,6 @@
    * :const:`Py_True` or :const:`Py_False` for successful comparisons
    * :const:`Py_NotImplemented` in case the type combination is unknown
 
-   Note that :const:`Py_EQ` and :const:`Py_NE` comparisons can cause a
-   :exc:`UnicodeWarning` in case the conversion of the arguments to Unicode fails
-   with a :exc:`UnicodeDecodeError`.
-
    Possible values for *op* are :const:`Py_GT`, :const:`Py_GE`, :const:`Py_EQ`,
    :const:`Py_NE`, :const:`Py_LT`, and :const:`Py_LE`.
 
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -2079,10 +2079,6 @@
    - Py_True or Py_False for successful comparisons
    - Py_NotImplemented in case the type combination is unknown
 
-   Note that Py_EQ and Py_NE comparisons can cause a UnicodeWarning in
-   case the conversion of the arguments to Unicode fails with a
-   UnicodeDecodeError.
-
    Possible values for op:
 
      Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE

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