commit 9ada3d6e29d5165dadacbe6be07bcd35cfbef59d
author Thomas Wouters <thomas@python.org> Fri Apr 21 09:47:09 2006 +0000
committer Thomas Wouters <thomas@python.org> Fri Apr 21 09:47:09 2006 +0000
tree 19bca246f86e49114613e5c9f08d4ebe637ae480
parent 725ccd181020ba04bfeea41078ddb0c82c284c63

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

Lib/re.py

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

Lib/test/regrtest.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 getopt
 import random
 import warnings
-import sre
+import re
 import cStringIO
 import traceback
 
@@ -525,7 +525,7 @@
                     _path_created.clear()
                     warnings.filters[:] = fs
                     gc.collect()
-                    sre.purge()
+                    re.purge()
                     _strptime._regex_cache.clear()
                     urlparse.clear_cache()
                     urllib.urlcleanup()

Lib/test/test___all__.py

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 @@
         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")

Lib/test/test_re.py

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 @@
 
 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
 

Modules/_sre.c

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)
         );
 }