mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert PySet_Add() changes.

This commit is contained in:
Raymond Hettinger 2008-01-26 09:31:11 +00:00
parent d375723365
commit dee3f65d98
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Doc/c-api/set.rst
View File

@ -112,6 +112,9 @@ or :class:`frozenset` or instances of their subtypes.
the *key* is unhashable. Raise :exc:`PyExc_SystemError` if *anyset* is not a the *key* is unhashable. Raise :exc:`PyExc_SystemError` if *anyset* is not a
:class:`set`, :class:`frozenset`, or an instance of a subtype. :class:`set`, :class:`frozenset`, or an instance of a subtype.
The following functions are available for instances of :class:`set` or its
subtypes but not for instances of :class:`frozenset` or its subtypes.
.. cfunction:: int PySet_Add(PyObject *set, PyObject *key) .. cfunction:: int PySet_Add(PyObject *set, PyObject *key)
@ -121,14 +124,6 @@ or :class:`frozenset` or instances of their subtypes.
Raise a :exc:`SystemError` if *set* is an not an instance of :class:`set` or its Raise a :exc:`SystemError` if *set* is an not an instance of :class:`set` or its
subtype. subtype.
.. versionchanged:: 2.6
Now works with instances of :class:`frozenset` or its subtypes.
Like :cfunc:`PyTuple_SetItem` in that it can be used to fill-in the
values of brand new frozensets before they are exposed to other code.
The following functions are available for instances of :class:`set` or its
subtypes but not for instances of :class:`frozenset` or its subtypes.
.. cfunction:: int PySet_Discard(PyObject *set, PyObject *key) .. cfunction:: int PySet_Discard(PyObject *set, PyObject *key)

5
Objects/setobject.c
View File

@ -2198,6 +2198,10 @@ PySet_Discard(PyObject *set, PyObject *key)
int int
PySet_Add(PyObject *set, PyObject *key) PySet_Add(PyObject *set, PyObject *key)
{ {
if (!PyType_IsSubtype(Py_TYPE(set), &PySet_Type)) {
PyErr_BadInternalCall();
return -1;
}
return set_add_key((PySetObject *)set, key); return set_add_key((PySetObject *)set, key);
} }
@ -2341,6 +2345,7 @@ test_c_api(PySetObject *so)
f = PyFrozenSet_New(dup); f = PyFrozenSet_New(dup);
assert(PySet_Size(f) == 3); assert(PySet_Size(f) == 3);
assert(PyFrozenSet_CheckExact(f)); assert(PyFrozenSet_CheckExact(f));
assertRaises(PySet_Add(f, elem) == -1, PyExc_SystemError);
assertRaises(PySet_Discard(f, elem) == -1, PyExc_SystemError); assertRaises(PySet_Discard(f, elem) == -1, PyExc_SystemError);
assertRaises(PySet_Pop(f) == NULL, PyExc_SystemError); assertRaises(PySet_Pop(f) == NULL, PyExc_SystemError);
Py_DECREF(f); Py_DECREF(f);

18
Python/marshal.c
View File

@ -860,7 +860,7 @@ r_object(RFILE *p)
retval = NULL; retval = NULL;
break; break;
} }
v = (type == TYPE_SET) ? PySet_New(NULL) : PyFrozenSet_New(NULL); v = PyTuple_New((int)n);
if (v == NULL) { if (v == NULL) {
retval = NULL; retval = NULL;
break; break;
@ -875,14 +875,18 @@ r_object(RFILE *p)
v = NULL; v = NULL;
break; break;
} }
if (PySet_Add(v, v2) == -1) { PyTuple_SET_ITEM(v, (int)i, v2);
Py_DECREF(v); }
Py_DECREF(v2); if (v == NULL) {
v = NULL; retval = NULL;
break; break;
} }
} if (type == TYPE_SET)
retval = (v == NULL) ? NULL : v; v3 = PySet_New(v);
else
v3 = PyFrozenSet_New(v);
Py_DECREF(v);
retval = v3;
break; break;
case TYPE_CODE: case TYPE_CODE: