summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/re.py (renamed from Lib/sre.py)0
-rwxr-xr-xLib/test/regrtest.py4
-rw-r--r--Lib/test/test___all__.py1
-rw-r--r--Lib/test/test_re.py2
-rw-r--r--Modules/_sre.c6
5 files changed, 7 insertions, 6 deletions
diff --git a/Lib/sre.py b/Lib/re.py
index a33e34e..a33e34e 100644
--- a/Lib/sre.py
+++ b/Lib/re.py
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index b850912..85f57a6 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -110,7 +110,7 @@ import sys
import getopt
import random
import warnings
-import sre
+import re
import cStringIO
import traceback
@@ -525,7 +525,7 @@ def runtest(test, generate, verbose, quiet, testdir=None, huntrleaks=False):
_path_created.clear()
warnings.filters[:] = fs
gc.collect()
- sre.purge()
+ re.purge()
_strptime._regex_cache.clear()
urlparse.clear_cache()
urllib.urlcleanup()
diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index 74a9cdf..0b2e7da 100644
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -145,7 +145,6 @@ class AllTest(unittest.TestCase):
self.check_all("smtplib")
self.check_all("sndhdr")
self.check_all("socket")
- self.check_all("sre")
self.check_all("_strptime")
self.check_all("symtable")
self.check_all("tabnanny")
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index 9755005..14a0acf 100644
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -3,7 +3,7 @@ sys.path = ['.'] + sys.path
from test.test_support import verbose, run_unittest
import re
-from sre import Scanner
+from re import Scanner
import sys, os, traceback
from weakref import proxy
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)
);
}