summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2001-06-18 12:34:31 (GMT)
committerGuido van Rossum <guido@python.org>2001-06-18 12:34:31 (GMT)
commiteff2a98727f9ae2aa4b5bcf93d79e0010782839c (patch)
tree0103ea8874a435cfba13663e4974ef46af5d96cf
parentbbdc66ff2f829b8a86edbd355388f23ab927983a (diff)
downloadcpython-eff2a98727f9ae2aa4b5bcf93d79e0010782839c.zip
cpython-eff2a98727f9ae2aa4b5bcf93d79e0010782839c.tar.gz
cpython-eff2a98727f9ae2aa4b5bcf93d79e0010782839c.tar.bz2
Applying this to the 2.1.1 branch:
Fix SF bug #433904 (Alex Martelli) - all s_* methods return None only.
-rw-r--r--Lib/rexec.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/Lib/rexec.py b/Lib/rexec.py
index 6a7c207..cb397ce 100644
--- a/Lib/rexec.py
+++ b/Lib/rexec.py
@@ -332,24 +332,25 @@ class RExec(ihooks._Verbose):
r = apply(func, args)
finally:
self.restore_files()
+ return r
def s_exec(self, *args):
- self.s_apply(self.r_exec, args)
+ return self.s_apply(self.r_exec, args)
def s_eval(self, *args):
- self.s_apply(self.r_eval, args)
+ return self.s_apply(self.r_eval, args)
def s_execfile(self, *args):
- self.s_apply(self.r_execfile, args)
+ return self.s_apply(self.r_execfile, args)
def s_import(self, *args):
- self.s_apply(self.r_import, args)
+ return self.s_apply(self.r_import, args)
def s_reload(self, *args):
- self.s_apply(self.r_reload, args)
+ return self.s_apply(self.r_reload, args)
def s_unload(self, *args):
- self.s_apply(self.r_unload, args)
+ return self.s_apply(self.r_unload, args)
# Restricted open(...)