Merge branch 'master' into configs

zopefoundation · May 23, 2017 · d16778d · d16778d
2 parents 84dbab8 + 97ab42b
commit d16778d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
@@ -6,6 +6,8 @@ Changes
 
 - Update Configurations to give better feedback and helpful reports.
   [loechel]
+- Drop support for long-deprecated ``sets`` module.
+  [tseaver]
 
 
 4.0a1 (2017-05-05)

diff --git a/src/RestrictedPython/Utilities.py b/src/RestrictedPython/Utilities.py
@@ -25,12 +25,6 @@
 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,7 +1,3 @@
-from RestrictedPython._compat import IS_PY3
-
-import pytest
-
 
 def test_string_in_utility_builtins():
     import string
@@ -32,14 +28,6 @@ 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