[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #29009: Merge 3.5.
xiang.zhang
python-checkins at python.org
Mon Dec 19 05:43:40 EST 2016
https://hg.python.org/cpython/rev/da958d01755a
changeset: 105743:da958d01755a
branch: 3.6
parent: 105739:f3706a9430da
parent: 105742:8f5ed2a38f64
user: Xiang Zhang <angwerzx at 126.com>
date: Mon Dec 19 18:39:02 2016 +0800
summary:
Issue #29009: Merge 3.5.
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
@@ -2075,10 +2075,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
More information about the Python-checkins
mailing list