allow safe_import to be called with up to 4 args and check for . in name

diff --git a/Lib/rexec.py b/Lib/rexec.py
index cc908a39957a92dc54fb1983c0ba0eae3a83cbed..6f24433f341e0f03eaed08ab541ed9ae85131565 100644 (file)
--- a/Lib/rexec.py
+++ b/Lib/rexec.py
@@ -59,7 +59,9 @@ copydict(posix.environ, safe_posix.environ)
 safe_types = new_module('types')
 copymodule(types, safe_types)
 
-def safe_import(name):
+def safe_import(name, globals=None, locals=None, fromlist=None):
+       if '.' in name:
+               raise ImportError, "import of dotted names not supported"
        if safe_sys.modules.has_key(name):
                return safe_sys.modules[name]
        if name in safe_modules: