From 24440f5ad4b35d74d7dcb7ca986b49c6588f2614 Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Tue, 11 Jun 2019 01:36:35 -0700 Subject: [PATCH 1/2] [3.7] bpo-37219: Remove erroneous optimization for differencing an empty set (GH-13965) #13967 --- Lib/test/test_set.py | 6 ++++++ Objects/setobject.c | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py index bb1081f034fe804..e4766ab190be011 100644 --- a/Lib/test/test_set.py +++ b/Lib/test/test_set.py @@ -895,6 +895,12 @@ def test_pickling(self): self.assertEqual(self.set, copy, "%s != %s" % (self.set, copy)) + def test_issue_37219(self): + with self.assertRaises(TypeError): + set().difference(123) + with self.assertRaises(TypeError): + set().difference_update(123) + #------------------------------------------------------------------------------ class TestBasicOpsEmpty(TestBasicOps, unittest.TestCase): diff --git a/Objects/setobject.c b/Objects/setobject.c index 357e48ca3ce0dd1..1e4781fe11eeb99 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -1478,10 +1478,6 @@ PyDoc_STRVAR(isdisjoint_doc, static int set_difference_update_internal(PySetObject *so, PyObject *other) { - if (PySet_GET_SIZE(so) == 0) { - return 0; - } - if ((PyObject *)so == other) return set_clear_internal(so); @@ -1556,10 +1552,6 @@ set_difference(PySetObject *so, PyObject *other) Py_ssize_t pos = 0, other_size; int rv; - if (PySet_GET_SIZE(so) == 0) { - return set_copy(so); - } - if (PyAnySet_Check(other)) { other_size = PySet_GET_SIZE(other); } From a97a46fe9a513f9403fa61f3d5457be916b41c4d Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Tue, 11 Jun 2019 01:37:49 -0700 Subject: [PATCH 2/2] Add blurb --- .../Core and Builtins/2019-06-11-01-37-34.bpo-37219.jPSufq.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2019-06-11-01-37-34.bpo-37219.jPSufq.rst diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-06-11-01-37-34.bpo-37219.jPSufq.rst b/Misc/NEWS.d/next/Core and Builtins/2019-06-11-01-37-34.bpo-37219.jPSufq.rst new file mode 100644 index 000000000000000..ef8f52dce6784f6 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2019-06-11-01-37-34.bpo-37219.jPSufq.rst @@ -0,0 +1 @@ +Remove errorneous optimization for empty set differences.