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

usable again.

4 files changed, 3 insertions, 4 deletions

diff --git a/Lib/sre.py b/Lib/re.py
index a33e34e4e1..a33e34e4e1 100644
--- a/Lib/sre.py
+++ b/Lib/re.py
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index b8509129c8..85f57a6c0e 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 74a9cdf05b..0b2e7dae6d 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 9755005f11..14a0acfc6b 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