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

Author: rhettinger

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):

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.

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);
  }