Author: guido.van.rossum
Date: Thu May 10 19:35:11 2007
New Revision: 55229
Modified:
python/branches/py3k-struni/ (props changed)
python/branches/py3k-struni/Objects/setobject.c
Log:
Merged revisions 55228 via svnmerge from
svn+ssh://[EMAIL PROTECTED]/python/branches/p3yk
................
r55228 | guido.van.rossum | 2007-05-10 10:25:43 -0700 (Thu, 10 May 2007) | 9
lines
Merged revisions 55227 via svnmerge from
svn+ssh://[EMAIL PROTECTED]/python/trunk
........
r55227 | guido.van.rossum | 2007-05-10 10:20:15 -0700 (Thu, 10 May 2007) |
2 lines
Fix a bug in test_c_api() that caused a negative refcount.
........
................
Modified: python/branches/py3k-struni/Objects/setobject.c
==============================================================================
--- python/branches/py3k-struni/Objects/setobject.c (original)
+++ python/branches/py3k-struni/Objects/setobject.c Thu May 10 19:35:11 2007
@@ -2222,7 +2222,7 @@
Py_ssize_t count;
char *s;
Py_ssize_t i;
- PyObject *elem, *dup, *t, *f, *dup2;
+ PyObject *elem=NULL, *dup=NULL, *t, *f, *dup2, *x;
PyObject *ob = (PyObject *)so;
/* Verify preconditions and exercise type/size checks */
@@ -2268,8 +2268,8 @@
/* Exercise direct iteration */
i = 0, count = 0;
- while (_PySet_Next((PyObject *)dup, &i, &elem)) {
- s = PyString_AsString(elem);
+ while (_PySet_Next((PyObject *)dup, &i, &x)) {
+ s = PyString_AsString(x);
assert(s && (s[0] == 'a' || s[0] == 'b' || s[0] == 'c'));
count++;
}
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
