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

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv28409

Modified Files:
	rexec.py 
Log Message:

Add support for "import re" -- it uses pre, but user code does not need
to.


Index: rexec.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/rexec.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** rexec.py	1998/09/21 14:53:26	1.25
--- rexec.py	2000/10/05 20:42:44	1.26
***************
*** 154,157 ****
--- 154,160 ----
          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):
***************
*** 198,201 ****
--- 201,211 ----
          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):