Merge trunk up to 43069, putting re.py back and hopefully making the branch

usable again.

diff --git a/Lib/sre.py b/Lib/re.py
similarity index 100%
rename from Lib/sre.py
rename to Lib/re.py

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index b8509129c87d4bec70ed9c53bbfce895baa0e2f3..85f57a6c0e01ff2ae73b9ce16badf8a3e4ed8d37 100755 (executable)
--- 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 74a9cdf05b5056b334306a14c1813224f87ad710..0b2e7dae6de8ddaec1c85194fef9b60b51f2b8de 100644 (file)
--- 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 9755005f110437d1976ef99b6a1dd4b8ffa35805..14a0acfc6bd1d6dbc2e05ac8dc7bf42702b62078 100644 (file)
--- 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 c16721074961590215f5f7f637cc289a68dcf027..81223d73deb9e280f30fbed1285b1e59a5613127 100644 (file)
--- 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)
         );
 }