[Python-checkins] CVS: python/dist/src/Lib rexec.py,1.30,1.31

Fred L. Drake fdrake@users.sourceforge.net
Tue, 07 Aug 2001 12:49:17 -0700


Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv14971

Modified Files:
	rexec.py 
Log Message:

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.


Index: rexec.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/rexec.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** rexec.py	2001/06/22 18:19:16	1.30
--- rexec.py	2001/08/07 19:49:15	1.31
***************
*** 155,161 ****
          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):
--- 155,158 ----
***************
*** 202,212 ****
          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):
--- 199,202 ----