Skip to content

Drop support for long-deprecated 'sets' module. #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 23, 2017
Merged

Drop support for long-deprecated 'sets' module. #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64db0c0
Drop support for long-deprecated 'sets' module.
tseaver May 23, 2017
f7c16f3
Update test_utilities.py
loechel May 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Changes
4.0a2 (unreleased)
------------------

- Nothing changed yet.
- Drop support for long-deprecated ``sets`` module.


4.0a1 (2017-05-05)
Expand Down
6 changes: 0 additions & 6 deletions src/RestrictedPython/Utilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions tests/builtins/test_utilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
from RestrictedPython._compat import IS_PY3

import pytest


def test_string_in_utility_builtins():
import string
Expand Down Expand Up @@ -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
Expand Down