bpo-42846: Convert CJK codec extensions to multiphase init (GH-24157)
Convert the 6 CJK codec extension modules (_codecs_cn, _codecs_hk,
_codecs_iso2022, _codecs_jp, _codecs_kr and _codecs_tw) to the
multiphase initialization API (PEP 489).
Remove getmultibytecodec() local cache: always import
_multibytecodec. It should be uncommon to get a codec. For example,
this function is only called once per CJK codec module.
Fix a reference leak in register_maps() error path.
diff --git a/Modules/cjkcodecs/cjkcodecs.h b/Modules/cjkcodecs/cjkcodecs.h
index e41755b..3b89bc9 100644
--- a/Modules/cjkcodecs/cjkcodecs.h
+++ b/Modules/cjkcodecs/cjkcodecs.h
@@ -245,15 +245,13 @@ static const struct dbcs_map *mapping_list;
static PyObject *
getmultibytecodec(void)
{
- static PyObject *cofunc = NULL;
-
- if (cofunc == NULL) {
- PyObject *mod = PyImport_ImportModuleNoBlock("_multibytecodec");
- if (mod == NULL)
- return NULL;
- cofunc = PyObject_GetAttrString(mod, "__create_codec");
- Py_DECREF(mod);
+ PyObject *mod = PyImport_ImportModuleNoBlock("_multibytecodec");
+ if (mod == NULL) {
+ return NULL;
}
+
+ PyObject *cofunc = PyObject_GetAttrString(mod, "__create_codec");
+ Py_DECREF(mod);
return cofunc;
}
@@ -297,10 +295,6 @@ getcodec(PyObject *self, PyObject *encoding)
return r;
}
-static struct PyMethodDef __methods[] = {
- {"getcodec", (PyCFunction)getcodec, METH_O, ""},
- {NULL, NULL},
-};
static int
register_maps(PyObject *module)
@@ -309,12 +303,17 @@ register_maps(PyObject *module)
for (h = mapping_list; h->charset[0] != '\0'; h++) {
char mhname[256] = "__map_";
- int r;
strcpy(mhname + sizeof("__map_") - 1, h->charset);
- r = PyModule_AddObject(module, mhname,
- PyCapsule_New((void *)h, PyMultibyteCodec_CAPSULE_NAME, NULL));
- if (r == -1)
+
+ PyObject *capsule = PyCapsule_New((void *)h,
+ PyMultibyteCodec_CAPSULE_NAME, NULL);
+ if (capsule == NULL) {
return -1;
+ }
+ if (PyModule_AddObject(module, mhname, capsule) < 0) {
+ Py_DECREF(capsule);
+ return -1;
+ }
}
return 0;
}
@@ -395,25 +394,36 @@ importmap(const char *modname, const char *symbol,
}
#endif
+static int
+_cjk_exec(PyObject *module)
+{
+ return register_maps(module);
+}
+
+
+static struct PyMethodDef _cjk_methods[] = {
+ {"getcodec", (PyCFunction)getcodec, METH_O, ""},
+ {NULL, NULL},
+};
+
+static PyModuleDef_Slot _cjk_slots[] = {
+ {Py_mod_exec, _cjk_exec},
+ {0, NULL}
+};
+
#define I_AM_A_MODULE_FOR(loc) \
- static struct PyModuleDef __module = { \
+ static struct PyModuleDef _cjk_module = { \
PyModuleDef_HEAD_INIT, \
- "_codecs_"#loc, \
- NULL, \
- 0, \
- __methods, \
- NULL, \
- NULL, \
- NULL, \
- NULL \
+ .m_name = "_codecs_"#loc, \
+ .m_size = 0, \
+ .m_methods = _cjk_methods, \
+ .m_slots = _cjk_slots, \
}; \
+ \
PyMODINIT_FUNC \
PyInit__codecs_##loc(void) \
{ \
- PyObject *m = PyModule_Create(&__module); \
- if (m != NULL) \
- (void)register_maps(m); \
- return m; \
+ return PyModuleDef_Init(&_cjk_module); \
}
#endif