Issue #29009: Merge 3.5.

zhangyangyu · zhangyangyu · commit 47888da90b1a · 2016-12-19T18:39:02.000+08:00
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
@@ -1668,10 +1668,6 @@ They all return *NULL* or ``-1`` if an exception occurs.
    * :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
@@ -2075,10 +2075,6 @@ PyAPI_FUNC(int) _PyUnicode_EqualToASCIIString(
    - 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
