Alas, I have to restore 'marshal', since it is needed by the new

cPickle-compatible pickle, and pickle must be importable in restricted
mode.  I guess I'll have to make marshal safe.

diff --git a/Lib/rexec.py b/Lib/rexec.py
index 29b9ad6649a96e925a94e2cc12afaa127d0ebf90..a548e24348ebec7913764b722288426a13c0d5cf 100644 (file)
--- a/Lib/rexec.py
+++ b/Lib/rexec.py
@@ -21,7 +21,6 @@ XXX To do:
 import sys
 import __builtin__
 import os
-import marshal
 import ihooks
 
 
@@ -133,7 +132,7 @@ class RExec(ihooks._Verbose):
 
     ok_builtin_modules = ('audioop', 'array', 'binascii',
                          'cmath', 'errno', 'imageop',
-                         'math', 'md5', 'operator',
+                         'marshal', 'math', 'md5', 'operator',
                          'parser', 'regex', 'rotor', 'select',
                          'strop', 'struct', 'time')