Merge trunk up to 43069, putting re.py back and hopefully making the branch
usable again.
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()