diff options
| author | Thomas Wouters <thomas@python.org> | 2006-04-21 09:47:09 (GMT) |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2006-04-21 09:47:09 (GMT) |
| commit | 9ada3d6e29d5165dadacbe6be07bcd35cfbef59d (patch) | |
| tree | 19bca246f86e49114613e5c9f08d4ebe637ae480 /Modules | |
| parent | 725ccd181020ba04bfeea41078ddb0c82c284c63 (diff) | |
| download | cpython-9ada3d6e29d5165dadacbe6be07bcd35cfbef59d.zip cpython-9ada3d6e29d5165dadacbe6be07bcd35cfbef59d.tar.gz cpython-9ada3d6e29d5165dadacbe6be07bcd35cfbef59d.tar.bz2 | |
Merge trunk up to 43069, putting re.py back and hopefully making the branch
usable again.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_sre.c | 6 |
1 files changed, 4 insertions, 2 deletions
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 @@ static char copyright[] = #define SRE_MODULE "sre" #endif +#define SRE_PY_MODULE "re" + /* defining this one enables tracing */ #undef VERBOSE @@ -2455,7 +2457,7 @@ pattern_subx(PatternObject* self, PyObject* template, PyObject* string, } 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 @@ match_expand(MatchObject* self, PyObject* args) /* delegate to Python code */ return call( - SRE_MODULE, "_expand", + SRE_PY_MODULE, "_expand", PyTuple_Pack(3, self->pattern, self, template) ); } |