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

Guido van Rossum gvanrossum@users.sourceforge.net
Mon, 18 Jun 2001 05:33:38 -0700


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

Modified Files:
	rexec.py 
Log Message:
Fix SF bug #433904 (Alex Martelli) - all s_* methods return None only.


Index: rexec.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/rexec.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** rexec.py	2001/02/15 22:15:13	1.28
--- rexec.py	2001/06/18 12:33:36	1.29
***************
*** 333,354 ****
          finally:
              self.restore_files()
  
      def s_exec(self, *args):
!         self.s_apply(self.r_exec, args)
  
      def s_eval(self, *args):
!         self.s_apply(self.r_eval, args)
  
      def s_execfile(self, *args):
!         self.s_apply(self.r_execfile, args)
  
      def s_import(self, *args):
!         self.s_apply(self.r_import, args)
  
      def s_reload(self, *args):
!         self.s_apply(self.r_reload, args)
  
      def s_unload(self, *args):
!         self.s_apply(self.r_unload, args)
  
      # Restricted open(...)
--- 333,355 ----
          finally:
              self.restore_files()
+         return r
  
      def s_exec(self, *args):
!         return self.s_apply(self.r_exec, args)
  
      def s_eval(self, *args):
!         return self.s_apply(self.r_eval, args)
  
      def s_execfile(self, *args):
!         return self.s_apply(self.r_execfile, args)
  
      def s_import(self, *args):
!         return self.s_apply(self.r_import, args)
  
      def s_reload(self, *args):
!         return self.s_apply(self.r_reload, args)
  
      def s_unload(self, *args):
!         return self.s_apply(self.r_unload, args)
  
      # Restricted open(...)