( )⚙ D12221 cext: remove Python 2 module initializer functions

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12221

cext: remove Python 2 module initializer functions
ClosedPublic

Authored by indygreg on Mar 1 2022, 7:21 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGed03fffaac30: cext: remove Python 2 module initializer functions
Summary

We no longer need these since we dropped support for Python 2.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Mar 1 2022, 7:21 PM
Alphare accepted this revision.Mar 2 2022, 5:13 AM
This revision is now accepted and ready to land.Mar 2 2022, 5:13 AM
indygreg added a commit: rHGed03fffaac30: cext: remove Python 2 module initializer functions.Mar 2 2022, 7:41 AM
Closed by commit rHGed03fffaac30: cext: remove Python 2 module initializer functions (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 32337

mercurial/cext/base85.c

"If the second parameter is true, pad the result to a multiple of " "If the second parameter is true, pad the result to a multiple of "
"five characters.\n"}, "five characters.\n"},
{"b85decode", b85decode, METH_VARARGS, "Decode base85 text.\n"}, {"b85decode", b85decode, METH_VARARGS, "Decode base85 text.\n"},
{NULL, NULL}, {NULL, NULL},
}; };
static const int version = 1; static const int version = 1;
#ifdef IS_PY3K
static struct PyModuleDef base85_module = { static struct PyModuleDef base85_module = {
PyModuleDef_HEAD_INIT, "base85", base85_doc, -1, methods, PyModuleDef_HEAD_INIT, "base85", base85_doc, -1, methods,
}; };
PyMODINIT_FUNC PyInit_base85(void) PyMODINIT_FUNC PyInit_base85(void)
{ {
PyObject *m; PyObject *m;
b85prep(); b85prep();
m = PyModule_Create(&base85_module); m = PyModule_Create(&base85_module);
PyModule_AddIntConstant(m, "version", version); PyModule_AddIntConstant(m, "version", version);
return m; return m;
} }
#else
PyMODINIT_FUNC initbase85(void)
{
PyObject *m;
m = Py_InitModule3("base85", methods, base85_doc);
b85prep();
PyModule_AddIntConstant(m, "version", version);
}
#endif

mercurial/cext/bdiff.c

"like str.splitlines, but only split on newlines\n"}, "like str.splitlines, but only split on newlines\n"},
{"xdiffblocks", xdiffblocks, METH_VARARGS, {"xdiffblocks", xdiffblocks, METH_VARARGS,
"find a list of matching lines using xdiff algorithm\n"}, "find a list of matching lines using xdiff algorithm\n"},
{NULL, NULL}, {NULL, NULL},
}; };
static const int version = 3; static const int version = 3;
#ifdef IS_PY3K
static struct PyModuleDef bdiff_module = { static struct PyModuleDef bdiff_module = {
PyModuleDef_HEAD_INIT, "bdiff", mdiff_doc, -1, methods, PyModuleDef_HEAD_INIT, "bdiff", mdiff_doc, -1, methods,
}; };
PyMODINIT_FUNC PyInit_bdiff(void) PyMODINIT_FUNC PyInit_bdiff(void)
{ {
PyObject *m; PyObject *m;
m = PyModule_Create(&bdiff_module); m = PyModule_Create(&bdiff_module);
PyModule_AddIntConstant(m, "version", version); PyModule_AddIntConstant(m, "version", version);
return m; return m;
} }
#else
PyMODINIT_FUNC initbdiff(void)
{
PyObject *m;
m = Py_InitModule3("bdiff", methods, mdiff_doc);
PyModule_AddIntConstant(m, "version", version);
}
#endif

mercurial/cext/mpatch.c

static PyMethodDef methods[] = { static PyMethodDef methods[] = {
{"patches", patches, METH_VARARGS, "apply a series of patches\n"}, {"patches", patches, METH_VARARGS, "apply a series of patches\n"},
{"patchedsize", patchedsize, METH_VARARGS, "calculed patched size\n"}, {"patchedsize", patchedsize, METH_VARARGS, "calculed patched size\n"},
{NULL, NULL}, {NULL, NULL},
}; };
static const int version = 1; static const int version = 1;
#ifdef IS_PY3K
static struct PyModuleDef mpatch_module = { static struct PyModuleDef mpatch_module = {
PyModuleDef_HEAD_INIT, "mpatch", mpatch_doc, -1, methods, PyModuleDef_HEAD_INIT, "mpatch", mpatch_doc, -1, methods,
}; };
PyMODINIT_FUNC PyInit_mpatch(void) PyMODINIT_FUNC PyInit_mpatch(void)
{ {
PyObject *m; PyObject *m;
m = PyModule_Create(&mpatch_module); m = PyModule_Create(&mpatch_module);
if (m == NULL) if (m == NULL)
return NULL; return NULL;
mpatch_Error = mpatch_Error =
PyErr_NewException("mercurial.cext.mpatch.mpatchError", NULL, NULL); PyErr_NewException("mercurial.cext.mpatch.mpatchError", NULL, NULL);
Py_INCREF(mpatch_Error); Py_INCREF(mpatch_Error);
PyModule_AddObject(m, "mpatchError", mpatch_Error); PyModule_AddObject(m, "mpatchError", mpatch_Error);
PyModule_AddIntConstant(m, "version", version); PyModule_AddIntConstant(m, "version", version);
return m; return m;
} }
#else
PyMODINIT_FUNC initmpatch(void)
{
PyObject *m;
m = Py_InitModule3("mpatch", methods, mpatch_doc);
mpatch_Error =
PyErr_NewException("mercurial.cext.mpatch.mpatchError", NULL, NULL);
PyModule_AddIntConstant(m, "version", version);
}
#endif

mercurial/cext/osutil.c

"Is a CoreGraphics session available?" "Is a CoreGraphics session available?"
}, },
#endif #endif
{NULL, NULL} {NULL, NULL}
}; };
static const int version = 4; static const int version = 4;
#ifdef IS_PY3K
static struct PyModuleDef osutil_module = { static struct PyModuleDef osutil_module = {
PyModuleDef_HEAD_INIT, PyModuleDef_HEAD_INIT,
"osutil", "osutil",
osutil_doc, osutil_doc,
-1, -1,
methods methods
}; };
PyMODINIT_FUNC PyInit_osutil(void) PyMODINIT_FUNC PyInit_osutil(void)
{ {
PyObject *m; PyObject *m;
if (PyType_Ready(&listdir_stat_type) < 0) if (PyType_Ready(&listdir_stat_type) < 0)
return NULL; return NULL;
m = PyModule_Create(&osutil_module); m = PyModule_Create(&osutil_module);
PyModule_AddIntConstant(m, "version", version); PyModule_AddIntConstant(m, "version", version);
return m; return m;
} }
#else
PyMODINIT_FUNC initosutil(void)
{
PyObject *m;
if (PyType_Ready(&listdir_stat_type) == -1)
return;
m = Py_InitModule3("osutil", methods, osutil_doc);
PyModule_AddIntConstant(m, "version", version);
}
#endif

mercurial/cext/parsers.c

"Python %s\n at: %s", "Python %s\n at: %s",
versionerrortext, hexversion, Py_GetVersion(), versionerrortext, hexversion, Py_GetVersion(),
Py_GetProgramFullPath()); Py_GetProgramFullPath());
return -1; return -1;
} }
return 0; return 0;
} }
#ifdef IS_PY3K
static struct PyModuleDef parsers_module = {PyModuleDef_HEAD_INIT, "parsers", static struct PyModuleDef parsers_module = {PyModuleDef_HEAD_INIT, "parsers",
parsers_doc, -1, methods}; parsers_doc, -1, methods};
PyMODINIT_FUNC PyInit_parsers(void) PyMODINIT_FUNC PyInit_parsers(void)
{ {
PyObject *mod; PyObject *mod;
if (check_python_version() == -1) if (check_python_version() == -1)
return NULL; return NULL;
mod = PyModule_Create(&parsers_module); mod = PyModule_Create(&parsers_module);
module_init(mod); module_init(mod);
return mod; return mod;
} }
#else
PyMODINIT_FUNC initparsers(void)
{
PyObject *mod;
if (check_python_version() == -1) {
return;
}
mod = Py_InitModule3("parsers", methods, parsers_doc);
module_init(mod);
}
#endif