summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-11-16 13:41:11 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2016-11-16 13:41:11 (GMT)
commitfab6acd9f58584d2f4b361418e4d17f9c23db2f9 (patch)
treeaee38e54448d48d8652ab4c62792ca414d4653f3 /Include
parent3b73ea127892d0e1f9d8f12f88e4f9c0ba0b89b1 (diff)
parentf5894dd646f5e39918377b37b8c8694cebdca103 (diff)
downloadcpython-fab6acd9f58584d2f4b361418e4d17f9c23db2f9.zip
cpython-fab6acd9f58584d2f4b361418e4d17f9c23db2f9.tar.gz
cpython-fab6acd9f58584d2f4b361418e4d17f9c23db2f9.tar.bz2
Issue #28701: Replace _PyUnicode_CompareWithId with _PyUnicode_EqualToASCIIId.
The latter function is more readable, faster and doesn't raise exceptions. Based on patch by Xiang Zhang.
Diffstat (limited to 'Include')
-rw-r--r--Include/unicodeobject.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index 7b60089..f8f98bd 100644
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -2037,12 +2037,31 @@ PyAPI_FUNC(int) PyUnicode_Compare(
);
#ifndef Py_LIMITED_API
+/* Compare a string with an identifier and return -1, 0, 1 for less than,
+ equal, and greater than, respectively.
+ Raise an exception and return -1 on error. */
+
PyAPI_FUNC(int) _PyUnicode_CompareWithId(
PyObject *left, /* Left string */
_Py_Identifier *right /* Right identifier */
);
+
+/* Test whether a unicode is equal to ASCII identifier. Return 1 if true,
+ 0 otherwise. Return 0 if any argument contains non-ASCII characters.
+ Any error occurs inside will be cleared before return. */
+
+PyAPI_FUNC(int) _PyUnicode_EqualToASCIIId(
+ PyObject *left, /* Left string */
+ _Py_Identifier *right /* Right identifier */
+ );
#endif
+/* Compare a Unicode object with C string and return -1, 0, 1 for less than,
+ equal, and greater than, respectively. It is best to pass only
+ ASCII-encoded strings, but the function interprets the input string as
+ ISO-8859-1 if it contains non-ASCII characters.
+ Raise an exception and return -1 on error. */
+
PyAPI_FUNC(int) PyUnicode_CompareWithASCIIString(
PyObject *left,
const char *right /* ASCII-encoded string */