Skip to content

C
cpython
Kaydet (Commit) 10956eab authored tarafından Raymond Hettinger's avatar Raymond Hettinger
Dosyalara gözat
Seçenekler

Forward port r62848.

üst 519a658c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
Objects/setobject.c
Dosyayı görüntüle @ 10956eab
...@@ -1743,7 +1743,7 @@ set_contains(PySetObject *so, PyObject *key) ...@@ -1743,7 +1743,7 @@ set_contains(PySetObject *so, PyObject *key)
rv = set_contains_key(so, key); rv = set_contains_key(so, key);
if (rv == -1) { if (rv == -1) {
if (!PyAnySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError)) if (!PySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError))
return -1; return -1;
PyErr_Clear(); PyErr_Clear();
tmpkey = make_new_set(&PyFrozenSet_Type, NULL); tmpkey = make_new_set(&PyFrozenSet_Type, NULL);
...@@ -1778,7 +1778,7 @@ set_remove(PySetObject *so, PyObject *key) ...@@ -1778,7 +1778,7 @@ set_remove(PySetObject *so, PyObject *key)
rv = set_discard_key(so, key); rv = set_discard_key(so, key);
if (rv == -1) { if (rv == -1) {
if (!PyAnySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError)) if (!PySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError))
return NULL; return NULL;
PyErr_Clear(); PyErr_Clear();
tmpkey = make_new_set(&PyFrozenSet_Type, NULL); tmpkey = make_new_set(&PyFrozenSet_Type, NULL);
...@@ -1809,7 +1809,7 @@ set_discard(PySetObject *so, PyObject *key) ...@@ -1809,7 +1809,7 @@ set_discard(PySetObject *so, PyObject *key)
rv = set_discard_key(so, key); rv = set_discard_key(so, key);
if (rv == -1) { if (rv == -1) {
if (!PyAnySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError)) if (!PySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError))
return NULL; return NULL;
PyErr_Clear(); PyErr_Clear();
tmpkey = make_new_set(&PyFrozenSet_Type, NULL); tmpkey = make_new_set(&PyFrozenSet_Type, NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment