Applying this to the 2.1.1 branch:

Fix SF bug #433904 (Alex Martelli) - all s_* methods return None only.
This commit is contained in:
Guido van Rossum
2001-06-18 12:34:31 +00:00
parent bbdc66ff2f
commit eff2a98727

View File

@@ -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(...)