From: Guido van Rossum <guido@python.org>
Date: Fri, 25 Apr 1997 19:10:15 +0000 (+0000)
Subject: Alas, I have to restore 'marshal', since it is needed by the new
X-Git-Tag: v1.5a1~134
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=faeae5cd784b4832aa93d4da535326f87c67b4a5;p=python

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 29b9ad6649..a548e24348 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')