diff options
| author | Inada Naoki <songofacandy@gmail.com> | 2022-05-12 14:48:38 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-12 14:48:38 +0900 |
| commit | f9c9354a7a173eaca2aa19e667b5cf12167b7fed (patch) | |
| tree | eb0fdd3219f53c973f1a7dbbcb9f8b0e0babdf36 /Objects/stringlib | |
| parent | 68fec31364e96d122aae0571c14683b4ddb0ebd0 (diff) | |
| download | cpython-git-f9c9354a7a173eaca2aa19e667b5cf12167b7fed.tar.gz | |
gh-92536: PEP 623: Remove wstr and legacy APIs from Unicode (GH-92537)
Diffstat (limited to 'Objects/stringlib')
| -rw-r--r-- | Objects/stringlib/eq.h | 11 | ||||
| -rw-r--r-- | Objects/stringlib/unicodedefs.h | 32 |
2 files changed, 3 insertions, 40 deletions
diff --git a/Objects/stringlib/eq.h b/Objects/stringlib/eq.h index 9c1058b86c..2f2438845a 100644 --- a/Objects/stringlib/eq.h +++ b/Objects/stringlib/eq.h @@ -4,15 +4,10 @@ * unicode_eq() is called when the hash of two unicode objects is equal. */ Py_LOCAL_INLINE(int) -unicode_eq(PyObject *aa, PyObject *bb) +unicode_eq(PyObject *a, PyObject *b) { - assert(PyUnicode_Check(aa)); - assert(PyUnicode_Check(bb)); - assert(PyUnicode_IS_READY(aa)); - assert(PyUnicode_IS_READY(bb)); - - PyUnicodeObject *a = (PyUnicodeObject *)aa; - PyUnicodeObject *b = (PyUnicodeObject *)bb; + assert(PyUnicode_Check(a)); + assert(PyUnicode_Check(b)); if (PyUnicode_GET_LENGTH(a) != PyUnicode_GET_LENGTH(b)) return 0; diff --git a/Objects/stringlib/unicodedefs.h b/Objects/stringlib/unicodedefs.h deleted file mode 100644 index ba2ce0aeea..0000000000 --- a/Objects/stringlib/unicodedefs.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef STRINGLIB_UNICODEDEFS_H -#define STRINGLIB_UNICODEDEFS_H - -/* this is sort of a hack. there's at least one place (formatting - floats) where some stringlib code takes a different path if it's - compiled as unicode. */ -#define STRINGLIB_IS_UNICODE 1 - -#define FASTSEARCH fastsearch -#define STRINGLIB(F) stringlib_##F -#define STRINGLIB_OBJECT PyUnicodeObject -#define STRINGLIB_SIZEOF_CHAR Py_UNICODE_SIZE -#define STRINGLIB_CHAR Py_UNICODE -#define STRINGLIB_TYPE_NAME "unicode" -#define STRINGLIB_PARSE_CODE "U" -#define STRINGLIB_ISSPACE Py_UNICODE_ISSPACE -#define STRINGLIB_ISLINEBREAK BLOOM_LINEBREAK -#define STRINGLIB_ISDECIMAL Py_UNICODE_ISDECIMAL -#define STRINGLIB_TODECIMAL Py_UNICODE_TODECIMAL -#define STRINGLIB_STR PyUnicode_AS_UNICODE -#define STRINGLIB_LEN PyUnicode_GET_SIZE -#define STRINGLIB_NEW PyUnicode_FromUnicode -#define STRINGLIB_CHECK PyUnicode_Check -#define STRINGLIB_CHECK_EXACT PyUnicode_CheckExact -#define STRINGLIB_MUTABLE 0 - -#define STRINGLIB_TOSTR PyObject_Str -#define STRINGLIB_TOASCII PyObject_ASCII - -#define STRINGLIB_WANT_CONTAINS_OBJ 1 - -#endif /* !STRINGLIB_UNICODEDEFS_H */ |