From 64db0c0e819483fd1c478aa4eb58b93b8818dc5c Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Tue, 23 May 2017 12:48:46 -0400
Subject: [PATCH 1/2] Drop support for long-deprecated 'sets' module.

---
 docs/CHANGES.rst                  | 2 +-
 src/RestrictedPython/Utilities.py | 6 ------
 tests/builtins/test_utilities.py  | 8 --------
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
index e7853e6..6c3fab1 100644
--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
@@ -4,7 +4,7 @@ Changes
 4.0a2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Drop support for long-deprecated ``sets`` module.
 
 
 4.0a1 (2017-05-05)
diff --git a/src/RestrictedPython/Utilities.py b/src/RestrictedPython/Utilities.py
index 160fecd..aee2b20 100644
--- 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
index 2a83782..1ac116f 100644
--- a/tests/builtins/test_utilities.py
+++ b/tests/builtins/test_utilities.py
@@ -32,14 +32,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

From f7c16f3e276ad462ada533f30970a123a15e0c93 Mon Sep 17 00:00:00 2001
From: Alexander Loechel <loechel@users.noreply.github.com>
Date: Wed, 24 May 2017 00:06:46 +0200
Subject: [PATCH 2/2] Update test_utilities.py

Fix flake8 problems
---
 tests/builtins/test_utilities.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/builtins/test_utilities.py b/tests/builtins/test_utilities.py
index 1ac116f..d6b0426 100644
--- 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