Merge branch 'Python3_update' into undo-changes-in-PR3

zopefoundation · Mar 27, 2017 · d6c641d · d6c641d
2 parents d83e527 + d295875
commit d6c641d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/RestrictedPython/Utilities.py b/src/RestrictedPython/Utilities.py
@@ -25,6 +25,12 @@
 utility_builtins['set'] = set
 utility_builtins['frozenset'] = frozenset
 
+try:
+    import sets
+    utility_builtins['sets'] = sets
+except ImportError:
+    pass
+
 try:
     import DateTime
     utility_builtins['DateTime'] = DateTime.DateTime

diff --git a/tests/builtins/test_utilities.py b/tests/builtins/test_utilities.py
@@ -1,3 +1,6 @@
+from RestrictedPython._compat import IS_PY3
+import pytest
+
 
 def test_string_in_utility_builtins():
     import string
@@ -28,6 +31,14 @@ def test_set_in_utility_builtins():
     assert utility_builtins['set'] is set
 
 
+@pytest.mark.skipif(IS_PY3,
+                    reason='Python 3 has no longer includes the sets module.')
+def test_sets_in_utility_builtins():
+    from RestrictedPython.Utilities import utility_builtins
+    import sets
+    assert utility_builtins['sets'] is sets
+
+
 def test_frozenset_in_utility_builtins():
     from RestrictedPython.Utilities import utility_builtins
     assert utility_builtins['frozenset'] is frozenset