diff options
| author | Xiang Zhang <angwerzx@126.com> | 2016-12-19 10:39:02 (GMT) |
|---|---|---|
| committer | Xiang Zhang <angwerzx@126.com> | 2016-12-19 10:39:02 (GMT) |
| commit | 47888da90b1a40692eca23bcc77346112b1d188a (patch) | |
| tree | b8dfb3e1e42cf26fda150af84b14e8b3992162c0 | |
| parent | d4580ecb8da130fd9061565defcdb73bc08aa311 (diff) | |
| parent | bfbc29cb8f5797f239a6ad8944edfea4e153cb75 (diff) | |
| download | cpython-47888da90b1a40692eca23bcc77346112b1d188a.zip cpython-47888da90b1a40692eca23bcc77346112b1d188a.tar.gz cpython-47888da90b1a40692eca23bcc77346112b1d188a.tar.bz2 | |
Issue #29009: Merge 3.5.
| -rw-r--r-- | Doc/c-api/unicode.rst | 4 | ||||
| -rw-r--r-- | 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 index c11e049..b31d689 100644 --- 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 index 8103a63..792d0e8 100644 --- 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 |