[Python-checkins] bpo-46541: Remove usage of _Py_IDENTIFIER from lzma module (GH-31683)

corona10 webhook-mailer at python.org
Fri Mar 4 11:39:27 EST 2022


https://github.com/python/cpython/commit/d168c728f7114959e8fc147538ea1d24f2f5af79
commit: d168c728f7114959e8fc147538ea1d24f2f5af79
branch: main
author: Dong-hee Na <donghee.na at python.org>
committer: corona10 <donghee.na92 at gmail.com>
date: 2022-03-05T01:38:56+09:00
summary:

bpo-46541: Remove usage of _Py_IDENTIFIER from lzma module (GH-31683)

files:
M Modules/_lzmamodule.c

diff --git a/Modules/_lzmamodule.c b/Modules/_lzmamodule.c
index e3fc90e5175eb..b572d8cd909fd 100644
--- a/Modules/_lzmamodule.c
+++ b/Modules/_lzmamodule.c
@@ -6,7 +6,6 @@
 */
 
 #define PY_SSIZE_T_CLEAN
-#define NEEDS_PY_IDENTIFIER
 
 #include "Python.h"
 #include "structmember.h"         // PyMemberDef
@@ -431,17 +430,19 @@ parse_filter_chain_spec(_lzma_state *state, lzma_filter filters[], PyObject *fil
    Python-level filter specifiers (represented as dicts). */
 
 static int
-spec_add_field(PyObject *spec, _Py_Identifier *key, unsigned long long value)
+spec_add_field(PyObject *spec, const char *key, unsigned long long value)
 {
-    int status;
-    PyObject *value_object;
-
-    value_object = PyLong_FromUnsignedLongLong(value);
+    PyObject *value_object = PyLong_FromUnsignedLongLong(value);
     if (value_object == NULL) {
         return -1;
     }
-
-    status = _PyDict_SetItemId(spec, key, value_object);
+    PyObject *key_object = PyUnicode_InternFromString(key);
+    if (key_object == NULL) {
+        Py_DECREF(value_object);
+        return -1;
+    }
+    int status = PyDict_SetItem(spec, key_object, value_object);
+    Py_DECREF(key_object);
     Py_DECREF(value_object);
     return status;
 }
@@ -458,8 +459,7 @@ build_filter_spec(const lzma_filter *f)
 
 #define ADD_FIELD(SOURCE, FIELD) \
     do { \
-        _Py_IDENTIFIER(FIELD); \
-        if (spec_add_field(spec, &PyId_##FIELD, SOURCE->FIELD) == -1) \
+        if (spec_add_field(spec, #FIELD, SOURCE->FIELD) == -1) \
             goto error;\
     } while (0)
 



More information about the Python-checkins mailing list