worked on @icemac review requests

README.rst

@@ -26,11 +26,11 @@ This would not harm any system.
     ...     return 'Hello World!'
     ... """
     >>>
-    >>> locals = {}
+    >>> loc = {}
     >>> byte_code = compile_restricted(source_code, '<inline>', 'exec')
-    >>> exec(byte_code, safe_builtins, locals)
+    >>> exec(byte_code, safe_builtins, loc)
     >>>
-    >>> locals['example']()
+    >>> loc['example']()
     'Hello World!'
 
 Problematic code example

setup.py

@@ -27,9 +27,9 @@ def read(*rnames):
       version='4.0a2.dev0',
       url='http://pypi.python.org/pypi/RestrictedPython',
       license='ZPL 2.1',
-      description='RestrictedPython is a defined subset of the Python language'
-                  ' which allows to provide a program input into a trusted'
-                  ' environment.',
+      description='RestrictedPython is a defined subset of the Python '
+                  'language which allows to provide a program input into '
+                  'a trusted environment.',
       long_description=(read('README.rst') + '\n' +
                         read('docs', 'CHANGES.rst')),
       classifiers=[

tests/test_imports.py

@@ -2,6 +2,7 @@
 Tests about imports
 """
 
+from RestrictedPython import safe_builtins
 from tests import c_exec
 from tests import e_exec
 
@@ -21,9 +22,11 @@ def test_os_import(c_exec, e_exec):
     """Test that import should not work out of the box.
     TODO: Why does this work.
     """
-    result = c_exec(OS_IMPORT_EXAMPLE)
-    assert result.code is not None
-    assert result.errors == ()
-
-    # with pytest.raises(NameError):
-    #    e_exec(OS_IMPORT_EXAMPLE)
+    result = c_exec(OS_IMPORT_EXAMPLE, safe_builtins)
+    # TODO: there is a tests/__init__.py problem, as it seems to pass the
+    #       safe_builtins into the compile function instead of the source.
+    assert result.code is None
+    # assert result.errors == ()
+
+    with pytest.raises(NameError):
+        e_exec(OS_IMPORT_EXAMPLE, safe_builtins)