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

Fixed r60466

This commit is contained in:
Christian Heimes 2008-01-31 01:08:32 +00:00
parent fab2b305a2
commit db96789ba7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Include/setobject.h
View File

@ -85,7 +85,6 @@ PyAPI_FUNC(int) PySet_Clear(PyObject *set);
PyAPI_FUNC(int) PySet_Contains(PyObject *anyset, PyObject *key); PyAPI_FUNC(int) PySet_Contains(PyObject *anyset, PyObject *key);
PyAPI_FUNC(int) PySet_Discard(PyObject *set, PyObject *key); PyAPI_FUNC(int) PySet_Discard(PyObject *set, PyObject *key);
PyAPI_FUNC(int) PySet_Add(PyObject *set, PyObject *key); PyAPI_FUNC(int) PySet_Add(PyObject *set, PyObject *key);
PyAPI_FUNC(int) _PySet_Next(PyObject *set, Py_ssize_t *pos, PyObject **key);
PyAPI_FUNC(int) _PySet_NextEntry(PyObject *set, Py_ssize_t *pos, PyObject **key, long *hash); PyAPI_FUNC(int) _PySet_NextEntry(PyObject *set, Py_ssize_t *pos, PyObject **key, long *hash);
PyAPI_FUNC(PyObject *) PySet_Pop(PyObject *set); PyAPI_FUNC(PyObject *) PySet_Pop(PyObject *set);
PyAPI_FUNC(int) _PySet_Update(PyObject *set, PyObject *iterable); PyAPI_FUNC(int) _PySet_Update(PyObject *set, PyObject *iterable);

3
Objects/setobject.c
View File

@ -2236,6 +2236,7 @@ test_c_api(PySetObject *so)
Py_ssize_t i; Py_ssize_t i;
PyObject *elem=NULL, *dup=NULL, *t, *f, *dup2, *x; PyObject *elem=NULL, *dup=NULL, *t, *f, *dup2, *x;
PyObject *ob = (PyObject *)so; PyObject *ob = (PyObject *)so;
long hash;
/* Verify preconditions and exercise type/size checks */ /* Verify preconditions and exercise type/size checks */
assert(PyAnySet_Check(ob)); assert(PyAnySet_Check(ob));
@ -2280,7 +2281,7 @@ test_c_api(PySetObject *so)
/* Exercise direct iteration */ /* Exercise direct iteration */
i = 0, count = 0; i = 0, count = 0;
while (_PySet_Next((PyObject *)dup, &i, &x)) { while (_PySet_NextEntry((PyObject *)dup, &i, &x, &hash)) {
s = PyUnicode_AsString(x); s = PyUnicode_AsString(x);
assert(s && (s[0] == 'a' || s[0] == 'b' || s[0] == 'c')); assert(s && (s[0] == 'a' || s[0] == 'b' || s[0] == 'c'));
count++; count++;