Merge trunk up to 43069, putting re.py back and hopefully making the branch
usable again.
diff --git a/Modules/_sre.c b/Modules/_sre.c
index c167210..81223d7 100644
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -51,6 +51,8 @@
#define SRE_MODULE "sre"
#endif
+#define SRE_PY_MODULE "re"
+
/* defining this one enables tracing */
#undef VERBOSE
@@ -2455,7 +2457,7 @@
} else {
/* not a literal; hand it over to the template compiler */
filter = call(
- SRE_MODULE, "_subx",
+ SRE_PY_MODULE, "_subx",
PyTuple_Pack(2, self, template)
);
if (!filter)
@@ -2872,7 +2874,7 @@
/* delegate to Python code */
return call(
- SRE_MODULE, "_expand",
+ SRE_PY_MODULE, "_expand",
PyTuple_Pack(3, self->pattern, self, template)
);
}