diff options
Diffstat (limited to 'Modules/unicodedata.c')
| -rw-r--r-- | Modules/unicodedata.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c index 7369db5..6491811 100644 --- a/Modules/unicodedata.c +++ b/Modules/unicodedata.c @@ -15,7 +15,6 @@ #ifndef Py_BUILD_CORE_BUILTIN # define Py_BUILD_CORE_MODULE 1 #endif -#define NEEDS_PY_IDENTIFIER #define PY_SSIZE_T_CLEAN @@ -25,11 +24,6 @@ #include <stdbool.h> -_Py_IDENTIFIER(NFC); -_Py_IDENTIFIER(NFD); -_Py_IDENTIFIER(NFKC); -_Py_IDENTIFIER(NFKD); - /*[clinic input] module unicodedata class unicodedata.UCD 'PreviousDBVersion *' '<not used>' @@ -890,17 +884,17 @@ unicodedata_UCD_is_normalized_impl(PyObject *self, PyObject *form, PyObject *cmp; int match = 0; - if (_PyUnicode_EqualToASCIIId(form, &PyId_NFC)) { + if (PyUnicode_CompareWithASCIIString(form, "NFC") == 0) { nfc = true; } - else if (_PyUnicode_EqualToASCIIId(form, &PyId_NFKC)) { + else if (PyUnicode_CompareWithASCIIString(form, "NFKC") == 0) { nfc = true; k = true; } - else if (_PyUnicode_EqualToASCIIId(form, &PyId_NFD)) { + else if (PyUnicode_CompareWithASCIIString(form, "NFD") == 0) { /* matches default values for `nfc` and `k` */ } - else if (_PyUnicode_EqualToASCIIId(form, &PyId_NFKD)) { + else if (PyUnicode_CompareWithASCIIString(form, "NFKD") == 0) { k = true; } else { @@ -953,7 +947,7 @@ unicodedata_UCD_normalize_impl(PyObject *self, PyObject *form, return input; } - if (_PyUnicode_EqualToASCIIId(form, &PyId_NFC)) { + if (PyUnicode_CompareWithASCIIString(form, "NFC") == 0) { if (is_normalized_quickcheck(self, input, true, false, true) == YES) { Py_INCREF(input); @@ -961,7 +955,7 @@ unicodedata_UCD_normalize_impl(PyObject *self, PyObject *form, } return nfc_nfkc(self, input, 0); } - if (_PyUnicode_EqualToASCIIId(form, &PyId_NFKC)) { + if (PyUnicode_CompareWithASCIIString(form, "NFKC") == 0) { if (is_normalized_quickcheck(self, input, true, true, true) == YES) { Py_INCREF(input); @@ -969,7 +963,7 @@ unicodedata_UCD_normalize_impl(PyObject *self, PyObject *form, } return nfc_nfkc(self, input, 1); } - if (_PyUnicode_EqualToASCIIId(form, &PyId_NFD)) { + if (PyUnicode_CompareWithASCIIString(form, "NFD") == 0) { if (is_normalized_quickcheck(self, input, false, false, true) == YES) { Py_INCREF(input); @@ -977,7 +971,7 @@ unicodedata_UCD_normalize_impl(PyObject *self, PyObject *form, } return nfd_nfkd(self, input, 0); } - if (_PyUnicode_EqualToASCIIId(form, &PyId_NFKD)) { + if (PyUnicode_CompareWithASCIIString(form, "NFKD") == 0) { if (is_normalized_quickcheck(self, input, false, true, true) == YES) { Py_INCREF(input); |