traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #29009: Merge 3.6.

This commit is contained in:
Xiang Zhang 2016-12-19 18:39:28 +08:00
parent ec60edb977 47888da90b
commit bd0ff946bc
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/c-api/unicode.rst
View File

@ -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_True` or :const:`Py_False` for successful comparisons
* :const:`Py_NotImplemented` in case the type combination is unknown * :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`, Possible values for *op* are :const:`Py_GT`, :const:`Py_GE`, :const:`Py_EQ`,
:const:`Py_NE`, :const:`Py_LT`, and :const:`Py_LE`. :const:`Py_NE`, :const:`Py_LT`, and :const:`Py_LE`.

4
Include/unicodeobject.h
View File

@ -2079,10 +2079,6 @@ PyAPI_FUNC(int) _PyUnicode_EqualToASCIIString(
- Py_True or Py_False for successful comparisons - Py_True or Py_False for successful comparisons
- Py_NotImplemented in case the type combination is unknown - 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: Possible values for op:
Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE