traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-37219: Remove erroneous optimization for differencing an empty set (GH-13965)

This commit is contained in:
Raymond Hettinger 2019-06-11 01:15:24 -07:00 committed by GitHub
parent 408a2ef1ac
commit 1f11cf9521
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/test/test_set.py
View File

@ -895,6 +895,12 @@ class TestBasicOps:
self.assertEqual(self.set, copy, self.assertEqual(self.set, copy,
"%s != %s" % (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): class TestBasicOpsEmpty(TestBasicOps, unittest.TestCase):

1
Misc/NEWS.d/next/Core and Builtins/2019-06-10-23-18-31.bpo-37219.jPSufq.rst Normal file
View File

@ -0,0 +1 @@
Remove errorneous optimization for empty set differences.

8
Objects/setobject.c
View File

@ -1456,10 +1456,6 @@ PyDoc_STRVAR(isdisjoint_doc,
static int static int
set_difference_update_internal(PySetObject *so, PyObject *other) set_difference_update_internal(PySetObject *so, PyObject *other)
{ {
if (PySet_GET_SIZE(so) == 0) {
return 0;
}
if ((PyObject *)so == other) if ((PyObject *)so == other)
return set_clear_internal(so); return set_clear_internal(so);
@ -1534,10 +1530,6 @@ set_difference(PySetObject *so, PyObject *other)
Py_ssize_t pos = 0, other_size; Py_ssize_t pos = 0, other_size;
int rv; int rv;
if (PySet_GET_SIZE(so) == 0) {
return set_copy(so, NULL);
}
if (PyAnySet_Check(other)) { if (PyAnySet_Check(other)) {
other_size = PySet_GET_SIZE(other); other_size = PySet_GET_SIZE(other);
} }