Merge branch 'master' into travis-use-buildout

zopefoundation · Mar 3, 2017 · 15b6af1 · 15b6af1
2 parents 863f475 + 7af3dc6
commit 15b6af1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 11 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,7 +4,7 @@ Changes
 3.7.0a1 (unreleased)
 --------------------
 
-- Add support for built-in ``set`` types.
+- TBD
 
 3.6.0 (2010-07-09)
 ------------------

diff --git a/src/RestrictedPython/Guards.py b/src/RestrictedPython/Guards.py
@@ -23,7 +23,7 @@
 for name in ['False', 'None', 'True', 'abs', 'basestring', 'bool', 'callable',
              'chr', 'cmp', 'complex', 'divmod', 'float', 'hash',
              'hex', 'id', 'int', 'isinstance', 'issubclass', 'len',
-             'long', 'oct', 'ord', 'pow', 'range', 'repr', 'round', 'set',
+             'long', 'oct', 'ord', 'pow', 'range', 'repr', 'round',
              'str', 'tuple', 'unichr', 'unicode', 'xrange', 'zip']:
 
     safe_builtins[name] = __builtins__[name]

diff --git a/src/RestrictedPython/tests/restricted_module.py b/src/RestrictedPython/tests/restricted_module.py
@@ -33,11 +33,6 @@ def try_map():
     print map(inc, x),
     return printed
 
-def try_set():
-    x = [1, 1, 2, 3]
-    print set(x)
-    return printed
-
 def try_apply():
     def f(x, y, z):
         return x + y + z

diff --git a/src/RestrictedPython/tests/testRestrictions.py b/src/RestrictedPython/tests/testRestrictions.py
@@ -251,10 +251,6 @@ def checkTryMap(self):
         res = self.execFunc('try_map')
         self.assertEqual(res, "[2, 3, 4]")
 
-    def checkTrySet(self):
-        res = self.execFunc('try_set')
-        self.assertEqual(res, "set([1, 2, 3])")
-
     def checkApply(self):
         del apply_wrapper_called[:]
         res = self.execFunc('try_apply')