[Python-checkins] Remove usage of _Py_IDENTIFIER from unicodedata module. (GH-91532)
corona10
webhook-mailer at python.org
Thu Apr 14 21:44:09 EDT 2022
https://github.com/python/cpython/commit/2bf5f64455c47eca082696291ba96e15e2f2299c
commit: 2bf5f64455c47eca082696291ba96e15e2f2299c
branch: main
author: Dong-hee Na <donghee.na at python.org>
committer: corona10 <donghee.na92 at gmail.com>
date: 2022-04-15T10:44:05+09:00
summary:
Remove usage of _Py_IDENTIFIER from unicodedata module. (GH-91532)
files:
M Modules/unicodedata.c
diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
index 7369db53d2e0b..64918115283d1 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);
More information about the Python-checkins
mailing list