Merge branch 'master' into fix-147

zopefoundation · Feb 8, 2019 · 25a9d65 · 25a9d65
2 parents 43a71c0 + 21e08d4
commit 25a9d65
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,4 @@
 language: python
-sudo: false
 
 matrix:
     include:
@@ -16,15 +15,12 @@ matrix:
         - python: "3.7"
           env: TOXENV=py37,py37-datetime
           dist: xenial
-          sudo: true
         - python: "3.7-dev"
           env: TOXENV=py37,py37-datetime
           dist: xenial
-          sudo: true
         - python: "3.8-dev"
           env: TOXENV=py38,py38-datetime
           dist: xenial
-          sudo: true
     allow_failures:
         - python: "3.8-dev"
           env: TOXENV=py38,py38-datetime

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -25,7 +25,8 @@ def _eval(compile_func):
     def _eval(source, glb=None):
         code = _compile(compile_func, source)
         if glb is None:
-            glb = {}
+            glb = {
+                '__builtins__': RestrictedPython.Guards.safe_builtins.copy()}
         return eval(code, glb)
     return _eval
 

diff --git a/tests/test_compile.py b/tests/test_compile.py
@@ -206,7 +206,7 @@ def test_compile_restricted_eval():
     """This test checks compile_restricted itself if that raise Python errors.
     """
     with pytest.raises(SyntaxError,
-                       message="Line 3: Eval calls are not allowed."):
+                       match="Line 3: Eval calls are not allowed."):
         compile_restricted(EVAL_EXAMPLE, '<string>', 'exec')