mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
number of tests, all because of the codecs/_multibytecodecs issue described here (it's not a Py3K issue, just something Py3K discovers): http://mail.python.org/pipermail/python-dev/2006-April/064051.html Hye-Shik Chang promised to look for a fix, so no need to fix it here. The tests that are expected to break are: test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecs test_multibytecodec This merge fixes an actual test failure (test_weakref) in this branch, though, so I believe merging is the right thing to do anyway.
This commit is contained in:
parent
9ada3d6e29
commit
49fd7fa443
640 changed files with 52240 additions and 18408 deletions
|
@ -38,9 +38,8 @@ iter_dealloc(seqiterobject *it)
|
|||
static int
|
||||
iter_traverse(seqiterobject *it, visitproc visit, void *arg)
|
||||
{
|
||||
if (it->it_seq == NULL)
|
||||
return 0;
|
||||
return visit(it->it_seq, arg);
|
||||
Py_VISIT(it->it_seq);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
|
@ -123,7 +122,7 @@ PyTypeObject PySeqIter_Type = {
|
|||
0, /* tp_richcompare */
|
||||
0, /* tp_weaklistoffset */
|
||||
PyObject_SelfIter, /* tp_iter */
|
||||
(iternextfunc)iter_iternext, /* tp_iternext */
|
||||
iter_iternext, /* tp_iternext */
|
||||
seqiter_methods, /* tp_methods */
|
||||
0, /* tp_members */
|
||||
};
|
||||
|
@ -162,11 +161,8 @@ calliter_dealloc(calliterobject *it)
|
|||
static int
|
||||
calliter_traverse(calliterobject *it, visitproc visit, void *arg)
|
||||
{
|
||||
int err;
|
||||
if (it->it_callable != NULL && (err = visit(it->it_callable, arg)))
|
||||
return err;
|
||||
if (it->it_sentinel != NULL && (err = visit(it->it_sentinel, arg)))
|
||||
return err;
|
||||
Py_VISIT(it->it_callable);
|
||||
Py_VISIT(it->it_sentinel);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue