Remove make_re() function; this is no longer needed since _sre and pcre

are now allowed by ok_builtin_modules.  This effectively backs out
revision 1.26.

This closes SF bug #448546.

diff --git a/Lib/rexec.py b/Lib/rexec.py
index 307c03832def86a2c93efc56398c9f825cc7150c..90c8f6f95cbd6bfd3dd61ee669136ecc44a0563e 100644 (file)
--- a/Lib/rexec.py
+++ b/Lib/rexec.py
@@ -154,9 +154,6 @@ class RExec(ihooks._Verbose):
         self.make_sys()
         self.loader = RModuleLoader(self.hooks, verbose)
         self.importer = RModuleImporter(self.loader, verbose)
-        # but since re isn't normally built-in, we can add it at the end;
-        # we need the imported to be set before this can be imported.
-        self.make_re()
 
     def set_trusted_path(self):
         # Set the path from which dynamic modules may be loaded.
@@ -202,13 +199,6 @@ class RExec(ihooks._Verbose):
         for key, value in os.environ.items():
             e[key] = value
 
-    def make_re(self):
-        dst = self.add_module("re")
-        src = self.r_import("pre")
-        for name in dir(src):
-            if name != "__name__":
-                setattr(dst, name, getattr(src, name))
-
     def make_sys(self):
         m = self.copy_only(sys, self.ok_sys_names)
         m.modules = self.modules