summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-04-25 19:10:15 (GMT)
committerGuido van Rossum <guido@python.org>1997-04-25 19:10:15 (GMT)
commitfaeae5cd784b4832aa93d4da535326f87c67b4a5 (patch)
treef12863d369445b7462f3f61743deed3875faa2bd
parent5026cb4dc6477c81c465c8d0f3a1e6c5344d20c5 (diff)
downloadcpython-faeae5cd784b4832aa93d4da535326f87c67b4a5.zip
cpython-faeae5cd784b4832aa93d4da535326f87c67b4a5.tar.gz
cpython-faeae5cd784b4832aa93d4da535326f87c67b4a5.tar.bz2
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.
-rw-r--r--Lib/rexec.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/rexec.py b/Lib/rexec.py
index 29b9ad6..a548e24 100644
--- 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')