Skip to content

bpo-42243: Use PyModule_Add*() in _sre iso. direct module dict manipulation #23101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

bpo-42243: Use PyModule_Add*() in _sre iso. direct module dict manipulation #23101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0d47d4
Use PyModule_Add*() in _sre iso. direct module dict manipulation
Oct 14, 2020
ab13ae6
Address review comment: SRE_MAXREPEAT and SRE_MAXGROUPS are unsigned
Nov 2, 2020
8561628
Test that MAXREPEAT and MAXGROUPS are unsigned
Nov 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Lib/test/test_re.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2197,6 +2197,10 @@ def test_overlap_table(self):
self.assertEqual(f("ababba"), [0, 0, 1, 2, 0, 1])
self.assertEqual(f("abcabdac"), [0, 0, 0, 1, 2, 0, 1, 0])

def test_signedness(self):
self.assertGreaterEqual(sre_compile.MAXREPEAT, 0)
self.assertGreaterEqual(sre_compile.MAXGROUPS, 0)


class ExternalTests(unittest.TestCase):

Expand Down
44 changes: 19 additions & 25 deletions Modules/_sre.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2773,11 +2773,20 @@ static struct PyModuleDef sremodule = {
NULL
};

#define ADD_ULONG_CONSTANT(module, name, value) \
do { \
PyObject *o = PyLong_FromUnsignedLong(value); \
if (!o) \
return NULL; \
if (PyModule_AddObject(module, name, o) < 0) { \
Py_DECREF(o); \
return NULL; \
} \
} while (0)

PyMODINIT_FUNC PyInit__sre(void)
{
PyObject* m;
PyObject* d;
PyObject* x;

/* Patch object types */
if (PyType_Ready(&Pattern_Type) || PyType_Ready(&Match_Type) ||
Expand All @@ -2787,37 +2796,22 @@ PyMODINIT_FUNC PyInit__sre(void)
m = PyModule_Create(&sremodule);
if (m == NULL)
return NULL;
d = PyModule_GetDict(m);

x = PyLong_FromLong(SRE_MAGIC);
if (x) {
PyDict_SetItemString(d, "MAGIC", x);
Py_DECREF(x);
if (PyModule_AddIntConstant(m, "MAGIC", SRE_MAGIC) < 0) {
return NULL;
}

x = PyLong_FromLong(sizeof(SRE_CODE));
if (x) {
PyDict_SetItemString(d, "CODESIZE", x);
Py_DECREF(x);
if (PyModule_AddIntConstant(m, "CODESIZE", sizeof(SRE_CODE)) < 0) {
return NULL;
}

x = PyLong_FromUnsignedLong(SRE_MAXREPEAT);
if (x) {
PyDict_SetItemString(d, "MAXREPEAT", x);
Py_DECREF(x);
}
ADD_ULONG_CONSTANT(m, "MAXREPEAT", SRE_MAXREPEAT);
ADD_ULONG_CONSTANT(m, "MAXGROUPS", SRE_MAXGROUPS);

x = PyLong_FromUnsignedLong(SRE_MAXGROUPS);
if (x) {
PyDict_SetItemString(d, "MAXGROUPS", x);
Py_DECREF(x);
if (PyModule_AddStringConstant(m, "copyright", copyright) < 0) {
return NULL;
}

x = PyUnicode_FromString(copyright);
if (x) {
PyDict_SetItemString(d, "copyright", x);
Py_DECREF(x);
}
return m;
}

Expand Down